From 2ac233893936b716f077ac72fa64f19768340161 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Mon, 20 Oct 2014 07:23:44 +0200 Subject: [PATCH] Edition du devis fonctionnelle --- WorkFlowProvider/NpgsqlContentProvider.cs | 29 +++- WorkFlowProvider/WorkFlowProvider.csproj | 1 + web/Controllers/FrontOfficeController.cs | 4 +- web/Controllers/WorkFlowController.cs | 17 +- web/Global.asax.cs | 4 + web/Models/App.master | 4 +- web/Theme/blue/asc.gif | Bin 0 -> 54 bytes web/Theme/blue/bg.gif | Bin 0 -> 64 bytes web/Theme/blue/desc.gif | Bin 0 -> 54 bytes web/Theme/blue/style.css | 39 +++++ web/Theme/dark/asc.gif | Bin 0 -> 54 bytes web/Theme/dark/bg.gif | Bin 0 -> 64 bytes web/Theme/dark/desc.gif | Bin 0 -> 54 bytes web/Theme/dark/style.css | 41 +++++ web/Theme/green/asc.png | Bin 0 -> 2665 bytes web/Theme/green/bg.png | Bin 0 -> 2655 bytes web/Theme/green/desc.png | Bin 0 -> 2662 bytes web/Theme/green/style.css | 39 +++++ web/{ => Theme}/style.css | 0 web/Views/FrontOffice/Estimate.aspx | 194 +++++++++++++++------- web/Web.csproj | 23 ++- yavscModel/WorkFlow/Writting.cs | 30 ++++ 22 files changed, 349 insertions(+), 76 deletions(-) create mode 100644 web/Theme/blue/asc.gif create mode 100644 web/Theme/blue/bg.gif create mode 100644 web/Theme/blue/desc.gif create mode 100644 web/Theme/blue/style.css create mode 100644 web/Theme/dark/asc.gif create mode 100644 web/Theme/dark/bg.gif create mode 100644 web/Theme/dark/desc.gif create mode 100644 web/Theme/dark/style.css create mode 100644 web/Theme/green/asc.png create mode 100644 web/Theme/green/bg.png create mode 100644 web/Theme/green/desc.png create mode 100644 web/Theme/green/style.css rename web/{ => Theme}/style.css (100%) diff --git a/WorkFlowProvider/NpgsqlContentProvider.cs b/WorkFlowProvider/NpgsqlContentProvider.cs index 94dccea7..333535ab 100644 --- a/WorkFlowProvider/NpgsqlContentProvider.cs +++ b/WorkFlowProvider/NpgsqlContentProvider.cs @@ -66,11 +66,6 @@ namespace WorkFlowProvider throw new NotImplementedException (); } - public void UpdateWritting (Writting wr) - { - throw new NotImplementedException (); - } - public void SetWrittingStatus (long wrtid, int status, string username) { throw new NotImplementedException (); @@ -197,6 +192,30 @@ namespace WorkFlowProvider } } } + + + public void UpdateWritting (Writting wr) + { + using (NpgsqlConnection cnx = CreateConnection ()) { + using (NpgsqlCommand cmd = cnx.CreateCommand ()) { + cmd.CommandText = + "update writtings set " + + "description = @desc, " + + "ucost = @ucost, " + + "count = @count, " + + "productid = @prdid " + + "where _id = @wrid"; + cmd.Parameters.Add ("@wrid", wr.Id); + cmd.Parameters.Add ("@desc", wr.Description); + cmd.Parameters.Add ("@ucost", wr.UnitaryCost); + cmd.Parameters.Add ("@prdid", wr.ProductReference); + cmd.Parameters.Add ("@count", wr.Count); + cnx.Open (); + cmd.ExecuteNonQuery (); + cnx.Close (); + } + } + } public void SetTitle (long estid, string newTitle) { diff --git a/WorkFlowProvider/WorkFlowProvider.csproj b/WorkFlowProvider/WorkFlowProvider.csproj index c8f6968e..7393fe8c 100644 --- a/WorkFlowProvider/WorkFlowProvider.csproj +++ b/WorkFlowProvider/WorkFlowProvider.csproj @@ -9,6 +9,7 @@ Library WorkFlowProvider WorkFlowProvider + v4.5 true diff --git a/web/Controllers/FrontOfficeController.cs b/web/Controllers/FrontOfficeController.cs index f88eaf3c..2fa73ae1 100644 --- a/web/Controllers/FrontOfficeController.cs +++ b/web/Controllers/FrontOfficeController.cs @@ -21,9 +21,10 @@ namespace Yavsc.Controllers public class FrontOfficeController : Controller { [Authorize] - public ActionResult Estimate(Estimate model,string submit) + public ActionResult Estimate(Estimate model,string submit) { if (ModelState.IsValid) { + ViewData ["WebApiUrl"] = "http://"+ Request.Url.Authority + "/api/WorkFlow"; string username = HttpContext.User.Identity.Name; if (model.Id > 0) { Estimate f = WorkFlowManager.GetEstimate (model.Id); @@ -31,7 +32,6 @@ namespace Yavsc.Controllers ModelState.AddModelError ("Id", "Wrong Id"); return View (model); } - if (username != f.Owner) if (!Roles.IsUserInRole ("FrontOffice")) throw new UnauthorizedAccessException ("You're not allowed to view/modify this estimate"); diff --git a/web/Controllers/WorkFlowController.cs b/web/Controllers/WorkFlowController.cs index 57a9f0a4..fe2a306a 100644 --- a/web/Controllers/WorkFlowController.cs +++ b/web/Controllers/WorkFlowController.cs @@ -11,7 +11,6 @@ using System.Web.Security; namespace Yavsc.ApiControllers { - //[HttpControllerConfiguration(ActionValueBinder=typeof(Basic.MvcActionValueBinder))] public class WorkFlowController : ApiController { string adminRoleName="Admin"; @@ -39,10 +38,13 @@ namespace Yavsc.ApiControllers { WorkFlowManager.DropWritting (wrid); } - [HttpGet] + [Authorize] - public void UpdateWritting(Writting wr) + [AcceptVerbs("POST")] + public void UpdateWritting([FromBody] Writting wr) { + if (!ModelState.IsValid) + throw new Exception ("Modèle invalide"); WorkFlowManager.UpdateWritting (wr); } @@ -62,12 +64,13 @@ namespace Yavsc.ApiControllers return new { test=string.Format("Hello {0}!",username) }; } - [HttpGet] - [HttpPost] + + [AcceptVerbs("POST")] [Authorize] - public long Write (long estid, string desc, decimal ucost, int count, string productid) { + public long Write ([FromUri] long estid, [FromBody] Writting wr) { // TODO ensure estid owner matches the current one - return WorkFlowManager.Write(estid, desc, ucost, count, productid); + return WorkFlowManager.Write(estid, wr.Description, + wr.UnitaryCost, wr.Count, wr.ProductReference); } } } diff --git a/web/Global.asax.cs b/web/Global.asax.cs index 73321a12..f3f0e9eb 100644 --- a/web/Global.asax.cs +++ b/web/Global.asax.cs @@ -16,6 +16,10 @@ namespace Yavsc { routes.IgnoreRoute ("{resource}.axd/{*pathInfo}"); + routes.IgnoreRoute ("js/{*pathInfo}"); + routes.IgnoreRoute ("Theme/{*pathInfo}"); + routes.IgnoreRoute ("css/{*pathInfo}"); + routes.IgnoreRoute ("images/{*pathInfo}"); routes.MapRoute ( "Blog", diff --git a/web/Models/App.master b/web/Models/App.master index d76e89db..f15053c5 100644 --- a/web/Models/App.master +++ b/web/Models/App.master @@ -5,9 +5,11 @@ <% Page.Title += " - "+YavscHelpers.SiteName; %> + + - + diff --git a/web/Theme/blue/asc.gif b/web/Theme/blue/asc.gif new file mode 100644 index 0000000000000000000000000000000000000000..74157867f25acbc146704d43399d6c3605ba7724 GIT binary patch literal 54 zcmZ?wbhEHb6lGvxXkcJa);0M5|G(l-7DfgJMg|=QAOOiQF!A=tFW`Q0{?_dDi`go= G4AuZ#-wosd literal 0 HcmV?d00001 diff --git a/web/Theme/blue/bg.gif b/web/Theme/blue/bg.gif new file mode 100644 index 0000000000000000000000000000000000000000..fac668fcf42af844a3af0a239fa638ddbc08443c GIT binary patch literal 64 zcmZ?wbhEHb6lLIKXkcJa);0M5|G(l-7DfgJMg|=QAOOiQFp2l{H=O3Yl~fU8)V1~= QTew|n!uOuePzDBT00piR0RR91 literal 0 HcmV?d00001 diff --git a/web/Theme/blue/desc.gif b/web/Theme/blue/desc.gif new file mode 100644 index 0000000000000000000000000000000000000000..3b30b3c58eabdb47a1c420ad03c8e30b966cc858 GIT binary patch literal 54 zcmZ?wbhEHb6lGvxXkcJa);0M5|G(l-7DfgJMg|=QAOOiQF!A>EGoD<#VNP?1QCB1* GgEatI(+xQQ literal 0 HcmV?d00001 diff --git a/web/Theme/blue/style.css b/web/Theme/blue/style.css new file mode 100644 index 00000000..071b3cc0 --- /dev/null +++ b/web/Theme/blue/style.css @@ -0,0 +1,39 @@ +/* tables */ +table.tablesorter { + font-family:arial; + background-color: #CDCDCD; + margin:10px 0pt 15px; + font-size: 8pt; + width: 100%; + text-align: left; +} +table.tablesorter thead tr th, table.tablesorter tfoot tr th { + background-color: #e6EEEE; + border: 1px solid #FFF; + font-size: 8pt; + padding: 4px; +} +table.tablesorter thead tr .header { + background-image: url(bg.gif); + background-repeat: no-repeat; + background-position: center right; + cursor: pointer; +} +table.tablesorter tbody td { + color: #3D3D3D; + padding: 4px; + background-color: #FFF; + vertical-align: top; +} +table.tablesorter tbody tr.odd td { + background-color:#F0F0F6; +} +table.tablesorter thead tr .headerSortUp { + background-image: url(/Theme/blue/asc.gif); +} +table.tablesorter thead tr .headerSortDown { + background-image: url(/Theme/blue/desc.gif); +} +table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp { +background-color: #8dbdd8; +} diff --git a/web/Theme/dark/asc.gif b/web/Theme/dark/asc.gif new file mode 100644 index 0000000000000000000000000000000000000000..74157867f25acbc146704d43399d6c3605ba7724 GIT binary patch literal 54 zcmZ?wbhEHb6lGvxXkcJa);0M5|G(l-7DfgJMg|=QAOOiQF!A=tFW`Q0{?_dDi`go= G4AuZ#-wosd literal 0 HcmV?d00001 diff --git a/web/Theme/dark/bg.gif b/web/Theme/dark/bg.gif new file mode 100644 index 0000000000000000000000000000000000000000..fac668fcf42af844a3af0a239fa638ddbc08443c GIT binary patch literal 64 zcmZ?wbhEHb6lLIKXkcJa);0M5|G(l-7DfgJMg|=QAOOiQFp2l{H=O3Yl~fU8)V1~= QTew|n!uOuePzDBT00piR0RR91 literal 0 HcmV?d00001 diff --git a/web/Theme/dark/desc.gif b/web/Theme/dark/desc.gif new file mode 100644 index 0000000000000000000000000000000000000000..3b30b3c58eabdb47a1c420ad03c8e30b966cc858 GIT binary patch literal 54 zcmZ?wbhEHb6lGvxXkcJa);0M5|G(l-7DfgJMg|=QAOOiQF!A>EGoD<#VNP?1QCB1* GgEatI(+xQQ literal 0 HcmV?d00001 diff --git a/web/Theme/dark/style.css b/web/Theme/dark/style.css new file mode 100644 index 00000000..5fd7a115 --- /dev/null +++ b/web/Theme/dark/style.css @@ -0,0 +1,41 @@ +/* tables */ +table.tablesorter { + font-family:arial; + background-color: #333; + margin:10px 0pt 15px; + font-size: 8pt; + width: 100%; + text-align: left; +} +table.tablesorter thead tr th, table.tablesorter tfoot tr th { + background-color: rgba(0,0,0,0.5); + border: 1px solid #206; + font-size: 8pt; + padding: 4px; +} +table.tablesorter thead tr .header { + background-image: url(bg.gif); + background-repeat: no-repeat; + background-position: center right; + cursor: pointer; +} +table.tablesorter tbody td { + color: #ffa; + padding: 4px; + vertical-align: top; + background-color: #002; +} + +table.tablesorter .odd td { + background-color: #004; +} + +table.tablesorter thead tr .headerSortUp { + background-image: url(/Theme/dark/asc.gif); +} +table.tablesorter thead tr .headerSortDown { + background-image: url(/Theme/dark/desc.gif); +} +table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp { +background-color: #123; +} diff --git a/web/Theme/green/asc.png b/web/Theme/green/asc.png new file mode 100644 index 0000000000000000000000000000000000000000..66e39cad0118035e24e5ccb2cc9795ac936746d3 GIT binary patch literal 2665 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 Cpy)LK literal 0 HcmV?d00001 diff --git a/web/Theme/green/style.css b/web/Theme/green/style.css new file mode 100644 index 00000000..8ea42b4b --- /dev/null +++ b/web/Theme/green/style.css @@ -0,0 +1,39 @@ +table.tablesorter { + font-size: 12px; + background-color: #4D4D4D; + width: 1024px; + border: 1px solid #000; +} +table.tablesorter th { + text-align: left; + padding: 5px; + background-color: #6E6E6E; +} +table.tablesorter td { + color: #FFF; + padding: 5px; +} +table.tablesorter .even { + background-color: #3D3D3D; +} +table.tablesorter .odd { + background-color: #6E6E6E; +} +table.tablesorter .header { + background-image: url(bg.png); + background-repeat: no-repeat; + border-left: 1px solid #FFF; + border-right: 1px solid #000; + border-top: 1px solid #FFF; + padding-left: 30px; + padding-top: 8px; + height: auto; +} +table.tablesorter .headerSortUp { + background-image: url(/Theme/green/asc.png); + background-repeat: no-repeat; +} +table.tablesorter .headerSortDown { + background-image: url(/Theme/green/desc.png); + background-repeat: no-repeat; +} \ No newline at end of file diff --git a/web/style.css b/web/Theme/style.css similarity index 100% rename from web/style.css rename to web/Theme/style.css diff --git a/web/Views/FrontOffice/Estimate.aspx b/web/Views/FrontOffice/Estimate.aspx index e1021939..c7ae75bd 100644 --- a/web/Views/FrontOffice/Estimate.aspx +++ b/web/Views/FrontOffice/Estimate.aspx @@ -1,8 +1,14 @@ <%@ Page Title="Devis" Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/App.master" %> - + + + + + + + <%= Html.ValidationSummary("Devis") %> <% using (Html.BeginForm("Estimate","FrontOffice")) { %> <%= Html.LabelFor(model => model.Title) %>:<%= Html.TextBox( "Title" ) %> @@ -22,25 +28,14 @@ <% } else { %> - - <% } %> -<% if (Model.Lines ==null || Model.Lines.Length == 0) { %> -Pas de ligne. -<% -} else { %> + + + - @@ -48,9 +43,10 @@ -<% foreach (Writting wr in Model.Lines) { %> - - +<% int lc=0; + if (Model.Lines!=null) + foreach (Writting wr in Model.Lines) { lc++; %> +row" id="wr<%=wr.Id%>"> @@ -60,13 +56,14 @@
Id Description Product Reference Count
<%=wr.Id%>
<%=wr.Description%> <%=wr.ProductReference%> <%=wr.Count%>
- -<% } %> - <% } %> <% } %> + + + +
- + -
+ diff --git a/web/Web.csproj b/web/Web.csproj index 6de340db..e263cb21 100644 --- a/web/Web.csproj +++ b/web/Web.csproj @@ -25,6 +25,11 @@ Yavsc true + + + + + none @@ -107,6 +112,10 @@ + + + + @@ -145,7 +154,6 @@ - @@ -204,6 +212,19 @@ + + + + + + + + + + + + + diff --git a/yavscModel/WorkFlow/Writting.cs b/yavscModel/WorkFlow/Writting.cs index 10c38073..2d18c21d 100644 --- a/yavscModel/WorkFlow/Writting.cs +++ b/yavscModel/WorkFlow/Writting.cs @@ -1,13 +1,43 @@ using System; +using System.ComponentModel.DataAnnotations; namespace Yavsc.Model.WorkFlow { + /// + /// A Writting. + /// Une ligne d'écriture dans un devis ou une facture + /// public class Writting { + /// + /// Gets or sets the identifier. + /// + /// The identifier. public long Id { get; set; } + /// + /// Gets or sets the unitary cost, per unit, or per hour ... + /// Who knows? + /// + /// The unitary cost. + [Required()] public decimal UnitaryCost { get; set; } + /// + /// Gets or sets the count. + /// + /// The count. + [Required()] public int Count { get; set; } + /// + /// Gets or sets the product reference. + /// + /// The product reference. + [Required()] public string ProductReference { get; set; } + /// + /// Gets or sets the description. + /// + /// The description. + [Required()] public string Description { get; set; } } }