From 3c6c3f19aacd6f72ff96859972aaddea7c04cf0c Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Wed, 28 Jan 2015 15:04:07 +0100 Subject: [PATCH] Refactoring: moving the Catalog manager and model into the Yavsc.Model.FrontOffice namespace * Web.config: * Catalog.xml: * MyClass.cs: * Note.cs: * Euro.cs: * Unit.cs: * Text.cs: * Link.cs: * Price.cs: * Label.cs: * Brand.cs: * Scalar.cs: * Option.cs: * Period.cs: * YavscModel.csproj: * Catalog.cs: * Service.cs: * Product.cs: * YavscClient.csproj: * CatalogManager.cs: * Currency.cs: * CheckBox.cs: * SaleForm.cs: * FormInput.cs: * CatalogProvider.cs: * TextInput.cs: * SelectItem.cs: * SalesCatalog.csproj: * FilesInput.cs: * FormElement.cs: * SelectInput.cs: * IValueProvider.cs: * StockStatus.cs: * RadioButton.cs: * Commande.cs: * ProductImage.cs: * WebCatalogExtensions.cs: * TemplateException.cs: * ProductCategory.cs: * PhysicalProduct.cs: * Note.cs: * Link.cs: * Text.cs: * Euro.cs: * Unit.cs: * WorkFlowManager.cs: * Brand.cs: * Label.cs: * Price.cs: * Scalar.cs: * FrontOfficeController.cs: * Period.cs: * Option.cs: * Product.cs: * Service.cs: * Catalog.cs: * SaleForm.cs: * Currency.cs: * CheckBox.cs: * TextInput.cs: * FrontOfficeApiController.cs: * FormInput.cs: * SelectItem.cs: * FilesInput.cs: * XmlCatalog.cs: * FormElement.cs: * SelectInput.cs: * RadioButton.cs: * StockStatus.cs: * ProductImage.cs: * CatalogHelper.cs: * CatalogManager.cs: * CatalogProvider.cs: * ProductCategory.cs: * PhysicalProduct.cs: * XmlCatalogProvider.cs: * CatalogProviderConfigurationElement.cs: * CatalogProvidersConfigurationSection.cs: * CatalogProvidersConfigurationCollection.cs: * CatalogProviderConfigurationElement.cs: * CatalogProvidersConfigurationSection.cs: * CatalogProvidersConfigurationCollection.cs: * CatalogHelper.cs: --- SalesCatalog/SalesCatalog.csproj | 41 ++++--------------- SalesCatalog/XmlImplementation/XmlCatalog.cs | 2 +- .../XmlImplementation/XmlCatalogProvider.cs | 2 +- web/CatExts/WebCatalogExtensions.cs | 3 +- web/Catalog.xml | 15 +++++-- web/Controllers/FrontOfficeApiController.cs | 2 +- web/Controllers/FrontOfficeController.cs | 2 - web/Controllers/IValueProvider.cs | 1 - web/Controllers/TemplateException.cs | 1 - web/Web.config | 2 +- .../FrontOffice/Catalog}/Brand.cs | 3 +- .../FrontOffice/Catalog}/Catalog.cs | 2 +- .../FrontOffice/Catalog}/CatalogHelper.cs | 4 +- .../FrontOffice/Catalog}/CatalogManager.cs | 4 +- .../FrontOffice/Catalog}/CatalogProvider.cs | 3 +- .../FrontOffice/Catalog}/CheckBox.cs | 2 +- .../CatalogProviderConfigurationElement.cs | 2 +- ...CatalogProvidersConfigurationCollection.cs | 2 +- .../CatalogProvidersConfigurationSection.cs | 2 +- .../FrontOffice/Catalog}/Currency.cs | 2 +- .../FrontOffice/Catalog}/Euro.cs | 2 +- .../FrontOffice/Catalog}/FilesInput.cs | 2 +- .../FrontOffice/Catalog}/FormElement.cs | 2 +- .../FrontOffice/Catalog}/FormInput.cs | 2 +- .../FrontOffice/Catalog}/Label.cs | 2 +- .../FrontOffice/Catalog}/Link.cs | 2 +- .../FrontOffice/Catalog}/Note.cs | 2 +- .../FrontOffice/Catalog}/Option.cs | 2 +- .../FrontOffice/Catalog}/Period.cs | 2 +- .../FrontOffice/Catalog}/PhysicalProduct.cs | 2 +- .../FrontOffice/Catalog}/Price.cs | 4 +- .../FrontOffice/Catalog}/Product.cs | 2 +- .../FrontOffice/Catalog}/ProductCategory.cs | 2 +- .../FrontOffice/Catalog}/ProductImage.cs | 2 +- .../FrontOffice/Catalog}/RadioButton.cs | 2 +- .../FrontOffice/Catalog}/SaleForm.cs | 2 +- .../FrontOffice/Catalog}/Scalar.cs | 2 +- .../FrontOffice/Catalog}/SelectInput.cs | 2 +- .../FrontOffice/Catalog}/SelectItem.cs | 2 +- .../FrontOffice/Catalog}/Service.cs | 2 +- .../FrontOffice/Catalog}/StockStatus.cs | 2 +- .../FrontOffice/Catalog}/Text.cs | 2 +- .../FrontOffice/Catalog}/TextInput.cs | 2 +- .../FrontOffice/Catalog}/Unit.cs | 2 +- yavscModel/FrontOffice/Commande.cs | 11 ++++- yavscModel/WorkFlow/WorkFlowManager.cs | 3 +- yavscModel/YavscModel.csproj | 41 ++++++++++++++++--- yavscclient/MyClass.cs | 2 +- yavscclient/YavscClient.csproj | 4 ++ 49 files changed, 110 insertions(+), 98 deletions(-) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/Brand.cs (92%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/Catalog.cs (97%) rename {SalesCatalog => yavscModel/FrontOffice/Catalog}/CatalogHelper.cs (96%) rename {SalesCatalog => yavscModel/FrontOffice/Catalog}/CatalogManager.cs (94%) rename {SalesCatalog => yavscModel/FrontOffice/Catalog}/CatalogProvider.cs (85%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/CheckBox.cs (92%) rename {SalesCatalog => yavscModel/FrontOffice/Catalog}/Configuration/CatalogProviderConfigurationElement.cs (95%) rename {SalesCatalog => yavscModel/FrontOffice/Catalog}/Configuration/CatalogProvidersConfigurationCollection.cs (92%) rename {SalesCatalog => yavscModel/FrontOffice/Catalog}/Configuration/CatalogProvidersConfigurationSection.cs (93%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/Currency.cs (65%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/Euro.cs (93%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/FilesInput.cs (91%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/FormElement.cs (74%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/FormInput.cs (93%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/Label.cs (88%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/Link.cs (83%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/Note.cs (80%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/Option.cs (89%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/Period.cs (82%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/PhysicalProduct.cs (94%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/Price.cs (83%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/Product.cs (96%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/ProductCategory.cs (93%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/ProductImage.cs (91%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/RadioButton.cs (92%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/SaleForm.cs (95%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/Scalar.cs (83%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/SelectInput.cs (94%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/SelectItem.cs (90%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/Service.cs (94%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/StockStatus.cs (67%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/Text.cs (82%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/TextInput.cs (97%) rename {SalesCatalog/Model => yavscModel/FrontOffice/Catalog}/Unit.cs (88%) diff --git a/SalesCatalog/SalesCatalog.csproj b/SalesCatalog/SalesCatalog.csproj index 96872501c..5aea0e3a8 100644 --- a/SalesCatalog/SalesCatalog.csproj +++ b/SalesCatalog/SalesCatalog.csproj @@ -9,6 +9,7 @@ Library SalesCatalog SalesCatalog + v4.5 true @@ -38,44 +39,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -95,4 +62,10 @@ + + + {68F5B80A-616E-4C3C-91A0-828AA40000BD} + YavscModel + + \ No newline at end of file diff --git a/SalesCatalog/XmlImplementation/XmlCatalog.cs b/SalesCatalog/XmlImplementation/XmlCatalog.cs index 31b2a2ba9..745af5e96 100644 --- a/SalesCatalog/XmlImplementation/XmlCatalog.cs +++ b/SalesCatalog/XmlImplementation/XmlCatalog.cs @@ -1,6 +1,6 @@ using System; -using SalesCatalog.Model; using System.Xml.Serialization; +using Yavsc.Model.FrontOffice; namespace SalesCatalog.XmlImplementation { diff --git a/SalesCatalog/XmlImplementation/XmlCatalogProvider.cs b/SalesCatalog/XmlImplementation/XmlCatalogProvider.cs index 95b18e5d2..d05d9830c 100644 --- a/SalesCatalog/XmlImplementation/XmlCatalogProvider.cs +++ b/SalesCatalog/XmlImplementation/XmlCatalogProvider.cs @@ -1,9 +1,9 @@ using System; using System.Xml.Serialization; -using SalesCatalog.Model; using System.Configuration; using System.IO; using System.Xml; +using Yavsc.Model.FrontOffice; namespace SalesCatalog.XmlImplementation { diff --git a/web/CatExts/WebCatalogExtensions.cs b/web/CatExts/WebCatalogExtensions.cs index b7679832d..e811e8368 100644 --- a/web/CatExts/WebCatalogExtensions.cs +++ b/web/CatExts/WebCatalogExtensions.cs @@ -1,11 +1,10 @@ using System; using System.Web; -using SalesCatalog; -using SalesCatalog.Model; using System.Text; using System.Web.Mvc; using System.Web.Routing; using System.Web.Mvc.Html; +using Yavsc.Model.FrontOffice; namespace Yavsc.CatExts { diff --git a/web/Catalog.xml b/web/Catalog.xml index d0aa93990..34ccc98dd 100644 --- a/web/Catalog.xml +++ b/web/Catalog.xml @@ -38,17 +38,26 @@ comment Commentaire - + diff --git a/web/Controllers/FrontOfficeApiController.cs b/web/Controllers/FrontOfficeApiController.cs index d94f07443..49dc0e007 100644 --- a/web/Controllers/FrontOfficeApiController.cs +++ b/web/Controllers/FrontOfficeApiController.cs @@ -1,7 +1,6 @@ using System; using Yavsc; using SalesCatalog; -using SalesCatalog.Model; using System.Web.Routing; using System.Threading.Tasks; using System.Diagnostics; @@ -23,6 +22,7 @@ using System.Text; using System.Web.Profile; using System.Collections.Specialized; using Yavsc.Model; +using Yavsc.Model.FrontOffice; namespace Yavsc.ApiControllers { diff --git a/web/Controllers/FrontOfficeController.cs b/web/Controllers/FrontOfficeController.cs index 83ed31d6a..81cb5b8bb 100644 --- a/web/Controllers/FrontOfficeController.cs +++ b/web/Controllers/FrontOfficeController.cs @@ -1,7 +1,5 @@ using System; using Yavsc; -using SalesCatalog; -using SalesCatalog.Model; using System.Web.Mvc; using System.Web; using System.Text.RegularExpressions; diff --git a/web/Controllers/IValueProvider.cs b/web/Controllers/IValueProvider.cs index 2a408b9a7..accea9340 100644 --- a/web/Controllers/IValueProvider.cs +++ b/web/Controllers/IValueProvider.cs @@ -1,7 +1,6 @@ using System; using Yavsc; using SalesCatalog; -using SalesCatalog.Model; using System.Web.Routing; using System.Threading.Tasks; using System.Diagnostics; diff --git a/web/Controllers/TemplateException.cs b/web/Controllers/TemplateException.cs index 19c499809..2d6b530df 100644 --- a/web/Controllers/TemplateException.cs +++ b/web/Controllers/TemplateException.cs @@ -1,7 +1,6 @@ using System; using Yavsc; using SalesCatalog; -using SalesCatalog.Model; using System.Web.Routing; using System.Threading.Tasks; using System.Diagnostics; diff --git a/web/Web.config b/web/Web.config index 11f0edcdc..be41dd8f1 100644 --- a/web/Web.config +++ b/web/Web.config @@ -240,7 +240,7 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx - + diff --git a/SalesCatalog/Model/Brand.cs b/yavscModel/FrontOffice/Catalog/Brand.cs similarity index 92% rename from SalesCatalog/Model/Brand.cs rename to yavscModel/FrontOffice/Catalog/Brand.cs index 0c948542d..470a7bcf2 100644 --- a/SalesCatalog/Model/Brand.cs +++ b/yavscModel/FrontOffice/Catalog/Brand.cs @@ -1,8 +1,7 @@ using System; -using System.Xml.Serialization; using System.ComponentModel.DataAnnotations; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public class Brand { diff --git a/SalesCatalog/Model/Catalog.cs b/yavscModel/FrontOffice/Catalog/Catalog.cs similarity index 97% rename from SalesCatalog/Model/Catalog.cs rename to yavscModel/FrontOffice/Catalog/Catalog.cs index 2fb41aaae..e5508754a 100644 --- a/SalesCatalog/Model/Catalog.cs +++ b/yavscModel/FrontOffice/Catalog/Catalog.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { /// /// Catalog. diff --git a/SalesCatalog/CatalogHelper.cs b/yavscModel/FrontOffice/Catalog/CatalogHelper.cs similarity index 96% rename from SalesCatalog/CatalogHelper.cs rename to yavscModel/FrontOffice/Catalog/CatalogHelper.cs index e6b493f5f..33ac99490 100644 --- a/SalesCatalog/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 SalesCatalog.Configuration; +using Yavsc.Model.FrontOffice.Configuration; -namespace SalesCatalog +namespace Yavsc.Model.FrontOffice { /// /// Catalog helper. diff --git a/SalesCatalog/CatalogManager.cs b/yavscModel/FrontOffice/Catalog/CatalogManager.cs similarity index 94% rename from SalesCatalog/CatalogManager.cs rename to yavscModel/FrontOffice/Catalog/CatalogManager.cs index c9552a864..2d1628fae 100644 --- a/SalesCatalog/CatalogManager.cs +++ b/yavscModel/FrontOffice/Catalog/CatalogManager.cs @@ -1,7 +1,5 @@ using System; -using SalesCatalog.Model; - -namespace SalesCatalog +namespace Yavsc.Model.FrontOffice { /// /// Catalog manager. diff --git a/SalesCatalog/CatalogProvider.cs b/yavscModel/FrontOffice/Catalog/CatalogProvider.cs similarity index 85% rename from SalesCatalog/CatalogProvider.cs rename to yavscModel/FrontOffice/Catalog/CatalogProvider.cs index c7fa1e32e..c922008e3 100644 --- a/SalesCatalog/CatalogProvider.cs +++ b/yavscModel/FrontOffice/Catalog/CatalogProvider.cs @@ -1,8 +1,7 @@ using System; using System.Configuration.Provider; -using SalesCatalog.Model; -namespace SalesCatalog +namespace Yavsc.Model.FrontOffice { /// /// Catalog provider.
diff --git a/SalesCatalog/Model/CheckBox.cs b/yavscModel/FrontOffice/Catalog/CheckBox.cs similarity index 92% rename from SalesCatalog/Model/CheckBox.cs rename to yavscModel/FrontOffice/Catalog/CheckBox.cs index 91321fc7f..41ac08ef1 100644 --- a/SalesCatalog/Model/CheckBox.cs +++ b/yavscModel/FrontOffice/Catalog/CheckBox.cs @@ -1,6 +1,6 @@ using System; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public class CheckBox : FormInput { diff --git a/SalesCatalog/Configuration/CatalogProviderConfigurationElement.cs b/yavscModel/FrontOffice/Catalog/Configuration/CatalogProviderConfigurationElement.cs similarity index 95% rename from SalesCatalog/Configuration/CatalogProviderConfigurationElement.cs rename to yavscModel/FrontOffice/Catalog/Configuration/CatalogProviderConfigurationElement.cs index 60488a351..9538635f8 100644 --- a/SalesCatalog/Configuration/CatalogProviderConfigurationElement.cs +++ b/yavscModel/FrontOffice/Catalog/Configuration/CatalogProviderConfigurationElement.cs @@ -1,7 +1,7 @@ using System; using System.Configuration; -namespace SalesCatalog.Configuration +namespace Yavsc.Model.FrontOffice.Configuration { public class CatalogProviderConfigurationElement : ConfigurationElement diff --git a/SalesCatalog/Configuration/CatalogProvidersConfigurationCollection.cs b/yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationCollection.cs similarity index 92% rename from SalesCatalog/Configuration/CatalogProvidersConfigurationCollection.cs rename to yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationCollection.cs index cf1491a2a..0f1e181f9 100644 --- a/SalesCatalog/Configuration/CatalogProvidersConfigurationCollection.cs +++ b/yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationCollection.cs @@ -2,7 +2,7 @@ using System; using System.Configuration; using System.ComponentModel; -namespace SalesCatalog.Configuration +namespace Yavsc.Model.FrontOffice.Configuration { public class CatalogProvidersConfigurationCollection : ConfigurationElementCollection { diff --git a/SalesCatalog/Configuration/CatalogProvidersConfigurationSection.cs b/yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationSection.cs similarity index 93% rename from SalesCatalog/Configuration/CatalogProvidersConfigurationSection.cs rename to yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationSection.cs index b6f945c9a..b404992de 100644 --- a/SalesCatalog/Configuration/CatalogProvidersConfigurationSection.cs +++ b/yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationSection.cs @@ -2,7 +2,7 @@ using System; using System.Configuration; using System.ComponentModel; -namespace SalesCatalog.Configuration +namespace Yavsc.Model.FrontOffice.Configuration { public class CatalogProvidersConfigurationSection : ConfigurationSection { diff --git a/SalesCatalog/Model/Currency.cs b/yavscModel/FrontOffice/Catalog/Currency.cs similarity index 65% rename from SalesCatalog/Model/Currency.cs rename to yavscModel/FrontOffice/Catalog/Currency.cs index 0700448cd..b2dd16968 100644 --- a/SalesCatalog/Model/Currency.cs +++ b/yavscModel/FrontOffice/Catalog/Currency.cs @@ -1,6 +1,6 @@ using System; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public abstract class Currency: Unit { diff --git a/SalesCatalog/Model/Euro.cs b/yavscModel/FrontOffice/Catalog/Euro.cs similarity index 93% rename from SalesCatalog/Model/Euro.cs rename to yavscModel/FrontOffice/Catalog/Euro.cs index 72e3f5768..2eee2f442 100644 --- a/SalesCatalog/Model/Euro.cs +++ b/yavscModel/FrontOffice/Catalog/Euro.cs @@ -1,6 +1,6 @@ using System; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public class Euro : Currency { diff --git a/SalesCatalog/Model/FilesInput.cs b/yavscModel/FrontOffice/Catalog/FilesInput.cs similarity index 91% rename from SalesCatalog/Model/FilesInput.cs rename to yavscModel/FrontOffice/Catalog/FilesInput.cs index 06ab9ebb0..b6a76eaf4 100644 --- a/SalesCatalog/Model/FilesInput.cs +++ b/yavscModel/FrontOffice/Catalog/FilesInput.cs @@ -1,6 +1,6 @@ using System; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public class FilesInput : FormInput { diff --git a/SalesCatalog/Model/FormElement.cs b/yavscModel/FrontOffice/Catalog/FormElement.cs similarity index 74% rename from SalesCatalog/Model/FormElement.cs rename to yavscModel/FrontOffice/Catalog/FormElement.cs index 283c0312b..c2367b95a 100644 --- a/SalesCatalog/Model/FormElement.cs +++ b/yavscModel/FrontOffice/Catalog/FormElement.cs @@ -1,6 +1,6 @@ using System; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public abstract class FormElement { diff --git a/SalesCatalog/Model/FormInput.cs b/yavscModel/FrontOffice/Catalog/FormInput.cs similarity index 93% rename from SalesCatalog/Model/FormInput.cs rename to yavscModel/FrontOffice/Catalog/FormInput.cs index c291f2f43..f8b22d54d 100644 --- a/SalesCatalog/Model/FormInput.cs +++ b/yavscModel/FrontOffice/Catalog/FormInput.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public abstract class FormInput: FormElement { diff --git a/SalesCatalog/Model/Label.cs b/yavscModel/FrontOffice/Catalog/Label.cs similarity index 88% rename from SalesCatalog/Model/Label.cs rename to yavscModel/FrontOffice/Catalog/Label.cs index 6b3c98032..635ff4a04 100644 --- a/SalesCatalog/Model/Label.cs +++ b/yavscModel/FrontOffice/Catalog/Label.cs @@ -1,6 +1,6 @@ using System; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public class Label:FormElement { diff --git a/SalesCatalog/Model/Link.cs b/yavscModel/FrontOffice/Catalog/Link.cs similarity index 83% rename from SalesCatalog/Model/Link.cs rename to yavscModel/FrontOffice/Catalog/Link.cs index 728c824ce..41d7d32fc 100644 --- a/SalesCatalog/Model/Link.cs +++ b/yavscModel/FrontOffice/Catalog/Link.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public class Link:Label { diff --git a/SalesCatalog/Model/Note.cs b/yavscModel/FrontOffice/Catalog/Note.cs similarity index 80% rename from SalesCatalog/Model/Note.cs rename to yavscModel/FrontOffice/Catalog/Note.cs index add594c45..5c3ec6b10 100644 --- a/SalesCatalog/Model/Note.cs +++ b/yavscModel/FrontOffice/Catalog/Note.cs @@ -1,6 +1,6 @@ using System; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public class Note:Text { diff --git a/SalesCatalog/Model/Option.cs b/yavscModel/FrontOffice/Catalog/Option.cs similarity index 89% rename from SalesCatalog/Model/Option.cs rename to yavscModel/FrontOffice/Catalog/Option.cs index daeea5a3c..3c03c7987 100644 --- a/SalesCatalog/Model/Option.cs +++ b/yavscModel/FrontOffice/Catalog/Option.cs @@ -1,6 +1,6 @@ using System; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public class Option : FormElement { diff --git a/SalesCatalog/Model/Period.cs b/yavscModel/FrontOffice/Catalog/Period.cs similarity index 82% rename from SalesCatalog/Model/Period.cs rename to yavscModel/FrontOffice/Catalog/Period.cs index b4e30b310..6e063d2ce 100644 --- a/SalesCatalog/Model/Period.cs +++ b/yavscModel/FrontOffice/Catalog/Period.cs @@ -1,6 +1,6 @@ using System; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public class Period { diff --git a/SalesCatalog/Model/PhysicalProduct.cs b/yavscModel/FrontOffice/Catalog/PhysicalProduct.cs similarity index 94% rename from SalesCatalog/Model/PhysicalProduct.cs rename to yavscModel/FrontOffice/Catalog/PhysicalProduct.cs index 158c0d5d2..f3060e0ab 100644 --- a/SalesCatalog/Model/PhysicalProduct.cs +++ b/yavscModel/FrontOffice/Catalog/PhysicalProduct.cs @@ -1,6 +1,6 @@ using System; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public class PhysicalProduct : Product { diff --git a/SalesCatalog/Model/Price.cs b/yavscModel/FrontOffice/Catalog/Price.cs similarity index 83% rename from SalesCatalog/Model/Price.cs rename to yavscModel/FrontOffice/Catalog/Price.cs index dee40da19..b468b56c7 100644 --- a/SalesCatalog/Model/Price.cs +++ b/yavscModel/FrontOffice/Catalog/Price.cs @@ -1,6 +1,6 @@ using System; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public class Price: Scalar { @@ -21,7 +21,7 @@ namespace SalesCatalog.Model } Currency curr; - public override SalesCatalog.Model.Unit Unit { + public override Unit Unit { get { return curr; } diff --git a/SalesCatalog/Model/Product.cs b/yavscModel/FrontOffice/Catalog/Product.cs similarity index 96% rename from SalesCatalog/Model/Product.cs rename to yavscModel/FrontOffice/Catalog/Product.cs index 4f7cda8ba..f4478180e 100644 --- a/SalesCatalog/Model/Product.cs +++ b/yavscModel/FrontOffice/Catalog/Product.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { /// /// Product. diff --git a/SalesCatalog/Model/ProductCategory.cs b/yavscModel/FrontOffice/Catalog/ProductCategory.cs similarity index 93% rename from SalesCatalog/Model/ProductCategory.cs rename to yavscModel/FrontOffice/Catalog/ProductCategory.cs index be88b5b93..5a72bac30 100644 --- a/SalesCatalog/Model/ProductCategory.cs +++ b/yavscModel/FrontOffice/Catalog/ProductCategory.cs @@ -1,6 +1,6 @@ using System; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public class ProductCategory { diff --git a/SalesCatalog/Model/ProductImage.cs b/yavscModel/FrontOffice/Catalog/ProductImage.cs similarity index 91% rename from SalesCatalog/Model/ProductImage.cs rename to yavscModel/FrontOffice/Catalog/ProductImage.cs index 83bc58229..f4d968606 100644 --- a/SalesCatalog/Model/ProductImage.cs +++ b/yavscModel/FrontOffice/Catalog/ProductImage.cs @@ -1,6 +1,6 @@ using System; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public class ProductImage: FormElement { diff --git a/SalesCatalog/Model/RadioButton.cs b/yavscModel/FrontOffice/Catalog/RadioButton.cs similarity index 92% rename from SalesCatalog/Model/RadioButton.cs rename to yavscModel/FrontOffice/Catalog/RadioButton.cs index ecf36bf20..8fcdd971b 100644 --- a/SalesCatalog/Model/RadioButton.cs +++ b/yavscModel/FrontOffice/Catalog/RadioButton.cs @@ -1,6 +1,6 @@ using System; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public class RadioButton:FormInput { diff --git a/SalesCatalog/Model/SaleForm.cs b/yavscModel/FrontOffice/Catalog/SaleForm.cs similarity index 95% rename from SalesCatalog/Model/SaleForm.cs rename to yavscModel/FrontOffice/Catalog/SaleForm.cs index ea4f0c4e1..950c2773c 100644 --- a/SalesCatalog/Model/SaleForm.cs +++ b/yavscModel/FrontOffice/Catalog/SaleForm.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public class SaleForm { diff --git a/SalesCatalog/Model/Scalar.cs b/yavscModel/FrontOffice/Catalog/Scalar.cs similarity index 83% rename from SalesCatalog/Model/Scalar.cs rename to yavscModel/FrontOffice/Catalog/Scalar.cs index 705d7111f..e543789b5 100644 --- a/SalesCatalog/Model/Scalar.cs +++ b/yavscModel/FrontOffice/Catalog/Scalar.cs @@ -1,6 +1,6 @@ using System; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public abstract class Scalar { diff --git a/SalesCatalog/Model/SelectInput.cs b/yavscModel/FrontOffice/Catalog/SelectInput.cs similarity index 94% rename from SalesCatalog/Model/SelectInput.cs rename to yavscModel/FrontOffice/Catalog/SelectInput.cs index a3e5e1955..f96af152d 100644 --- a/SalesCatalog/Model/SelectInput.cs +++ b/yavscModel/FrontOffice/Catalog/SelectInput.cs @@ -2,7 +2,7 @@ using System; using System.Text; using System.Web.Mvc; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public class SelectInput: FormInput { diff --git a/SalesCatalog/Model/SelectItem.cs b/yavscModel/FrontOffice/Catalog/SelectItem.cs similarity index 90% rename from SalesCatalog/Model/SelectItem.cs rename to yavscModel/FrontOffice/Catalog/SelectItem.cs index 9ac5cafc4..1c56cdfc7 100644 --- a/SalesCatalog/Model/SelectItem.cs +++ b/yavscModel/FrontOffice/Catalog/SelectItem.cs @@ -1,6 +1,6 @@ using System; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public class SelectItem { diff --git a/SalesCatalog/Model/Service.cs b/yavscModel/FrontOffice/Catalog/Service.cs similarity index 94% rename from SalesCatalog/Model/Service.cs rename to yavscModel/FrontOffice/Catalog/Service.cs index 9c1531259..a2a39142a 100644 --- a/SalesCatalog/Model/Service.cs +++ b/yavscModel/FrontOffice/Catalog/Service.cs @@ -1,6 +1,6 @@ using System; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public class Service : Product { diff --git a/SalesCatalog/Model/StockStatus.cs b/yavscModel/FrontOffice/Catalog/StockStatus.cs similarity index 67% rename from SalesCatalog/Model/StockStatus.cs rename to yavscModel/FrontOffice/Catalog/StockStatus.cs index b4129b4ed..9dfa24f0c 100644 --- a/SalesCatalog/Model/StockStatus.cs +++ b/yavscModel/FrontOffice/Catalog/StockStatus.cs @@ -1,6 +1,6 @@ using System; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public enum StockStatus { diff --git a/SalesCatalog/Model/Text.cs b/yavscModel/FrontOffice/Catalog/Text.cs similarity index 82% rename from SalesCatalog/Model/Text.cs rename to yavscModel/FrontOffice/Catalog/Text.cs index ab223c01c..d2c38237e 100644 --- a/SalesCatalog/Model/Text.cs +++ b/yavscModel/FrontOffice/Catalog/Text.cs @@ -1,6 +1,6 @@ using System; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public class Text: FormElement { diff --git a/SalesCatalog/Model/TextInput.cs b/yavscModel/FrontOffice/Catalog/TextInput.cs similarity index 97% rename from SalesCatalog/Model/TextInput.cs rename to yavscModel/FrontOffice/Catalog/TextInput.cs index d021392f3..4f7e4f434 100644 --- a/SalesCatalog/Model/TextInput.cs +++ b/yavscModel/FrontOffice/Catalog/TextInput.cs @@ -1,6 +1,6 @@ using System; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public class TextInput:FormInput { diff --git a/SalesCatalog/Model/Unit.cs b/yavscModel/FrontOffice/Catalog/Unit.cs similarity index 88% rename from SalesCatalog/Model/Unit.cs rename to yavscModel/FrontOffice/Catalog/Unit.cs index 8b64aea61..bafd9e1de 100644 --- a/SalesCatalog/Model/Unit.cs +++ b/yavscModel/FrontOffice/Catalog/Unit.cs @@ -1,6 +1,6 @@ using System; -namespace SalesCatalog.Model +namespace Yavsc.Model.FrontOffice { public abstract class Unit { diff --git a/yavscModel/FrontOffice/Commande.cs b/yavscModel/FrontOffice/Commande.cs index 0946b92f6..4aa62c3e6 100644 --- a/yavscModel/FrontOffice/Commande.cs +++ b/yavscModel/FrontOffice/Commande.cs @@ -1,9 +1,8 @@ using System; using Yavsc; -using SalesCatalog; -using SalesCatalog.Model; using System.Collections.Specialized; using Yavsc.Model.WorkFlow; +using Newtonsoft.Json; namespace Yavsc.Model.FrontOffice @@ -13,6 +12,9 @@ namespace Yavsc.Model.FrontOffice public DateTime CreationDate { get; set; } public long Id { get; set; } public string ProdRef { get; set; } + + public StringDictionary Parameters = new StringDictionary(); + public Commande() { } @@ -22,6 +24,11 @@ namespace Yavsc.Model.FrontOffice // string catref=collection["catref"]; // Catalog Url from which formdata has been built cmd.ProdRef=collection["ref"]; // Required product reference cmd.CreationDate = DateTime.Now; + + // stores the parameters: + foreach (string key in collection.AllKeys) { + cmd.Parameters.Add (key, collection [key]); + } WorkFlowManager wm = new WorkFlowManager (); wm.RegisterCommand (cmd); // sets cmd.Id return cmd; diff --git a/yavscModel/WorkFlow/WorkFlowManager.cs b/yavscModel/WorkFlow/WorkFlowManager.cs index d9014dc81..b9215b0b4 100644 --- a/yavscModel/WorkFlow/WorkFlowManager.cs +++ b/yavscModel/WorkFlow/WorkFlowManager.cs @@ -3,7 +3,6 @@ using Yavsc.Model.WorkFlow; using System.Configuration; using Yavsc.Model.WorkFlow.Configuration; using System.Collections.Specialized; -using SalesCatalog.Model; using Yavsc.Model.FrontOffice; namespace Yavsc.Model.WorkFlow @@ -111,7 +110,7 @@ namespace Yavsc.Model.WorkFlow { if (!string.IsNullOrWhiteSpace(productid)) { if (Catalog == null) - Catalog = SalesCatalog.CatalogManager.GetCatalog ("/WorkFlowApi"); + Catalog = CatalogManager.GetCatalog ("/WorkFlowApi"); if (Catalog == null) throw new Exception ("No catalog"); Product p = Catalog.FindProduct (productid); diff --git a/yavscModel/YavscModel.csproj b/yavscModel/YavscModel.csproj index b2ddb0f6a..3b0bf6f4b 100644 --- a/yavscModel/YavscModel.csproj +++ b/yavscModel/YavscModel.csproj @@ -99,6 +99,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -109,12 +143,7 @@ - - - - {90BF2234-7252-4CD5-B2A4-17501B19279B} - SalesCatalog - + diff --git a/yavscclient/MyClass.cs b/yavscclient/MyClass.cs index 6e2594aab..a6c0c5f38 100644 --- a/yavscclient/MyClass.cs +++ b/yavscclient/MyClass.cs @@ -1,11 +1,11 @@ using System; using System.Net.Http; using System.Threading.Tasks; -using SalesCatalog.Model; using System.Net.Http.Headers; using System.Collections.Generic; using System.Net.Http.Formatting; using Newtonsoft.Json; +using Yavsc.Model.FrontOffice; namespace Yavsc { diff --git a/yavscclient/YavscClient.csproj b/yavscclient/YavscClient.csproj index 8e34c4133..4d7b0b704 100644 --- a/yavscclient/YavscClient.csproj +++ b/yavscclient/YavscClient.csproj @@ -51,5 +51,9 @@ {90BF2234-7252-4CD5-B2A4-17501B19279B} SalesCatalog + + {68F5B80A-616E-4C3C-91A0-828AA40000BD} + YavscModel + \ No newline at end of file