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

aggiornamenti grafici odierni + nuovo report tradotto...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2014-06-16 11:52:09 +02:00
parent 54a13e87f0
commit fe5514d06d
22 changed files with 2552 additions and 2143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C2P/C2P.csproj.user
+1 -1
View File
@@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>218</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>WinLab</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
C2P/Default.aspx
+5 -5
View File
@@ -32,19 +32,19 @@
<div class="panel-body">
<div class="shortcuts">
<asp:HyperLink runat="server" ID="HyperLink2" class="shortcut" NavigateUrl="ExistingProductOffer">
<i class="fa fa-list-alt shortcut-icon"></i> <span class="shortcut-label"><%: traduci("ExistProdOff") %></span>
<i class="fa fa-cubes shortcut-icon"></i> <span class="shortcut-label"><%: traduci("ExistProdOff") %></span>
</asp:HyperLink>
<asp:HyperLink runat="server" ID="HyperLink3" class="shortcut" NavigateUrl="NewProductOffer">
<i class="fa fa-list-alt shortcut-icon"></i> <span class="shortcut-label"><%: traduci("NewProdOff") %></span>
<i class="fa fa-cube shortcut-icon"></i> <span class="shortcut-label"><%: traduci("NewProdOff") %></span>
</asp:HyperLink>
<asp:HyperLink runat="server" ID="HyperLink4" class="shortcut" NavigateUrl="OffersArchive">
<i class="fa fa-list-alt shortcut-icon"></i> <span class="shortcut-label"><%: traduci("OffersArchive") %></span>
<i class="fa fa-database shortcut-icon"></i> <span class="shortcut-label"><%: traduci("OffersArchive") %></span>
</asp:HyperLink>
<asp:HyperLink runat="server" ID="HyperLink5" class="shortcut" NavigateUrl="MarginReport">
<i class="fa fa-list-alt shortcut-icon"></i> <span class="shortcut-label"><%: traduci("MarginReport") %></span>
<i class="fa fa-eur shortcut-icon"></i> <span class="shortcut-label"><%: traduci("MarginReport") %></span>
</asp:HyperLink>
<asp:HyperLink runat="server" ID="HyperLink6" class="shortcut" NavigateUrl="WhatIf">
<i class="fa fa-list-alt shortcut-icon"></i> <span class="shortcut-label"><%: traduci("WhatIf") %></span>
<i class="fa fa-question-circle shortcut-icon"></i> <span class="shortcut-label"><%: traduci("WhatIf") %></span>
</asp:HyperLink>
</div>
</div>
C2P/ExistingProductOffer.aspx
+1 -1
View File
@@ -17,7 +17,7 @@
<div class="col-xs-3">
<asp:UpdatePanel ID="upSelettore" runat="server" ViewStateMode="Disabled">
<ContentTemplate>
<uc1:mod_autocomplete runat="server" ID="acArticolo" contextKey="a" minCharAutocomplete="2" showKey="false" ServicePath="Services/WS_data.asmx/Items" placeholder="Type to Search" />
<uc1:mod_autocomplete runat="server" ID="acArticolo" contextKey="a" minCharAutocomplete="4" showKey="false" ServicePath="Services/WS_data.asmx/Items" placeholder="Type to Search" />
<%--<asp:DropDownList ID="ddlProduct" runat="server" DataSourceID="odsProducts" DataValueField="value" DataTextField="value" AutoPostBack="true" Font-Size="1.4em" />
<asp:ObjectDataSource ID="odsProducts" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selItemsTableAdapter"></asp:ObjectDataSource>--%>
</ContentTemplate>
C2P/WebUserControls/mod_OffersArchive.ascx
+3 -3
View File
@@ -42,17 +42,17 @@
</div>
<div class="row" style="min-height: 3.3em;">
<div class="col-sm-12">
<uc1:mod_autocomplete runat="server" ID="acClient" contextKey="c" minCharAutocomplete="2" showKey="false" ServicePath="../Services/WS_data.asmx/Clients" placeholder="Type to Search" labelRicercaTrad="acCliente" labelWidth="85px" />
<uc1:mod_autocomplete runat="server" ID="acClient" contextKey="c" minCharAutocomplete="2" showKey="false" ServicePath="../Services/WS_data.asmx/Clients" placeholder="Type to Search - Clients" labelRicercaTrad="acCliente" labelWidth="85px" />
</div>
</div>
<div class="row" style="min-height: 3.3em;">
<div class="col-sm-12">
<uc1:mod_autocomplete runat="server" ID="acMaterial" contextKey="l" minCharAutocomplete="2" showKey="false" ServicePath="../Services/WS_data.asmx/RawMat" placeholder="Type to Search" labelRicercaTrad="acLega" labelWidth="85px" />
<uc1:mod_autocomplete runat="server" ID="acMaterial" contextKey="l" minCharAutocomplete="2" showKey="false" ServicePath="../Services/WS_data.asmx/RawMat" placeholder="Type to Search - Material" labelRicercaTrad="acLega" labelWidth="85px" />
</div>
</div>
<div class="row" style="min-height: 3.3em;">
<div class="col-sm-12">
<uc1:mod_autocomplete runat="server" ID="acItem" contextKey="a" minCharAutocomplete="2" showKey="false" ServicePath="../Services/WS_data.asmx/Items" placeholder="Type to Search" labelRicercaTrad="acArticolo" labelWidth="85px" />
<uc1:mod_autocomplete runat="server" ID="acItem" contextKey="a" minCharAutocomplete="2" showKey="false" ServicePath="../Services/WS_data.asmx/Items" placeholder="Type to Search - Items" labelRicercaTrad="acArticolo" labelWidth="85px" />
</div>
</div>
<%--<div class="row" style="min-height: 3.3em;">
C2P/WebUserControls/mod_Q_Header.ascx
+9 -9
View File
@@ -27,10 +27,10 @@
<uc1:mod_display ID="mod_display3" runat="server" etichetta='<%# traduci("Alloy") %>' valore='<%# Bind("RawMat") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("Base6060") %>' valore='<%# Bind("RawMatCost","{0:C4}") %>' />
<uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("Base6060") %>' valore='<%# Bind("RawMatCost","{0:C3}") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display7" runat="server" etichetta='<%# traduci("ExtraAlloy") %>' valore='<%# Bind("RawMatExtraCost","{0:C4}") %>' />
<uc1:mod_display ID="mod_display7" runat="server" etichetta='<%# traduci("ExtraAlloy") %>' valore='<%# Bind("RawMatExtraCost","{0:C3}") %>' />
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display4" runat="server" etichetta='<%# traduci("OrderBatch") %>' valore='<%# Bind("BatchQty") %>' />
@@ -41,7 +41,7 @@
<uc1:mod_display ID="mod_display6" runat="server" etichetta='<%# traduci("Incoterms") %>' valore='<%# Bind("CodInco") %>' />
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display8" runat="server" etichetta='<%# traduci("Agency") %>' valore='<%# Bind("ProvvCost","{0:C4}") %>' />
<uc1:mod_display ID="mod_display8" runat="server" etichetta='<%# traduci("Agency") %>' valore='<%# Bind("ProvvCost","{0:C3}") %>' />
</div>
</div>
<div class="row">
@@ -77,11 +77,11 @@
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("Base6060") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox5" runat="server" Text='<%# Bind("RawMatCost","{0:N4}") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox5" runat="server" Text='<%# Bind("RawMatCost","{0:N3}") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display7" runat="server" etichetta='<%# traduci("ExtraAlloy") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox7" runat="server" Text='<%# Bind("RawMatExtraCost","{0:N4}") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox7" runat="server" Text='<%# Bind("RawMatExtraCost","{0:N3}") %>' />
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display4" runat="server" etichetta='<%# traduci("OrderBatch") %>' />
@@ -96,7 +96,7 @@
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display8" runat="server" etichetta='<%# traduci("Agency") %>' />
<asp:Label Font-Bold="true" ID="TextBox8" runat="server" Text='<%# Eval("ProvvCost","{0:N4}") %>' CssClass="text-right" />
<asp:Label Font-Bold="true" ID="TextBox8" runat="server" Text='<%# Eval("ProvvCost","{0:N3}") %>' CssClass="text-right" />
</div>
</div>
<div class="row">
@@ -137,13 +137,13 @@
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("Base6060") %>' />
<asp:TextBox Font-Bold="true" ID="txtRawMatCost" runat="server" Text='<%# Bind("RawMatCost","{0:N4}") %>' />
<asp:TextBox Font-Bold="true" ID="txtRawMatCost" runat="server" Text='<%# Bind("RawMatCost","{0:N3}") %>' />
<asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ErrorMessage="!!!" CssClass="text-danger" ControlToValidate="txtRawMatCost" />
<%--<asp:RegularExpressionValidator ID="RegularExpressionValidator1" CssClass="txt-danger" runat="server" ErrorMessage="00.000 !!!" ControlToValidate="txtRawMatCost" ValidationExpression="/\d+\.?\d*/" Display="Dynamic" />--%>
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display7" runat="server" etichetta='<%# traduci("ExtraAlloy") %>' />
<asp:TextBox Font-Bold="true" ID="txtRawMatExtraCost" runat="server" Text='<%# Bind("RawMatExtraCost","{0:N4}") %>' OnDataBinding="txtRawMatExtraCost_DataBinding" />
<asp:TextBox Font-Bold="true" ID="txtRawMatExtraCost" runat="server" Text='<%# Bind("RawMatExtraCost","{0:N3}") %>' OnDataBinding="txtRawMatExtraCost_DataBinding" />
<asp:RequiredFieldValidator ID="RequiredFieldValidator2" runat="server" ErrorMessage="!!!" CssClass="text-danger" ControlToValidate="txtRawMatExtraCost" />
</div>
<div class="col-xs-6 text-right">
@@ -160,7 +160,7 @@
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display8" runat="server" etichetta='<%# traduci("Agency") %>' />
<asp:Label Font-Bold="true" ID="TextBox8" runat="server" Text='<%# Eval("ProvvCost","{0:N4}") %>' CssClass="text-right" />
<asp:Label Font-Bold="true" ID="TextBox8" runat="server" Text='<%# Eval("ProvvCost","{0:N3}") %>' CssClass="text-right" />
</div>
</div>
<div class="row">
C2P/WebUserControls/mod_QuoteDet.ascx
+1 -1
View File
@@ -31,7 +31,7 @@
</div>
</div>
<div class="container">
<div class="row" style="min-height: 282px;">
<div class="row"> <!--style="min-height: 282px;">-->
<div class="panel panel-default">
<%--<div class="panel-heading">--%>
<div class="btn-group btn-group-justified">
C2P/WebUserControls/mod_S_ExtrPar.ascx
+2 -2
View File
@@ -158,11 +158,11 @@
<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:N4}") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox3" runat="server" Text='<%# Bind("WSR01_sim", "{0:N3}") %>' />
</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:N4}") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox4" runat="server" Text='<%# Bind("MSR01_sim", "{0:N3}") %>' />
</div>
<div class="col-xs-8 text-right">
<uc1:mod_display ID="mod_display21" runat="server" etichetta='<%# traduci("NetProd01_sim") %>' />
C2P/WebUserControls/mod_S_Header.ascx
+9 -9
View File
@@ -27,10 +27,10 @@
<uc1:mod_display ID="mod_display3" runat="server" etichetta='<%# traduci("Alloy") %>' valore='<%# Bind("RawMat") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("Base6060") %>' valore='<%# Bind("RawMatCost","{0:C4}") %>' />
<uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("Base6060") %>' valore='<%# Bind("RawMatCost","{0:C3}") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display7" runat="server" etichetta='<%# traduci("ExtraAlloy") %>' valore='<%# Bind("RawMatExtraCost","{0:C4}") %>' />
<uc1:mod_display ID="mod_display7" runat="server" etichetta='<%# traduci("ExtraAlloy") %>' valore='<%# Bind("RawMatExtraCost","{0:C3}") %>' />
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display4" runat="server" etichetta='<%# traduci("OrderBatch") %>' valore='<%# Bind("BatchQty") %>' />
@@ -41,7 +41,7 @@
<uc1:mod_display ID="mod_display6" runat="server" etichetta='<%# traduci("Incoterms") %>' valore='<%# Bind("CodInco") %>' />
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display8" runat="server" etichetta='<%# traduci("Agency") %>' valore='<%# Bind("ProvvCost","{0:C4}") %>' />
<uc1:mod_display ID="mod_display8" runat="server" etichetta='<%# traduci("Agency") %>' valore='<%# Bind("ProvvCost","{0:C3}") %>' />
</div>
</div>
<div class="row">
@@ -79,11 +79,11 @@
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("Base6060") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox5" runat="server" Text='<%# Bind("RawMatCost","{0:N4}") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox5" runat="server" Text='<%# Bind("RawMatCost","{0:N3}") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display7" runat="server" etichetta='<%# traduci("ExtraAlloy") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox7" runat="server" Text='<%# Bind("RawMatExtraCost","{0:N4}") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox7" runat="server" Text='<%# Bind("RawMatExtraCost","{0:N3}") %>' />
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display4" runat="server" etichetta='<%# traduci("OrderBatch") %>' />
@@ -98,7 +98,7 @@
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display8" runat="server" etichetta='<%# traduci("Agency") %>' />
<asp:Label Font-Bold="true" ID="TextBox8" runat="server" Text='<%# Eval("ProvvCost","{0:N4}") %>' CssClass="text-right" />
<asp:Label Font-Bold="true" ID="TextBox8" runat="server" Text='<%# Eval("ProvvCost","{0:N3}") %>' CssClass="text-right" />
</div>
</div>
<div class="row">
@@ -139,13 +139,13 @@
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("Base6060") %>' />
<asp:TextBox Font-Bold="true" ID="txtRawMatCost" runat="server" Text='<%# Bind("RawMatCost","{0:N4}") %>' />
<asp:TextBox Font-Bold="true" ID="txtRawMatCost" runat="server" Text='<%# Bind("RawMatCost","{0:N3}") %>' />
<asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ErrorMessage="!!!" CssClass="text-danger" ControlToValidate="txtRawMatCost" />
<%--<asp:RegularExpressionValidator ID="RegularExpressionValidator1" CssClass="txt-danger" runat="server" ErrorMessage="00.000 !!!" ControlToValidate="txtRawMatCost" ValidationExpression="/\d+\.?\d*/" Display="Dynamic" />--%>
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display7" runat="server" etichetta='<%# traduci("ExtraAlloy") %>' />
<asp:TextBox Font-Bold="true" ID="txtRawMatExtraCost" runat="server" Text='<%# Bind("RawMatExtraCost","{0:N4}") %>' />
<asp:TextBox Font-Bold="true" ID="txtRawMatExtraCost" runat="server" Text='<%# Bind("RawMatExtraCost","{0:N3}") %>' />
<asp:RequiredFieldValidator ID="RequiredFieldValidator2" runat="server" ErrorMessage="!!!" CssClass="text-danger" ControlToValidate="txtRawMatExtraCost" />
</div>
<div class="col-xs-6 text-right">
@@ -162,7 +162,7 @@
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display8" runat="server" etichetta='<%# traduci("Agency") %>' />
<asp:Label Font-Bold="true" ID="TextBox8" runat="server" Text='<%# Eval("ProvvCost","{0:N4}") %>' CssClass="text-right" />
<asp:Label Font-Bold="true" ID="TextBox8" runat="server" Text='<%# Eval("ProvvCost","{0:N3}") %>' CssClass="text-right" />
</div>
</div>
<div class="row">
C2P/WebUserControls/mod_S_PackPar.ascx
+1 -1
View File
@@ -93,7 +93,7 @@
</div>
<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:N4}") %>' />
<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:N2} kg/h") %>' />
C2P/WebUserControls/mod_autocomplete.ascx
+4 -5
View File
@@ -34,7 +34,7 @@
select: function (e, i) {
$("#<%=hiddenFieldID.ClientID %>").val(i.item.val);
$("#<%=txtSel.ClientID %>").val(i.item.label);
$("#<%=btnPost.ClientID %>").click();
$("#<%=btnSearch.ClientID %>").click();
},
minLength: <%=txtMinCharAutoCom.Text %>
});
@@ -55,9 +55,8 @@
</script>
<%--controlli "principali"--%>
<div class="input-group input-group-sm">
<span class="input-group-addon text-left" style="text-align: left;">
<asp:Label runat="server" ID="lblField"><%: traduci("Search") %></asp:Label>
<asp:Button runat="server" ID="btnPost" OnClick="btnPost_Click" Visible="false" Text="+" />
<span class="input-group-btn" style="text-align: left;">
<asp:LinkButton runat="server" ID="btnSearch" CssClass="btn btn-primary btn-sm"><asp:Label runat="server" ID="lblField"><%: traduci("Search") %></asp:Label></asp:LinkButton>
</span>
<asp:TextBox runat="server" ID="txtSel" CssClass="searchinput form-control" OnTextChanged="txtSel_TextChanged" AutoPostBack="True" TextMode="SingleLine" AutoCompleteType="Search" />
<%--controlli "accessori"--%>
@@ -67,7 +66,7 @@
<asp:LinkButton runat="server" ID="lnkReset" Text="X" type="button" OnClick="lnkReset_Click" Font-Size="0.8em" />
</span>
</div>
<asp:TextBox runat="server" ID="hiddenFieldID" AutoPostBack="true" OnTextChanged="hiddenFieldID_TextChanged" Visible="false" ViewStateMode="Enabled" Width="0px" Font-Size="6pt" BackColor="Transparent" BorderStyle="None" Height="0px" />
<asp:TextBox runat="server" ID="hiddenFieldID" AutoPostBack="true" OnTextChanged="hiddenFieldID_TextChanged" ViewStateMode="Enabled" Width="0px" Font-Size="6pt" BackColor="Transparent" BorderStyle="None" Height="0px" />
<style>
.ui-autocomplete-category {
C2P/WebUserControls/mod_autocomplete.ascx.cs
+1 -1
View File
@@ -127,7 +127,7 @@ namespace C2P.WebUserControls
}
catch
{
answ = txtSel.Text.Trim();
answ = txtSel.Text.Trim();
}
if (answ == "")
{
C2P/WebUserControls/mod_autocomplete.ascx.designer.cs
Generated
+9 -9
View File
@@ -30,6 +30,15 @@ namespace C2P.WebUserControls {
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// btnSearch control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton btnSearch;
/// <summary>
/// lblField control.
/// </summary>
@@ -39,15 +48,6 @@ namespace C2P.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblField;
/// <summary>
/// btnPost control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnPost;
/// <summary>
/// txtSel control.
/// </summary>
C2P/WebUserControls/mod_marginReport.ascx
+4 -4
View File
@@ -4,7 +4,7 @@
<%@ Register Src="~/WebUserControls/mod_MaRepNewData.ascx" TagName="mod_MaRepNewData" TagPrefix="uc3" %>
<div class="row" style="min-height: 282px;">
<div class="row"> <!--style="min-height: 282px;">-->
<div class="panel panel-default">
<div class="btn-group btn-group-justified">
<div class="btn-group">
@@ -23,7 +23,7 @@
<%: traduci("HMaRepBody") %>
<div class="panel panel-success">
<div class="panel-heading">
<h4><%: traduci("HMaRepActData") %></h4>
<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" />
@@ -34,7 +34,7 @@
<h3>Step 1</h3>
<div class="panel panel-default">
<div class="panel-heading">
<h4><%: traduci("HMaRepLoadData") %></h4>
<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" />
@@ -53,7 +53,7 @@
<h3>Step 2</h3>
<div class="panel panel-warning">
<div class="panel-heading">
<h4><%: traduci("HMaRepProcData") %></h4>
<h4 style="margin-top: -4px;margin-bottom: -4px;"><%: traduci("HMaRepProcData") %></h4>
</div>
<div class="panel-body bg-warning">
<div class="row">
C2P/WebUserControls/mod_newProduct.ascx
+1 -1
View File
@@ -33,7 +33,7 @@
</div>
</div>
<div class="container">
<div class="row" style="min-height: 282px;">
<div class="row"> <!--style="min-height: 282px;">-->
<div class="panel panel-warning">
<div class="btn-group btn-group-justified">
<div class="btn-group">
C2P/bin/C2P.dll
BIN
View File
Binary file not shown.
C2P_Report/C2P_Report.csproj
+3 -1
View File
@@ -133,7 +133,9 @@
<Content Include="Reports\ReportOffers.rdlc" />
</ItemGroup>
<ItemGroup>
<Content Include="Reports\StdCostList.rdlc" />
<Content Include="Reports\StdCostList.rdlc">
<SubType>Designer</SubType>
</Content>
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
C2P_Report/Reports/StdCostList.rdl
+1246 -1042
View File
File diff suppressed because it is too large Load Diff
C2P_Report/Reports/StdCostList.rdlc
+1246 -1042
View File
File diff suppressed because it is too large Load Diff
C2P_Report/StdCostList.aspx.cs
+2 -2
View File
@@ -57,10 +57,10 @@ namespace C2P_Report
// 2) caricamento tab dati
DataTable tabVoc = new DataTable();
DataTable tabStdCostList = new DataTable();
tabVoc = (DataTable)SteamWare.selDataVoc.mgr.getVocabolarioByLemma(lingua, "C2P_prt1"); // HARD CODED lemma x report!!!
tabVoc = (DataTable)SteamWare.selDataVoc.mgr.getVocabolarioByLemma(lingua, "C2P_prtCL"); // HARD CODED lemma x report!!!
tabStdCostList = (DataTable)DtProxy.man.taSCL.getByDate(dataRif);
// 3) inserimento dataset nel report
//localReport.DataSources.Add(new ReportDataSource("dsVocabolario", tabVoc));
localReport.DataSources.Add(new ReportDataSource("dsVocabolario", tabVoc));
localReport.DataSources.Add(new ReportDataSource("dsStdCostList", tabStdCostList));
}
}
C2P_Report/bin/C2P_Report.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.93.194")]
[assembly: AssemblyFileVersion("0.8.93.194")]
[assembly: AssemblyVersion("0.8.98.197")]
[assembly: AssemblyFileVersion("0.8.98.197")]
[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.93.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("0.8.93.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("0.8.98.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("0.8.98.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+