From a74f865aee357472ca2de7d645f4d0113759094f Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 21 May 2014 18:33:44 +0200 Subject: [PATCH] =?UTF-8?q?vers=200.7.77=20-=20ciorrezione=20condizioni=20?= =?UTF-8?q?IN/OUT=20modalit=C3=A0=20editing=20x=20Q=20-=20inizio=20correzi?= =?UTF-8?q?one=20modalit=C3=A0=20IN/OUT=20editing=20x=20SIM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- C2P/WebUserControls/mod_Q_Header.ascx | 2 +- C2P/WebUserControls/mod_Q_Header.ascx.cs | 15 ++++ C2P/WebUserControls/mod_Q_Quot.ascx | 2 +- C2P/WebUserControls/mod_Q_Quot.ascx.cs | 15 ++++ C2P/WebUserControls/mod_S_Dies.ascx | 4 +- C2P/WebUserControls/mod_S_Dies.ascx.cs | 24 +++++- C2P/WebUserControls/mod_S_ExtrPar.ascx | 4 +- C2P/WebUserControls/mod_S_ExtrPar.ascx.cs | 24 +++++- C2P/WebUserControls/mod_S_Header.ascx | 2 +- C2P/WebUserControls/mod_S_Header.ascx.cs | 16 +++- C2P/WebUserControls/mod_S_PackPar.ascx | 4 +- C2P/WebUserControls/mod_S_PackPar.ascx.cs | 24 +++++- C2P/WebUserControls/mod_S_Quot.ascx | 2 +- C2P/WebUserControls/mod_S_Quot.ascx.cs | 16 +++- C2P/WebUserControls/mod_newProduct.ascx.cs | 92 +++++++++++++++------ C2P/bin/C2P.dll | Bin 359424 -> 361472 bytes C2P/bin/C2P_Data.dll | Bin 521216 -> 521216 bytes C2P/bin/SteamWare.dll | Bin 501248 -> 501248 bytes C2P_Report/bin/C2P_Data.dll | Bin 521216 -> 521216 bytes C2P_Report/bin/C2P_Report.dll | Bin 6656 -> 6656 bytes C2P_Report/bin/SteamWare.dll | Bin 501248 -> 501248 bytes VersGen/C2P.cs | 4 +- VersGen/C2P.tt | 4 +- 23 files changed, 211 insertions(+), 43 deletions(-) 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 67a823c4080ef104115442731c3dcd9dba59e395..0e7de8df294bed32963543397839681dbc3ba9b1 100644 GIT binary patch delta 20325 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 RZ{vKBFDJkD+=Jpr{y%v*JJ$dJ delta 18701 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 diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index eb05d51540bf209acf29af9866dca140abf2d338..a0fec8066023bb28047277787c5ffda0dd8b181f 100644 GIT binary patch delta 75 zcmZp8A>Z&qenJP6`jy76)-J}@E~eHl=GHEj)-Kl8F1D>*?1%OX^yh84!u_|!yIF{H fM`_eb&+Rb>*j2QETBbL>V%K7{*}nD_doU*e$ABL% delta 75 zcmZp8A>Z&qenJP+t>cYdtzC?*T}-WA%&lE4tzE3GU2I#s*bnU&P+y#4knq9Sx#jTe fP>Xc0P1|D*u&ZbRwM=h%#jeGuzkTg1_Fzr`<|7~R diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index 7c764210e8fe62516b1c0cf8344e7be51a0e008b..6c9537a309eee719cfe48a10ad6cb3dac789ab68 100644 GIT binary patch delta 74 zcmZoTBiC?7ZbAo>>XpW>)-J}@E~eHl=GHEj)-Kl8F1D>*>`|!#dDl0bbM4aiZ=Az) ewrjRh?eZ_F>=r;B)4$DS*JAYCt~ihVK05%4e;#=N delta 74 zcmZoTBiC?7ZbAps&Et(-tzC?*T}-WA%&lE4tzE3GU2I#s*rQSf=9EeVt-qt~zh@G! e@>^rs>g8Wj*)4!Nrhl8uuEl7xU2z`!eRcqzLLRUH diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index eb05d51540bf209acf29af9866dca140abf2d338..a0fec8066023bb28047277787c5ffda0dd8b181f 100644 GIT binary patch delta 75 zcmZp8A>Z&qenJP6`jy76)-J}@E~eHl=GHEj)-Kl8F1D>*?1%OX^yh84!u_|!yIF{H fM`_eb&+Rb>*j2QETBbL>V%K7{*}nD_doU*e$ABL% delta 75 zcmZp8A>Z&qenJP+t>cYdtzC?*T}-WA%&lE4tzE3GU2I#s*bnU&P+y#4knq9Sx#jTe fP>Xc0P1|D*u&ZbRwM=h%#jeGuzkTg1_Fzr`<|7~R diff --git a/C2P_Report/bin/C2P_Report.dll b/C2P_Report/bin/C2P_Report.dll index bfb04bbf08a40274fe7344ede6898dcc1ab99344..7f9221297afd202580c409d4784badd64d69688a 100644 GIT binary patch delta 49 zcmZoLX)u}4!Bl){W0#PCK+6^FLn}1q`_DdS{Bbt>d9BTB1lBMDB_~G-X)#XN+$vPf F4ge1(6iEO8 delta 49 zcmZoLX)u}4!F2cd#x5ZNf!J+Zdh?zY_%5A4n@RtVXUXO@0&5t7l9Qu^v>01Aw+dCW F0{|rY6#oDK diff --git a/C2P_Report/bin/SteamWare.dll b/C2P_Report/bin/SteamWare.dll index 7c764210e8fe62516b1c0cf8344e7be51a0e008b..6c9537a309eee719cfe48a10ad6cb3dac789ab68 100644 GIT binary patch delta 74 zcmZoTBiC?7ZbAo>>XpW>)-J}@E~eHl=GHEj)-Kl8F1D>*>`|!#dDl0bbM4aiZ=Az) ewrjRh?eZ_F>=r;B)4$DS*JAYCt~ihVK05%4e;#=N delta 74 zcmZoTBiC?7ZbAps&Et(-tzC?*T}-WA%&lE4tzE3GU2I#s*rQSf=9EeVt-qt~zh@G! e@>^rs>g8Wj*)4!Nrhl8uuEl7xU2z`!eRcqzLLRUH 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")] <#+