diff --git a/NpgsqlContentProvider/ChangeLog b/NpgsqlContentProvider/ChangeLog index 0b3a5c10..925ef31f 100644 --- a/NpgsqlContentProvider/ChangeLog +++ b/NpgsqlContentProvider/ChangeLog @@ -1,3 +1,8 @@ +2015-10-30 Paul Schneider + + * NpgsqlContentProvider.cs: refactoring: a dedicated name + space for the catalog + 2015-10-28 Paul Schneider * NpgsqlCircleProvider.cs: Restores circles edition diff --git a/NpgsqlContentProvider/NpgsqlContentProvider.cs b/NpgsqlContentProvider/NpgsqlContentProvider.cs index 2c3a514c..fc3cf861 100644 --- a/NpgsqlContentProvider/NpgsqlContentProvider.cs +++ b/NpgsqlContentProvider/NpgsqlContentProvider.cs @@ -12,6 +12,7 @@ using System.Runtime.Serialization.Json; using System.IO; using System.Text; using Newtonsoft.Json; +using Yavsc.Model.FrontOffice.Catalog; namespace Yavsc { diff --git a/SalesCatalog/ChangeLog b/SalesCatalog/ChangeLog index d0b6a8f8..2891a814 100644 --- a/SalesCatalog/ChangeLog +++ b/SalesCatalog/ChangeLog @@ -1,3 +1,9 @@ +2015-10-30 Paul Schneider + + * XmlCatalog.cs: + * XmlCatalogProvider.cs: refactoring: a dedicated name space + for the catalog + 2015-07-15 Paul Schneider * SalesCatalog.csproj: Moves to Mono framework diff --git a/SalesCatalog/XmlImplementation/XmlCatalog.cs b/SalesCatalog/XmlImplementation/XmlCatalog.cs index d2e8c21c..6957769e 100644 --- a/SalesCatalog/XmlImplementation/XmlCatalog.cs +++ b/SalesCatalog/XmlImplementation/XmlCatalog.cs @@ -1,6 +1,6 @@ using System; using System.Xml.Serialization; -using Yavsc.Model.FrontOffice; +using Yavsc.Model.FrontOffice.Catalog; namespace SalesCatalog.XmlImplementation { diff --git a/SalesCatalog/XmlImplementation/XmlCatalogProvider.cs b/SalesCatalog/XmlImplementation/XmlCatalogProvider.cs index 99cc3531..ea6eb00b 100644 --- a/SalesCatalog/XmlImplementation/XmlCatalogProvider.cs +++ b/SalesCatalog/XmlImplementation/XmlCatalogProvider.cs @@ -3,8 +3,8 @@ using System.Xml.Serialization; using System.Configuration; using System.IO; using System.Xml; -using Yavsc.Model.FrontOffice; using System.Web; +using Yavsc.Model.FrontOffice.Catalog; namespace SalesCatalog.XmlImplementation { diff --git a/web/ApiControllers/FrontOfficeController.cs b/web/ApiControllers/FrontOfficeController.cs index a7c43f12..a2079981 100644 --- a/web/ApiControllers/FrontOfficeController.cs +++ b/web/ApiControllers/FrontOfficeController.cs @@ -13,6 +13,7 @@ using Yavsc.Model.FrontOffice; using Yavsc.Model.RolesAndMembers; using Yavsc.Model.WorkFlow; using System.IO; +using Yavsc.Model.FrontOffice.Catalog; namespace Yavsc.ApiControllers { diff --git a/web/App_Themes/dark/images/ui-bg_glass_20_555555_1x400.png b/web/App_Themes/dark/images/ui-bg_glass_20_555555_1x400.png index ea805f98..6ffeab9d 100644 Binary files a/web/App_Themes/dark/images/ui-bg_glass_20_555555_1x400.png and b/web/App_Themes/dark/images/ui-bg_glass_20_555555_1x400.png differ diff --git a/web/App_Themes/dark/images/ui-bg_glass_40_0078a3_1x400.png b/web/App_Themes/dark/images/ui-bg_glass_40_0078a3_1x400.png index 58fdcfe7..dc5a6bf5 100644 Binary files a/web/App_Themes/dark/images/ui-bg_glass_40_0078a3_1x400.png and b/web/App_Themes/dark/images/ui-bg_glass_40_0078a3_1x400.png differ diff --git a/web/App_Themes/dark/images/ui-bg_glass_40_ffc73d_1x400.png b/web/App_Themes/dark/images/ui-bg_glass_40_ffc73d_1x400.png index 05575c0f..72a035d5 100644 Binary files a/web/App_Themes/dark/images/ui-bg_glass_40_ffc73d_1x400.png and b/web/App_Themes/dark/images/ui-bg_glass_40_ffc73d_1x400.png differ diff --git a/web/App_Themes/dark/images/ui-bg_gloss-wave_25_333333_500x100.png b/web/App_Themes/dark/images/ui-bg_gloss-wave_25_333333_500x100.png index fa9479fd..670b844f 100644 Binary files a/web/App_Themes/dark/images/ui-bg_gloss-wave_25_333333_500x100.png and b/web/App_Themes/dark/images/ui-bg_gloss-wave_25_333333_500x100.png differ diff --git a/web/App_Themes/dark/images/ui-bg_highlight-soft_80_eeeeee_1x100.png b/web/App_Themes/dark/images/ui-bg_highlight-soft_80_eeeeee_1x100.png index e1adedd1..cce32824 100644 Binary files a/web/App_Themes/dark/images/ui-bg_highlight-soft_80_eeeeee_1x100.png and b/web/App_Themes/dark/images/ui-bg_highlight-soft_80_eeeeee_1x100.png differ diff --git a/web/App_Themes/dark/images/ui-bg_inset-soft_25_000000_1x100.png b/web/App_Themes/dark/images/ui-bg_inset-soft_25_000000_1x100.png index 242f12ba..b9f22318 100644 Binary files a/web/App_Themes/dark/images/ui-bg_inset-soft_25_000000_1x100.png and b/web/App_Themes/dark/images/ui-bg_inset-soft_25_000000_1x100.png differ diff --git a/web/App_Themes/dark/images/ui-bg_inset-soft_30_f58400_1x100.png b/web/App_Themes/dark/images/ui-bg_inset-soft_30_f58400_1x100.png index d91945b4..6db83f8e 100644 Binary files a/web/App_Themes/dark/images/ui-bg_inset-soft_30_f58400_1x100.png and b/web/App_Themes/dark/images/ui-bg_inset-soft_30_f58400_1x100.png differ diff --git a/web/App_Themes/dark/images/ui-icons_222222_256x240.png b/web/App_Themes/dark/images/ui-icons_222222_256x240.png index 8a188cb6..e9c8e16a 100644 Binary files a/web/App_Themes/dark/images/ui-icons_222222_256x240.png and b/web/App_Themes/dark/images/ui-icons_222222_256x240.png differ diff --git a/web/App_Themes/dark/images/ui-icons_4b8e0b_256x240.png b/web/App_Themes/dark/images/ui-icons_4b8e0b_256x240.png index 512a87b7..3b237fba 100644 Binary files a/web/App_Themes/dark/images/ui-icons_4b8e0b_256x240.png and b/web/App_Themes/dark/images/ui-icons_4b8e0b_256x240.png differ diff --git a/web/App_Themes/dark/images/ui-icons_a83300_256x240.png b/web/App_Themes/dark/images/ui-icons_a83300_256x240.png index c3008c6a..4e7008e0 100644 Binary files a/web/App_Themes/dark/images/ui-icons_a83300_256x240.png and b/web/App_Themes/dark/images/ui-icons_a83300_256x240.png differ diff --git a/web/App_Themes/dark/images/ui-icons_cccccc_256x240.png b/web/App_Themes/dark/images/ui-icons_cccccc_256x240.png index d5a2d82e..9fdc41a9 100644 Binary files a/web/App_Themes/dark/images/ui-icons_cccccc_256x240.png and b/web/App_Themes/dark/images/ui-icons_cccccc_256x240.png differ diff --git a/web/App_Themes/dark/images/ui-icons_ffffff_256x240.png b/web/App_Themes/dark/images/ui-icons_ffffff_256x240.png index 6126c4e3..4d66f596 100644 Binary files a/web/App_Themes/dark/images/ui-icons_ffffff_256x240.png and b/web/App_Themes/dark/images/ui-icons_ffffff_256x240.png differ diff --git a/web/App_Themes/images/ui-bg_glass_20_555555_1x400.png b/web/App_Themes/images/ui-bg_glass_20_555555_1x400.png index ea805f98..6ffeab9d 100644 Binary files a/web/App_Themes/images/ui-bg_glass_20_555555_1x400.png and b/web/App_Themes/images/ui-bg_glass_20_555555_1x400.png differ diff --git a/web/App_Themes/images/ui-bg_glass_40_0078a3_1x400.png b/web/App_Themes/images/ui-bg_glass_40_0078a3_1x400.png index 58fdcfe7..dc5a6bf5 100644 Binary files a/web/App_Themes/images/ui-bg_glass_40_0078a3_1x400.png and b/web/App_Themes/images/ui-bg_glass_40_0078a3_1x400.png differ diff --git a/web/App_Themes/images/ui-bg_glass_40_ffc73d_1x400.png b/web/App_Themes/images/ui-bg_glass_40_ffc73d_1x400.png index 05575c0f..72a035d5 100644 Binary files a/web/App_Themes/images/ui-bg_glass_40_ffc73d_1x400.png and b/web/App_Themes/images/ui-bg_glass_40_ffc73d_1x400.png differ diff --git a/web/App_Themes/images/ui-bg_gloss-wave_25_333333_500x100.png b/web/App_Themes/images/ui-bg_gloss-wave_25_333333_500x100.png index fa9479fd..670b844f 100644 Binary files a/web/App_Themes/images/ui-bg_gloss-wave_25_333333_500x100.png and b/web/App_Themes/images/ui-bg_gloss-wave_25_333333_500x100.png differ diff --git a/web/App_Themes/images/ui-bg_highlight-soft_80_eeeeee_1x100.png b/web/App_Themes/images/ui-bg_highlight-soft_80_eeeeee_1x100.png index e1adedd1..cce32824 100644 Binary files a/web/App_Themes/images/ui-bg_highlight-soft_80_eeeeee_1x100.png and b/web/App_Themes/images/ui-bg_highlight-soft_80_eeeeee_1x100.png differ diff --git a/web/App_Themes/images/ui-bg_inset-soft_25_000000_1x100.png b/web/App_Themes/images/ui-bg_inset-soft_25_000000_1x100.png index 242f12ba..b9f22318 100644 Binary files a/web/App_Themes/images/ui-bg_inset-soft_25_000000_1x100.png and b/web/App_Themes/images/ui-bg_inset-soft_25_000000_1x100.png differ diff --git a/web/App_Themes/images/ui-bg_inset-soft_30_f58400_1x100.png b/web/App_Themes/images/ui-bg_inset-soft_30_f58400_1x100.png index d91945b4..6db83f8e 100644 Binary files a/web/App_Themes/images/ui-bg_inset-soft_30_f58400_1x100.png and b/web/App_Themes/images/ui-bg_inset-soft_30_f58400_1x100.png differ diff --git a/web/App_Themes/images/ui-icons_222222_256x240.png b/web/App_Themes/images/ui-icons_222222_256x240.png index 8a188cb6..e9c8e16a 100644 Binary files a/web/App_Themes/images/ui-icons_222222_256x240.png and b/web/App_Themes/images/ui-icons_222222_256x240.png differ diff --git a/web/App_Themes/images/ui-icons_4b8e0b_256x240.png b/web/App_Themes/images/ui-icons_4b8e0b_256x240.png index 512a87b7..3b237fba 100644 Binary files a/web/App_Themes/images/ui-icons_4b8e0b_256x240.png and b/web/App_Themes/images/ui-icons_4b8e0b_256x240.png differ diff --git a/web/App_Themes/images/ui-icons_a83300_256x240.png b/web/App_Themes/images/ui-icons_a83300_256x240.png index c3008c6a..4e7008e0 100644 Binary files a/web/App_Themes/images/ui-icons_a83300_256x240.png and b/web/App_Themes/images/ui-icons_a83300_256x240.png differ diff --git a/web/App_Themes/images/ui-icons_cccccc_256x240.png b/web/App_Themes/images/ui-icons_cccccc_256x240.png index d5a2d82e..9fdc41a9 100644 Binary files a/web/App_Themes/images/ui-icons_cccccc_256x240.png and b/web/App_Themes/images/ui-icons_cccccc_256x240.png differ diff --git a/web/App_Themes/images/ui-icons_ffffff_256x240.png b/web/App_Themes/images/ui-icons_ffffff_256x240.png index 6126c4e3..4d66f596 100644 Binary files a/web/App_Themes/images/ui-icons_ffffff_256x240.png and b/web/App_Themes/images/ui-icons_ffffff_256x240.png differ diff --git a/web/App_Themes/jquery.timepicker.css b/web/App_Themes/jquery.timepicker.css index cd75f13f..112cc38f 100755 --- a/web/App_Themes/jquery.timepicker.css +++ b/web/App_Themes/jquery.timepicker.css @@ -2,11 +2,11 @@ overflow-y: auto; height: 150px; width: 6.5em; - background: #fff; + background: #000; border: 1px solid #ddd; - -webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2); - -moz-box-shadow:0 5px 10px rgba(0,0,0,0.2); - box-shadow:0 5px 10px rgba(0,0,0,0.2); + -webkit-box-shadow:0 5px 10px rgba(256,256,256,0.2); + -moz-box-shadow:0 5px 10px rgba(256,256,256,0.2); + box-shadow:0 5px 10px rgba(256,256,256,0.2); outline: none; z-index: 10001; margin: 0; @@ -39,24 +39,24 @@ padding: 3px 0 3px 5px; cursor: pointer; white-space: nowrap; - color: #000; + color: #fff; list-style: none; margin: 0; } .ui-timepicker-list:hover .ui-timepicker-selected { - background: #fff; color: #000; + background: #000; color: #fff; } li.ui-timepicker-selected, .ui-timepicker-list li:hover, .ui-timepicker-list .ui-timepicker-selected:hover { - background: #1980EC; color: #fff; + background: #D78012; color: #000; } li.ui-timepicker-selected .ui-timepicker-duration, .ui-timepicker-list li:hover .ui-timepicker-duration { - color: #ccc; + color: #333; } .ui-timepicker-list li.ui-timepicker-disabled, @@ -68,5 +68,5 @@ li.ui-timepicker-selected .ui-timepicker-duration, .ui-timepicker-list li.ui-timepicker-disabled:hover, .ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled { - background: #f2f2f2; + background: #0d0d0d; } diff --git a/web/CatExts/WebCatalogExtensions.cs b/web/CatExts/WebCatalogExtensions.cs index 178db006..24f0b583 100644 --- a/web/CatExts/WebCatalogExtensions.cs +++ b/web/CatExts/WebCatalogExtensions.cs @@ -5,6 +5,7 @@ using System.Web.Mvc; using System.Web.Routing; using Yavsc.Model.FrontOffice; using System.Web.Mvc.Html; +using Yavsc.Model.FrontOffice.Catalog; namespace Yavsc.CatExts { diff --git a/web/ChangeLog b/web/ChangeLog index 2627d6e8..cdda226f 100644 --- a/web/ChangeLog +++ b/web/ChangeLog @@ -1,3 +1,52 @@ +2015-10-30 Paul Schneider + + * packages.config: + * App.master: + * datepair.js: + * Book.aspx: + * datepair.min.js: + * jquery.datepair.js: + * jquery-ui-1.11.4.js: + * jquery.timepicker.js: + * jquery-1.11.3.min.js: + * jquery.datepair.min.js: + * WebCatalogExtensions.cs: + * GoogleController.cs: + * jquery.timepicker.min.js: + * jquery.timepicker.css: + * FrontOfficeController.cs: + * ui-icons_ffffff_256x240.png: + * ui-icons_cccccc_256x240.png: + * ui-icons_a83300_256x240.png: + * ui-icons_4b8e0b_256x240.png: + * ui-icons_222222_256x240.png: + * ui-bg_glass_40_ffc73d_1x400.png: + * ui-bg_glass_40_0078a3_1x400.png: + * ui-bg_glass_20_555555_1x400.png: + * ui-icons_222222_256x240.png: + * ui-icons_4b8e0b_256x240.png: + * ui-icons_a83300_256x240.png: + * ui-icons_cccccc_256x240.png: + * ui-icons_ffffff_256x240.png: + * ui-bg_glass_40_ffc73d_1x400.png: + * ui-bg_glass_40_0078a3_1x400.png: + * ui-bg_glass_20_555555_1x400.png: + * ui-bg_inset-soft_25_000000_1x100.png: + * ui-bg_inset-soft_30_f58400_1x100.png: + * ui-bg_gloss-wave_25_333333_500x100.png: + * ui-bg_highlight-soft_80_eeeeee_1x100.png: + * ui-bg_inset-soft_30_f58400_1x100.png: + * ui-bg_inset-soft_25_000000_1x100.png: + * ui-bg_gloss-wave_25_333333_500x100.png: + * ui-bg_highlight-soft_80_eeeeee_1x100.png: + + * FrontOfficeController.cs: refactoring: a dedicated name + space for the catalog + + * ChooseADate.aspx: WIP + + * Web.csproj: date pairing : includes the javascript modules + 2015-10-29 Paul Schneider * Index.aspx: Gives this page a title diff --git a/web/Controllers/FrontOfficeController.cs b/web/Controllers/FrontOfficeController.cs index 64cccc2d..1886e892 100644 --- a/web/Controllers/FrontOfficeController.cs +++ b/web/Controllers/FrontOfficeController.cs @@ -15,6 +15,7 @@ using Yavsc.Model.FileSystem; using Yavsc.Model.Calendar; using System.Configuration; using Yavsc.Helpers; +using Yavsc.Model.FrontOffice.Catalog; namespace Yavsc.Controllers { diff --git a/web/Controllers/GoogleController.cs b/web/Controllers/GoogleController.cs index b29043e6..b8092d61 100644 --- a/web/Controllers/GoogleController.cs +++ b/web/Controllers/GoogleController.cs @@ -314,10 +314,10 @@ namespace Yavsc.Controllers { if (ModelState.IsValid) { DateTime mindate = DateTime.Now; - if (model.PreferedDate < mindate) - model.PreferedDate = mindate; - if (model.MaxDate < mindate) - model.MaxDate = mindate.AddYears (1).Date; + if (model.StartDate < mindate) + model.StartDate = mindate; + if (model.EndDate < mindate) + model.EndDate = mindate.AddYears (1).Date; var muc = Membership.FindUsersByName (model.Person); if (muc.Count == 0) { @@ -336,7 +336,7 @@ namespace Yavsc.Controllers ModelState.AddModelError ("Person", LocalizedText.No_calendar_for_this_user); return View (model); } - DateTime maxdate = model.MaxDate; + DateTime maxdate = model.EndDate; CalendarApi c = new CalendarApi (); CalendarEventList res; try { diff --git a/web/Models/App.master b/web/Models/App.master index b8fbdaab..1cec7333 100644 --- a/web/Models/App.master +++ b/web/Models/App.master @@ -15,7 +15,7 @@ " /> - + + + + + + + + + + + + + + +<% using ( Html.BeginForm("Book","Google") ) { %> +
+Date d'intervention +Intervention souhaitée entre le + "> + <%= Html.ValidationMessageFor(model=>model.StartDate) %> +et le + "> + <%= Html.ValidationMessageFor(model=>model.EndDate) %> +
+
+Heure et durée d'intervention souhaitée +<%= Html.LabelFor(model=>model.StartHour) %> + "> + <%= Html.ValidationMessageFor(model=>model.StartHour) %> + +<%= Html.LabelFor(model=>model.EndHour) %> + "> + <%= Html.ValidationMessageFor(model=>model.EndHour) %> +
+
+
+Intervenant + <%= Html.LabelFor(model=>model.Role) %>: + <%= Html.TextBoxFor(model=>model.Role) %> + <%= Html.ValidationMessageFor(model=>model.Role) %> +
+ <%= Html.LabelFor(model=>model.Person) %>: + <%= Html.TextBoxFor(model=>model.Person) %> + <%= Html.ValidationMessageFor(model=>model.Person) %> +
+ + + +<% } %> +
<%= Html.Encode(ViewData["json"]) %>
+ +
diff --git a/web/Views/Google/Book.aspx b/web/Views/Google/Book.aspx index 1dc0f864..0d2092bf 100644 --- a/web/Views/Google/Book.aspx +++ b/web/Views/Google/Book.aspx @@ -1,71 +1,39 @@ <%@ Page Title="Booking" Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/App.master" %> - - - - - - - + + - - - + + + <% using ( Html.BeginForm("Book","Google") ) { %> -
Période de recherche - -<%= Html.LabelFor(model=>model.PreferedDate) %>: - <%= Html.TextBoxFor(model => model.PreferedDate) %> - <%= Html.ValidationMessageFor(model=>model.PreferedDate) %> -
-<%= Html.LabelFor(model=>model.PreferedHour) %>: - <%= Html.TextBoxFor(model=>model.PreferedHour) %> - <%= Html.ValidationMessageFor(model=>model.PreferedHour) %> -
-<%= Html.LabelFor(model=>model.MaxDate) %>: - <%= Html.TextBoxFor(model=>model.MaxDate) %> - <%= Html.ValidationMessageFor(model=>model.MaxDate) %> +
Date d'intervention : +Intervention souhaitée entre le + + <%= Html.ValidationMessageFor(model=>model.StartDate) %> +et le + + <%= Html.ValidationMessageFor(model=>model.EndDate) %>
-<%= Html.LabelFor(model=>model.MinDuration) %>: - <%= Html.TextBoxFor(model=>model.MinDuration) %> - <%= Html.ValidationMessageFor(model=>model.MinDuration) %> -
+ Heure et durée d'intervention souhaitée +<%= Html.LabelFor(model=>model.StartHour) %> + + <%= Html.ValidationMessageFor(model=>model.StartHour) %> + +<%= Html.LabelFor(model=>model.EndHour) %> + + <%= Html.ValidationMessageFor(model=>model.EndHour) %> + +
+
+Intervenant <%= Html.LabelFor(model=>model.Role) %>: <%= Html.TextBoxFor(model=>model.Role) %> <%= Html.ValidationMessageFor(model=>model.Role) %> @@ -73,19 +41,26 @@ return Globalize.format( new Date(value), "t" ); <%= Html.LabelFor(model=>model.Person) %>: <%= Html.TextBoxFor(model=>model.Person) %> <%= Html.ValidationMessageFor(model=>model.Person) %> -
+
+ $(document).ready(function(){ + var tpconfig = { + 'timeFormat': 'H:i', + 'showDuration': true, + 'disableTimeRanges': [ + ['17:01pm', '24:01pm'], + ['0am', '9am'] + ]}; + $.datepicker.setDefaults($.datepicker.regional[ "fr" ] ); + var dpconfig = { + 'format': 'yy/mm/dd', + 'autoclose': true } ; + + $('#book .time').timepicker(tpconfig); + $('#book .date').datepicker(dpconfig); + $('#book').datepair(); + }); + <% } %> diff --git a/web/Views/Google/ChooseADate.aspx b/web/Views/Google/ChooseADate.aspx index 37b7cbdc..63e3053a 100644 --- a/web/Views/Google/ChooseADate.aspx +++ b/web/Views/Google/ChooseADate.aspx @@ -1,12 +1,10 @@ -<%@ Page Title="Google calendar usage" Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/App.master" %> +<%@ Page Title="Google calendar usage" Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/App.master" %> -<% using ( Html.BeginForm("SetCalendar","Google") ) { %> -<% foreach (CalendarListEntry e in Model.items.Where(x=>x.accessRole=="owner")) { %> - -<%=Html.Encode(e.summary)%>
-<%=Html.Encode(e.description)%>
+<% using ( Html.BeginForm("ChooseAStartingDate","Google") ) { %> +<% foreach (Period e in Model.Values) { %> + <% } %> "> diff --git a/web/Web.csproj b/web/Web.csproj index 930cab8f..032ff932 100644 --- a/web/Web.csproj +++ b/web/Web.csproj @@ -462,6 +462,12 @@ + + + + + + diff --git a/web/packages.config b/web/packages.config index 21de4205..8a9e87aa 100644 --- a/web/packages.config +++ b/web/packages.config @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/yavscModel/Calendar/BookQuery.cs b/yavscModel/Calendar/BookQuery.cs index aec2c321..854d9507 100644 --- a/yavscModel/Calendar/BookQuery.cs +++ b/yavscModel/Calendar/BookQuery.cs @@ -35,24 +35,26 @@ namespace Yavsc.Model.Calendar /// /// The prefered date. [DataType(DataType.Date)] - [DisplayFormat(DataFormatString = "{0:dd/MM/yyyy}", ApplyFormatInEditMode = true)] - public DateTime PreferedDate { get; set; } + [DisplayFormat(DataFormatString = "{0:yyyy/MM/dd}", ApplyFormatInEditMode = true)] + [Display(ResourceType=typeof(LocalizedText),Name="StartDate")] + public DateTime StartDate { get; set; } /// /// Gets or sets the minimum time. /// /// The minimum time. [RegularExpression("\\d\\d:\\d\\d")] - public string PreferedHour { get; set; } + [Display(ResourceType=typeof(LocalizedText),Name="StartHour")] + public string StartHour { get; set; } /// /// Gets or sets the max date. /// /// The max date. - [Display(Name="MaxDate",ResourceType=typeof(LocalizedText))] + [Display(Name="EndDate",ResourceType=typeof(LocalizedText))] [DataType(DataType.Date)] - [DisplayFormat(DataFormatString = "{0:dd/MM/yyyy}", ApplyFormatInEditMode = true)] - public DateTime MaxDate { get; set; } + [DisplayFormat(DataFormatString = "{0:yyyy/MM/dd}", ApplyFormatInEditMode = true)] + public DateTime EndDate { get; set; } /// @@ -61,7 +63,8 @@ namespace Yavsc.Model.Calendar /// The duration. [RegularExpression("\\d\\d:\\d\\d")] [Required(ErrorMessage= "S'il vous plait, saisissez une durée minimale d'intervention")] - public string MinDuration { get; set; } + [Display(Name="EndHour",ResourceType=typeof(LocalizedText))] + public string EndHour { get; set; } /// /// Gets or sets the person. diff --git a/yavscModel/ChangeLog b/yavscModel/ChangeLog index 5c60f251..ff4ae535 100644 --- a/yavscModel/ChangeLog +++ b/yavscModel/ChangeLog @@ -1,3 +1,50 @@ +2015-10-30 Paul Schneider + + * LocalizedText.resx: + * LocalizedText.fr.resx: + * BookQuery.cs: + * LocalizedText.Designer.cs: + * Link.cs: + * Note.cs: + * Euro.cs: + * Text.cs: + * Unit.cs: + * LocalizedText.fr.Designer.cs: + * Brand.cs: + * Label.cs: + * Scalar.cs: + * Period.cs: + * Option.cs: + * Product.cs: + * Catalog.cs: + * Service.cs: + * SaleForm.cs: + * Currency.cs: + * CheckBox.cs: + * FormInput.cs: + * TextInput.cs: + * SelectItem.cs: + * FilesInput.cs: + * RadioButton.cs: + * StockStatus.cs: + * SelectInput.cs: + * FormElement.cs: + * ProductImage.cs: + * CatalogHelper.cs: + * CatalogManager.cs: + * CatalogProvider.cs: + * PhysicalProduct.cs: + * ProductCategory.cs: + * CatalogProviderConfigurationElement.cs: + * CatalogProvidersConfigurationSection.cs: + * CatalogProvidersConfigurationCollection.cs: + + * WorkFlowManager.cs: + * IContentProvider.cs: + * Price.cs: + * PriceOnItemCount.cs: refactoring: a dedicated name space for + the catalog + 2015-10-29 Paul Schneider * YavscModel.csproj: diff --git a/yavscModel/FrontOffice/Catalog/Billing/Price.cs b/yavscModel/FrontOffice/Catalog/Billing/Price.cs index 32b0512e..c416d089 100644 --- a/yavscModel/FrontOffice/Catalog/Billing/Price.cs +++ b/yavscModel/FrontOffice/Catalog/Billing/Price.cs @@ -1,6 +1,6 @@ using System; -namespace Yavsc.Model.FrontOffice.Billing +namespace Yavsc.Model.FrontOffice.Catalog.Billing { /// /// Price. diff --git a/yavscModel/FrontOffice/Catalog/Billing/PriceOnItemCount.cs b/yavscModel/FrontOffice/Catalog/Billing/PriceOnItemCount.cs index 5a73554a..4200986e 100644 --- a/yavscModel/FrontOffice/Catalog/Billing/PriceOnItemCount.cs +++ b/yavscModel/FrontOffice/Catalog/Billing/PriceOnItemCount.cs @@ -21,7 +21,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace Yavsc.Model.FrontOffice.Billing +namespace Yavsc.Model.FrontOffice.Catalog.Billing { /// /// A set price. diff --git a/yavscModel/FrontOffice/Catalog/Brand.cs b/yavscModel/FrontOffice/Catalog/Brand.cs index e2fe27ba..2bcc76c7 100644 --- a/yavscModel/FrontOffice/Catalog/Brand.cs +++ b/yavscModel/FrontOffice/Catalog/Brand.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Brand. diff --git a/yavscModel/FrontOffice/Catalog/Catalog.cs b/yavscModel/FrontOffice/Catalog/Catalog.cs index 59a3cfab..294d359d 100644 --- a/yavscModel/FrontOffice/Catalog/Catalog.cs +++ b/yavscModel/FrontOffice/Catalog/Catalog.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Catalog. diff --git a/yavscModel/FrontOffice/Catalog/CatalogHelper.cs b/yavscModel/FrontOffice/Catalog/CatalogHelper.cs index 205c7162..50c16c56 100644 --- a/yavscModel/FrontOffice/Catalog/CatalogHelper.cs +++ b/yavscModel/FrontOffice/Catalog/CatalogHelper.cs @@ -2,9 +2,9 @@ using System; using System.Configuration; using System.Reflection; using System.Collections.Specialized; -using Yavsc.Model.FrontOffice.Configuration; +using Yavsc.Model.FrontOffice.Catalog.Configuration; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Catalog helper. diff --git a/yavscModel/FrontOffice/Catalog/CatalogManager.cs b/yavscModel/FrontOffice/Catalog/CatalogManager.cs index 84bb86d0..556fcc67 100644 --- a/yavscModel/FrontOffice/Catalog/CatalogManager.cs +++ b/yavscModel/FrontOffice/Catalog/CatalogManager.cs @@ -2,7 +2,7 @@ using System; using System.Web; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Catalog manager. diff --git a/yavscModel/FrontOffice/Catalog/CatalogProvider.cs b/yavscModel/FrontOffice/Catalog/CatalogProvider.cs index d479aaa2..8c71689a 100644 --- a/yavscModel/FrontOffice/Catalog/CatalogProvider.cs +++ b/yavscModel/FrontOffice/Catalog/CatalogProvider.cs @@ -1,7 +1,7 @@ using System; using System.Configuration.Provider; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Catalog provider.
diff --git a/yavscModel/FrontOffice/Catalog/CheckBox.cs b/yavscModel/FrontOffice/Catalog/CheckBox.cs index 73261d39..6a3d6c19 100644 --- a/yavscModel/FrontOffice/Catalog/CheckBox.cs +++ b/yavscModel/FrontOffice/Catalog/CheckBox.cs @@ -1,6 +1,6 @@ using System; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Check box. diff --git a/yavscModel/FrontOffice/Catalog/Configuration/CatalogProviderConfigurationElement.cs b/yavscModel/FrontOffice/Catalog/Configuration/CatalogProviderConfigurationElement.cs index 11f35018..3cefe1e4 100644 --- a/yavscModel/FrontOffice/Catalog/Configuration/CatalogProviderConfigurationElement.cs +++ b/yavscModel/FrontOffice/Catalog/Configuration/CatalogProviderConfigurationElement.cs @@ -1,7 +1,7 @@ using System; using System.Configuration; -namespace Yavsc.Model.FrontOffice.Configuration +namespace Yavsc.Model.FrontOffice.Catalog.Configuration { /// /// Catalog provider configuration element. diff --git a/yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationCollection.cs b/yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationCollection.cs index 0b18ac24..9da6d4c0 100644 --- a/yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationCollection.cs +++ b/yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationCollection.cs @@ -2,7 +2,7 @@ using System; using System.Configuration; using System.ComponentModel; -namespace Yavsc.Model.FrontOffice.Configuration +namespace Yavsc.Model.FrontOffice.Catalog.Configuration { /// /// Catalog providers configuration collection. diff --git a/yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationSection.cs b/yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationSection.cs index 7db9eece..a0da4132 100644 --- a/yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationSection.cs +++ b/yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationSection.cs @@ -2,7 +2,7 @@ using System; using System.Configuration; using System.ComponentModel; -namespace Yavsc.Model.FrontOffice.Configuration +namespace Yavsc.Model.FrontOffice.Catalog.Configuration { /// /// Catalog providers configuration section. diff --git a/yavscModel/FrontOffice/Catalog/Currency.cs b/yavscModel/FrontOffice/Catalog/Currency.cs index 5b2333c5..0390f407 100644 --- a/yavscModel/FrontOffice/Catalog/Currency.cs +++ b/yavscModel/FrontOffice/Catalog/Currency.cs @@ -1,6 +1,6 @@ using System; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Currency. diff --git a/yavscModel/FrontOffice/Catalog/Euro.cs b/yavscModel/FrontOffice/Catalog/Euro.cs index ada9cbc9..5de666a5 100644 --- a/yavscModel/FrontOffice/Catalog/Euro.cs +++ b/yavscModel/FrontOffice/Catalog/Euro.cs @@ -1,6 +1,6 @@ using System; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Euro. diff --git a/yavscModel/FrontOffice/Catalog/FilesInput.cs b/yavscModel/FrontOffice/Catalog/FilesInput.cs index 92f032c3..7e6df5c5 100644 --- a/yavscModel/FrontOffice/Catalog/FilesInput.cs +++ b/yavscModel/FrontOffice/Catalog/FilesInput.cs @@ -1,6 +1,6 @@ using System; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Files input. diff --git a/yavscModel/FrontOffice/Catalog/FormElement.cs b/yavscModel/FrontOffice/Catalog/FormElement.cs index a4bbc039..a60d1382 100644 --- a/yavscModel/FrontOffice/Catalog/FormElement.cs +++ b/yavscModel/FrontOffice/Catalog/FormElement.cs @@ -1,6 +1,6 @@ using System; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Form element. diff --git a/yavscModel/FrontOffice/Catalog/FormInput.cs b/yavscModel/FrontOffice/Catalog/FormInput.cs index a3f09ce6..6db4038d 100644 --- a/yavscModel/FrontOffice/Catalog/FormInput.cs +++ b/yavscModel/FrontOffice/Catalog/FormInput.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Form input. diff --git a/yavscModel/FrontOffice/Catalog/Label.cs b/yavscModel/FrontOffice/Catalog/Label.cs index 5c8cc0c9..66fbcacd 100644 --- a/yavscModel/FrontOffice/Catalog/Label.cs +++ b/yavscModel/FrontOffice/Catalog/Label.cs @@ -1,6 +1,6 @@ using System; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Label. diff --git a/yavscModel/FrontOffice/Catalog/Link.cs b/yavscModel/FrontOffice/Catalog/Link.cs index 2dc7e242..a4e6fcf6 100644 --- a/yavscModel/FrontOffice/Catalog/Link.cs +++ b/yavscModel/FrontOffice/Catalog/Link.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Link. diff --git a/yavscModel/FrontOffice/Catalog/Note.cs b/yavscModel/FrontOffice/Catalog/Note.cs index e9f4c499..71e28441 100644 --- a/yavscModel/FrontOffice/Catalog/Note.cs +++ b/yavscModel/FrontOffice/Catalog/Note.cs @@ -1,6 +1,6 @@ using System; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Note. diff --git a/yavscModel/FrontOffice/Catalog/Option.cs b/yavscModel/FrontOffice/Catalog/Option.cs index 11d41d1e..94053c7d 100644 --- a/yavscModel/FrontOffice/Catalog/Option.cs +++ b/yavscModel/FrontOffice/Catalog/Option.cs @@ -1,6 +1,6 @@ using System; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Option. diff --git a/yavscModel/FrontOffice/Catalog/Period.cs b/yavscModel/FrontOffice/Catalog/Period.cs index 3f3a3785..852e172d 100644 --- a/yavscModel/FrontOffice/Catalog/Period.cs +++ b/yavscModel/FrontOffice/Catalog/Period.cs @@ -1,6 +1,6 @@ using System; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Period. diff --git a/yavscModel/FrontOffice/Catalog/PhysicalProduct.cs b/yavscModel/FrontOffice/Catalog/PhysicalProduct.cs index 45791074..d4c8b0c0 100644 --- a/yavscModel/FrontOffice/Catalog/PhysicalProduct.cs +++ b/yavscModel/FrontOffice/Catalog/PhysicalProduct.cs @@ -1,7 +1,7 @@ using System; -using Yavsc.Model.FrontOffice.Billing; +using Yavsc.Model.FrontOffice.Catalog.Billing; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Physical product. diff --git a/yavscModel/FrontOffice/Catalog/Product.cs b/yavscModel/FrontOffice/Catalog/Product.cs index c4c5d6ce..6b444cae 100644 --- a/yavscModel/FrontOffice/Catalog/Product.cs +++ b/yavscModel/FrontOffice/Catalog/Product.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Product. diff --git a/yavscModel/FrontOffice/Catalog/ProductCategory.cs b/yavscModel/FrontOffice/Catalog/ProductCategory.cs index 6ff33efd..23f53c92 100644 --- a/yavscModel/FrontOffice/Catalog/ProductCategory.cs +++ b/yavscModel/FrontOffice/Catalog/ProductCategory.cs @@ -1,6 +1,6 @@ using System; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Product category. diff --git a/yavscModel/FrontOffice/Catalog/ProductImage.cs b/yavscModel/FrontOffice/Catalog/ProductImage.cs index 5de578db..f8ca604a 100644 --- a/yavscModel/FrontOffice/Catalog/ProductImage.cs +++ b/yavscModel/FrontOffice/Catalog/ProductImage.cs @@ -1,6 +1,6 @@ using System; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Product image. diff --git a/yavscModel/FrontOffice/Catalog/RadioButton.cs b/yavscModel/FrontOffice/Catalog/RadioButton.cs index 416b7364..e8803732 100644 --- a/yavscModel/FrontOffice/Catalog/RadioButton.cs +++ b/yavscModel/FrontOffice/Catalog/RadioButton.cs @@ -1,6 +1,6 @@ using System; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Radio button. diff --git a/yavscModel/FrontOffice/Catalog/SaleForm.cs b/yavscModel/FrontOffice/Catalog/SaleForm.cs index 288f2302..947ebfa0 100644 --- a/yavscModel/FrontOffice/Catalog/SaleForm.cs +++ b/yavscModel/FrontOffice/Catalog/SaleForm.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Sale form. diff --git a/yavscModel/FrontOffice/Catalog/Scalar.cs b/yavscModel/FrontOffice/Catalog/Scalar.cs index f8801f23..003b8268 100644 --- a/yavscModel/FrontOffice/Catalog/Scalar.cs +++ b/yavscModel/FrontOffice/Catalog/Scalar.cs @@ -1,6 +1,6 @@ using System; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Scalar. diff --git a/yavscModel/FrontOffice/Catalog/SelectInput.cs b/yavscModel/FrontOffice/Catalog/SelectInput.cs index 1da29294..3c6a4b19 100644 --- a/yavscModel/FrontOffice/Catalog/SelectInput.cs +++ b/yavscModel/FrontOffice/Catalog/SelectInput.cs @@ -2,7 +2,7 @@ using System; using System.Text; using System.Web.Mvc; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Select input. diff --git a/yavscModel/FrontOffice/Catalog/SelectItem.cs b/yavscModel/FrontOffice/Catalog/SelectItem.cs index 9c849fd1..c762d1db 100644 --- a/yavscModel/FrontOffice/Catalog/SelectItem.cs +++ b/yavscModel/FrontOffice/Catalog/SelectItem.cs @@ -1,6 +1,6 @@ using System; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Select item. diff --git a/yavscModel/FrontOffice/Catalog/Service.cs b/yavscModel/FrontOffice/Catalog/Service.cs index e1cfd7a3..95f3a391 100644 --- a/yavscModel/FrontOffice/Catalog/Service.cs +++ b/yavscModel/FrontOffice/Catalog/Service.cs @@ -1,7 +1,7 @@ using System; -using Yavsc.Model.FrontOffice.Billing; +using Yavsc.Model.FrontOffice.Catalog.Billing; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Service. diff --git a/yavscModel/FrontOffice/Catalog/StockStatus.cs b/yavscModel/FrontOffice/Catalog/StockStatus.cs index ff346a57..ddfa281c 100644 --- a/yavscModel/FrontOffice/Catalog/StockStatus.cs +++ b/yavscModel/FrontOffice/Catalog/StockStatus.cs @@ -1,6 +1,6 @@ using System; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Stock status. diff --git a/yavscModel/FrontOffice/Catalog/Text.cs b/yavscModel/FrontOffice/Catalog/Text.cs index 2981ee67..f2321fe7 100644 --- a/yavscModel/FrontOffice/Catalog/Text.cs +++ b/yavscModel/FrontOffice/Catalog/Text.cs @@ -1,6 +1,6 @@ using System; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Text. diff --git a/yavscModel/FrontOffice/Catalog/TextInput.cs b/yavscModel/FrontOffice/Catalog/TextInput.cs index 35f92473..4ba1efb0 100644 --- a/yavscModel/FrontOffice/Catalog/TextInput.cs +++ b/yavscModel/FrontOffice/Catalog/TextInput.cs @@ -1,6 +1,6 @@ using System; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Text input. diff --git a/yavscModel/FrontOffice/Catalog/Unit.cs b/yavscModel/FrontOffice/Catalog/Unit.cs index a760458a..009531d7 100644 --- a/yavscModel/FrontOffice/Catalog/Unit.cs +++ b/yavscModel/FrontOffice/Catalog/Unit.cs @@ -1,6 +1,6 @@ using System; -namespace Yavsc.Model.FrontOffice +namespace Yavsc.Model.FrontOffice.Catalog { /// /// Unit. diff --git a/yavscModel/LocalizedText.Designer.cs b/yavscModel/LocalizedText.Designer.cs index 0fc77ddd..aa63b8b5 100644 --- a/yavscModel/LocalizedText.Designer.cs +++ b/yavscModel/LocalizedText.Designer.cs @@ -184,9 +184,9 @@ namespace Yavsc.Model { } } - public static string My_Estimates { + public static string EndHour { get { - return ResourceManager.GetString("My_Estimates", resourceCulture); + return ResourceManager.GetString("EndHour", resourceCulture); } } @@ -280,6 +280,12 @@ namespace Yavsc.Model { } } + public static string My_Estimates { + get { + return ResourceManager.GetString("My_Estimates", resourceCulture); + } + } + public static string Location { get { return ResourceManager.GetString("Location", resourceCulture); @@ -460,6 +466,12 @@ namespace Yavsc.Model { } } + public static string StartHour { + get { + return ResourceManager.GetString("StartHour", resourceCulture); + } + } + public static string Unitary_cost { get { return ResourceManager.GetString("Unitary_cost", resourceCulture); diff --git a/yavscModel/LocalizedText.fr.Designer.cs b/yavscModel/LocalizedText.fr.Designer.cs index af6a6185..014568c3 100644 --- a/yavscModel/LocalizedText.fr.Designer.cs +++ b/yavscModel/LocalizedText.fr.Designer.cs @@ -112,6 +112,12 @@ namespace Yavsc.Model { } } + public static string Create { + get { + return ResourceManager.GetString("Create", resourceCulture); + } + } + public static string User_name { get { return ResourceManager.GetString("User_name", resourceCulture); @@ -184,9 +190,9 @@ namespace Yavsc.Model { } } - public static string Create { + public static string EndHour { get { - return ResourceManager.GetString("Create", resourceCulture); + return ResourceManager.GetString("EndHour", resourceCulture); } } @@ -214,6 +220,12 @@ namespace Yavsc.Model { } } + public static string Tag_name { + get { + return ResourceManager.GetString("Tag_name", resourceCulture); + } + } + public static string Google_error { get { return ResourceManager.GetString("Google_error", resourceCulture); @@ -274,9 +286,9 @@ namespace Yavsc.Model { } } - public static string Tag_name { + public static string StartHour { get { - return ResourceManager.GetString("Tag_name", resourceCulture); + return ResourceManager.GetString("StartHour", resourceCulture); } } diff --git a/yavscModel/LocalizedText.fr.resx b/yavscModel/LocalizedText.fr.resx index 8165ec6a..66f4161c 100644 --- a/yavscModel/LocalizedText.fr.resx +++ b/yavscModel/LocalizedText.fr.resx @@ -32,6 +32,7 @@ entrées Éditer Date de fin + Heure de fin Devis non trouvé Page web de l'événement Base de données éxistante @@ -73,7 +74,8 @@ Se souvenir du mot de passe Supprimer Rôle créé - Date de démarrage + Date de début + Heure de début Soumettre Nom du tag Version LaTeX diff --git a/yavscModel/LocalizedText.resx b/yavscModel/LocalizedText.resx index 5256b0dc..f585ce78 100644 --- a/yavscModel/LocalizedText.resx +++ b/yavscModel/LocalizedText.resx @@ -31,6 +31,7 @@ This email adress is already used ({0}). This user name is already used ({0}). Edit + End hour End date Estimate not found Event Web page @@ -77,6 +78,8 @@ role created Start date Submit + Start hour + Start date Tag name LaTeX version This site uses cookies diff --git a/yavscModel/WorkFlow/IContentProvider.cs b/yavscModel/WorkFlow/IContentProvider.cs index 47a6e375..38748d12 100644 --- a/yavscModel/WorkFlow/IContentProvider.cs +++ b/yavscModel/WorkFlow/IContentProvider.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using Yavsc.Model.FrontOffice.Catalog; using Yavsc.Model.FrontOffice; namespace Yavsc.Model.WorkFlow diff --git a/yavscModel/WorkFlow/WorkFlowManager.cs b/yavscModel/WorkFlow/WorkFlowManager.cs index c30da935..4e09e862 100644 --- a/yavscModel/WorkFlow/WorkFlowManager.cs +++ b/yavscModel/WorkFlow/WorkFlowManager.cs @@ -4,6 +4,7 @@ using System.Configuration; using System.Collections.Specialized; using Yavsc.Model.FrontOffice; using System.Configuration.Provider; +using Yavsc.Model.FrontOffice.Catalog; namespace Yavsc.Model.WorkFlow { diff --git a/yavscclient/ChangeLog b/yavscclient/ChangeLog index 4d52d8ed..9090fcd6 100644 --- a/yavscclient/ChangeLog +++ b/yavscclient/ChangeLog @@ -1,3 +1,8 @@ +2015-10-30 Paul Schneider + + * MyClass.cs: refactoring: a dedicated name space for the + catalog + 2015-07-15 Paul Schneider * YavscClient.csproj: Moves to Mono framework diff --git a/yavscclient/MyClass.cs b/yavscclient/MyClass.cs index 4f3277be..8a1743a7 100644 --- a/yavscclient/MyClass.cs +++ b/yavscclient/MyClass.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Net.Http.Formatting; using Newtonsoft.Json; using Yavsc.Model.FrontOffice; +using Yavsc.Model.FrontOffice.Catalog; namespace Yavsc {