From 8fee29366573de04abfd006f5a0d87576e5855a9 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Tue, 23 Sep 2014 12:25:41 +0200 Subject: [PATCH] * style.css: * UserPost.aspx: * Estimate.cs: * Writting.cs: * WorkFlowController.cs: * NpgsqlContentProvider.cs: * FrontOfficeApiController.cs: Fixed the GetEstimate function, refactoring --- WorkFlowProvider/NpgsqlContentProvider.cs | 28 ++++++++++++++++++++- web/Controllers/FrontOfficeApiController.cs | 25 ++---------------- web/Controllers/WorkFlowController.cs | 12 ++++++++- web/Views/Blogs/UserPost.aspx | 2 +- web/style.css | 12 +++------ yavscModel/WorkFlow/Estimate.cs | 2 ++ yavscModel/WorkFlow/Writting.cs | 2 +- 7 files changed, 48 insertions(+), 35 deletions(-) diff --git a/WorkFlowProvider/NpgsqlContentProvider.cs b/WorkFlowProvider/NpgsqlContentProvider.cs index 98840a46..54238e22 100644 --- a/WorkFlowProvider/NpgsqlContentProvider.cs +++ b/WorkFlowProvider/NpgsqlContentProvider.cs @@ -6,6 +6,7 @@ using System.Collections.Specialized; using yavscModel.WorkFlow; using System.Web.Mvc; using System.Configuration.Provider; +using System.Collections.Generic; namespace WorkFlowProvider { @@ -64,7 +65,32 @@ namespace WorkFlowProvider est.Title = rdr.GetString( rdr.GetOrdinal("title")); est.Owner = rdr.GetString( - rdr.GetOrdinal("username")); + rdr.GetOrdinal("username")); + using (NpgsqlCommand cmdw = new NpgsqlCommand ("select _id, productid, ucost, count, description from writtings where _id = @estid", cnx)) { + cmdw.Parameters.Add("@estid", estimid); + using (NpgsqlDataReader rdrw = cmdw.ExecuteReader ()) { + List lw = new List (); + while (rdrw.Read ()) { + Writting w = new Writting (); + w.Description = rdrw.GetString ( + rdrw.GetOrdinal ("description")); + int opi = rdrw.GetOrdinal ("productid"); + if (!rdrw.IsDBNull(opi)) + w.ProductReference = rdrw.GetInt64(opi); + int oco = rdrw.GetOrdinal ("count"); + if (!rdrw.IsDBNull(oco)) + w.Count = rdrw.GetInt32 (oco); + int ouc = rdrw.GetOrdinal ("ucost"); + if (!rdrw.IsDBNull(ouc)) + w.UnitaryCost = rdrw.GetDecimal (ouc); + // TODO get w.id + lw.Add (w); + } + est.Lines = lw.ToArray (); + } + } + // TODO est.Ciffer = somme des ecritures + // TODO read into est.Lines } cnx.Close (); return est; diff --git a/web/Controllers/FrontOfficeApiController.cs b/web/Controllers/FrontOfficeApiController.cs index 263331be..6c73ef9b 100644 --- a/web/Controllers/FrontOfficeApiController.cs +++ b/web/Controllers/FrontOfficeApiController.cs @@ -22,7 +22,8 @@ namespace Yavsc.ApiControllers [AcceptVerbs("GET")] public Catalog Catalog () { - return CatalogManager.GetCatalog (); + Catalog c = CatalogManager.GetCatalog (); + return c; } [AcceptVerbs("GET")] @@ -65,29 +66,7 @@ namespace Yavsc.ApiControllers return result; } - [HttpPost] - public string ProfileImagePost(HttpPostedFile profileImage) - { - string[] extensions = { ".jpg", ".jpeg", ".gif", ".bmp", ".png" }; - if (!extensions.Any(x => x.Equals(Path.GetExtension(profileImage.FileName.ToLower()), StringComparison.OrdinalIgnoreCase))) - { - throw new HttpResponseException( - new HttpResponseMessage(HttpStatusCode.BadRequest)); - } - // string root = System.Web.HttpContext.Current.Server.MapPath("~/App_Data/uploads"); - // Other code goes here - // profileImage.SaveAs (); - return "/path/to/image.png"; - } - - [HttpGet] - [Authorize] - public long CreateEstimate (string title) - { - return WFManager.CreateEstimate ( - Membership.GetUser().UserName,title); - } [HttpGet] [Authorize] public long AddToBasket (string title) diff --git a/web/Controllers/WorkFlowController.cs b/web/Controllers/WorkFlowController.cs index bf136bd3..780f8372 100644 --- a/web/Controllers/WorkFlowController.cs +++ b/web/Controllers/WorkFlowController.cs @@ -7,12 +7,21 @@ using System.Web.Http; using WorkFlowProvider; using yavscModel.WorkFlow; using System.Web.Http.Controllers; +using System.Web.Security; namespace Yavsc.ApiControllers { [HttpControllerConfiguration(ActionValueBinder=typeof(Basic.MvcActionValueBinder))] public class WorkFlowController : ApiController { + [HttpGet] + [Authorize] + public long CreateEstimate (string title) + { + return WFManager.CreateEstimate ( + Membership.GetUser().UserName,title); + } + [HttpGet] [Authorize] public object Index() @@ -44,7 +53,8 @@ namespace Yavsc.ApiControllers /// Estid. public Estimate GetEstimate (long estid) { - return WFManager.ContentProvider.GetEstimate (estid); + Estimate est = WFManager.ContentProvider.GetEstimate (estid); + return est; } /* public object Details(int id) diff --git a/web/Views/Blogs/UserPost.aspx b/web/Views/Blogs/UserPost.aspx index 2388abcf..cfecddd0 100644 --- a/web/Views/Blogs/UserPost.aspx +++ b/web/Views/Blogs/UserPost.aspx @@ -27,7 +27,7 @@ <% foreach (var c in (Comment[])ViewData["Comments"]) { %> -
<%=c.From%> +
<%=c.From%> <%= BBCodeHelper.Parser.ToHtml(c.CommentText) %> <% if ( username == Model.UserName || c.From == username ) { %> <%= Html.ActionLink("Supprimer","RemoveComment", new { cmtid = c.Id } )%> diff --git a/web/style.css b/web/style.css index 2c45f5d4..5d8ee9e8 100644 --- a/web/style.css +++ b/web/style.css @@ -13,18 +13,16 @@ body { video,img { max-width:100%; max-height:75%; - padding:.2em; - margin:0; position:relative; - top:.7em; } #login { position: fixed; + top: 3px; right:3px; font-size:x-small; - background-color:rgba(0,0,0,0.8); - color:rgb(0,254,0); + background-color:rgba(0,0,0,0.6); + color:rgb(130,254,130); } #login a { @@ -89,8 +87,6 @@ padding-left: 20px; .validation-summary-errors{ color: #f88; } -.pied { -} .actionlink { color: #B0B080; @@ -138,7 +134,7 @@ padding-left: 20px; @media print { body {background-color:white;color:black;} - .postcomment,#login,.actionlink,.metablog,.thanks{ display:none;} + header,footer,.postcomment,.actionlink,.metablog{ display:none;} } @media all and (max-width: 15em) { diff --git a/yavscModel/WorkFlow/Estimate.cs b/yavscModel/WorkFlow/Estimate.cs index 2b9945c0..c6402934 100644 --- a/yavscModel/WorkFlow/Estimate.cs +++ b/yavscModel/WorkFlow/Estimate.cs @@ -13,6 +13,8 @@ namespace yavscModel.WorkFlow public decimal Ciffer { get { decimal total = 0; + if (Lines == null) + return total; foreach (Writting l in Lines) total += l.UnitaryCost * l.Count; return total; diff --git a/yavscModel/WorkFlow/Writting.cs b/yavscModel/WorkFlow/Writting.cs index c5710edd..2321a138 100644 --- a/yavscModel/WorkFlow/Writting.cs +++ b/yavscModel/WorkFlow/Writting.cs @@ -6,7 +6,7 @@ namespace yavscModel.WorkFlow { public decimal UnitaryCost { get; set; } public int Count { get; set; } - public string ProductReference { get; set; } + public long ProductReference { get; set; } public string Description { get; set; } } }