From 343b4559ab6cb038e85e271faa8eb986699f17db Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 21 May 2014 15:16:27 +0200 Subject: [PATCH] vers 0.7.74 inserita correzione visualizzazione modifica stato anche x simulazioni --- C2P/WebUserControls/mod_QuoteDet.ascx.cs | 26 ++++++++++----- C2P/WebUserControls/mod_S_Dies.ascx.cs | 11 ++++++- C2P/WebUserControls/mod_S_ExtrPar.ascx.cs | 10 ++++++ C2P/WebUserControls/mod_S_Header.ascx.cs | 10 ++++++ C2P/WebUserControls/mod_S_PackPar.ascx.cs | 10 ++++++ C2P/WebUserControls/mod_S_Quot.ascx.cs | 10 ++++++ C2P/WebUserControls/mod_newProduct.ascx.cs | 36 +++++++++++++++++++-- C2P/bin/C2P.dll | Bin 358400 -> 358912 bytes C2P/bin/C2P_Data.dll | Bin 521728 -> 521728 bytes C2P/bin/SteamWare.dll | Bin 501248 -> 501248 bytes C2P_Report/bin/C2P_Data.dll | Bin 521728 -> 521728 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 +-- 15 files changed, 105 insertions(+), 16 deletions(-) diff --git a/C2P/WebUserControls/mod_QuoteDet.ascx.cs b/C2P/WebUserControls/mod_QuoteDet.ascx.cs index fa8eb27..20625e5 100644 --- a/C2P/WebUserControls/mod_QuoteDet.ascx.cs +++ b/C2P/WebUserControls/mod_QuoteDet.ascx.cs @@ -11,6 +11,16 @@ namespace C2P.WebUserControls { public partial class mod_QuoteDet : SteamWare.UserControl { + /// + /// stringa UID univoca + /// + public string uid + { + get + { + return this.UniqueID.Replace("$", "_").Replace("-", "_"); + } + } /// /// tipo di quote x la scheda corrente /// @@ -80,7 +90,7 @@ namespace C2P.WebUserControls { lblIdxQState.Text = value; } - } + } /// /// precedente valore richiesto... /// @@ -88,13 +98,13 @@ namespace C2P.WebUserControls { get { - return memLayer.ML.StringSessionObj("prevReqQD"); + return memLayer.ML.StringSessionObj("prevReq_" + uid); } set { - memLayer.ML.setSessionVal("prevReqQD", value); + memLayer.ML.setSessionVal("prevReq_" + uid, value); } - } + } /// /// indica se sia attivo in modalità editing qualche modulo /// @@ -102,11 +112,11 @@ namespace C2P.WebUserControls { get { - return memLayer.ML.BoolSessionObj("editActiveQD"); + return memLayer.ML.BoolSessionObj("editActive_" + uid); } set { - memLayer.ML.setSessionVal("editActiveQD", value); + memLayer.ML.setSessionVal("editActive_" + uid, value); } } /// @@ -366,7 +376,7 @@ namespace C2P.WebUserControls // aggiorno! updateBaseData(); } - + /// /// CONVERTE offerta in simulazione /// @@ -385,7 +395,7 @@ namespace C2P.WebUserControls #endif } - + /// /// rifiuta e riporta in draft /// diff --git a/C2P/WebUserControls/mod_S_Dies.ascx.cs b/C2P/WebUserControls/mod_S_Dies.ascx.cs index 3cfd2d7..edc189e 100644 --- a/C2P/WebUserControls/mod_S_Dies.ascx.cs +++ b/C2P/WebUserControls/mod_S_Dies.ascx.cs @@ -28,6 +28,15 @@ namespace C2P.WebUserControls frmView.ChangeMode(FormViewMode.ReadOnly); } } - + /// + /// indica se il controllo sia in modalità editing + /// + public bool isEditing + { + get + { + return (frmView.CurrentMode == FormViewMode.Edit); + } + } } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_S_ExtrPar.ascx.cs b/C2P/WebUserControls/mod_S_ExtrPar.ascx.cs index 08dfadd..60cb8dc 100644 --- a/C2P/WebUserControls/mod_S_ExtrPar.ascx.cs +++ b/C2P/WebUserControls/mod_S_ExtrPar.ascx.cs @@ -29,5 +29,15 @@ namespace C2P.WebUserControls } } + /// + /// indica se il controllo sia in modalità editing + /// + public bool isEditing + { + get + { + return (frmView.CurrentMode == FormViewMode.Edit); + } + } } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_S_Header.ascx.cs b/C2P/WebUserControls/mod_S_Header.ascx.cs index 0d503aa..503d96d 100644 --- a/C2P/WebUserControls/mod_S_Header.ascx.cs +++ b/C2P/WebUserControls/mod_S_Header.ascx.cs @@ -31,6 +31,16 @@ namespace C2P.WebUserControls } } /// + /// indica se il controllo sia in modalità editing + /// + public bool isEditing + { + get + { + return (frmView.CurrentMode == FormViewMode.Edit); + } + } + /// /// imposta modalità insert... /// public void setInsertMode() diff --git a/C2P/WebUserControls/mod_S_PackPar.ascx.cs b/C2P/WebUserControls/mod_S_PackPar.ascx.cs index cffa612..d23a64e 100644 --- a/C2P/WebUserControls/mod_S_PackPar.ascx.cs +++ b/C2P/WebUserControls/mod_S_PackPar.ascx.cs @@ -29,5 +29,15 @@ namespace C2P.WebUserControls } } + /// + /// indica se il controllo sia in modalità editing + /// + public bool isEditing + { + get + { + return (frmView.CurrentMode == FormViewMode.Edit); + } + } } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_S_Quot.ascx.cs b/C2P/WebUserControls/mod_S_Quot.ascx.cs index eb892a3..c5c669b 100644 --- a/C2P/WebUserControls/mod_S_Quot.ascx.cs +++ b/C2P/WebUserControls/mod_S_Quot.ascx.cs @@ -29,6 +29,16 @@ namespace C2P.WebUserControls } } + /// + /// indica se il controllo sia in modalità editing + /// + public bool isEditing + { + get + { + return (frmView.CurrentMode == FormViewMode.Edit); + } + } protected void odsQuotes_Updated(object sender, ObjectDataSourceStatusEventArgs e) { if (eh_update != null) diff --git a/C2P/WebUserControls/mod_newProduct.ascx.cs b/C2P/WebUserControls/mod_newProduct.ascx.cs index 2bd9bef..7ac0b29 100644 --- a/C2P/WebUserControls/mod_newProduct.ascx.cs +++ b/C2P/WebUserControls/mod_newProduct.ascx.cs @@ -11,6 +11,16 @@ namespace C2P.WebUserControls { public partial class mod_newProduct : SteamWare.UserControl { + /// + /// stringa UID univoca + /// + public string uid + { + get + { + return this.UniqueID.Replace("$", "_").Replace("-", "_"); + } + } /// /// tipo di quote x la scheda corrente /// @@ -88,11 +98,25 @@ namespace C2P.WebUserControls { get { - return memLayer.ML.StringSessionObj("prevReqQD"); + return memLayer.ML.StringSessionObj("prevReq_" + uid); } set { - memLayer.ML.setSessionVal("prevReqQD", value); + memLayer.ML.setSessionVal("prevReq_" + uid, value); + } + } + /// + /// indica se sia attivo in modalità editing qualche modulo + /// + protected bool editActive + { + get + { + return memLayer.ML.BoolSessionObj("editActive_" + uid); + } + set + { + memLayer.ML.setSessionVal("editActive_" + uid, value); } } /// @@ -203,6 +227,7 @@ namespace C2P.WebUserControls { LinkButton lBtn = ((LinkButton)sender); setModVisibility(lBtn.CommandArgument); + setBtnVisibility(); } /// /// sistemazione della visibilità dei moduli di dettaglio/editing @@ -277,6 +302,8 @@ namespace C2P.WebUserControls mod_S_Dies1.Visible = false; break; } + // verifica se sia attivo editing + editActive = (mod_S_ExtrPar1.isEditing || mod_S_Header1.isEditing || mod_S_PackPar1.isEditing || mod_S_Dies1.isEditing || mod_S_Quot1.isEditing); prevReq = req; // controllo SE sia visibile il pulsante crea offerta (netMargin > 0... DA VERIFICARE) DS_Quotes.QuoteFull_QRow riga; @@ -311,7 +338,10 @@ namespace C2P.WebUserControls private void setBtnVisibility() { // in base a stato corrente offerta decide cosa mostrare... - switch (IdxQState) + string currState = IdxQState; + // se è in edit UNO dei panels allora devo evitare editing con buttons finali... + if (editActive) currState = "-1"; + switch (currState) { case "0": divStato0.Visible = true; diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index dfe1ba068ef1438153ed1eef40eb40059d8e157f..72c7a11e577e5ea6b04db652ff99a3da25911a9c 100644 GIT binary patch delta 14374 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 delta 13707 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 G1^yqfk~-u7 diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index a64ddf891b62e652dfb43b2116df7dffc91d8580..e1dead2d719de5e02cf27e30e9759826600946ef 100644 GIT binary patch delta 75 zcmV-R0JQ&r>>q&aACQOwRHT85g^B@%iUNg-1BHqNg^C4*iUzfc2j;>M5|2dB;WPS9 ho#339Z&j)hw}8V3Bq{<_q?e}c2Py$2x6$nfF9_(EAYK3f delta 75 zcmV-R0JQ&r>>q&aACQOwDWZXjg^B@%iUNg-1BHqNg^C4*iUzfc2j;>M#e_AcQL>Lk hr*u)*@8HmXw}8V3Bq{*>`|!#Ti2Iddmbq1KIhGU e34S|~=H*{f*)4!Nrhl8uuEl7yU2z`!eRcqk=pJVP delta 74 zcmZoTBiC?7ZbAo>#-hfq)-J}@E~eHl=GHEj)-Kl8F1D>*>`|!#*XBq%8FR^aOtReE e8M$Gt`|>ZT>=r;B)4$DS*J3o>t~ihVK05$SeH^s_ diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index a64ddf891b62e652dfb43b2116df7dffc91d8580..e1dead2d719de5e02cf27e30e9759826600946ef 100644 GIT binary patch delta 75 zcmV-R0JQ&r>>q&aACQOwRHT85g^B@%iUNg-1BHqNg^C4*iUzfc2j;>M5|2dB;WPS9 ho#339Z&j)hw}8V3Bq{<_q?e}c2Py$2x6$nfF9_(EAYK3f delta 75 zcmV-R0JQ&r>>q&aACQOwDWZXjg^B@%iUNg-1BHqNg^C4*iUzfc2j;>M#e_AcQL>Lk hr*u)*@8HmXw}8V3Bq{2;5w+dCW F0|5Bl6XgH^ delta 49 zcmZoLX)u}4!KA%tW0#PCz#*>`|!#Ti2Iddmbq1KIhGU e34S|~=H*{f*)4!Nrhl8uuEl7yU2z`!eRcqk=pJVP delta 74 zcmZoTBiC?7ZbAo>#-hfq)-J}@E~eHl=GHEj)-Kl8F1D>*>`|!#*XBq%8FR^aOtReE e8M$Gt`|>ZT>=r;B)4$DS*J3o>t~ihVK05$SeH^s_ diff --git a/VersGen/C2P.cs b/VersGen/C2P.cs index 758c311..52637dc 100644 --- a/VersGen/C2P.cs +++ b/VersGen/C2P.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("0.7.73.171")] -[assembly: AssemblyFileVersion("0.7.73.171")] +[assembly: AssemblyVersion("0.7.74.171")] +[assembly: AssemblyFileVersion("0.7.74.171")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt index 98baf94..4badb9c 100644 --- a/VersGen/C2P.tt +++ b/VersGen/C2P.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("0.7.73.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("0.7.73.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("0.7.74.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("0.7.74.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+