Egalware/C2P
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update con modifiche grafiche e funzionali con Manuel

Browse Source
This commit is contained in:
Samuele E. Locatelli
2014-08-01 18:35:37 +02:00
parent 155a66dec9
commit e439dffe19
21 changed files with 160 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C2P/Default.aspx
+1 -1
View File
@@ -18,7 +18,7 @@
</div>
<p>Cost to Price for Extrusion</p>
</div>
<div class="col-xs-6 text-right"><img src="Images/extrusion.png" alt="" class="img-responsive" /></div>
<div class="col-xs-6 text-right" style=" margin-top: 10px;"><img src="Images/extrusion.png" alt="" class="img-responsive" /></div>
</div>
</asp:Content>
<asp:Content runat="server" ID="BodyContent" ContentPlaceHolderID="MainContent">
C2P/WebUserControls/mod_MaRepActData.ascx
+6 -6
View File
@@ -5,24 +5,24 @@
<ItemTemplate>
<div class="row bottomLine">
<div class="col-xs-6 text-left">
<uc1:mod_display ID="mod_display1" runat="server" etichetta='<%# traduci("FromDate") %>' valore='<%# Eval("FromDate", "{0:ddd dd/MM/yyyy}") %>' />
<uc1:mod_display ID="mod_display1" runat="server" etichetta='<%# traduci("FromDate") %>' valore='<%# Eval("FromDate", "{0:dd/MM/yyyy}") %>' />
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display2" runat="server" etichetta='<%# traduci("ToDate") %>' valore='<%# Eval("ToDate", "{0:ddd dd/MM/yyyy}") %>' />
<uc1:mod_display ID="mod_display2" runat="server" etichetta='<%# traduci("ToDate") %>' valore='<%# Eval("ToDate", "{0:dd/MM/yyyy}") %>' />
</div>
</div>
<div class="row">
<div class="col-xs-3 text-left">
<uc1:mod_display ID="mod_display3" runat="server" etichetta='<%# traduci("NumOrderRows") %>' valore='<%# Eval("NumOrderRows") %>' />
<uc1:mod_display ID="mod_display3" runat="server" etichetta='<%# traduci("NumOrderRows") %>' valore='<%# Eval("NumOrderRows","{0:N0}") %>' />
</div>
<div class="col-xs-3 text-left">
<uc1:mod_display ID="mod_display4" runat="server" etichetta='<%# traduci("NumOrders") %>' valore='<%# Eval("NumOrders") %>' />
<uc1:mod_display ID="mod_display4" runat="server" etichetta='<%# traduci("NumOrders") %>' valore='<%# Eval("NumOrders","{0:N0}") %>' />
</div>
<div class="col-xs-3 text-right">
<uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("NumItem") %>' valore='<%# Eval("NumItem") %>' />
<uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("NumItem") %>' valore='<%# Eval("NumItem","{0:N0}") %>' />
</div>
<div class="col-xs-3 text-right">
<uc1:mod_display ID="mod_display6" runat="server" etichetta='<%# traduci("NumClients") %>' valore='<%# Eval("NumClients") %>' />
<uc1:mod_display ID="mod_display6" runat="server" etichetta='<%# traduci("NumClients") %>' valore='<%# Eval("NumClients","{0:N0}") %>' />
</div>
</div>
</ItemTemplate>
C2P/WebUserControls/mod_MaRepNewData.ascx
+6 -6
View File
@@ -5,24 +5,24 @@
<ItemTemplate>
<div class="row bottomLine">
<div class="col-xs-6 text-left">
<uc1:mod_display ID="mod_display1" runat="server" etichetta='<%# traduci("FromDate") %>' valore='<%# Eval("FromDate", "{0:ddd dd/MM/yyyy}") %>' />
<uc1:mod_display ID="mod_display1" runat="server" etichetta='<%# traduci("FromDate") %>' valore='<%# Eval("FromDate", "{0:dd/MM/yyyy}") %>' />
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display2" runat="server" etichetta='<%# traduci("ToDate") %>' valore='<%# Eval("ToDate", "{0:ddd dd/MM/yyyy}") %>' />
<uc1:mod_display ID="mod_display2" runat="server" etichetta='<%# traduci("ToDate") %>' valore='<%# Eval("ToDate", "{0:dd/MM/yyyy}") %>' />
</div>
</div>
<div class="row">
<div class="col-xs-3 text-left">
<uc1:mod_display ID="mod_display3" runat="server" etichetta='<%# traduci("NumOrderRows") %>' valore='<%# Eval("NumOrderRows") %>' />
<uc1:mod_display ID="mod_display3" runat="server" etichetta='<%# traduci("NumOrderRows") %>' valore='<%# Eval("NumOrderRows","{0:N0}") %>' />
</div>
<div class="col-xs-3 text-left">
<uc1:mod_display ID="mod_display4" runat="server" etichetta='<%# traduci("NumOrders") %>' valore='<%# Eval("NumOrders") %>' />
<uc1:mod_display ID="mod_display4" runat="server" etichetta='<%# traduci("NumOrders") %>' valore='<%# Eval("NumOrders","{0:N0}") %>' />
</div>
<div class="col-xs-3 text-right">
<uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("NumItem") %>' valore='<%# Eval("NumItem") %>' />
<uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("NumItem") %>' valore='<%# Eval("NumItem","{0:N0}") %>' />
</div>
<div class="col-xs-3 text-right">
<uc1:mod_display ID="mod_display6" runat="server" etichetta='<%# traduci("NumClients") %>' valore='<%# Eval("NumClients") %>' />
<uc1:mod_display ID="mod_display6" runat="server" etichetta='<%# traduci("NumClients") %>' valore='<%# Eval("NumClients","{0:N0}") %>' />
</div>
</div>
</ItemTemplate>
C2P/WebUserControls/mod_S_Dies.ascx
+9 -9
View File
@@ -10,16 +10,16 @@
<ItemTemplate>
<div class="row bottomLine">
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display3" runat="server" etichetta='<%# traduci("DiesPrice_sim") %>' valore='<%# Eval("DiesPrice_sim", "{0:C2}") %>' />
<uc1:mod_display ID="mod_display3" runat="server" etichetta='<%# traduci("DiesPrice_sim") %>' valore='<%# Eval("DiesPrice_sim", "{0:C0}") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display7" runat="server" etichetta='<%# traduci("SamplePrice") %>' valore='<%# Eval("SamplePrice", "{0:C2}") %>' />
<uc1:mod_display ID="mod_display7" runat="server" etichetta='<%# traduci("SamplePrice") %>' valore='<%# Eval("SamplePrice", "{0:C0}") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("DiesFullCost") %>' valore='<%# Eval("DiesFullCost", "{0:C2}") %>' />
<uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("DiesFullCost") %>' valore='<%# Eval("DiesFullCost", "{0:C0}") %>' />
</div>
<div class="col-xs-2 col-xs-offset-4 text-right">
<uc1:mod_display ID="mod_display6" runat="server" etichetta='<%# traduci("DiesPriceClientQuote") %>' valore='<%# Eval("DiesPriceClientQuote", "{0:C2}") %>' />
<uc1:mod_display ID="mod_display6" runat="server" etichetta='<%# traduci("DiesPriceClientQuote") %>' valore='<%# Eval("DiesPriceClientQuote", "{0:C0}") %>' />
</div>
</div>
<div class="row bottomLine">
@@ -53,18 +53,18 @@
<EditItemTemplate>
<div class="row bottomLine">
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display3" runat="server" etichetta='<%# traduci("DiesPrice_sim") %>' valore='<%# Eval("DiesPrice_sim", "{0:C2}") %>' />
<uc1:mod_display ID="mod_display3" runat="server" etichetta='<%# traduci("DiesPrice_sim") %>' valore='<%# Eval("DiesPrice_sim", "{0:C0}") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display7" runat="server" etichetta='<%# traduci("SamplePrice") %>' />
<asp:TextBox Font-Bold="true" ID="txtCodPackag" runat="server" Text='<%# Bind("SamplePrice", "{0:N2}") %>' />
<asp:TextBox Font-Bold="true" ID="txtCodPackag" runat="server" Text='<%# Bind("SamplePrice", "{0:N0}") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("DiesFullCost") %>' valore='<%# Eval("DiesFullCost", "{0:C2}") %>' />
<uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("DiesFullCost") %>' valore='<%# Eval("DiesFullCost", "{0:C0}") %>' />
</div>
<div class="col-xs-2 col-xs-offset-4 text-right">
<uc1:mod_display ID="mod_display6" runat="server" etichetta='<%# traduci("DiesPriceClientQuote") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox1" runat="server" Text='<%# Bind("DiesPriceClientQuote", "{0:N2}") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox1" runat="server" Text='<%# Bind("DiesPriceClientQuote", "{0:N0}") %>' />
</div>
</div>
<div class="row bottomLine">
@@ -73,7 +73,7 @@
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display8" runat="server" etichetta='<%# traduci("DiesCommLife") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox2" runat="server" Text='<%# Bind("DiesCommLife", "{0:N2}") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox2" runat="server" Text='<%# Bind("DiesCommLife", "{0:N0}") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display13" runat="server" etichetta='<%# traduci("MonthSalesPrev") %>' />
C2P/WebUserControls/mod_S_ExtrPar.ascx
+14 -14
View File
@@ -25,7 +25,7 @@
<uc1:mod_display ID="mod_display2" runat="server" etichetta='<%# traduci("CodDiesGroup") %>' valore='<%# Eval("CodDiesGroup") %>' />
</div>
</div>
<div class="row bottomLine">
<div class="row">
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display3" runat="server" etichetta='<%# traduci("DiesEOLife") %>' valore='<%# Eval("DiesEOLife", "{0:N0}") %>' />
</div>
@@ -36,15 +36,15 @@
<uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("NumDiesExaust") %>' valore='<%# Eval("NumDiesExaust", "{0:N0}") %>' />
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display6" runat="server" etichetta='<%# traduci("DiesPrice") %>' valore='<%# Eval("DiesPrice", "{0:C3}") %>' />
<uc1:mod_display ID="mod_display6" runat="server" etichetta='<%# traduci("DiesPrice") %>' valore='<%# Eval("DiesPrice", "{0:C0}") %>' />
</div>
</div>
<div class="row bottomLine">
<div class="col-xs-6 text-left">
<uc1:mod_display ID="mod_display16" runat="server" etichetta='<%# traduci("DiesTecLife") %>' valore='<%# Eval("DiesTecLife", "{0:N2}") %>' />
<uc1:mod_display ID="mod_display16" runat="server" etichetta='<%# traduci("DiesTecLife") %>' valore='<%# Eval("DiesTecLife", "{0:N0}") %>' />
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display18" runat="server" etichetta='<%# traduci("DiesPrice_sim") %>' valore='<%# Eval("DiesPrice_sim", "{0:N2}") %>' />
<uc1:mod_display ID="mod_display18" runat="server" etichetta='<%# traduci("DiesPrice_sim") %>' valore='<%# Eval("DiesPrice_sim", "{0:C0}") %>' />
</div>
</div>
<div class="row bottomLine">
@@ -61,7 +61,7 @@
<uc1:mod_display ID="mod_display13" runat="server" etichetta='<%# traduci("KeyAMIL") %>' valore='<%# Eval("KeyAMIL") %>' />
</div>
</div>
<div class="row bottomLine">
<div class="row">
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display14" runat="server" etichetta='<%# traduci("WSR01") %>' valore='<%# Eval("WSR01", "{0:P2}") %>' />
</div>
@@ -69,7 +69,7 @@
<uc1:mod_display ID="mod_display15" runat="server" etichetta='<%# traduci("MSR01") %>' valore='<%# Eval("MSR01", "{0:P2}") %>' />
</div>
<div class="col-xs-8 text-right">
<uc1:mod_display ID="mod_display17" runat="server" etichetta='<%# traduci("NetProd01") %>' valore='<%# Eval("NetProd01", "{0:N2} kg/h") %>' />
<uc1:mod_display ID="mod_display17" runat="server" etichetta='<%# traduci("NetProd01") %>' valore='<%# Eval("NetProd01", "{0:N0} kg/h") %>' />
</div>
</div>
<div class="row">
@@ -105,7 +105,7 @@
<uc1:mod_display ID="mod_display2" runat="server" etichetta='<%# traduci("CodDiesGroup") %>' valore='<%# Eval("CodDiesGroup") %>' />
</div>
</div>
<div class="row bottomLine">
<div class="row">
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display3" runat="server" etichetta='<%# traduci("DiesEOLife") %>' valore='<%# Eval("DiesEOLife", "{0:N0}") %>' />
</div>
@@ -116,17 +116,17 @@
<uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("NumDiesExaust") %>' valore='<%# Eval("NumDiesExaust", "{0:N0}") %>' />
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display6" runat="server" etichetta='<%# traduci("DiesPrice") %>' valore='<%# Eval("DiesPrice", "{0:C3}") %>' />
<uc1:mod_display ID="mod_display6" runat="server" etichetta='<%# traduci("DiesPrice") %>' valore='<%# Eval("DiesPrice", "{0:C0}") %>' />
</div>
</div>
<div class="row bottomLine">
<div class="col-xs-6 text-left">
<uc1:mod_display ID="mod_display16" runat="server" etichetta='<%# traduci("DiesTecLife") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox2" runat="server" Text='<%# Bind("DiesTecLife", "{0:N2}") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox2" runat="server" Text='<%# Bind("DiesTecLife", "{0:N0}") %>' />
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display18" runat="server" etichetta='<%# traduci("DiesPrice_sim") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox1" runat="server" Text='<%# Bind("DiesPrice_sim", "{0:N2}") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox1" runat="server" Text='<%# Bind("DiesPrice_sim", "{0:N0}") %>' />
</div>
</div>
<div class="row bottomLine">
@@ -144,7 +144,7 @@
<uc1:mod_display ID="mod_display13" runat="server" etichetta='<%# traduci("KeyAMIL") %>' valore='<%# Eval("KeyAMIL") %>' />
</div>
</div>
<div class="row bottomLine">
<div class="row">
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display14" runat="server" etichetta='<%# traduci("WSR01") %>' valore='<%# Eval("WSR01", "{0:P2}") %>' />
</div>
@@ -152,17 +152,17 @@
<uc1:mod_display ID="mod_display15" runat="server" etichetta='<%# traduci("MSR01") %>' valore='<%# Eval("MSR01", "{0:P2}") %>' />
</div>
<div class="col-xs-8 text-right">
<uc1:mod_display ID="mod_display17" runat="server" etichetta='<%# traduci("NetProd01") %>' valore='<%# Eval("NetProd01", "{0:N2} kg/h") %>' />
<uc1:mod_display ID="mod_display17" runat="server" etichetta='<%# traduci("NetProd01") %>' valore='<%# Eval("NetProd01", "{0:N0} kg/h") %>' />
</div>
</div>
<div class="row">
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display19" runat="server" etichetta='<%# traduci("WSR01_sim") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox3" runat="server" Text='<%# Bind("WSR01_sim", "{0:N3}") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox3" runat="server" Text='<%# Bind("WSR01_sim", "{0:N0}") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display20" runat="server" etichetta='<%# traduci("MSR01_sim") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox4" runat="server" Text='<%# Bind("MSR01_sim", "{0:N3}") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox4" runat="server" Text='<%# Bind("MSR01_sim", "{0:N0}") %>' />
</div>
<div class="col-xs-8 text-right">
<uc1:mod_display ID="mod_display21" runat="server" etichetta='<%# traduci("NetProd01_sim") %>' />
C2P/WebUserControls/mod_S_PackPar.ascx
+17 -13
View File
@@ -40,19 +40,21 @@
</div>
</div>
<div class="row">
<div class="col-xs-2 text-left">
<div class="col-xs-6 text-left">
<uc1:mod_display ID="mod_display14" runat="server" etichetta='<%# traduci("DSR") %>' valore='<%# Eval("DSR", "{0:P2}") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display15" runat="server" etichetta='<%# traduci("FSR") %>' valore='<%# Eval("FSR", "{0:P2}") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display1" runat="server" etichetta='<%# traduci("DSR_sim") %>' valore='<%# Eval("DSR_sim", "{0:P2}") %>' />
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display17" runat="server" etichetta='<%# traduci("NetProd04") %>' valore='<%# Eval("NetProd04", "{0:N0} kg/h") %>' />
</div>
</div>
<div class="row">
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display1" runat="server" etichetta='<%# traduci("DSR_sim") %>' valore='<%# Eval("DSR_sim", "{0:P2}") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display15" runat="server" etichetta='<%# traduci("FSR") %>' valore='<%# Eval("FSR", "{0:P2}") %>' />
</div>
</div>
</ItemTemplate>
<EditItemTemplate>
<div class="row bottomLine">
@@ -76,7 +78,7 @@
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display8" runat="server" etichetta='<%# traduci("PWeight") %>' valore='<%# Eval("PWeight", "{0:N2} kg") %>' />
</div>
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display12" runat="server" etichetta='<%# traduci("PTare") %>' valore='<%# Eval("PTare", "{0:N2} kg") %>' />
</div>
@@ -85,18 +87,20 @@
</div>
</div>
<div class="row">
<div class="col-xs-2 text-left">
<div class="col-xs-6 text-left">
<uc1:mod_display ID="mod_display14" runat="server" etichetta='<%# traduci("DSR") %>' valore='<%# Eval("DSR", "{0:P2}") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display15" runat="server" etichetta='<%# traduci("FSR") %>' valore='<%# Eval("FSR", "{0:P2}") %>' />
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display17" runat="server" etichetta='<%# traduci("NetProd04") %>' valore='<%# Eval("NetProd04", "{0:N0} kg/h") %>' />
</div>
</div>
<div class="row">
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display1" runat="server" etichetta='<%# traduci("DSR_sim") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox1" runat="server" Text='<%# Bind("DSR_sim", "{0:N3}") %>' />
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display17" runat="server" etichetta='<%# traduci("NetProd04") %>' valore='<%# Eval("NetProd04", "{0:N0} kg/h") %>' />
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display15" runat="server" etichetta='<%# traduci("FSR") %>' valore='<%# Eval("FSR", "{0:P2}") %>' />
</div>
</div>
<div class="row" style="padding-top: 4px;">
C2P/WebUserControls/mod_fileUploader.ascx
+2 -2
View File
@@ -5,10 +5,10 @@
</Triggers>
<ContentTemplate>
<div class="row">
<div class="col-xs-6">
<div class="col-xs-9">
<asp:FileUpload ID="FileUploadControl" runat="server" />
</div>
<div class="col-xs-6">
<div class="col-xs-3">
<asp:Button ID="btnUpload" runat="server" Text="Upload" OnClick="btnUpload_Click" CssClass="btn btn-default btn-sm" />
</div>
</div>
C2P/WebUserControls/mod_marginReport.ascx
+73 -51
View File
@@ -7,6 +7,27 @@
<div class="row">
<!--style="min-height: 282px;">-->
<div class="panel panel-default">
<div class="panel-body">
<div class="row">
<div class="col-xs-4 col-xs-offset-4">
<div runat="server" id="divHelp">
<h3 style="text-align: center; margin: auto;"><%: traduci("HMaRepTitle") %></h3>
<br />
<div class="panel panel-success">
<div class="panel-heading">
<h4 style="margin-top: -4px; margin-bottom: -4px;"><%: traduci("HMaRepActData") %></h4>
</div>
<div class="panel-body bg-success">
<uc1:mod_MaRepActData ID="mod_MaRepActData1" runat="server" />
</div>
</div>
<div style="font-size: 1.2em; text-align: center; margin: auto;">
<%: traduci("HMaRepBody") %>
</div>
</div>
</div>
</div>
</div>
<div class="btn-group btn-group-justified">
<div class="btn-group">
<asp:LinkButton runat="server" ID="lbHeader" class="btn btn-default" OnClick="lbt_Click" CommandArgument="DataIn"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("MarginReportDataIn") %></asp:LinkButton>
@@ -18,72 +39,73 @@
<asp:LinkButton runat="server" ID="lbExtrPar" class="btn btn-default" OnClick="lbt_Click" CommandArgument="Analisys"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("MarginReportAnalisys") %></asp:LinkButton>
</div>
</div>
<div class="panel-body">
<div runat="server" id="divHelp">
<h2><%: traduci("HMaRepTitle") %></h2>
<%: traduci("HMaRepBody") %>
<div class="panel panel-success">
<div class="panel-heading">
<h4 style="margin-top: -4px; margin-bottom: -4px;"><%: traduci("HMaRepActData") %></h4>
</div>
<div class="panel-body bg-success">
<uc1:mod_MaRepActData ID="mod_MaRepActData1" runat="server" />
</div>
</div>
</div>
<div runat="server" id="divDataIn">
<h3><%: traduci("HMaRepStepA") %></h3>
<div class="panel panel-default">
<div class="panel-heading">
<h4 style="margin-top: -4px; margin-bottom: -4px;"><%: traduci("HMaRepLoadData") %></h4>
</div>
<div class="panel-body">
<uc2:mod_fileUploader ID="mod_fileUploader1" runat="server" contTypeFilt="application/vnd.ms-excel" fileName="MarginRep_Import.csv" />
<div class="row">
<div class="col-xs-6">
<asp:Label runat="server" ID="lblUploadDone" />
<div class="panel-body" style="min-height: 213px;">
<div class="row">
<div class="col-xs-4">
<div runat="server" id="divDataIn">
<%--<h3><%: traduci("HMaRepStepA") %></h3>--%>
<div class="panel panel-default" style="min-height: 180px;">
<div class="panel-heading">
<h4 style="margin-top: -4px; margin-bottom: -4px;"><%: traduci("HMaRepLoadData") %></h4>
</div>
<div class="col-xs-6">
<asp:Button runat="server" CssClass="btn btn-success btn-sm" ID="btnGoStep2" Text="--> Step 2" Visible="false" OnClick="btnGoStep2_Click" />
<div class="panel-body">
<uc2:mod_fileUploader ID="mod_fileUploader1" runat="server" contTypeFilt="application/vnd.ms-excel" fileName="MarginRep_Import.csv" />
<div class="row">
<div class="col-xs-9">
<asp:Label runat="server" ID="lblUploadDone" />
</div>
<div class="col-xs-3">
<asp:Button runat="server" CssClass="btn btn-success btn-sm" ID="btnGoStep2" Text=">Step 2" Visible="false" OnClick="btnGoStep2_Click" />
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div runat="server" id="divDataProc">
<h3><%: traduci("HMaRepStepB") %></h3>
<div class="panel panel-warning">
<div class="panel-heading">
<h4 style="margin-top: -4px; margin-bottom: -4px;"><%: traduci("HMaRepProcData") %></h4>
</div>
<div class="panel-body bg-warning">
<div class="row">
<div class="col-xs-12">
<uc3:mod_MaRepNewData ID="mod_MaRepNewData1" runat="server" />
<div class="col-xs-4">
<div runat="server" id="divDataProc">
<%--<h3><%: traduci("HMaRepStepB") %></h3>--%>
<div class="panel panel-warning" style="min-height: 180px;">
<div class="panel-heading">
<h4 style="margin-top: -4px; margin-bottom: -4px;"><%: traduci("HMaRepProcData") %></h4>
</div>
</div>
<div class="row">
<div class="col-xs-6">
<asp:Button runat="server" CssClass="btn btn-success btn-sm" ID="btnDoAcquire" Text="Acquire" OnClick="btnDoAcquire_Click" />
<%--<asp:LinkButton runat="server" Width="100%" ID="lbSimulate" CssClass="btn btn-danger" OnClick="lbSimulate_Click"><i class="fa fa-flask"></i> <%:traduci("Simulate") %></asp:LinkButton>--%>
</div>
<div class="col-xs-6">
<asp:Label runat="server" ID="lblAcqOut" CssClass="didascalia" />
<div class="panel-body bg-warning">
<div class="row">
<div class="col-xs-12">
<uc3:mod_MaRepNewData ID="mod_MaRepNewData1" runat="server" />
</div>
</div>
<div class="row" style="margin-top: 10px;">
<div class="col-xs-12">
<asp:Button runat="server" CssClass="btn btn-success btn-sm" ID="btnDoAcquire" Text="Acquire" OnClick="btnDoAcquire_Click" />
&nbsp;
<asp:Label runat="server" ID="lblAcqOut" CssClass="didascalia" />
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div runat="server" id="divAnalisys">
<h3><%: traduci("HMaRepStepC") %></h3>
<div class="col-xs-12 text-center">
<asp:HyperLink runat="server" ID="HyperLink2" class="btn btn-success btn-lg" NavigateUrl="~/Reports/MarginReport.xlsx">
<div class="col-xs-4">
<div runat="server" id="divAnalisys">
<%--<h3><%: traduci("HMaRepStepC") %></h3>--%>
<div class="panel panel-info" style="min-height: 180px;">
<div class="panel-heading">
<h4 style="margin-top: -4px; margin-bottom: -4px;"><%--<%: traduci("HMaRepProcData") %>--%>&nbsp;</h4>
</div>
<div class="panel-body bg-info" style="padding-top: 20px; padding-bottom: 20px;">
<div class="col-xs-12 text-center">
<asp:HyperLink runat="server" ID="HyperLink2" class="btn btn-success btn-lg" NavigateUrl="~/Reports/MarginReport.xlsx">
<i class="fa fa-file-excel-o fa-3x"></i>
<div style="margin-top:0.5em;">
<%: traduci("MarginReport") %>
</div>
</asp:HyperLink>
</asp:HyperLink>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
C2P/WebUserControls/mod_marginReport.ascx.cs
+1 -1
View File
@@ -99,7 +99,7 @@ namespace C2P.WebUserControls
break;
case "DataProc":
divDataProc.Visible = true;
btnDoAcquire.Visible = (queueLenght() > 0);
btnDoAcquire.Enabled = (queueLenght() > 0);
break;
case "Analisys":
divAnalisys.Visible = true;
C2P/WebUserControls/mod_marginReport.ascx.designer.cs
Generated
+18 -18
View File
@@ -12,6 +12,24 @@ namespace C2P.WebUserControls {
public partial class mod_marginReport {
/// <summary>
/// divHelp control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHelp;
/// <summary>
/// mod_MaRepActData1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::C2P.WebUserControls.mod_MaRepActData mod_MaRepActData1;
/// <summary>
/// lbHeader control.
/// </summary>
@@ -39,24 +57,6 @@ namespace C2P.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbExtrPar;
/// <summary>
/// divHelp control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHelp;
/// <summary>
/// mod_MaRepActData1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::C2P.WebUserControls.mod_MaRepActData mod_MaRepActData1;
/// <summary>
/// divDataIn control.
/// </summary>
C2P/bin/C2P.dll
BIN
View File
Binary file not shown.
C2P/bin/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P/bin/SteamWare.dll
BIN
View File
Binary file not shown.
C2P/login.aspx.cs
+9 -1
View File
@@ -8,6 +8,7 @@ using System.Web.UI;
using System.Web.UI.WebControls;
using System.Web.UI.WebControls.WebParts;
using System.Web.UI.HtmlControls;
using SteamWare;
public partial class login : System.Web.UI.Page
{
@@ -40,7 +41,14 @@ public partial class login : System.Web.UI.Page
void Mod_login1_Login_Error(object sender, EventArgs e)
{
Response.Redirect("./unauthorized.aspx");
if (memLayer.ML.confReadBool("autoEnrollEnabled"))
{
Response.Redirect("./Default.aspx");
}
else
{
Response.Redirect("./unauthorized.aspx");
}
}
void Mod_login1_Login_ok(object sender, EventArgs e)
C2P_Data/bin/Release/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P_Data/bin/Release/SteamWare.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/C2P_Report.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/SteamWare.dll
BIN
View File
Binary file not shown.
VersGen/C2P.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("0.8.110.241")]
[assembly: AssemblyFileVersion("0.8.110.241")]
[assembly: AssemblyVersion("0.8.112.243")]
[assembly: AssemblyFileVersion("0.8.112.243")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")]
[assembly: AssemblyCompany("Steamware")]
VersGen/C2P.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("0.8.110.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("0.8.110.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("0.8.112.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("0.8.112.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+