diff --git a/C2P/WebUserControls/mod_Q_Header.ascx b/C2P/WebUserControls/mod_Q_Header.ascx index 6783bf6..3ce6a2d 100644 --- a/C2P/WebUserControls/mod_Q_Header.ascx +++ b/C2P/WebUserControls/mod_Q_Header.ascx @@ -6,7 +6,7 @@ <%} %> <%@ Register Src="~/WebUserControls/mod_display.ascx" TagName="mod_display" TagPrefix="uc1" %> - +
diff --git a/C2P/WebUserControls/mod_Q_Header.ascx.cs b/C2P/WebUserControls/mod_Q_Header.ascx.cs index 7fe256b..f6a7014 100644 --- a/C2P/WebUserControls/mod_Q_Header.ascx.cs +++ b/C2P/WebUserControls/mod_Q_Header.ascx.cs @@ -170,5 +170,20 @@ namespace C2P.WebUserControls lista.SelectedIndex = lista.Items.IndexOf(lista.Items.FindByValue(RawMat)); } } + /// + /// controllo se inviare evento refresh al cambio di modo della formview + /// + /// + /// + protected void frmView_ModeChanged(object sender, EventArgs e) + { + if (frmView.CurrentMode == FormViewMode.ReadOnly) + { + if (eh_update != null) + { + eh_update(this, new EventArgs()); + } + } + } } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_Q_Quot.ascx b/C2P/WebUserControls/mod_Q_Quot.ascx index 88f46cc..5cd10fc 100644 --- a/C2P/WebUserControls/mod_Q_Quot.ascx +++ b/C2P/WebUserControls/mod_Q_Quot.ascx @@ -6,7 +6,7 @@ <%} %> <%@ Register Src="~/WebUserControls/mod_displayHor.ascx" TagName="mod_displayHor" TagPrefix="uc1" %> - +
diff --git a/C2P/WebUserControls/mod_Q_Quot.ascx.cs b/C2P/WebUserControls/mod_Q_Quot.ascx.cs index 5ba1f36..8a40d0b 100644 --- a/C2P/WebUserControls/mod_Q_Quot.ascx.cs +++ b/C2P/WebUserControls/mod_Q_Quot.ascx.cs @@ -59,6 +59,21 @@ namespace C2P.WebUserControls if (Math.Round(Convert.ToDecimal(val1), 3) < Math.Round(Convert.ToDecimal(val2), 3)) answ = "text-danger"; return answ; } + /// + /// controllo se inviare evento refresh al cambio di modo della formview + /// + /// + /// + protected void frmView_ModeChanged(object sender, EventArgs e) + { + if (frmView.CurrentMode == FormViewMode.ReadOnly) + { + if (eh_update != null) + { + eh_update(this, new EventArgs()); + } + } + } } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_S_Dies.ascx b/C2P/WebUserControls/mod_S_Dies.ascx index 5965e85..8bc9d03 100644 --- a/C2P/WebUserControls/mod_S_Dies.ascx +++ b/C2P/WebUserControls/mod_S_Dies.ascx @@ -6,7 +6,7 @@ <%} %> <%@ Register Src="~/WebUserControls/mod_display.ascx" TagName="mod_display" TagPrefix="uc1" %> - +
@@ -108,7 +108,7 @@
- + diff --git a/C2P/WebUserControls/mod_S_Dies.ascx.cs b/C2P/WebUserControls/mod_S_Dies.ascx.cs index edc189e..40eb80f 100644 --- a/C2P/WebUserControls/mod_S_Dies.ascx.cs +++ b/C2P/WebUserControls/mod_S_Dies.ascx.cs @@ -13,7 +13,7 @@ namespace C2P.WebUserControls { } - + public event EventHandler eh_update; /// /// fa toggle tra modo edit e read/item /// @@ -38,5 +38,27 @@ namespace C2P.WebUserControls return (frmView.CurrentMode == FormViewMode.Edit); } } + protected void odsQuotes_Updated(object sender, ObjectDataSourceStatusEventArgs e) + { + if (eh_update != null) + { + eh_update(this, new EventArgs()); + } + } + /// + /// controllo se inviare evento refresh al cambio di modo della formview + /// + /// + /// + protected void frmView_ModeChanged(object sender, EventArgs e) + { + if (frmView.CurrentMode == FormViewMode.ReadOnly) + { + if (eh_update != null) + { + eh_update(this, new EventArgs()); + } + } + } } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_S_ExtrPar.ascx b/C2P/WebUserControls/mod_S_ExtrPar.ascx index a290ef3..9df5372 100644 --- a/C2P/WebUserControls/mod_S_ExtrPar.ascx +++ b/C2P/WebUserControls/mod_S_ExtrPar.ascx @@ -6,7 +6,7 @@ <%} %> <%@ Register Src="~/WebUserControls/mod_display.ascx" TagName="mod_display" TagPrefix="uc1" %> - +
@@ -181,7 +181,7 @@
- + diff --git a/C2P/WebUserControls/mod_S_ExtrPar.ascx.cs b/C2P/WebUserControls/mod_S_ExtrPar.ascx.cs index 60cb8dc..b76360b 100644 --- a/C2P/WebUserControls/mod_S_ExtrPar.ascx.cs +++ b/C2P/WebUserControls/mod_S_ExtrPar.ascx.cs @@ -13,7 +13,7 @@ namespace C2P.WebUserControls { } - + public event EventHandler eh_update; /// /// fa toggle tra modo edit e read/item /// @@ -39,5 +39,27 @@ namespace C2P.WebUserControls return (frmView.CurrentMode == FormViewMode.Edit); } } + protected void odsQuotes_Updated(object sender, ObjectDataSourceStatusEventArgs e) + { + if (eh_update != null) + { + eh_update(this, new EventArgs()); + } + } + /// + /// controllo se inviare evento refresh al cambio di modo della formview + /// + /// + /// + protected void frmView_ModeChanged(object sender, EventArgs e) + { + if (frmView.CurrentMode == FormViewMode.ReadOnly) + { + if (eh_update != null) + { + eh_update(this, new EventArgs()); + } + } + } } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_S_Header.ascx b/C2P/WebUserControls/mod_S_Header.ascx index de7f8a9..4d9416e 100644 --- a/C2P/WebUserControls/mod_S_Header.ascx +++ b/C2P/WebUserControls/mod_S_Header.ascx @@ -6,7 +6,7 @@ <%} %> <%@ Register Src="~/WebUserControls/mod_display.ascx" TagName="mod_display" TagPrefix="uc1" %> - +
diff --git a/C2P/WebUserControls/mod_S_Header.ascx.cs b/C2P/WebUserControls/mod_S_Header.ascx.cs index 503d96d..3b5bf84 100644 --- a/C2P/WebUserControls/mod_S_Header.ascx.cs +++ b/C2P/WebUserControls/mod_S_Header.ascx.cs @@ -168,6 +168,20 @@ namespace C2P.WebUserControls lista.SelectedIndex = lista.Items.IndexOf(lista.Items.FindByValue(RawMat)); } } - + /// + /// controllo se inviare evento refresh al cambio di modo della formview + /// + /// + /// + protected void frmView_ModeChanged(object sender, EventArgs e) + { + if (frmView.CurrentMode == FormViewMode.ReadOnly) + { + if (eh_update != null) + { + eh_update(this, new EventArgs()); + } + } + } } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_S_PackPar.ascx b/C2P/WebUserControls/mod_S_PackPar.ascx index 2c3f5b7..ea1b913 100644 --- a/C2P/WebUserControls/mod_S_PackPar.ascx +++ b/C2P/WebUserControls/mod_S_PackPar.ascx @@ -6,7 +6,7 @@ <%} %> <%@ Register Src="~/WebUserControls/mod_display.ascx" TagName="mod_display" TagPrefix="uc1" %> - +
@@ -111,7 +111,7 @@
- + diff --git a/C2P/WebUserControls/mod_S_PackPar.ascx.cs b/C2P/WebUserControls/mod_S_PackPar.ascx.cs index d23a64e..5bd9fb5 100644 --- a/C2P/WebUserControls/mod_S_PackPar.ascx.cs +++ b/C2P/WebUserControls/mod_S_PackPar.ascx.cs @@ -13,7 +13,7 @@ namespace C2P.WebUserControls { } - + public event EventHandler eh_update; /// /// fa toggle tra modo edit e read/item /// @@ -39,5 +39,27 @@ namespace C2P.WebUserControls return (frmView.CurrentMode == FormViewMode.Edit); } } + protected void odsQuotes_Updated(object sender, ObjectDataSourceStatusEventArgs e) + { + if (eh_update != null) + { + eh_update(this, new EventArgs()); + } + } + /// + /// controllo se inviare evento refresh al cambio di modo della formview + /// + /// + /// + protected void frmView_ModeChanged(object sender, EventArgs e) + { + if (frmView.CurrentMode == FormViewMode.ReadOnly) + { + if (eh_update != null) + { + eh_update(this, new EventArgs()); + } + } + } } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_S_Quot.ascx b/C2P/WebUserControls/mod_S_Quot.ascx index c4eede4..71c1e6b 100644 --- a/C2P/WebUserControls/mod_S_Quot.ascx +++ b/C2P/WebUserControls/mod_S_Quot.ascx @@ -6,7 +6,7 @@ <%} %> <%@ Register Src="~/WebUserControls/mod_displayHor.ascx" TagName="mod_displayHor" TagPrefix="uc1" %> - +
diff --git a/C2P/WebUserControls/mod_S_Quot.ascx.cs b/C2P/WebUserControls/mod_S_Quot.ascx.cs index c5c669b..7ebdd6e 100644 --- a/C2P/WebUserControls/mod_S_Quot.ascx.cs +++ b/C2P/WebUserControls/mod_S_Quot.ascx.cs @@ -60,6 +60,20 @@ namespace C2P.WebUserControls if (Math.Round(Convert.ToDecimal(val1), 3) < Math.Round(Convert.ToDecimal(val2), 3)) answ = "text-danger"; return answ; } - + /// + /// controllo se inviare evento refresh al cambio di modo della formview + /// + /// + /// + protected void frmView_ModeChanged(object sender, EventArgs e) + { + if (frmView.CurrentMode == FormViewMode.ReadOnly) + { + if (eh_update != null) + { + eh_update(this, new EventArgs()); + } + } + } } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_newProduct.ascx.cs b/C2P/WebUserControls/mod_newProduct.ascx.cs index fec8928..bd57b55 100644 --- a/C2P/WebUserControls/mod_newProduct.ascx.cs +++ b/C2P/WebUserControls/mod_newProduct.ascx.cs @@ -135,12 +135,59 @@ namespace C2P.WebUserControls hlGetPdf.NavigateUrl = string.Format("~/RepOffers?ticket={0}", 4); // va fatta con altra pagina che dia direttamente SINGOLO REPORT?!? hlRevHist.ToolTip = traduci("RevisionHistory"); prevReq = ""; + editActive = false; setModVisibility("Header"); } + mod_S_Dies1.eh_update += mod_S_Dies1_eh_update; + mod_S_ExtrPar1.eh_update += mod_S_ExtrPar1_eh_update; mod_S_Header1.eh_update += mod_S_Header1_eh_update; -#if false - mod_S_Quot1.eh_update += mod_S_Quot1_eh_update; -#endif + mod_S_PackPar1.eh_update += mod_S_PackPar1_eh_update; + mod_S_Quot1.eh_update += mod_S_Quot1_eh_update; + } + + /// + /// aggiorna info base dell'offerta + /// + void mod_S_Dies1_eh_update(object sender, EventArgs e) + { + updateBaseData(); + setModVisibility(""); + } + /// + /// aggiorna info base dell'offerta + /// + void mod_S_ExtrPar1_eh_update(object sender, EventArgs e) + { + updateBaseData(); + setModVisibility(""); + } + /// + /// richiesto update x cambiamento valori costs + /// + /// + /// + void mod_S_Header1_eh_update(object sender, EventArgs e) + { + updateBaseData(); + setModVisibility(""); + } + /// + /// aggiorna info base dell'offerta + /// + void mod_S_PackPar1_eh_update(object sender, EventArgs e) + { + updateBaseData(); + setModVisibility(""); + } + /// + /// richiesto update x cambiamento valori header + /// + /// + /// + void mod_S_Quot1_eh_update(object sender, EventArgs e) + { + updateBaseData(); + setModVisibility(""); } /// /// aggiorna info base dell'offerta @@ -164,26 +211,6 @@ namespace C2P.WebUserControls setBtnVisibility(); } /// - /// richiesto update x cambiamento valori header - /// - /// - /// - void mod_S_Quot1_eh_update(object sender, EventArgs e) - { - updateBaseData(); - setModVisibility(""); - } - /// - /// richiesto update x cambiamento valori costs - /// - /// - /// - void mod_S_Header1_eh_update(object sender, EventArgs e) - { - updateBaseData(); - setModVisibility(""); - } - /// /// Calcola css dato valore prezzo offerto vs importi full cost e min price /// /// @@ -240,6 +267,7 @@ namespace C2P.WebUserControls // se NON HO dati x una richiesta specifica vado in modalità INSERT.. { // mostro solo controllo header in modalità INSERT + editActive = true; mod_S_Header1.setInsertMode(); mod_S_Costs1.Visible = false; mod_S_ExtrPar1.Visible = false; @@ -300,6 +328,7 @@ namespace C2P.WebUserControls mod_S_Header1.Visible = true; mod_S_PackPar1.Visible = false; mod_S_Dies1.Visible = false; + editActive = false; break; } // verifica se sia attivo editing @@ -322,7 +351,7 @@ namespace C2P.WebUserControls // fix visibilità button creazione offerta lbCreateOffer.Visible = okCreate; // fix altri button x edit.. - if (!showEdit) + if (!showEdit || editActive) { lbHeader.CssClass = "btn btn-warning disabled"; lbExtrPar.CssClass = "btn btn-warning disabled"; @@ -330,6 +359,21 @@ namespace C2P.WebUserControls lbDiesPar.CssClass = "btn btn-warning disabled"; lbCosts.CssClass = "btn btn-warning disabled"; lbQuotation.CssClass = "btn btn-warning disabled"; + // riabilito controlli in edit... + if (mod_S_Header1.isEditing) lbHeader.CssClass = "btn btn-warning"; + if (mod_S_ExtrPar1.isEditing) lbExtrPar.CssClass = "btn btn-warning"; + if (mod_S_PackPar1.isEditing) lbPackPar.CssClass = "btn btn-warning"; + if (mod_S_Dies1.isEditing) lbDiesPar.CssClass = "btn btn-warning"; + if (mod_S_Quot1.isEditing) lbQuotation.CssClass = "btn btn-warning"; + } + else + { + lbHeader.CssClass = "btn btn-warning"; + lbExtrPar.CssClass = "btn btn-warning"; + lbPackPar.CssClass = "btn btn-warning"; + lbDiesPar.CssClass = "btn btn-warning"; + lbCosts.CssClass = "btn btn-warning"; + lbQuotation.CssClass = "btn btn-warning"; } } /// diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 67a823c..0e7de8d 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 eb05d51..a0fec80 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 7c76421..6c9537a 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index eb05d51..a0fec80 100644 Binary files a/C2P_Report/bin/C2P_Data.dll and b/C2P_Report/bin/C2P_Data.dll differ diff --git a/C2P_Report/bin/C2P_Report.dll b/C2P_Report/bin/C2P_Report.dll index bfb04bb..7f92212 100644 Binary files a/C2P_Report/bin/C2P_Report.dll and b/C2P_Report/bin/C2P_Report.dll differ diff --git a/C2P_Report/bin/SteamWare.dll b/C2P_Report/bin/SteamWare.dll index 7c76421..6c9537a 100644 Binary files a/C2P_Report/bin/SteamWare.dll and b/C2P_Report/bin/SteamWare.dll differ diff --git a/VersGen/C2P.cs b/VersGen/C2P.cs index 29af58d..4802311 100644 --- a/VersGen/C2P.cs +++ b/VersGen/C2P.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("0.7.75.171")] -[assembly: AssemblyFileVersion("0.7.75.171")] +[assembly: AssemblyVersion("0.7.77.171")] +[assembly: AssemblyFileVersion("0.7.77.171")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt index a772ab3..032df2a 100644 --- a/VersGen/C2P.tt +++ b/VersGen/C2P.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("0.7.75.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("0.7.75.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("0.7.77.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("0.7.77.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+