From 214f79d9357976f8c8a4fa29403c4a0adaba985c Mon Sep 17 00:00:00 2001
From: Paul Schneider <paulschneider@free.fr>
Date: Tue, 4 Nov 2014 00:32:47 +0100
Subject: [PATCH] better design

---
 web/Theme/style.css                 | 37 +++++++++++++++---------
 web/Views/FrontOffice/Estimate.aspx | 44 +++++++++++++++++++----------
 web/Views/FrontOffice/Writting.ascx | 13 +++++----
 3 files changed, 60 insertions(+), 34 deletions(-)

diff --git a/web/Theme/style.css b/web/Theme/style.css
index 4757a3bc..e58efe88 100644
--- a/web/Theme/style.css
+++ b/web/Theme/style.css
@@ -8,13 +8,18 @@ body {
         margin-bottom:3em;
 }
 
-main, aside {
-		background-color: rgba(0,0,0,0.8);
+main {
+	background-color: rgba(0,0,0,0.8);
+	float:left;
+	margin:.5em;
 }
 
-		aside {
-		display:inline;
-		max-width:15em;
+aside div {
+	display: block;
+		background-color: rgba(32,16,16,0.5);
+		margin: 0.7em;
+		float: left;
+		margin:.5em;
 		}
 video,img {
 	max-width:100%;
@@ -41,9 +46,10 @@ a {
    background-color:rgba(0,30,0,0.5);
 }
 
-a:hover {
+.actionlink:hover {
 	background-color:rgba(30,0,124,0.5);
-border-color: white;
+    border-color: white;
+
 }
 
 a:visited {
@@ -60,8 +66,7 @@ label {
 .error {
 	color: #f88;
 	font-size: large;
-	border: solid green;
-	background-color: rgba(64,0,0,0.1);
+	background-color: rgba(128,0,0,0.3);
 }
 .validation-summary-errors{
 	color: #f88;
@@ -98,6 +103,9 @@ padding-left: 20px;
 	border-radius:25px;
    background-color:rgba(0,0,32,0.8);
    font-size:x-small;
+   z-index:1;
+   cursor: pointer;
+   font-family: 'Arial', cursive;
 }
 
 .code {
@@ -138,14 +146,15 @@ padding-left: 20px;
 	}
 
 .hidcom {
-	font-size: smaller;
-	display:none;	
-}
-.actionlink:hover + .hidcom {
-   display:inline; position:relative; left:0x; top:0px; padding:5px; margin:5px;
+	display:none; position:fixed; z-index:-1; 
+	 padding:5px; margin:5px;
    background-color: rgba(0,0,40,.8); 
 }
 
+.actionlink:hover + .hidcom {
+   display:block; 
+}
+
 
 @media print {
 		body {background-color:white;color:black;}
diff --git a/web/Views/FrontOffice/Estimate.aspx b/web/Views/FrontOffice/Estimate.aspx
index c369caca..9ffeac78 100644
--- a/web/Views/FrontOffice/Estimate.aspx
+++ b/web/Views/FrontOffice/Estimate.aspx
@@ -44,7 +44,7 @@
 <% int lc=0;
    if (Model.Lines!=null)
    foreach (Writting wr in Model.Lines) { lc++; %>
-<tr class="<%= (lc%2==0)?"odd ":"even " %>row" id="wr<%=wr.Id%>">
+<tr class="<%= (wr.Id%2==0)?"even ":"odd " %>row" id="wr<%=wr.Id%>">
 <td><%=wr.Description%></td>
 <td><%=wr.ProductReference%></td>
 <td><%=wr.Count%></td>
@@ -58,7 +58,7 @@
 </asp:Content>
    <asp:Content ContentPlaceHolderID="MASContent" ID="MASContent1" runat="server">
 
-   <div>
+
    <% ViewData["EstimateId"]=Model.Id; %>
    <%= Html.Partial("Writting",new Writting(),new ViewDataDictionary(ViewData)
         {
@@ -67,13 +67,17 @@
                 HtmlFieldPrefix = ViewData.TemplateInfo.HtmlFieldPrefix==""?"wr":ViewData.TemplateInfo.HtmlFieldPrefix+"_wr"
             }
         }) %>
+
+       
         <form>
-        <input type="button" id="btnnew" value="Nouvelle écriture"/>
-        <input type="button" id="btncreate" value="Ecrire"/>
-        <input type="button" id="btnmodify" value="Modifier" class="hidden"/>
-        <input type="button" id="btndrop" value="Supprimer" class="hidden"/>
-        </form>
+     <div>
+        <input type="button" id="btnnew" value="Nouvelle écriture" class="actionlink"/>
+        <input type="button" id="btncreate" value="Ecrire" class="actionlink"/>
+        <input type="button" id="btnmodify" value="Modifier" class="hidden actionlink"/>
+        <input type="button" id="btndrop" value="Supprimer" class="hidden actionlink"/>
+      </div>  </form>
      <tt id="msg" class="hidden message"></tt>
+
      <style>
      .row { cursor:pointer; }
      table.tablesorter td:hover { background-color: rgba(0,64,0,0.5); }
@@ -101,12 +105,11 @@
 
      function wredit(pwrid)
      {
-
+        if (wr_Id.value>0) {
      	$("#wr"+wr_Id.value).removeClass("selected");
      	$("#wr"+wr_Id.value).addClass((wr_Id.value%2==0)?"even":"odd");
+     	}
      	$("#wr_Id").val(pwrid);
-
-
      	if (pwrid>0) {
     	$("#btncreate").addClass("hidden");
     	$("#btnmodify").removeClass("hidden");
@@ -165,13 +168,19 @@
 function addRow(){
        var wrt = GetWritting();
 		var estid = parseInt($("#Id").val());
+        
+            $("#Err_wr_Description").text("");
+            $("#Err_wr_ProductReference").text("");
+            $("#Err_wr_UnitaryCost").text("");
+            $("#Err_wr_Count").text("");
+
         $.ajax({
             url: "<%=Url.Content("~/api/WorkFlow/Write?estid=")%>"+estid,
             type: "POST",
             data: wrt,
             success: function (data) { 
             wrt.Id = Number(data);
-            wr_Id.value = wrt.Id;
+             wredit(wrt.Id);
             var wridval = 'wr'+wrt.Id;
             jQuery('<tr/>', { 
             id: wridval,
@@ -184,14 +193,19 @@ function addRow(){
             $("#"+wridval).click(function(ev){onEditRow(ev);});
      $(".tablesorter").tablesorter( {sortList: [[0,0], [1,0]]} );
             message(false);
+           
             },
+            dataType: "json",
             statusCode: {
             	400: function(data) {
-            		alert(JSON.stringify(data));
+            		$.each(data.responseJSON, function (key, value) {
+            		document.getElementById("Err_" + value.key.replace(".","_")).innerHTML=value.errors.join("<br/>");
+                	});
             		}
             	},
             error: function (xhr, ajaxOptions, thrownError) {
-            message(xhr.status+" : "+xhr.responseText+" / "+thrownError);}});
+			if (xhr.status != 400)
+            	message(xhr.status+" : "+xhr.responseText+" / "+thrownError);}});
     }
 
      function onEditRow(e) {
@@ -227,8 +241,8 @@ function addRow(){
 });
     </script>
   
-   </div>
-    </form>
+   
+    <div>
     <a class="actionlink" href="<%=ViewData["WebApiBase"]%>/FrontOffice/GetEstimTex?estimid=<%=Model.Id%>"><%= LocalizedText.Tex_version %></a>
     <a class="actionlink" href="<%=ViewData["WebApiBase"]%>/FrontOffice/GetEstimPdf?estimid=<%=Model.Id%>"><%= LocalizedText.Pdf_version %></a>
     </div>
diff --git a/web/Views/FrontOffice/Writting.ascx b/web/Views/FrontOffice/Writting.ascx
index 3e310634..0cd1f60f 100644
--- a/web/Views/FrontOffice/Writting.ascx
+++ b/web/Views/FrontOffice/Writting.ascx
@@ -2,20 +2,23 @@
 
 <%= Html.ValidationSummary("Ligne de devis") %>
 <% using  (Html.BeginForm("Write","WorkFlow")) { %>
+<div>
 <%= Html.Hidden( "Id" ) %>
 <%= Html.Hidden( "EstimateId", (long) ViewData["EstimateId"]) %>
 
-<%= Html.LabelFor(model => model.Description) %>:<%= Html.TextBox( "Description" ) %>
-<%= Html.ValidationMessage("Description", "*") %>
+<%= Html.LabelFor(model => model.Description) %>:<%= Html.TextArea( "Description" ) %>
+<%= Html.ValidationMessage("Description", "*", new { @id="Err_wr_Description", @class="error" }) %>
 <br/>
 <%= Html.LabelFor(model => model.ProductReference) %>:<%= Html.TextBox( "ProductReference" ) %>
-<%= Html.ValidationMessage("ProductReference", "*") %>
+<%= Html.ValidationMessage("ProductReference", "*", new { @id="Err_wr_ProductReference", @class="error" }) %>
 <br/>
 <%= Html.LabelFor(model => model.UnitaryCost) %>:<%= Html.TextBox( "UnitaryCost" ) %>
-<%= Html.ValidationMessage("UnitaryCost", "*") %>
+<%= Html.ValidationMessage("UnitaryCost", "", new { @id="Err_wr_UnitaryCost", @class="error" }) %>
 <br/>
 <%= Html.LabelFor(model => model.Count) %>:<%= Html.TextBox( "Count" ) %>
-<%= Html.ValidationMessage("Count", "*") %><br/>
+<%= Html.ValidationMessage("Count", "", new { @id="Err_wr_Count" , @class="error"}) %>
+
+</div>
 <% } %>