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

update con Emanuele

Browse Source 
iniziato a creare 2 report (Q/S) di stampa da sistemare by Gian
This commit is contained in:
Samuele E. Locatelli
2014-08-08 17:08:43 +02:00
parent b54c28ea12
commit 60690e3585
21 changed files with 17497 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C2P/WebUserControls/mod_OffersArchive.ascx
+1 -1
View File
@@ -73,7 +73,7 @@
</div>
</div>
</div>--%>
<div class="row" style="min-height: 3.3em;">
<div class="row" style="min-height: 3.3em; font-size:0.8em;">
<div class="col-sm-12">
<uc4:mod_range ID="mod_range1" runat="server" minVal="0" maxVal="5000" />
</div>
C2P/WebUserControls/mod_OffersArchive.ascx.cs
+1
View File
@@ -37,6 +37,7 @@ namespace C2P.WebUserControls
periodo.fine = DateTime.Now.Date.AddDays(1);
periodo.inizio = periodo.fine.AddDays(-8);
mod_selPeriodo1.intervalloAnalisi = periodo;
mod_range1.RangeLabel = traduci("RangeBatch");
}
setBtnVisib();
mod_selPeriodo1.eh_doUpdate += mod_selPeriodo1_eh_doUpdate;
C2P/WebUserControls/mod_Q_ExtrPar.ascx
+1 -1
View File
@@ -35,7 +35,7 @@
<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">
C2P/WebUserControls/mod_Q_Header.ascx
+1 -1
View File
@@ -16,7 +16,7 @@
<uc1:mod_display ID="mod_display10" runat="server" etichetta='<%# traduci("CodItemGroup") %>' valore='<%# Bind("CodItemGroup") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display11" runat="server" etichetta='<%# traduci("UnitWeight") %>' valore='<%# Bind("UnitWeight") %>' />
<uc1:mod_display ID="mod_display11" runat="server" etichetta='<%# traduci("UnitWeight") %>' valore='<%# Bind("UnitWeight","{0:N0}") %>' />
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display2" runat="server" etichetta='<%# traduci("Customer") %>' toolTipVal='<%# Bind("CodClient") %>' valore='<%# Bind("ClientName") %>' />
C2P/WebUserControls/mod_S_Header.ascx
+1 -1
View File
@@ -16,7 +16,7 @@
<uc1:mod_display ID="mod_display10" runat="server" etichetta='<%# traduci("CodItemGroup") %>' valore='<%# Bind("CodItemGroup") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display11" runat="server" etichetta='<%# traduci("UnitWeight") %>' valore='<%# Bind("UnitWeight") %>' />
<uc1:mod_display ID="mod_display11" runat="server" etichetta='<%# traduci("UnitWeight") %>' valore='<%# Bind("UnitWeight","{0:N0}") %>' />
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display2" runat="server" etichetta='<%# traduci("Customer") %>' toolTipVal='<%# Bind("CodClient") %>' valore='<%# Bind("ClientName") %>' />
C2P/WebUserControls/mod_range.ascx
+6 -6
View File
@@ -1,25 +1,25 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_range.ascx.cs" Inherits="C2P.WebUserControls.mod_range" %>
<div class="row">
<div class="col-xs-5 text-left">
<div class="col-xs-4 text-left">
<div class="input-group input-group-sm">
<span class="input-group-addon">
<asp:Label runat="server" ID="lblMin"><%: traduci("Min") %></asp:Label>
</span>
<asp:Label runat="server" ID="valMin" Visible="false" />
<asp:TextBox runat="server" ID="txtMin" Width="5em" AutoPostBack="true" CssClass="searchinput form-control" />
<asp:TextBox runat="server" ID="txtMin" Width="5em" Font-Size="0.9em" AutoPostBack="true" CssClass="searchinput form-control" />
</div>
</div>
<div class="col-xs-2 text-center">
<%: traduci("Range") %>
<div class="col-xs-4 text-center">
<asp:Label runat="server" ForeColor="#999999" ID="lblRange"></asp:Label>
</div>
<div class="col-xs-5 text-right">
<div class="col-xs-4 text-right">
<div class="input-group input-group-sm">
<span class="input-group-addon">
<asp:Label runat="server" ID="lblMax"><%: traduci("Max") %></asp:Label>
</span>
<asp:Label runat="server" ID="valMax" Visible="false" />
<asp:TextBox runat="server" ID="txtMax" Width="5em" AutoPostBack="true" CssClass="searchinput form-control" />
<asp:TextBox runat="server" ID="txtMax" Width="5em" Font-Size="0.9em" AutoPostBack="true" CssClass="searchinput form-control" />
</div>
</div>
</div>
C2P/WebUserControls/mod_range.ascx.cs
+14
View File
@@ -105,5 +105,19 @@ namespace C2P.WebUserControls
txtMax.Text = value.ToString();
}
}
/// <summary>
/// valore range
/// </summary>
public string RangeLabel
{
get
{
return lblRange.Text.Trim();
}
set
{
lblRange.Text = value;
}
}
}
}
C2P/WebUserControls/mod_range.ascx.designer.cs
Generated
+13 -4
View File
@@ -13,13 +13,13 @@ namespace C2P.WebUserControls {
public partial class mod_range {
/// <summary>
/// lblField control.
/// lblMin 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.Label lblField;
protected global::System.Web.UI.WebControls.Label lblMin;
/// <summary>
/// valMin control.
@@ -40,13 +40,22 @@ namespace C2P.WebUserControls {
protected global::System.Web.UI.WebControls.TextBox txtMin;
/// <summary>
/// Label1 control.
/// lblRange 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.Label Label1;
protected global::System.Web.UI.WebControls.Label lblRange;
/// <summary>
/// lblMax 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.Label lblMax;
/// <summary>
/// valMax control.
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_Data/bin/Release/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P_Report/ReportViewer.aspx.cs
+10
View File
@@ -56,6 +56,16 @@ namespace C2P_Report
// 1) impostazione file report
localReport.ReportPath = @".\Reports\ReportOffers.rdlc";
// switch in base al tipo di report: Q (standard) o S (sim)
switch(Request.QueryString["QuoteType"].ToString())
{
case "Q":
localReport.ReportPath = @".\Reports\ReportOffers_Q.rdlc";
break;
case "S":
localReport.ReportPath = @".\Reports\ReportOffers_S.rdlc";
break;
}
// 2) caricamento tab dati
DataTable tabVoc = new DataTable();
C2P_Report/Reports/ReportOffers_Q.rdl
+5815
View File
File diff suppressed because it is too large Load Diff
C2P_Report/Reports/ReportOffers_Q.rdlc
+5815
View File
File diff suppressed because it is too large Load Diff
C2P_Report/Reports/ReportOffers_S.rdlc
+5815
View File
File diff suppressed because it is too large Load Diff
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.113.246")]
[assembly: AssemblyFileVersion("0.8.113.246")]
[assembly: AssemblyVersion("0.8.114.250")]
[assembly: AssemblyFileVersion("0.8.114.250")]
[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.113.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("0.8.113.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("0.8.114.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("0.8.114.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+