refactoring
This commit is contained in:
@ -1,6 +1,6 @@
|
||||
using System;
|
||||
using WorkFlowProvider;
|
||||
using yavscModel.WorkFlow;
|
||||
using Yavsc.Model.WorkFlow;
|
||||
|
||||
namespace ITContent
|
||||
{
|
||||
|
@ -3,7 +3,7 @@
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>10.0.0</ProductVersion>
|
||||
<ProductVersion>8.0.30703</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{88D83FC9-4158-4435-98A6-1F8F7F448B8F}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
@ -41,9 +41,9 @@
|
||||
<Project>{821FF72D-9F4B-4A2C-B95C-7B965291F119}</Project>
|
||||
<Name>WorkFlowProvider</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\yavscModel\yavscModel.csproj">
|
||||
<ProjectReference Include="..\yavscModel\YavscModel.csproj">
|
||||
<Project>{68F5B80A-616E-4C3C-91A0-828AA40000BD}</Project>
|
||||
<Name>yavscModel</Name>
|
||||
<Name>YavscModel</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
</Project>
|
@ -45,9 +45,9 @@
|
||||
<Project>{821FF72D-9F4B-4A2C-B95C-7B965291F119}</Project>
|
||||
<Name>WorkFlowProvider</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\yavscModel\yavscModel.csproj">
|
||||
<ProjectReference Include="..\yavscModel\YavscModel.csproj">
|
||||
<Project>{68F5B80A-616E-4C3C-91A0-828AA40000BD}</Project>
|
||||
<Name>yavscModel</Name>
|
||||
<Name>YavscModel</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
</Project>
|
@ -3,7 +3,7 @@ using System.Configuration;
|
||||
using System.Reflection;
|
||||
using System.Collections.Specialized;
|
||||
using Npgsql.Web.Blog.Configuration;
|
||||
using yavscModel.Blogs;
|
||||
using Yavsc.Model.Blogs;
|
||||
|
||||
namespace Npgsql.Web.Blog
|
||||
{
|
||||
|
@ -1,5 +1,5 @@
|
||||
using System;
|
||||
using yavscModel.Blogs;
|
||||
using Yavsc.Model.Blogs;
|
||||
|
||||
|
||||
namespace Npgsql.Web.Blog
|
||||
|
@ -3,7 +3,7 @@ using System.Configuration;
|
||||
using System.Configuration.Provider;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace yavscModel.Blogs
|
||||
namespace Yavsc.Model.Blogs
|
||||
{
|
||||
public abstract class BlogProvider: ProviderBase
|
||||
{
|
||||
|
@ -3,7 +3,7 @@ using System.Configuration;
|
||||
using System.Configuration.Provider;
|
||||
using Npgsql;
|
||||
using System.Collections.Generic;
|
||||
using yavscModel.Blogs;
|
||||
using Yavsc.Model.Blogs;
|
||||
|
||||
namespace Npgsql.Web.Blog
|
||||
{
|
||||
|
@ -62,9 +62,9 @@
|
||||
<None Include="Sql\BlogTable.sql" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\yavscModel\yavscModel.csproj">
|
||||
<ProjectReference Include="..\yavscModel\YavscModel.csproj">
|
||||
<Project>{68F5B80A-616E-4C3C-91A0-828AA40000BD}</Project>
|
||||
<Name>yavscModel</Name>
|
||||
<Name>YavscModel</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
</Project>
|
@ -3,7 +3,7 @@
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>10.0.0</ProductVersion>
|
||||
<ProductVersion>8.0.30703</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{BBA7175D-7F92-4278-96FC-84C495A2B5A6}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
|
@ -3,7 +3,7 @@
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>10.0.0</ProductVersion>
|
||||
<ProductVersion>8.0.30703</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{90BF2234-7252-4CD5-B2A4-17501B19279B}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
@ -32,13 +32,11 @@
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="nunit.framework, Version=2.6.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
|
||||
<Private>False</Private>
|
||||
<Package>nunit</Package>
|
||||
</Reference>
|
||||
<Reference Include="System.ComponentModel.DataAnnotations" />
|
||||
<Reference Include="System.Configuration" />
|
||||
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="AssemblyInfo.cs" />
|
||||
|
@ -3,7 +3,7 @@
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>10.0.0</ProductVersion>
|
||||
<ProductVersion>8.0.30703</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
@ -30,12 +30,8 @@
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
|
||||
<Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
|
||||
<Reference Include="System.Web.Extensions" />
|
||||
<Reference Include="System.Web.DynamicData" />
|
||||
<Reference Include="System.Web" />
|
||||
|
@ -3,7 +3,7 @@ using Npgsql;
|
||||
using NpgsqlTypes;
|
||||
using System.Configuration;
|
||||
using System.Collections.Specialized;
|
||||
using yavscModel.WorkFlow;
|
||||
using Yavsc.Model.WorkFlow;
|
||||
using System.Web.Mvc;
|
||||
using System.Configuration.Provider;
|
||||
using System.Collections.Generic;
|
||||
|
@ -1,5 +1,5 @@
|
||||
using System;
|
||||
using yavscModel.WorkFlow;
|
||||
using Yavsc.Model.WorkFlow;
|
||||
using System.Configuration;
|
||||
using WorkFlowProvider.Configuration;
|
||||
using System.Collections.Specialized;
|
||||
|
@ -45,9 +45,9 @@
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\yavscModel\yavscModel.csproj">
|
||||
<ProjectReference Include="..\yavscModel\YavscModel.csproj">
|
||||
<Project>{68F5B80A-616E-4C3C-91A0-828AA40000BD}</Project>
|
||||
<Name>yavscModel</Name>
|
||||
<Name>YavscModel</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
@ -9,7 +9,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NpgsqlBlogProvider", "Npgsq
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SalesCatalog", "SalesCatalog\SalesCatalog.csproj", "{90BF2234-7252-4CD5-B2A4-17501B19279B}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "yavscModel", "yavscModel\yavscModel.csproj", "{68F5B80A-616E-4C3C-91A0-828AA40000BD}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YavscModel", "yavscModel\YavscModel.csproj", "{68F5B80A-616E-4C3C-91A0-828AA40000BD}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkFlowProvider", "WorkFlowProvider\WorkFlowProvider.csproj", "{821FF72D-9F4B-4A2C-B95C-7B965291F119}"
|
||||
EndProject
|
||||
|
@ -3,7 +3,7 @@
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>10.0.0</ProductVersion>
|
||||
<ProductVersion>8.0.30703</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{6C5E1490-E141-4ADA-84E5-6D65523D6B73}</ProjectGuid>
|
||||
<OutputType>Exe</OutputType>
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using yavscModel.Admin;
|
||||
using Yavsc.Model.Admin;
|
||||
using Npgsql.Web.Blog;
|
||||
|
||||
namespace Yavsc.Admin
|
||||
|
@ -1,17 +0,0 @@
|
||||
using System;
|
||||
using SalesCatalog.Model;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Yavsc.Basket
|
||||
{
|
||||
public class Basket
|
||||
{
|
||||
public Basket ()
|
||||
{
|
||||
}
|
||||
|
||||
public void Add(Product p)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
@ -10,7 +10,7 @@ using System.Web.Mvc.Ajax;
|
||||
using System.Web.Profile;
|
||||
using System.Web.Security;
|
||||
using Yavsc;
|
||||
using yavscModel.RolesAndMembers;
|
||||
using Yavsc.Model.RolesAndMembers;
|
||||
using Yavsc.Helpers;
|
||||
|
||||
namespace Yavsc.Controllers
|
||||
|
@ -5,9 +5,9 @@ using System.Web;
|
||||
using System.Web.Mvc;
|
||||
using System.Web.Mvc.Ajax;
|
||||
using System.Web.Security;
|
||||
using yavscModel.RolesAndMembers;
|
||||
using Yavsc.Model.RolesAndMembers;
|
||||
|
||||
namespace Yavsc.Controllers.Controllers
|
||||
namespace Yavsc.Controllers
|
||||
{
|
||||
public class AdminController : Controller
|
||||
{
|
||||
|
@ -4,7 +4,7 @@ using System.Linq;
|
||||
using System.Web;
|
||||
using System.Web.Mvc;
|
||||
using Yavsc.Admin;
|
||||
using yavscModel.Admin;
|
||||
using Yavsc.Model.Admin;
|
||||
|
||||
|
||||
namespace Yavsc.Controllers
|
||||
@ -66,5 +66,7 @@ namespace Yavsc.Controllers
|
||||
return View (datac);
|
||||
}
|
||||
|
||||
/*[Authorize(Roles="Admin")]
|
||||
public ActionResult Estimate*/
|
||||
}
|
||||
}
|
||||
|
@ -4,7 +4,7 @@ using System.Linq;
|
||||
using System.Web;
|
||||
using System.Web.Security;
|
||||
using System.Web.Http;
|
||||
using yavscModel.WorkFlow;
|
||||
using Yavsc.Model.WorkFlow;
|
||||
|
||||
namespace Yavsc.ApiControllers
|
||||
{
|
||||
|
@ -2,20 +2,20 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using System.Web.Mvc;
|
||||
using System.Web.Mvc.Ajax;
|
||||
using System.Web.Security;
|
||||
using System.Web.Http;
|
||||
using Npgsql.Web.Blog;
|
||||
using yavscModel.Blogs;
|
||||
using Yavsc.Model.Blogs;
|
||||
|
||||
namespace Yavsc.Controllers
|
||||
namespace Yavsc.ApiControllers
|
||||
{
|
||||
public class BlogsApiController : Controller
|
||||
public class BlogsApiController : ApiController
|
||||
{
|
||||
private const string adminRoleName = "Admin";
|
||||
protected override void Initialize (System.Web.Routing.RequestContext requestContext)
|
||||
|
||||
protected override void Initialize (System.Web.Http.Controllers.HttpControllerContext controllerContext)
|
||||
{
|
||||
base.Initialize (requestContext);
|
||||
base.Initialize (controllerContext);
|
||||
if (!Roles.RoleExists (adminRoleName)) {
|
||||
Roles.CreateRole (adminRoleName);
|
||||
}
|
||||
@ -35,7 +35,7 @@ namespace Yavsc.Controllers
|
||||
return BlogManager.Tag (postid, tag);
|
||||
}
|
||||
|
||||
public static HttpStatusCodeResult RemovePost(string user, string title) {
|
||||
public static void RemovePost(string user, string title) {
|
||||
if (!Roles.IsUserInRole ("Admin")) {
|
||||
string rguser = Membership.GetUser ().UserName;
|
||||
if (rguser != user) {
|
||||
@ -47,12 +47,11 @@ namespace Yavsc.Controllers
|
||||
}
|
||||
BlogEntry e = BlogManager.GetPost (user, title);
|
||||
if (e == null) {
|
||||
return new HttpNotFoundResult (
|
||||
throw new KeyNotFoundException (
|
||||
string.Format("Aucun post portant le titre \"{0}\" pour l'utilisateur {1}",
|
||||
title, user));
|
||||
}
|
||||
BlogManager.RemovePost (user, title);
|
||||
return new HttpStatusCodeResult (200);
|
||||
}
|
||||
|
||||
public void RemoveTag(long tagid) {
|
||||
|
@ -14,8 +14,9 @@ using System.Web.Security;
|
||||
using CodeKicker.BBCode;
|
||||
using Npgsql.Web.Blog;
|
||||
using Yavsc;
|
||||
using yavscModel;
|
||||
using yavscModel.Blogs;
|
||||
using Yavsc.Model;
|
||||
using Yavsc.Model.Blogs;
|
||||
using Yavsc.ApiControllers;
|
||||
|
||||
namespace Yavsc.Controllers
|
||||
{
|
||||
@ -250,8 +251,10 @@ namespace Yavsc.Controllers
|
||||
ViewData["returnUrl"]=returnUrl;
|
||||
if (!confirm)
|
||||
return View ("RemovePost");
|
||||
HttpStatusCodeResult res = BlogsApiController.RemovePost (user,title);
|
||||
return (res.StatusCode==200? Return(returnUrl):res);
|
||||
BlogsApiController.RemovePost (user,title);
|
||||
if (returnUrl == null)
|
||||
RedirectToAction ("Index",new { user = user });
|
||||
return Redirect (returnUrl);
|
||||
}
|
||||
|
||||
private ActionResult Return (string returnUrl)
|
||||
|
@ -1,21 +0,0 @@
|
||||
using System;
|
||||
using Yavsc;
|
||||
using SalesCatalog;
|
||||
using SalesCatalog.Model;
|
||||
using System.Web.Mvc;
|
||||
using System.Web;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.IO;
|
||||
using Yavsc.Controllers;
|
||||
|
||||
namespace Yavsc.Controllers
|
||||
{
|
||||
public class Commande
|
||||
{
|
||||
public Commande(FormCollection collection)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -5,7 +5,6 @@ using System.Web;
|
||||
using System.Web.Mvc;
|
||||
using System.IO;
|
||||
using System.Web.Security;
|
||||
using FileSystem;
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
namespace Yavsc.Controllers
|
||||
|
@ -13,7 +13,7 @@ using System.IO;
|
||||
using System.Net;
|
||||
using WorkFlowProvider;
|
||||
using System.Web.Security;
|
||||
using yavscModel.WorkFlow;
|
||||
using Yavsc.Model.WorkFlow;
|
||||
|
||||
namespace Yavsc.ApiControllers
|
||||
{
|
||||
@ -33,12 +33,7 @@ namespace Yavsc.ApiControllers
|
||||
return CatalogManager.GetCatalog ().GetBrand (brandName).GetProductCategory (prodCategorie)
|
||||
;
|
||||
}
|
||||
|
||||
[AcceptVerbs("GET","POST")]
|
||||
public string Command()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
/*
|
||||
|
||||
public HttpResponseMessage Post()
|
||||
{
|
||||
@ -66,7 +61,7 @@ namespace Yavsc.ApiControllers
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
|
||||
[Authorize]
|
||||
|
@ -8,7 +8,7 @@ using System.Text.RegularExpressions;
|
||||
using System.IO;
|
||||
using Yavsc.Controllers;
|
||||
using System.Collections.Generic;
|
||||
using yavscModel.WorkFlow;
|
||||
using Yavsc.Model.WorkFlow;
|
||||
using WorkFlowProvider;
|
||||
using System.Web.Security;
|
||||
|
||||
|
@ -5,7 +5,7 @@ using System.Web;
|
||||
|
||||
using System.Web.Http;
|
||||
using WorkFlowProvider;
|
||||
using yavscModel.WorkFlow;
|
||||
using Yavsc.Model.WorkFlow;
|
||||
using System.Web.Http.Controllers;
|
||||
using System.Web.Security;
|
||||
|
||||
@ -18,6 +18,7 @@ namespace Yavsc.ApiControllers
|
||||
|
||||
protected override void Initialize (HttpControllerContext controllerContext)
|
||||
{
|
||||
// TODO move it in a module initialization
|
||||
base.Initialize (controllerContext);
|
||||
if (!Roles.RoleExists (adminRoleName)) {
|
||||
Roles.CreateRole (adminRoleName);
|
||||
|
@ -1,6 +1,6 @@
|
||||
using System;
|
||||
using System.Web.UI.WebControls;
|
||||
using yavscModel.RolesAndMembers;
|
||||
using Yavsc.Model.RolesAndMembers;
|
||||
|
||||
|
||||
namespace Yavsc
|
||||
|
@ -21,13 +21,13 @@
|
||||
</controls>
|
||||
<namespaces>
|
||||
<add namespace="SalesCatalog.Model" />
|
||||
<add namespace="yavscModel" />
|
||||
<add namespace="Yavsc.Model" />
|
||||
<add namespace="Yavsc.Helpers" />
|
||||
<add namespace="Yavsc.Admin" />
|
||||
<add namespace="Yavsc.CatExts" />
|
||||
<add namespace="yavscModel.RolesAndMembers" />
|
||||
<add namespace="yavscModel.Admin" />
|
||||
<add namespace="yavscModel.Blogs" />
|
||||
<add namespace="Yavsc.Model.RolesAndMembers" />
|
||||
<add namespace="Yavsc.Model.Admin" />
|
||||
<add namespace="Yavsc.Model.Blogs" />
|
||||
</namespaces>
|
||||
</pages>
|
||||
</system.web>
|
||||
|
@ -65,9 +65,10 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
|
||||
<add assembly="System.Net.Http.WebRequest, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<add assembly="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=c7439020c8fedf87" />
|
||||
<add assembly="System.Configuration.Install, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<add assembly="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
|
||||
<add assembly="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
|
||||
<add assembly="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
|
||||
<add assembly="System.Web.Http.WebHost" />
|
||||
<add assembly="System.Net.Http.Formatting" />
|
||||
</assemblies>
|
||||
</compilation>
|
||||
<!-- samarcheupa
|
||||
@ -86,7 +87,7 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
|
||||
<add namespace="System.Web.Routing" />
|
||||
<add namespace="System.Linq" />
|
||||
<add namespace="System.Collections.Generic" />
|
||||
<add namespace="Yavsc.Helpers" />
|
||||
<add namespace="Yavsc.Helpers" />
|
||||
</namespaces>
|
||||
</pages>
|
||||
<authorization>
|
||||
@ -119,9 +120,9 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
|
||||
</providers>
|
||||
</roleManager>
|
||||
<workflow defaultProvider="ITProvider">
|
||||
<providers>
|
||||
<clear/>
|
||||
<add name="ITProvider" type="ITContentProvider.ITCPNpgsqlProvider, ITContentProvider" applicationName="/" connectionStringName="yavsc"/>
|
||||
<providers>
|
||||
<clear />
|
||||
<add name="ITProvider" type="ITContentProvider.ITCPNpgsqlProvider, ITContentProvider" applicationName="/" connectionStringName="yavsc" />
|
||||
</providers>
|
||||
</workflow>
|
||||
<profile defaultProvider="NpgsqlProfileProvider">
|
||||
|
@ -62,9 +62,7 @@
|
||||
<Reference Include="Npgsql" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Security" />
|
||||
<Reference Include="nunit.framework, Version=2.6.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
|
||||
<Package>nunit</Package>
|
||||
</Reference>
|
||||
<Reference Include="nunit.framework, Version=2.6.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
|
||||
<Reference Include="CodeKicker.BBCode">
|
||||
<HintPath>lib\CodeKicker.BBCode.dll</HintPath>
|
||||
</Reference>
|
||||
@ -109,7 +107,6 @@
|
||||
<Folder Include="Views\FileSystem\" />
|
||||
<Folder Include="CatExts\" />
|
||||
<Folder Include="Views\WorkFlow\" />
|
||||
<Folder Include="Basket\" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Controllers\HomeController.cs" />
|
||||
@ -137,12 +134,9 @@
|
||||
<Compile Include="CatExts\WebCatalogExtensions.cs" />
|
||||
<Compile Include="Controllers\WorkFlowController.cs" />
|
||||
<Compile Include="Controllers\FrontOfficeApiController.cs" />
|
||||
<Compile Include="Controllers\Commande.cs" />
|
||||
<Compile Include="Helpers\YavscHelpers.cs" />
|
||||
<Compile Include="Controllers\BasketController.cs" />
|
||||
<Compile Include="Basket\Basket.cs" />
|
||||
<Compile Include="FileInfoCollection.cs" />
|
||||
<Compile Include="Controllers\BasketImpact.cs" />
|
||||
<Compile Include="MvcActionValueBinder.cs" />
|
||||
<Compile Include="Controllers\BlogsApiController.cs" />
|
||||
<Compile Include="Controllers\AdminController.cs" />
|
||||
@ -254,10 +248,6 @@
|
||||
<Project>{821FF72D-9F4B-4A2C-B95C-7B965291F119}</Project>
|
||||
<Name>WorkFlowProvider</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\yavscModel\yavscModel.csproj">
|
||||
<Project>{68F5B80A-616E-4C3C-91A0-828AA40000BD}</Project>
|
||||
<Name>yavscModel</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\WebControls\WebControls.csproj">
|
||||
<Project>{59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356}</Project>
|
||||
<Name>WebControls</Name>
|
||||
@ -270,5 +260,9 @@
|
||||
<Project>{88D83FC9-4158-4435-98A6-1F8F7F448B8F}</Project>
|
||||
<Name>ITContent</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\yavscModel\YavscModel.csproj">
|
||||
<Project>{68F5B80A-616E-4C3C-91A0-828AA40000BD}</Project>
|
||||
<Name>YavscModel</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
@ -4,7 +4,7 @@ using System.IO;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace yavscModel.Admin
|
||||
namespace Yavsc.Model.Admin
|
||||
{
|
||||
public class DataAccess {
|
||||
private string host = "localhost";
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace yavscModel.Admin
|
||||
namespace Yavsc.Model.Admin
|
||||
{
|
||||
public class RestoreQuery: DataAccess
|
||||
{
|
||||
|
@ -3,7 +3,7 @@ using System.Configuration;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel;
|
||||
|
||||
namespace yavscModel.Blogs
|
||||
namespace Yavsc.Model.Blogs
|
||||
{
|
||||
public class Blog
|
||||
{
|
||||
|
@ -2,7 +2,7 @@ using System;
|
||||
using System.ComponentModel;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace yavscModel.Blogs
|
||||
namespace Yavsc.Model.Blogs
|
||||
{
|
||||
public class BlogEditCommentModel:Comment
|
||||
{
|
||||
|
@ -2,7 +2,7 @@ using System;
|
||||
using System.ComponentModel;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace yavscModel.Blogs
|
||||
namespace Yavsc.Model.Blogs
|
||||
{
|
||||
public class BlogEditEntryModel:BlogEntry
|
||||
{
|
||||
|
@ -3,7 +3,7 @@ using System.Configuration;
|
||||
using System.ComponentModel;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace yavscModel.Blogs
|
||||
namespace Yavsc.Model.Blogs
|
||||
{
|
||||
public class BlogEntry {
|
||||
long id;
|
||||
|
@ -1,9 +1,9 @@
|
||||
using System;
|
||||
using System.Configuration;
|
||||
using System.Collections.Generic;
|
||||
using yavscModel.Blogs;
|
||||
using Yavsc.Model.Blogs;
|
||||
|
||||
namespace yavscModel.Blogs
|
||||
namespace Yavsc.Model.Blogs
|
||||
{
|
||||
public class BlogEntryCollection : List<BlogEntry>
|
||||
{
|
||||
|
@ -3,7 +3,7 @@ using System.Configuration;
|
||||
using System.ComponentModel;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace yavscModel.Blogs
|
||||
namespace Yavsc.Model.Blogs
|
||||
{
|
||||
public class Comment
|
||||
{
|
||||
|
@ -2,7 +2,7 @@ using System;
|
||||
using System.Configuration;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace yavscModel.Blogs
|
||||
namespace Yavsc.Model.Blogs
|
||||
{
|
||||
|
||||
public enum FindBlogEntryFlags : byte {
|
||||
|
@ -2,7 +2,7 @@ using System;
|
||||
using System.IO;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace FileSystem
|
||||
namespace Yavsc.Model.FileSystem
|
||||
{
|
||||
public class FileInfoCollection: List<FileInfo>
|
||||
{
|
||||
|
@ -2,7 +2,7 @@
|
||||
using System.Configuration;
|
||||
using System.Collections.Specialized;
|
||||
|
||||
namespace yavscModel
|
||||
namespace Yavsc.Model
|
||||
{
|
||||
public interface IModule
|
||||
{
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace yavscModel.RolesAndMembers
|
||||
namespace Yavsc.Model.RolesAndMembers
|
||||
{
|
||||
public class ChangePasswordModel
|
||||
{
|
||||
|
@ -2,7 +2,7 @@ using System;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel;
|
||||
|
||||
namespace yavscModel.RolesAndMembers
|
||||
namespace Yavsc.Model.RolesAndMembers
|
||||
{
|
||||
public class LoginModel
|
||||
{
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace yavscModel.RolesAndMembers
|
||||
namespace Yavsc.Model.RolesAndMembers
|
||||
{
|
||||
public class NewAdminModel
|
||||
{
|
||||
|
@ -2,7 +2,7 @@ using System;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel;
|
||||
|
||||
namespace yavscModel.RolesAndMembers
|
||||
namespace Yavsc.Model.RolesAndMembers
|
||||
{
|
||||
public class NewRoleModel
|
||||
{
|
||||
|
@ -3,7 +3,7 @@ using System.ComponentModel;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Web.Profile;
|
||||
|
||||
namespace yavscModel.RolesAndMembers
|
||||
namespace Yavsc.Model.RolesAndMembers
|
||||
{
|
||||
public class Profile
|
||||
{
|
||||
|
@ -2,7 +2,7 @@ using System;
|
||||
using System.ComponentModel;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace yavscModel.RolesAndMembers
|
||||
namespace Yavsc.Model.RolesAndMembers
|
||||
{
|
||||
public class RegisterViewModel
|
||||
{
|
||||
|
@ -3,13 +3,7 @@ using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
|
||||
using System.Web.Http;
|
||||
using WorkFlowProvider;
|
||||
using yavscModel.WorkFlow;
|
||||
using System.Web.Http.Controllers;
|
||||
using System.Web.Http.ModelBinding;
|
||||
|
||||
namespace Yavsc.ApiControllers
|
||||
namespace Yavsc.Model.WorkFlow
|
||||
{
|
||||
|
||||
public class BasketImpact
|
17
yavscModel/WorkFlow/Commande.cs
Normal file
17
yavscModel/WorkFlow/Commande.cs
Normal file
@ -0,0 +1,17 @@
|
||||
using System;
|
||||
using Yavsc;
|
||||
using SalesCatalog;
|
||||
using SalesCatalog.Model;
|
||||
using System.Collections.Specialized;
|
||||
|
||||
namespace Yavsc.Model.WorkFlow
|
||||
{
|
||||
public class Commande
|
||||
{
|
||||
public Commande(NameValueCollection collection)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
using System;
|
||||
|
||||
namespace yavscModel.WorkFlow
|
||||
namespace Yavsc.Model.WorkFlow
|
||||
{
|
||||
public class Estimate
|
||||
{
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace yavscModel.WorkFlow
|
||||
namespace Yavsc.Model.WorkFlow
|
||||
{
|
||||
public interface IContent
|
||||
{
|
||||
|
@ -2,7 +2,7 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Web.Mvc;
|
||||
|
||||
namespace yavscModel.WorkFlow
|
||||
namespace Yavsc.Model.WorkFlow
|
||||
{
|
||||
|
||||
public interface IContentProvider : IModule, IDisposable
|
||||
|
@ -1,8 +1,8 @@
|
||||
using System;
|
||||
using yavscModel.WorkFlow;
|
||||
using Yavsc.Model.WorkFlow;
|
||||
using System.Web.Mvc;
|
||||
|
||||
namespace yavscModel.WorkFlow
|
||||
namespace Yavsc.Model.WorkFlow
|
||||
{
|
||||
public interface IWFModule
|
||||
{
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace yavscModel.WorkFlow
|
||||
namespace Yavsc.Model.WorkFlow
|
||||
{
|
||||
public interface IWFOrder
|
||||
{
|
||||
|
@ -2,7 +2,7 @@ using System;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel;
|
||||
|
||||
namespace yavscModel.WorkFlow
|
||||
namespace Yavsc.Model.WorkFlow
|
||||
{
|
||||
[Obsolete("This should be define in an IT specific module")]
|
||||
public class NewProjectModel
|
||||
|
@ -1,6 +1,6 @@
|
||||
using System;
|
||||
|
||||
namespace yavscModel.WorkFlow
|
||||
namespace Yavsc.Model.WorkFlow
|
||||
{
|
||||
public class OrderStatusChangedEventArgs: EventArgs
|
||||
{
|
||||
|
@ -2,7 +2,7 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Web.Mvc;
|
||||
|
||||
namespace yavscModel.WorkFlow
|
||||
namespace Yavsc.Model.WorkFlow
|
||||
{
|
||||
public class StatusChange {
|
||||
public int Status { get; set;}
|
||||
|
@ -1,8 +1,7 @@
|
||||
using System;
|
||||
using SalesCatalog.Model;
|
||||
using yavscModel.WorkFlow;
|
||||
|
||||
namespace yavscModel.WorkFlow
|
||||
namespace Yavsc.Model.WorkFlow
|
||||
{
|
||||
public class WFOrder : IWFOrder
|
||||
{
|
||||
|
@ -1,6 +1,6 @@
|
||||
using System;
|
||||
|
||||
namespace yavscModel.WorkFlow
|
||||
namespace Yavsc.Model.WorkFlow
|
||||
{
|
||||
public class Writting
|
||||
{
|
||||
|
@ -65,6 +65,8 @@
|
||||
<Compile Include="Blogs\FindBlogEntryFlags.cs" />
|
||||
<Compile Include="WorkFlow\StatusChange.cs" />
|
||||
<Compile Include="IModule.cs" />
|
||||
<Compile Include="WorkFlow\BasketImpact.cs" />
|
||||
<Compile Include="WorkFlow\Commande.cs" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<ItemGroup>
|
@ -3,7 +3,7 @@
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>10.0.0</ProductVersion>
|
||||
<ProductVersion>8.0.30703</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{EEFCECE6-3B7F-4BBE-B7AF-69377AF3CF39}</ProjectGuid>
|
||||
<OutputType>Exe</OutputType>
|
||||
|
Reference in New Issue
Block a user