notazof/yavsc
1
1
Fork 0
Code Issues 1 Pull requests Projects 2 Releases 6 Packages Wiki Activity Actions

* Fixed the Pdf generation under Slackware

Browse source 
* Estimate view developpement
This commit is contained in:
Paul Schneider 2014-11-03 16:55:09 +01:00
commit f695d108fb
27 changed files with 459 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files

9
web/Views/Account/Profile.aspx
View file

@ -121,10 +121,19 @@ Avatar </td><td> <img class="avatar" src="/Blogs/Avatar?user=<%=ViewData["User
<input type="submit"/>
<% } %>
</asp:Content>
<asp:Content ID="MASC1" ContentPlaceHolderID="MASContent" runat="server">
<% if (Roles.IsUserInRole("Admin")) { %>
Admin,
Bankable:<%= Model.IsBankable %>, Billable:<%=Model.IsBillable%>
<% } %>
<%= Html.ActionLink("Changer de mot de passe","ChangePassword", "Account")%>
</asp:Content>

189
web/Views/FrontOffice/Estimate.aspx
View file

@ -1,14 +1,14 @@
<%@ Page Title="Devis" Language="C#" Inherits="System.Web.Mvc.ViewPage<Estimate>" MasterPageFile="~/Models/App.master" %>
<asp:Content ContentPlaceHolderID="head" ID="head1" runat="server" >
<script type="text/javascript" src="/js/jquery-latest.js"></script>
<script type="text/javascript" src="/js/jquery.tablesorter.js"></script>
<link rel="stylesheet" href="/Theme/dark/style.css" type="text/css" media="print, projection, screen" />
<script type="text/javascript" src="<%=Url.Content("~/js/jquery-latest.js")%>"></script>
<script type="text/javascript" src="<%=Url.Content("~/js/jquery.tablesorter.js")%>"></script>
<script type="text/javascript" src="<%=Url.Content("~/js/jquery.validate.js")%>"></script>
<script type="text/javascript" src="<%=Url.Content("~/js/jquery.validate.unobtrusive.js")%>"></script>
<link rel="stylesheet" href="<%=Url.Content("~/Theme/dark/style.css")%>" type="text/css" media="print, projection, screen" />
</asp:Content>
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
<%= Html.ValidationSummary("Devis") %>
<% using (Html.BeginForm("Estimate","FrontOffice")) { %>
<%= Html.LabelFor(model => model.Title) %>:<%= Html.TextBox( "Title" ) %>
@ -21,14 +21,12 @@
<%= Html.LabelFor(model => model.Description) %>:<%=Html.TextArea( "Description") %>
<%= Html.ValidationMessage("Description", "*") %>
<br/>
<%= Html.LabelFor(model => model.Id) %>:<%=Model.Id%>
<%= Html.Hidden( "Id" ) %>
<br/>
<% if (Model.Id==0) { %>
<input type="submit" name="submit" value="Create"/>
<% } else { %>
<input type="submit" name="submit" value="Update"/>
<% } %>
@ -36,17 +34,17 @@
<table class="tablesorter">
<thead>
<tr>
<th><%=LocalizedText.Description%></th>
<th><%=LocalizedText.Product_reference%></th>
<th><%=LocalizedText.Count%></th>
<th><%=LocalizedText.Unitary_cost%></th>
<th><%=Yavsc.Model.LocalizedText.Description%></th>
<th><%=Yavsc.Model.LocalizedText.Product_reference%></th>
<th><%=Yavsc.Model.LocalizedText.Count%></th>
<th><%=Yavsc.Model.LocalizedText.Unitary_cost%></th>
</tr>
</thead>
<tbody id="wrts">
<% int lc=0;
if (Model.Lines!=null)
foreach (Writting wr in Model.Lines) { lc++; %>
<tr class="<%= (lc%2==0)?"odd ":"" %>row" id="wr<%=wr.Id%>">
<tr class="<%= (lc%2==0)?"odd ":"even " %>row" id="wr<%=wr.Id%>">
<td><%=wr.Description%></td>
<td><%=wr.ProductReference%></td>
<td><%=wr.Count%></td>
@ -60,73 +58,61 @@
</asp:Content>
<asp:Content ContentPlaceHolderID="MASContent" ID="MASContent1" runat="server">
<script type="text/javascript" >
function ShowHideBtn(btn,id)
{
var shdiv = document.getElementById(id);
var wanit = shdiv.style.display == "none"; // switch button
shdiv.style.display = wanit ? "block" : "none";
btn.value = wanit ? "-" : "+";
}
</script>
<form id="writeform">
<input type="button" id="btndtl" value="+"/>
<div id="writearea" style="display:none;">
<input type="button" id="btnnew" value="Nouvelle écriture"/>
<input type="hidden" name="estid" id="estid" value="<%=Model.Id%>"/>
<label for="Description">Description:</label>
<textarea name="Description" id="wrdesc" ></textarea>
<label for="UnitaryCost">Prix unitaire:</label>
<input type="number" name="UnitaryCost" id="UnitaryCost" step="0.01"/>
<label for="Count">Quantité:</label>
<input type="number" name="Count" id="Count"/>
<label for="ProductReference">Référence du produit:</label>
<input type="text" name="ProductReference" id="ProductReference"/>
<input type="button" name="btnmodify" id="btnmodify" value="Modifier"/>
<input type="button" name="btncreate" id="btncreate" value="Écrire"/>
<input type="button" name="btndrop" id="btndrop" value="Supprimer"/>
<input type="hidden" name="wrid" id="wrid" />
<tt id="msg" class="message" style="display:none;"></tt>
<div>
<% ViewData["EstimateId"]=Model.Id; %>
<%= Html.Partial("Writting",new Writting(),new ViewDataDictionary(ViewData)
{
TemplateInfo = new System.Web.Mvc.TemplateInfo
{
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>
<tt id="msg" class="hidden message"></tt>
<style>
.row { cursor:pointer; }
table.tablesorter td:hover { background-color: rgba(0,64,0,0.5); }
.hidden { display:none; }
.selected *, .odd .selected { font-size-adjust: +1; background-color: rgb(0,64,0); }
.selected td { background-color: rgba(0,64,0,0.5); }
</style>
<script>
jQuery.support.cors = true;
function message(msg) {
if (msg) { $("#msg").css("display:inline");
$("#msg").text(msg);} else { $("#msg").css("display:hidden"); } }
if (msg) {
$("#msg").removeClass("hidden");
$("#msg").text(msg);
} else { $("#msg").addClass("hidden"); } }
function GetWritting () {
function GetWritting () {
return {
Id: Number($("#wrid").val()),
UnitaryCost: Number($("#UnitaryCost").val()),
Count: parseInt($("#Count").val()),
ProductReference: $("#ProductReference").val(),
Description: $("#wrdesc").val()
Id: Number($("#wr_Id").val()),
UnitaryCost: Number($("#wr_UnitaryCost").val()),
Count: parseInt($("#wr_Count").val()),
ProductReference: $("#wr_ProductReference").val(),
Description: $("#wr_Description").val()
};
}
function wredit(pwrid)
{
$("#wr"+wrid.value).removeClass("selected");
$("#wrid").val(pwrid);
if (wrid.value!=0)
$("#wr"+wrid.value).addClass("selected");
$("#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");
$("#btndrop").removeClass("hidden");
$("#wr"+wr_Id.value).removeClass((wr_Id.value%2==0)?"even":"odd");
$("#wr"+wr_Id.value).addClass("selected");
} else {
$("#btncreate").removeClass("hidden");
$("#btnmodify").addClass("hidden");
@ -136,19 +122,19 @@
function delRow() {
$.ajax({
url: "<%=ViewData["WABASEWF"]+"/DropWritting"%>",
url: "<%=Url.Content("~/api/WorkFlow/DropWritting")%>",
type: "Get",
data: { wrid: wrid.value },
data: { wrid: wr_Id.value },
contentType: 'application/json; charset=utf-8',
success: function () {
var tr = document.getElementById("wr"+wrid.value);
$("#wr"+wrid.value).remove();
$("#wrid").val(0);
$("#ucost").val(0);
$("#Count").val(0);
$("#Description").val();
$("#ProductReference").val();
$("#wr"+wr_Id.value).remove();
$("#wr_Id").val(0);
$("#wr_UnitaryCost").val(0);
$("#wr_Count").val(0);
$("#wr_Description").val();
$("#wr_ProductReference").val();
wredit(0);
message(false);
},
error: function (xhr, ajaxOptions, thrownError) {
message(xhr.status+" : "+xhr.responseText);}
@ -159,22 +145,19 @@
function setRow() {
var wrt = GetWritting();
$.ajax({
url: "<%=ViewData["WABASEWF"]+"/UpdateWritting"%>",
url: "<%=Url.Content("~/api/WorkFlow/UpdateWritting")%>",
type: 'POST',
data: wrt,
success: function (ms) {
if (ms)
message(JSON.stringify(ms));
else {
var cells = document.getElementById("wr"+wrt.Id).getElementsByTagName("TD");
success: function () {
var cells = document.getElementById("wr"+wrt.Id).getElementsByTagName("TD");
cells[0].innerHTML=wrt.Description;
cells[1].innerHTML=wrt.ProductReference;
cells[2].innerHTML=wrt.UnitaryCost;
cells[3].innerHTML=wrt.Count;
}
cells[2].innerHTML=wrt.Count;
cells[3].innerHTML=wrt.UnitaryCost;
message(false);
},
error: function (xhr, ajaxOptions, thrownError) {
$("#msg").text(xhr.status+" : "+xhr.responseText);}
message (xhr.status+" : "+xhr.responseText+" / "+thrownError);}
});
}
@ -183,15 +166,13 @@ function addRow(){
var wrt = GetWritting();
var estid = parseInt($("#Id").val());
$.ajax({
url: "<%=ViewData["WABASEWF"]+"/Write"%>/?estid="+estid,
url: "<%=Url.Content("~/api/WorkFlow/Write?estid=")%>"+estid,
type: "POST",
data: wrt,
success: function (data) {
wrt.Id = Number(data);
wrid.value = wrt.Id;
wr_Id.value = wrt.Id;
var wridval = 'wr'+wrt.Id;
//$("#wrts").append("<tr class=\"selected row\" id=\"wr"+wrt.Id+"\"><td>"+wrt.Description+"</td><td>"+wrt.ProductReference+"</td><td>"+wrt.Count+"</td><td>"+wrt.UnitaryCost+"</td></tr>");
jQuery('<tr/>', {
id: wridval,
"class": 'selected row',
@ -201,50 +182,56 @@ function addRow(){
$("<td>"+wrt.Count+"</td>").appendTo("#"+wridval);
$("<td>"+wrt.UnitaryCost+"</td>").appendTo("#"+wridval);
$("#"+wridval).click(function(ev){onEditRow(ev);});
$(".tablesorter").tablesorter( {sortList: [[0,0], [1,0]]} );
message(false);
},
statusCode: {
400: function(data) {
alert(JSON.stringify(data));
}
},
error: function (xhr, ajaxOptions, thrownError) {
message(xhr.status+" : "+xhr.responseText);}});
message(xhr.status+" : "+xhr.responseText+" / "+thrownError);}});
}
function ShowDtl(val)
{
document.getElementById("writearea").style.display = val ? "block" : "none";
document.getElementById("btndtl").value = val ? "-" : "+";
}
function onEditRow(e) {
ShowDtl(true);
var cells = e.delegateTarget.getElementsByTagName("TD");
var hid=e.delegateTarget.id;
var vwrid = Number(hid.substr(2));
wredit(vwrid);
$("#wrdesc").val(cells[0].innerHTML);
$("#ProductReference").val(cells[1].innerHTML);
$("#Count").val(cells[2].innerHTML);
$("#UnitaryCost").val(Number(cells[3].innerHTML.replace(",",".")));
$("#wr_Description").val(cells[0].innerHTML);
$("#wr_ProductReference").val(cells[1].innerHTML);
$("#wr_Count").val(cells[2].innerHTML);
$("#wr_UnitaryCost").val(Number(cells[3].innerHTML.replace(",",".")));
}
$(document).ready(function () {
// bug when no row: $(".tablesorter").tablesorter( {sortList: [[0,0], [1,0]]} );
// bug when no row:
<% if (Model.Lines != null) if (Model.Lines.Length>0) { %>
$(".tablesorter").tablesorter( {sortList: [[0,0], [1,0]]} );
<% } %>
$("#btncreate").click(addRow);
$("#btnmodify").click(setRow);
$("#btndrop").click(delRow);
$("#btndtl").click(function(){ShowDtl(document.getElementById("writearea").style.display != "block");});
$(".row").click(function (e) {onEditRow(e);});
$("#btnnew").click(function () {
wredit(0);
$("#wrdesc").val("");
$("#ProductReference").val("");
$("#Count").val(1);
$("#UnitaryCost").val(0);
$("#wr_Description").val("");
$("#wr_ProductReference").val("");
$("#wr_Count").val(1);
$("#wr_UnitaryCost").val(0);
});
});
</script>
</div>
</div>
</form>
<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>
</asp:Content>

14
web/Views/FrontOffice/Write.aspx
View file

@ -1,14 +0,0 @@
<%@ Page Title="Ligne de devis" Language="C#" Inherits="System.Web.Mvc.ViewPage<Writting>" MasterPageFile="~/Models/App.master" %>
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
<%= Html.ValidationSummary("Ligne de devis") %>
<% using (Html.BeginForm("Write","WorkFlow")) { %>
<%= Html.LabelFor(model => model.Id) %>:<%=Model.Id%>
<%= Html.Hidden( "Id" ) %>
<%= Html.Hidden( "EstimateId", (long) ViewData["EstimateId"]) %>
<%= Html.LabelFor(model => model.UnitaryCost) %>:<%= Html.TextBox( "UnitaryCost" ) %>
<%= Html.ValidationMessage("UnitaryCost", "*") %>
<% } %>
</asp:Content>

23
web/Views/FrontOffice/Writting.ascx Normal file
View file

@ -0,0 +1,23 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<Writting>" %>
<%= Html.ValidationSummary("Ligne de devis") %>
<% using (Html.BeginForm("Write","WorkFlow")) { %>
<%= Html.Hidden( "Id" ) %>
<%= Html.Hidden( "EstimateId", (long) ViewData["EstimateId"]) %>
<%= Html.LabelFor(model => model.Description) %>:<%= Html.TextBox( "Description" ) %>
<%= Html.ValidationMessage("Description", "*") %>
<br/>
<%= Html.LabelFor(model => model.ProductReference) %>:<%= Html.TextBox( "ProductReference" ) %>
<%= Html.ValidationMessage("ProductReference", "*") %>
<br/>
<%= Html.LabelFor(model => model.UnitaryCost) %>:<%= Html.TextBox( "UnitaryCost" ) %>
<%= Html.ValidationMessage("UnitaryCost", "*") %>
<br/>
<%= Html.LabelFor(model => model.Count) %>:<%= Html.TextBox( "Count" ) %>
<%= Html.ValidationMessage("Count", "*") %><br/>
<% } %>

17
web/Views/FrontOffice/test.cshtml
View file

@ -1,17 +0,0 @@
@{
Layout = null;
}
<!DOCTYPE html>
<html>
<head>
<title>test</title>
</head>
<body>
<div>
test
</div>
</body>
</html>

1
web/Views/Web.config
View file

@ -29,7 +29,6 @@
<add namespace="Yavsc.Model.Admin" />
<add namespace="Yavsc.Model.Blogs" />
<add namespace="Yavsc.Model.WorkFlow" />
<add namespace="Yavsc.App_GlobalResources" />
</namespaces>
</pages>
</system.web>