* SalesCatalog.csproj: clean an unused reference
* TestBrands.cs: * Service.cs: * PhysicalProduct.cs: clean an obsolete reference * TestCatalogInit.cs: cleaner * XmlCatalog.cs: * XmlCatalogProvider.cs: suppressed some xml doc warnings * Estimate.aspx: new jQuery version * Web.config: removed a section dotNetOpenAuth at using the .Net framework 4.5.1
This commit is contained in:
parent
da87d0ea97
commit
3dbf0265db
9 changed files with 46 additions and 41 deletions
|
|
@ -35,7 +35,6 @@
|
||||||
<Reference Include="System.Xml" />
|
<Reference Include="System.Xml" />
|
||||||
<Reference Include="System.ComponentModel.DataAnnotations" />
|
<Reference Include="System.ComponentModel.DataAnnotations" />
|
||||||
<Reference Include="System.Configuration" />
|
<Reference Include="System.Configuration" />
|
||||||
<Reference Include="System.Web.WebPages" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="AssemblyInfo.cs" />
|
<Compile Include="AssemblyInfo.cs" />
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@
|
||||||
#if TEST
|
#if TEST
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
using System;
|
using System;
|
||||||
using SalesCatalog.Model;
|
|
||||||
|
|
||||||
namespace SalesCatalog.Tests
|
namespace SalesCatalog.Tests
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
using System;
|
using System;
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
using SalesCatalog.XmlImplementation;
|
using SalesCatalog.XmlImplementation;
|
||||||
using SalesCatalog.Model;
|
|
||||||
using System.Xml.Serialization;
|
using System.Xml.Serialization;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Xml;
|
using System.Xml;
|
||||||
|
|
@ -68,8 +67,8 @@ namespace SalesCatalog.Tests
|
||||||
Option o3 = new Option ();
|
Option o3 = new Option ();
|
||||||
o3.Value = "6m"; o3.Text = "6 mois";
|
o3.Value = "6m"; o3.Text = "6 mois";
|
||||||
selSize.Items = new Option [] { o1, o2, o3 };
|
selSize.Items = new Option [] { o1, o2, o3 };
|
||||||
var txt1 = new SalesCatalog.Model.Text ();
|
var txt1 = new Text ();
|
||||||
var txt2 = new SalesCatalog.Model.Text ();
|
var txt2 = new Text ();
|
||||||
txt1.Val="Choose a title : ";
|
txt1.Val="Choose a title : ";
|
||||||
txt2.Val = "[br]Choose the size : ";
|
txt2.Val = "[br]Choose the size : ";
|
||||||
f.Items = new FormElement[] {txt1,ticat,txt2,selSize};
|
f.Items = new FormElement[] {txt1,ticat,txt2,selSize};
|
||||||
|
|
|
||||||
|
|
@ -4,9 +4,17 @@ using Yavsc.Model.FrontOffice;
|
||||||
|
|
||||||
namespace SalesCatalog.XmlImplementation
|
namespace SalesCatalog.XmlImplementation
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Xml catalog.
|
||||||
|
/// Inherits of the Catalog class,
|
||||||
|
/// to make it serializable from and to Xml
|
||||||
|
/// </summary>
|
||||||
[XmlRoot]
|
[XmlRoot]
|
||||||
public class XmlCatalog : Catalog
|
public class XmlCatalog : Catalog
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="SalesCatalog.XmlImplementation.XmlCatalog"/> class.
|
||||||
|
/// </summary>
|
||||||
public XmlCatalog ()
|
public XmlCatalog ()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,10 +7,20 @@ using Yavsc.Model.FrontOffice;
|
||||||
|
|
||||||
namespace SalesCatalog.XmlImplementation
|
namespace SalesCatalog.XmlImplementation
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Xml catalog provider.
|
||||||
|
/// In charge of getting the catalog data,
|
||||||
|
/// returning a Catalog object from GetCatalog
|
||||||
|
/// </summary>
|
||||||
public class XmlCatalogProvider: CatalogProvider
|
public class XmlCatalogProvider: CatalogProvider
|
||||||
{
|
{
|
||||||
#region implemented abstract members of SalesCatalog.CatalogProvider
|
#region implemented abstract members of SalesCatalog.CatalogProvider
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the catalog, loading it from
|
||||||
|
/// the file system at a first call,
|
||||||
|
/// and when its last write time has changed.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>The catalog.</returns>
|
||||||
public override Catalog GetCatalog ()
|
public override Catalog GetCatalog ()
|
||||||
{
|
{
|
||||||
// Assert fileName != null
|
// Assert fileName != null
|
||||||
|
|
@ -22,17 +32,36 @@ namespace SalesCatalog.XmlImplementation
|
||||||
LoadCatalog ();
|
LoadCatalog ();
|
||||||
return catInstance;
|
return catInstance;
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// The catalog instance.
|
||||||
|
/// </summary>
|
||||||
protected XmlCatalog catInstance = null;
|
protected XmlCatalog catInstance = null;
|
||||||
|
/// <summary>
|
||||||
|
/// The last modification date of the file loaded.
|
||||||
|
/// </summary>
|
||||||
protected DateTime lastModification = new DateTime(0);
|
protected DateTime lastModification = new DateTime(0);
|
||||||
|
/// <summary>
|
||||||
|
/// The name of the file loaded.
|
||||||
|
/// </summary>
|
||||||
protected string fileName = null;
|
protected string fileName = null;
|
||||||
#endregion
|
#endregion
|
||||||
|
/// <summary>
|
||||||
|
/// Initialize the catalog
|
||||||
|
/// using the specified name and config.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="name">Name.</param>
|
||||||
|
/// <param name="config">Config.</param>
|
||||||
public override void Initialize (string name, System.Collections.Specialized.NameValueCollection config)
|
public override void Initialize (string name, System.Collections.Specialized.NameValueCollection config)
|
||||||
{
|
{
|
||||||
fileName = config ["connection"];
|
if (config ["connection"] == null)
|
||||||
|
throw new Exception ("the 'connection' parameter is null " +
|
||||||
|
"(it should be the absolute path to the xml catalog)");
|
||||||
|
string basedir = AppDomain.CurrentDomain.BaseDirectory;
|
||||||
|
// config ["connection"] starts with "~/"
|
||||||
|
fileName = Path.Combine(basedir, config ["connection"].Substring (2));
|
||||||
LoadCatalog ();
|
LoadCatalog ();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void LoadCatalog ()
|
private void LoadCatalog ()
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<%@ Page Title="Devis" Language="C#" Inherits="System.Web.Mvc.ViewPage<Estimate>" MasterPageFile="~/Models/App.master" %>
|
<%@ Page Title="Devis" Language="C#" Inherits="System.Web.Mvc.ViewPage<Estimate>" MasterPageFile="~/Models/App.master" %>
|
||||||
|
|
||||||
<asp:Content ContentPlaceHolderID="head" ID="head1" runat="server" >
|
<asp:Content ContentPlaceHolderID="head" ID="head1" runat="server" >
|
||||||
<script type="text/javascript" src="<%=Url.Content("~/Scripts/jquery-2.1.1.js")%>"></script>
|
<script type="text/javascript" src="<%=Url.Content("~/Scripts/jquery-2.1.3.js")%>"></script>
|
||||||
<script type="text/javascript" src="<%=Url.Content("~/Scripts/jquery.tablesorter.js")%>"></script>
|
<script type="text/javascript" src="<%=Url.Content("~/Scripts/jquery.tablesorter.js")%>"></script>
|
||||||
<script type="text/javascript" src="<%=Url.Content("~/Scripts/jquery.validate.js")%>"></script>
|
<script type="text/javascript" src="<%=Url.Content("~/Scripts/jquery.validate.js")%>"></script>
|
||||||
<link rel="stylesheet" href="<%=Url.Content("~/Theme/dark/style.css")%>" type="text/css" media="print, projection, screen" />
|
<link rel="stylesheet" href="<%=Url.Content("~/Theme/dark/style.css")%>" type="text/css" media="print, projection, screen" />
|
||||||
|
|
|
||||||
|
|
@ -245,35 +245,6 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
|
||||||
</smtp>
|
</smtp>
|
||||||
</mailSettings>
|
</mailSettings>
|
||||||
</system.net>
|
</system.net>
|
||||||
<dotNetOpenAuth>
|
|
||||||
<messaging>
|
|
||||||
<untrustedWebRequest>
|
|
||||||
<whitelistHosts>
|
|
||||||
<!-- Uncomment to enable communication with localhost (should generally not activate in production!) -->
|
|
||||||
<!--<add name="localhost" />-->
|
|
||||||
</whitelistHosts>
|
|
||||||
</untrustedWebRequest>
|
|
||||||
</messaging>
|
|
||||||
<!-- Allow DotNetOpenAuth to publish usage statistics to library authors to improve the library. -->
|
|
||||||
<reporting enabled="true" />
|
|
||||||
<!-- This is an optional configuration section where aspects of dotnetopenauth can be customized. -->
|
|
||||||
<!-- For a complete set of configuration options see http://www.dotnetopenauth.net/developers/code-snippets/configuration-options/ -->
|
|
||||||
<openid>
|
|
||||||
<relyingParty>
|
|
||||||
<security requireSsl="false">
|
|
||||||
<!-- Uncomment the trustedProviders tag if your relying party should only accept positive assertions from a closed set of OpenID Providers. -->
|
|
||||||
<!--<trustedProviders rejectAssertionsFromUntrustedProviders="true">
|
|
||||||
<add endpoint="https://www.google.com/accounts/o8/ud" />
|
|
||||||
</trustedProviders>-->
|
|
||||||
</security>
|
|
||||||
<behaviors>
|
|
||||||
<!-- The following OPTIONAL behavior allows RPs to use SREG only, but be compatible
|
|
||||||
with OPs that use Attribute Exchange (in various formats). -->
|
|
||||||
<add type="DotNetOpenAuth.OpenId.RelyingParty.Behaviors.AXFetchAsSregTransform, DotNetOpenAuth.OpenId.RelyingParty" />
|
|
||||||
</behaviors>
|
|
||||||
</relyingParty>
|
|
||||||
</openid>
|
|
||||||
</dotNetOpenAuth>
|
|
||||||
<uri>
|
<uri>
|
||||||
<!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),
|
<!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),
|
||||||
which is necessary for OpenID urls with unicode characters in the domain/host name.
|
which is necessary for OpenID urls with unicode characters in the domain/host name.
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ namespace Yavsc.Model.FrontOffice
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
public Price UnitaryPrice { get; set; }
|
public Price UnitaryPrice { get; set; }
|
||||||
#region implemented abstract members of SalesCatalog.Model.Product
|
#region implemented abstract members of Product
|
||||||
public override string[] GetSalesConditions ()
|
public override string[] GetSalesConditions ()
|
||||||
{
|
{
|
||||||
return new string [] { string.Format(
|
return new string [] { string.Format(
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ namespace Yavsc.Model.FrontOffice
|
||||||
|
|
||||||
public Price HourPrice { get; set; }
|
public Price HourPrice { get; set; }
|
||||||
|
|
||||||
#region implemented abstract members of SalesCatalog.Model.Product
|
#region implemented abstract members of Product
|
||||||
public override string [] GetSalesConditions ()
|
public override string [] GetSalesConditions ()
|
||||||
{
|
{
|
||||||
return new string [] { string.Format(
|
return new string [] { string.Format(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue