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 dfe1ba0..72c7a11 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 a64ddf8..e1dead2 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 0e1f011..b2ea549 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 a64ddf8..e1dead2 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 34ee8c0..b263beb 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 0e1f011..b2ea549 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 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")]
<#+