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

Google date quey,

Browse source 
refactiring,
docpage

* Yavsc.sln:
* Web.csproj:
* YavscModel.csproj:
* OtherWebException.cs:
* ProjectInfo.cs:
* IValueProvider.cs:
* CalendarApi.cs:
* HomeController.cs:
* TemplateException.cs:
* WorkFlowController.cs:
* NpgsqlWorkflow.csproj:
* GoogleErrorMessage.cs:
* ITCPNpgsqlProvider.cs:
* NpgsqlContentProvider.cs:
* ITContentProvider.csproj:
* FrontOfficeApiController.cs:
* NpgsqlContentProvider.csproj: refactoring

* App.master:
* WebApiConfig.cs: New Web api configuration architecture

* SalesCatalog.csproj:
* XmlCatalogProvider.cs: using MVC to get the catalog xml filename 

* WorkFlowManager.cs:
* FrontOfficeController.cs:
* CatalogManager.cs: No more extra argument to get the catalog

* DateQuery.aspx:
* AskForADate.cs:
* GoogleController.cs: Google Date new query model

* style.css:
* BBCodeHelper.cs: Doc page responsive design

* Service.cs:
* SetPrice.cs: xml doc

* WebApiConfig.cs: refactioring
This commit is contained in:
Paul Schneider 2015-03-04 14:41:35 +01:00
commit 721b11eba3
29 changed files with 124 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,7 @@ namespace Yavsc.Model.FrontOffice.Billing
public class SetPrice: Price
{
/// <summary>
/// Gets or sets the minimum count.
/// Gets or sets the minimum count for this setprice.
/// </summary>
/// <value>The minimum count.</value>
[Range(0,int.MaxValue)]

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

@ -1,4 +1,7 @@
using System;
using System.Web;
namespace Yavsc.Model.FrontOffice
{
/// <summary>
@ -14,9 +17,9 @@ namespace Yavsc.Model.FrontOffice
/// </summary>
/// <returns>The catalog.</returns>
/// <param name="catalogUri">Catalog URI.</param>
public static Catalog GetCatalog (string catalogUri)
public static Catalog GetCatalog ()
{
string catalogUri = HttpContext.Current.Request.Url.AbsolutePath;
if (defaultProvider == null) {
if (CatalogHelper.Config == null)
CatalogHelper.LoadConfig ();

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

@ -26,6 +26,11 @@ namespace Yavsc.Model.FrontOffice
/// <value>The set prices.</value>
public SetPrice[] SetPrices { get; set; }
/// <summary>
/// Role names involved in this kind of service
/// </summary>
/// <value>The providers.</value>
public string[] Providers { get; set; }
#region implemented abstract members of Product
/// <summary>
/// Gets the sales conditions.

34
yavscModel/Google/AskForADate.cs
View file

@ -34,18 +34,23 @@ namespace Yavsc.Model.Google
/// </summary>
public AskForADate ()
{
MinDate = MaxDate = DateTime.Now.AddMinutes (5);
MaxDate = DateTime.Now.AddMinutes (5);
}
/// <summary>
/// Gets or sets the minimum date.
/// Gets or sets the prefered date.
/// </summary>
/// <value>The minimum date.</value>
[Display(Name="MinDate",ResourceType=typeof(LocalizedText))]
/// <value>The prefered date.</value>
[DataType(DataType.Date)]
[DisplayFormat(DataFormatString = "{0:dd/MM/yyyy}", ApplyFormatInEditMode = true)]
[Required(ErrorMessage = "S'il vous plait, saisissez une date minimale au format jj/mm/aaaa")]
public DateTime MinDate { get; set; }
public DateTime PreferedDate { 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; }
/// <summary>
/// Gets or sets the max date.
@ -56,27 +61,14 @@ namespace Yavsc.Model.Google
[DisplayFormat(DataFormatString = "{0:dd/MM/yyyy}", ApplyFormatInEditMode = true)]
public DateTime MaxDate { get; set; }
/// <summary>
/// Gets or sets the minimum time.
/// </summary>
/// <value>The minimum time.</value>
[Required(ErrorMessage = "S'il vous plait, saisissez une heure minimale au format hh:mm sur 24 heures")]
[RegularExpression("\\d\\d:\\d\\d")]
public string MinTime { get; set; }
/// <summary>
/// Gets or sets the max time.
/// </summary>
/// <value>The max time.</value>
[RegularExpression("\\d\\d:\\d\\d")]
public string MaxTime { get; set; }
/// <summary>
/// Gets or sets the duration.
/// </summary>
/// <value>The duration.</value>
[RegularExpression("\\d\\d:\\d\\d")]
public string Duration { get; set; }
[Required(ErrorMessage= "S'il vous plait, saisissez une durée minimale d'intervention")]
public string MinDuration { get; set; }
/// <summary>
/// Gets or sets the name of the user.

10
yavscModel/Google/GoogleErrorMessage.cs → yavscModel/OtherWebException.cs
View file

@ -23,12 +23,12 @@ using System.Net;
using System.IO;
using Newtonsoft.Json;
namespace Yavsc.Model.Google
namespace Yavsc.Model
{
/// <summary>
/// Google error exception.
/// </summary>
public class GoogleErrorException : Exception
public class OtherWebException : Exception
{
/// <summary>
/// Gets or sets the title.
@ -44,7 +44,7 @@ namespace Yavsc.Model.Google
/// Initializes a new instance of the <see cref="Yavsc.Model.Google.GoogleErrorException"/> class.
/// </summary>
/// <param name="ex">Ex.</param>
public GoogleErrorException (WebException ex) {
public OtherWebException (WebException ex) {
// ASSERT ex != null;
Title = ex.Message;
@ -60,7 +60,7 @@ namespace Yavsc.Model.Google
/// <param name="ex">Ex.</param>
/// <param name="message">Message.</param>
[Obsolete]
public GoogleErrorException(Exception ex, string message) {
public OtherWebException(Exception ex, string message) {
Content = message;
Title = ex.Message;
}
@ -69,7 +69,7 @@ namespace Yavsc.Model.Google
/// </summary>
/// <param name="ex">Ex.</param>
[Obsolete]
public GoogleErrorException(Exception ex) {
public OtherWebException(Exception ex) {
Content = ex.Message;
Title = ex.GetType().FullName;
}

2
yavscModel/WorkFlow/WorkFlowManager.cs
View file

@ -162,7 +162,7 @@ namespace Yavsc.Model.WorkFlow
{
if (!string.IsNullOrWhiteSpace(productid)) {
if (Catalog == null)
Catalog = CatalogManager.GetCatalog ("/WorkFlowApi");
Catalog = CatalogManager.GetCatalog ();
if (Catalog == null)
throw new Exception ("No catalog");
Product p = Catalog.FindProduct (productid);

2
yavscModel/YavscModel.csproj
View file

@ -93,7 +93,6 @@
<Compile Include="ITagHandler.cs" />
<Compile Include="IViewRenderer.cs" />
<Compile Include="ViewRenderer.cs" />
<Compile Include="Google\GoogleErrorMessage.cs" />
<Compile Include="RssFeeds.cs" />
<Compile Include="FrontOffice\Commande.cs" />
<Compile Include="FrontOffice\Catalog\Brand.cs" />
@ -138,6 +137,7 @@
<Compile Include="FrontOffice\CommandSet.cs" />
<Compile Include="FrontOffice\Catalog\Billing\SetPrice.cs" />
<Compile Include="FrontOffice\Catalog\Billing\Price.cs" />
<Compile Include="OtherWebException.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>