notazof/yavsc
1
1
Fork 0
Code Issues 1 Pull requests 1 Projects 2 Releases 9 Packages Wiki Activity Actions

* packages.config:

Browse source 
* App.master:
* datepair.js:
* Book.aspx:
* datepair.min.js:
* LocalizedText.resx:
* jquery.datepair.js:
* jquery-ui-1.11.4.js:
* jquery.timepicker.js:
* BookQuery.cs:
* jquery-1.11.3.min.js:
* LocalizedText.fr.resx:
* jquery.datepair.min.js:
* WebCatalogExtensions.cs:
* GoogleController.cs:
* LocalizedText.Designer.cs:
* jquery.timepicker.min.js:
* jquery.timepicker.css:
* Text.cs:
* Euro.cs:
* Unit.cs:
* Link.cs:
* Note.cs:
* LocalizedText.fr.Designer.cs:
* Brand.cs:
* Label.cs:
* Scalar.cs:
* FrontOfficeController.cs:
* Period.cs:
* Option.cs:
* Service.cs:
* Catalog.cs:
* Product.cs:
* CheckBox.cs:
* Currency.cs:
* SaleForm.cs:
* TextInput.cs:
* FormInput.cs:
* FilesInput.cs:
* SelectItem.cs:
* FormElement.cs:
* SelectInput.cs:
* RadioButton.cs:
* StockStatus.cs:
* ProductImage.cs:
* CatalogHelper.cs:
* CatalogManager.cs:
* ProductCategory.cs:
* PhysicalProduct.cs:
* ui-icons_ffffff_256x240.png:
* ui-icons_cccccc_256x240.png:
* CatalogProvider.cs:
* ui-icons_a83300_256x240.png:
* ui-icons_222222_256x240.png:
* ui-icons_4b8e0b_256x240.png:
* ui-bg_glass_20_555555_1x400.png:
* ui-bg_glass_40_0078a3_1x400.png:
* ui-bg_glass_40_ffc73d_1x400.png:
* ui-icons_222222_256x240.png:
* ui-icons_a83300_256x240.png:
* ui-icons_cccccc_256x240.png:
* ui-icons_4b8e0b_256x240.png:
* ui-icons_ffffff_256x240.png:
* ui-bg_glass_40_0078a3_1x400.png:
* ui-bg_glass_20_555555_1x400.png:
* ui-bg_inset-soft_30_f58400_1x100.png:
* ui-bg_inset-soft_25_000000_1x100.png:
* ui-bg_glass_40_ffc73d_1x400.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:
* CatalogProviderConfigurationElement.cs:
* CatalogProvidersConfigurationSection.cs:
* CatalogProvidersConfigurationCollection.cs: Date pairing at booking,
 Fixes the client side ui, concerning the dates and times

* MyClass.cs:
* WorkFlowManager.cs:
* IContentProvider.cs:
* FrontOfficeController.cs:
* XmlCatalog.cs:
* NpgsqlContentProvider.cs:
* Price.cs:
* XmlCatalogProvider.cs:
* PriceOnItemCount.cs: refactoring: a dedicated name space
  for the catalog

* ChooseADate.aspx: WIP

* Web.csproj: date pairing : includes the javascript modules
This commit is contained in:
Paul Schneider 2015-10-30 15:54:26 +01:00
commit 0a91d3935b
94 changed files with 955 additions and 297 deletions
Download patch file Download diff file Expand all files Collapse all files

17
yavscModel/Calendar/BookQuery.cs
View file

@ -35,24 +35,26 @@ namespace Yavsc.Model.Calendar
/// </summary>
/// <value>The prefered date.</value>
[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; }
/// <summary>
/// Gets or sets the minimum time.
/// </summary>
/// <value>The minimum time.</value>
[RegularExpression("\\d\\d:\\d\\d")]
public string PreferedHour { get; set; }
[Display(ResourceType=typeof(LocalizedText),Name="StartHour")]
public string StartHour { get; set; }
/// <summary>
/// Gets or sets the max date.
/// </summary>
/// <value>The max date.</value>
[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; }
/// <summary>
@ -61,7 +63,8 @@ namespace Yavsc.Model.Calendar
/// <value>The duration.</value>
[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; }
/// <summary>
/// Gets or sets the person.

47
yavscModel/ChangeLog
View file

@ -1,3 +1,50 @@
2015-10-30 Paul Schneider <paul@pschneider.fr>
* 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 <paul@pschneider.fr>
* YavscModel.csproj:

2
yavscModel/FrontOffice/Catalog/Billing/Price.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Yavsc.Model.FrontOffice.Billing
namespace Yavsc.Model.FrontOffice.Catalog.Billing
{
/// <summary>
/// Price.

2
yavscModel/FrontOffice/Catalog/Billing/PriceOnItemCount.cs
View file

@ -21,7 +21,7 @@
using System;
using System.ComponentModel.DataAnnotations;
namespace Yavsc.Model.FrontOffice.Billing
namespace Yavsc.Model.FrontOffice.Catalog.Billing
{
/// <summary>
/// A set price.

2
yavscModel/FrontOffice/Catalog/Brand.cs
View file

@ -1,7 +1,7 @@
using System;
using System.ComponentModel.DataAnnotations;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Brand.

2
yavscModel/FrontOffice/Catalog/Catalog.cs
View file

@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Catalog.

4
yavscModel/FrontOffice/Catalog/CatalogHelper.cs
View file

@ -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
{
/// <summary>
/// Catalog helper.

2
yavscModel/FrontOffice/Catalog/CatalogManager.cs
View file

@ -2,7 +2,7 @@ using System;
using System.Web;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Catalog manager.

2
yavscModel/FrontOffice/Catalog/CatalogProvider.cs
View file

@ -1,7 +1,7 @@
using System;
using System.Configuration.Provider;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Catalog provider.<br/>

2
yavscModel/FrontOffice/Catalog/CheckBox.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Check box.

2
yavscModel/FrontOffice/Catalog/Configuration/CatalogProviderConfigurationElement.cs
View file

@ -1,7 +1,7 @@
using System;
using System.Configuration;
namespace Yavsc.Model.FrontOffice.Configuration
namespace Yavsc.Model.FrontOffice.Catalog.Configuration
{
/// <summary>
/// Catalog provider configuration element.

2
yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationCollection.cs
View file

@ -2,7 +2,7 @@ using System;
using System.Configuration;
using System.ComponentModel;
namespace Yavsc.Model.FrontOffice.Configuration
namespace Yavsc.Model.FrontOffice.Catalog.Configuration
{
/// <summary>
/// Catalog providers configuration collection.

2
yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationSection.cs
View file

@ -2,7 +2,7 @@ using System;
using System.Configuration;
using System.ComponentModel;
namespace Yavsc.Model.FrontOffice.Configuration
namespace Yavsc.Model.FrontOffice.Catalog.Configuration
{
/// <summary>
/// Catalog providers configuration section.

2
yavscModel/FrontOffice/Catalog/Currency.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Currency.

2
yavscModel/FrontOffice/Catalog/Euro.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Euro.

2
yavscModel/FrontOffice/Catalog/FilesInput.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Files input.

2
yavscModel/FrontOffice/Catalog/FormElement.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Form element.

2
yavscModel/FrontOffice/Catalog/FormInput.cs
View file

@ -1,7 +1,7 @@
using System;
using System.ComponentModel.DataAnnotations;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Form input.

2
yavscModel/FrontOffice/Catalog/Label.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Label.

2
yavscModel/FrontOffice/Catalog/Link.cs
View file

@ -1,7 +1,7 @@
using System;
using System.ComponentModel.DataAnnotations;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Link.

2
yavscModel/FrontOffice/Catalog/Note.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Note.

2
yavscModel/FrontOffice/Catalog/Option.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Option.

2
yavscModel/FrontOffice/Catalog/Period.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Period.

4
yavscModel/FrontOffice/Catalog/PhysicalProduct.cs
View file

@ -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
{
/// <summary>
/// Physical product.

2
yavscModel/FrontOffice/Catalog/Product.cs
View file

@ -1,7 +1,7 @@
using System;
using System.ComponentModel.DataAnnotations;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Product.

2
yavscModel/FrontOffice/Catalog/ProductCategory.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Product category.

2
yavscModel/FrontOffice/Catalog/ProductImage.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Product image.

2
yavscModel/FrontOffice/Catalog/RadioButton.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Radio button.

2
yavscModel/FrontOffice/Catalog/SaleForm.cs
View file

@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Sale form.

2
yavscModel/FrontOffice/Catalog/Scalar.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Scalar.

2
yavscModel/FrontOffice/Catalog/SelectInput.cs
View file

@ -2,7 +2,7 @@ using System;
using System.Text;
using System.Web.Mvc;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Select input.

2
yavscModel/FrontOffice/Catalog/SelectItem.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Select item.

4
yavscModel/FrontOffice/Catalog/Service.cs
View file

@ -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
{
/// <summary>
/// Service.

2
yavscModel/FrontOffice/Catalog/StockStatus.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Stock status.

2
yavscModel/FrontOffice/Catalog/Text.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Text.

2
yavscModel/FrontOffice/Catalog/TextInput.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Text input.

2
yavscModel/FrontOffice/Catalog/Unit.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Yavsc.Model.FrontOffice
namespace Yavsc.Model.FrontOffice.Catalog
{
/// <summary>
/// Unit.

16
yavscModel/LocalizedText.Designer.cs generated
View file

@ -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);

20
yavscModel/LocalizedText.fr.Designer.cs generated
View file

@ -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);
}
}

4
yavscModel/LocalizedText.fr.resx
View file

@ -32,6 +32,7 @@
<data name="entries"><value>entrées</value></data>
<data name="Edit"><value>Éditer</value></data>
<data name="EndDate"><value>Date de fin</value></data>
<data name="EndHour"><value>Heure de fin</value></data>
<data name="Estimate_not_found"><value>Devis non trouvé</value></data>
<data name="EventWebPage"><value>Page web de l'événement</value></data>
<data name="ExistantDB"><value>Base de données éxistante</value></data>
@ -73,7 +74,8 @@
<data name="Remember_me"><value>Se souvenir du mot de passe</value></data>
<data name="Remove"><value>Supprimer</value></data>
<data name="role_created"><value>Rôle créé</value></data>
<data name="StartDate"><value>Date de démarrage</value></data>
<data name="StartDate"><value>Date de début</value></data>
<data name="StartHour"><value>Heure de début</value></data>
<data name="Submit"><value>Soumettre</value></data>
<data name="Tag_name"><value>Nom du tag</value></data>
<data name="Tex_version"><value>Version LaTeX</value></data>

3
yavscModel/LocalizedText.resx
View file

@ -31,6 +31,7 @@
<data name="DuplicateEmail"><value>This email adress is already used ({0}).</value></data>
<data name="DuplicateUserName"><value>This user name is already used ({0}).</value></data>
<data name="Edit"><value>Edit</value></data>
<data name="EndHour"><value>End hour</value></data>
<data name="EndDate"><value>End date</value></data>
<data name="Estimate_not_found"><value>Estimate not found</value></data>
<data name="EventWebPage"><value>Event Web page</value></data>
@ -77,6 +78,8 @@
<data name="role_created"><value>role created</value></data>
<data name="StartDate"><value>Start date</value></data>
<data name="Submit"><value>Submit</value></data>
<data name="StartHour"><value>Start hour</value></data>
<data name="StartDate"><value>Start date</value></data>
<data name="Tag_name"><value>Tag name</value></data>
<data name="Tex_version"><value>LaTeX version</value></data>
<data name="ThisSiteUsesCookies"><value>This site uses cookies</value></data>

1
yavscModel/WorkFlow/IContentProvider.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using Yavsc.Model.FrontOffice.Catalog;
using Yavsc.Model.FrontOffice;
namespace Yavsc.Model.WorkFlow

1
yavscModel/WorkFlow/WorkFlowManager.cs
View file

@ -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
{