diff --git a/C2P/C2P.csproj b/C2P/C2P.csproj index 7f223dc..18eaf42 100644 --- a/C2P/C2P.csproj +++ b/C2P/C2P.csproj @@ -284,6 +284,7 @@ + @@ -506,6 +507,13 @@ mod_display.ascx + + mod_displayHor.ascx + ASPXCodeBehind + + + mod_displayHor.ascx + mod_lemmiVocab.ascx ASPXCodeBehind diff --git a/C2P/ExistingProductOffer.aspx b/C2P/ExistingProductOffer.aspx index 8bc0b5b..284bb9c 100644 --- a/C2P/ExistingProductOffer.aspx +++ b/C2P/ExistingProductOffer.aspx @@ -1,7 +1,23 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" CodeBehind="ExistingProductOffer.aspx.cs" Inherits="C2P.ExistingProductOffer" %> + + fare clonando pagina QUOTE + +
+
+ Attenzione!
+ con questa selezione +
+
+ select pl.RawMat, CodItem, count(*) +from ProductionLog pl inner join DiesDet dd on pl.CodDies = dd.CodDies +where dd.CodItem = '1AN00001' +group by pl.RawMat, CodItem +
+
+ cercare se ci siano dati x poter generare un offerta standard o se piuttosto si debba x forza passare al simulatore diff --git a/C2P/ExistingProductOffer.aspx.cs b/C2P/ExistingProductOffer.aspx.cs index f2d5e51..77fe3f1 100644 --- a/C2P/ExistingProductOffer.aspx.cs +++ b/C2P/ExistingProductOffer.aspx.cs @@ -11,7 +11,6 @@ namespace C2P { protected void Page_Load(object sender, EventArgs e) { - Response.Redirect("Quote"); } } } \ No newline at end of file diff --git a/C2P/Images/loader.gif b/C2P/Images/loader.gif index 72fb406..e147f3e 100644 Binary files a/C2P/Images/loader.gif and b/C2P/Images/loader.gif differ diff --git a/C2P/WebUserControls/mod_OffersArchive.ascx b/C2P/WebUserControls/mod_OffersArchive.ascx index a359e98..40f9ccb 100644 --- a/C2P/WebUserControls/mod_OffersArchive.ascx +++ b/C2P/WebUserControls/mod_OffersArchive.ascx @@ -84,137 +84,49 @@
- - <%-- - - - - - --%> + <%# traduci("NoRecords") %> - <%-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --%> - <%-- - - - - - - - - - --%> - <%-- - - / - - --%> - + + + + + - - + + <%-- - + --%> - - + + <%-- - + --%> - - + + <%-- - + --%> - - - + + <%-- - + --%> @@ -222,7 +134,6 @@ - @@ -233,17 +144,6 @@ - <%-- - - - - - - - - - - --%> <%: numRecords %> diff --git a/C2P/WebUserControls/mod_OffersArchive.ascx.cs b/C2P/WebUserControls/mod_OffersArchive.ascx.cs index 09da418..191e449 100644 --- a/C2P/WebUserControls/mod_OffersArchive.ascx.cs +++ b/C2P/WebUserControls/mod_OffersArchive.ascx.cs @@ -21,6 +21,8 @@ namespace C2P.WebUserControls /// protected void Page_Load(object sender, EventArgs e) { + // calcolo il range dello slider... + setSliderVal(); // al caricamento NON mostro risultati ricerca... if (!Page.IsPostBack) { @@ -30,6 +32,21 @@ namespace C2P.WebUserControls } setBtnVisib(); } + + private void setSliderVal() + { + // !!!FARE!!! + + /* + * - Filtro su parametri attuali (prima apertura = ALL DATA con filtro sul periodo...) + * - cerco min/max qta + * - le impongo al selettore slicer + * + * */ + + rangeQta.minVal = 0; + rangeQta.maxVal = 5555; + } /// /// sistema visibilità button... /// @@ -56,13 +73,13 @@ namespace C2P.WebUserControls for (int i = 0; i < grView.Rows.Count; i++) { grView.SelectedIndex = i; - chkBox=((CheckBox)grView.SelectedRow.FindControl("chkSelect")); - if (chkBox.Checked) - { - QuoteType = grView.SelectedDataKey["QuoteType"].ToString(); - CodQuote = grView.SelectedDataKey["CodQuote"].ToString(); - QuoteRev = grView.SelectedDataKey["QuoteRev"].ToString(); - } + chkBox = ((CheckBox)grView.SelectedRow.FindControl("chkSelect")); + if (chkBox.Checked) + { + QuoteType = grView.SelectedDataKey["QuoteType"].ToString(); + CodQuote = grView.SelectedDataKey["CodQuote"].ToString(); + QuoteRev = grView.SelectedDataKey["QuoteRev"].ToString(); + } } } else @@ -365,5 +382,14 @@ namespace C2P.WebUserControls { } + /// + /// Gestione evento sort + /// + /// + /// + protected void grView_Sorted(object sender, EventArgs e) + { + // aggiornare indicando con una freccia la direzione ASC/DESC del sort... + } } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_Q_Costs.ascx b/C2P/WebUserControls/mod_Q_Costs.ascx index 4e1d2dd..09dec89 100644 --- a/C2P/WebUserControls/mod_Q_Costs.ascx +++ b/C2P/WebUserControls/mod_Q_Costs.ascx @@ -4,113 +4,113 @@ <%} %> -<%@ Register Src="~/WebUserControls/mod_display.ascx" TagName="mod_display" TagPrefix="uc1" %> +<%@ Register Src="~/WebUserControls/mod_displayHor.ascx" TagName="mod_displayHor" TagPrefix="uc1" %>
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
diff --git a/C2P/WebUserControls/mod_Q_Header.ascx b/C2P/WebUserControls/mod_Q_Header.ascx index f6acc43..a988e55 100644 --- a/C2P/WebUserControls/mod_Q_Header.ascx +++ b/C2P/WebUserControls/mod_Q_Header.ascx @@ -126,18 +126,18 @@
- + <%----%>
- +
- +
diff --git a/C2P/WebUserControls/mod_Q_Quot.ascx b/C2P/WebUserControls/mod_Q_Quot.ascx index c3d5372..1909830 100644 --- a/C2P/WebUserControls/mod_Q_Quot.ascx +++ b/C2P/WebUserControls/mod_Q_Quot.ascx @@ -4,50 +4,50 @@ <%} %> -<%@ Register Src="~/WebUserControls/mod_display.ascx" TagName="mod_display" TagPrefix="uc1" %> +<%@ Register Src="~/WebUserControls/mod_displayHor.ascx" TagName="mod_displayHor" TagPrefix="uc1" %>
- +
- +
- +
- +
- +
- +
- +
- +
@@ -56,45 +56,45 @@
- +
- +
- +
- +
- +
- +
- +
- +
diff --git a/C2P/WebUserControls/mod_QuoteDet.ascx b/C2P/WebUserControls/mod_QuoteDet.ascx index fbdbb3a..90ad0f0 100644 --- a/C2P/WebUserControls/mod_QuoteDet.ascx +++ b/C2P/WebUserControls/mod_QuoteDet.ascx @@ -10,7 +10,7 @@ <%} %>
-
+
<%: traduci("ReturnOffersArchive") %>
@@ -79,22 +79,22 @@
-
+
-  <%: traduci("nextIdxQState-010") %> +  <%: traduci("nextIdxQState-01") %>
-
+
-  <%: traduci("nextIdxQState-000") %> +  <%: traduci("nextIdxQState-00") %>
-  <%: traduci("nextIdxQState-020") %> +  <%: traduci("nextIdxQState-02") %>
-
+
-  <%: traduci("nextIdxQState-030") %> +  <%: traduci("nextIdxQState-03") %>
diff --git a/C2P/WebUserControls/mod_QuoteDet.ascx.cs b/C2P/WebUserControls/mod_QuoteDet.ascx.cs index 80cd4b7..391a6a3 100644 --- a/C2P/WebUserControls/mod_QuoteDet.ascx.cs +++ b/C2P/WebUserControls/mod_QuoteDet.ascx.cs @@ -130,7 +130,7 @@ namespace C2P.WebUserControls catch { } IdxQState = IdxQS.ToString(); - Status = traduci(string.Format("IdxQState-{0:D3}", IdxQS)); + Status = traduci(string.Format("IdxQState-{0:D2}", IdxQS)); setBtnVisibility(); } /// @@ -301,33 +301,33 @@ namespace C2P.WebUserControls switch (IdxQState) { case "0": - divStato00.Visible = true; - divStato10.Visible = false; - divStato20.Visible = false; + divStato0.Visible = true; + divStato1.Visible = false; + divStato2.Visible = false; btnGetPdf.Visible = false; break; - case "10": - divStato00.Visible = false; - divStato10.Visible = true; - divStato20.Visible = false; + case "1": + divStato0.Visible = false; + divStato1.Visible = true; + divStato2.Visible = false; btnGetPdf.Visible = true; break; - case "20": - divStato00.Visible = false; - divStato10.Visible = false; - divStato20.Visible = true; + case "2": + divStato0.Visible = false; + divStato1.Visible = false; + divStato2.Visible = true; btnGetPdf.Visible = true; break; - case "30": - divStato00.Visible = false; - divStato10.Visible = false; - divStato20.Visible = false; + case "3": + divStato0.Visible = false; + divStato1.Visible = false; + divStato2.Visible = false; btnGetPdf.Visible = true; break; default: - divStato00.Visible = false; - divStato10.Visible = false; - divStato20.Visible = false; + divStato0.Visible = false; + divStato1.Visible = false; + divStato2.Visible = false; btnGetPdf.Visible = false; break; } @@ -350,7 +350,7 @@ namespace C2P.WebUserControls protected void lnkCreateOffer_Click(object sender, EventArgs e) { // cambio stato offerta da draft! - DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 10); + DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 1); // aggiorno! updateBaseData(); } @@ -374,7 +374,7 @@ namespace C2P.WebUserControls protected void lbApprove_Click(object sender, EventArgs e) { // cambio stato offerta da draft! - DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 20); + DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 2); // aggiorno! updateBaseData(); } @@ -386,7 +386,7 @@ namespace C2P.WebUserControls protected void lbRelease_Click(object sender, EventArgs e) { // cambio stato offerta da draft! - DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 30); + DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 3); // aggiorno! updateBaseData(); } diff --git a/C2P/WebUserControls/mod_QuoteDet.ascx.designer.cs b/C2P/WebUserControls/mod_QuoteDet.ascx.designer.cs index 31fb4a0..6c14ed5 100644 --- a/C2P/WebUserControls/mod_QuoteDet.ascx.designer.cs +++ b/C2P/WebUserControls/mod_QuoteDet.ascx.designer.cs @@ -193,13 +193,13 @@ namespace C2P.WebUserControls { protected global::C2P.WebUserControls.mod_Q_Quot mod_Q_Quot1; /// - /// divStato00 control. + /// divStato0 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divStato00; + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divStato0; /// /// lbCreateOffer control. @@ -211,13 +211,13 @@ namespace C2P.WebUserControls { protected global::System.Web.UI.WebControls.LinkButton lbCreateOffer; /// - /// divStato10 control. + /// divStato1 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divStato10; + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divStato1; /// /// lbReject control. @@ -238,13 +238,13 @@ namespace C2P.WebUserControls { protected global::System.Web.UI.WebControls.LinkButton lbApprove; /// - /// divStato20 control. + /// divStato2 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divStato20; + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divStato2; /// /// lbRelease control. diff --git a/C2P/WebUserControls/mod_display.ascx.cs b/C2P/WebUserControls/mod_display.ascx.cs index 3cf2e6d..94a0f3b 100644 --- a/C2P/WebUserControls/mod_display.ascx.cs +++ b/C2P/WebUserControls/mod_display.ascx.cs @@ -55,6 +55,5 @@ namespace C2P.WebUserControls lblVal.ToolTip = value; } } - } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_displayHor.ascx b/C2P/WebUserControls/mod_displayHor.ascx new file mode 100644 index 0000000..5f64d72 --- /dev/null +++ b/C2P/WebUserControls/mod_displayHor.ascx @@ -0,0 +1,9 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_displayHor.ascx.cs" Inherits="C2P.WebUserControls.mod_displayHor" %> +
+
+ +
+
+ +
+
diff --git a/C2P/WebUserControls/mod_displayHor.ascx.cs b/C2P/WebUserControls/mod_displayHor.ascx.cs new file mode 100644 index 0000000..b42ed08 --- /dev/null +++ b/C2P/WebUserControls/mod_displayHor.ascx.cs @@ -0,0 +1,59 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace C2P.WebUserControls +{ + public partial class mod_displayHor : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + /// + /// etichetta + /// + public string etichetta + { + get + { + return lblLab.Text; + } + set + { + lblLab.Text = value; + } + } + /// + /// valore + /// + public string valore + { + get + { + return lblVal.Text; + } + set + { + lblVal.Text = value; + } + } + /// + /// valore + /// + public string toolTipVal + { + get + { + return lblVal.ToolTip; + } + set + { + lblVal.ToolTip = value; + } + } + } +} \ No newline at end of file diff --git a/C2P/WebUserControls/mod_displayHor.ascx.designer.cs b/C2P/WebUserControls/mod_displayHor.ascx.designer.cs new file mode 100644 index 0000000..2ee39fb --- /dev/null +++ b/C2P/WebUserControls/mod_displayHor.ascx.designer.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace C2P.WebUserControls { + + + public partial class mod_displayHor { + + /// + /// lblLab control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblLab; + + /// + /// lblVal control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblVal; + } +} diff --git a/C2P/WebUserControls/mod_selPeriodo.ascx b/C2P/WebUserControls/mod_selPeriodo.ascx index ff5c2e5..e3a34af 100644 --- a/C2P/WebUserControls/mod_selPeriodo.ascx +++ b/C2P/WebUserControls/mod_selPeriodo.ascx @@ -33,17 +33,8 @@ });
-
-
- - <%: traduci("Date") %> - - -
-
-
selezione @@ -56,6 +47,15 @@ 1 anno
+ +
+
+
+
+ + <%: traduci("ToDate") %> + +
diff --git a/C2P/WebUserControls/mod_selPeriodo.ascx.designer.cs b/C2P/WebUserControls/mod_selPeriodo.ascx.designer.cs index cc2d579..72bec41 100644 --- a/C2P/WebUserControls/mod_selPeriodo.ascx.designer.cs +++ b/C2P/WebUserControls/mod_selPeriodo.ascx.designer.cs @@ -22,13 +22,13 @@ namespace C2P.WebUserControls { protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; /// - /// lblPeriodo control. + /// ddlSelPeriodo control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Label lblPeriodo; + protected global::System.Web.UI.WebControls.DropDownList ddlSelPeriodo; /// /// txtInizio control. @@ -39,6 +39,15 @@ namespace C2P.WebUserControls { /// protected global::System.Web.UI.WebControls.TextBox txtInizio; + /// + /// lblPeriodo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblPeriodo; + /// /// txtFine control. /// @@ -48,15 +57,6 @@ namespace C2P.WebUserControls { /// protected global::System.Web.UI.WebControls.TextBox txtFine; - /// - /// ddlSelPeriodo control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.DropDownList ddlSelPeriodo; - /// /// btnUpdate control. /// diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index d5e0af0..eafcd5e 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index 286121a..96b0053 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index 9c437c8..60c1a5e 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/VersGen/C2P.cs b/VersGen/C2P.cs index b360b59..8994977 100644 --- a/VersGen/C2P.cs +++ b/VersGen/C2P.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("0.6.47.136")] -[assembly: AssemblyFileVersion("0.6.47.136")] +[assembly: AssemblyVersion("0.6.48.137")] +[assembly: AssemblyFileVersion("0.6.48.137")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt index 82dabda..7da97e8 100644 --- a/VersGen/C2P.tt +++ b/VersGen/C2P.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("0.6.47.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("0.6.47.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("0.6.48.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("0.6.48.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+