diff --git a/MP-ADM/BaseUserControl.cs b/MP-ADM/BaseUserControl.cs
index 14c8bc5c..192963ad 100644
--- a/MP-ADM/BaseUserControl.cs
+++ b/MP-ADM/BaseUserControl.cs
@@ -15,6 +15,55 @@ namespace MP_ADM
#endregion Internal Fields
+ #region Public Fields
+
+ ///
+ /// Abilitazione gestione Controlli periodici
+ ///
+ public bool enableControlli = memLayer.ML.cdvb("enableControlli");
+
+ ///
+ /// Abilitazione gestione Disegno articolo
+ ///
+ public bool enableDisegno = memLayer.ML.cdvb("enableDisegno");
+
+ ///
+ /// Abilitazione gestione grafici JScript
+ ///
+ public bool enableGraphJS = memLayer.ML.cdvb("enableGraphJS");
+
+ ///
+ /// Abilitazione gestione Pezzi LAsciati in macchina
+ ///
+ public bool enablePzProdLasciati = memLayer.ML.cdvb("enablePzProdLasciati");
+
+ ///
+ /// Abilitazione gestione Richieste - Promesse - ODL
+ ///
+ public bool enableRPO = memLayer.ML.cdvb("enableRPO");
+
+ ///
+ /// Abilitazione gestione scarti
+ ///
+ public bool enableScarti = memLayer.ML.cdvb("enableScarti");
+
+ ///
+ /// Abilitazione scheda Tecnica
+ ///
+ public bool enableSchedaTecnica = memLayer.ML.cdvb("enableSchedaTecnica");
+
+ ///
+ /// Abilitazione gestione SplitODL
+ ///
+ public bool enableSplitODL = memLayer.ML.cdvb("enableSplitODL");
+
+ ///
+ /// Abilitazione gestione Set PZ Pallet su tablet
+ ///
+ public bool enableTabSetPzPallet = memLayer.ML.cdvb("enableTabSetPzPallet");
+
+ #endregion Public Fields
+
#region Public Events
public event EventHandler eh_nuovoValore;
diff --git a/MP-ADM/WebUserControls/mod_gestioneODL.ascx.cs b/MP-ADM/WebUserControls/mod_gestioneODL.ascx.cs
index dea14363..6886b806 100644
--- a/MP-ADM/WebUserControls/mod_gestioneODL.ascx.cs
+++ b/MP-ADM/WebUserControls/mod_gestioneODL.ascx.cs
@@ -190,7 +190,7 @@ namespace MP_ADM.WebUserControls
{
get
{
- return !memLayer.ML.CRB("enableRPO");
+ return !enableRPO;
}
}
diff --git a/MP-SITE/BasePage.cs b/MP-SITE/BasePage.cs
index f124430c..3c5902ea 100644
--- a/MP-SITE/BasePage.cs
+++ b/MP-SITE/BasePage.cs
@@ -14,6 +14,55 @@ namespace MP_SITE
#endregion Internal Fields
+ #region Public Fields
+
+ ///
+ /// Abilitazione gestione Controlli periodici
+ ///
+ public bool enableControlli = memLayer.ML.cdvb("enableControlli");
+
+ ///
+ /// Abilitazione gestione Disegno articolo
+ ///
+ public bool enableDisegno = memLayer.ML.cdvb("enableDisegno");
+
+ ///
+ /// Abilitazione gestione grafici JScript
+ ///
+ public bool enableGraphJS = memLayer.ML.cdvb("enableGraphJS");
+
+ ///
+ /// Abilitazione gestione Pezzi LAsciati in macchina
+ ///
+ public bool enablePzProdLasciati = memLayer.ML.cdvb("enablePzProdLasciati");
+
+ ///
+ /// Abilitazione gestione Richieste - Promesse - ODL
+ ///
+ public bool enableRPO = memLayer.ML.cdvb("enableRPO");
+
+ ///
+ /// Abilitazione gestione scarti
+ ///
+ public bool enableScarti = memLayer.ML.cdvb("enableScarti");
+
+ ///
+ /// Abilitazione scheda Tecnica
+ ///
+ public bool enableSchedaTecnica = memLayer.ML.cdvb("enableSchedaTecnica");
+
+ ///
+ /// Abilitazione gestione SplitODL
+ ///
+ public bool enableSplitODL = memLayer.ML.cdvb("enableSplitODL");
+
+ ///
+ /// Abilitazione gestione Set PZ Pallet su tablet
+ ///
+ public bool enableTabSetPzPallet = memLayer.ML.cdvb("enableTabSetPzPallet");
+
+ #endregion Public Fields
+
#region Protected Properties
///
@@ -34,18 +83,6 @@ namespace MP_SITE
#endregion Protected Properties
- #region Public Properties
-
- public bool enableGraphJS
- {
- get
- {
- return memLayer.ML.CRB("enableGraphJS");
- }
- }
-
- #endregion Public Properties
-
#region Public Methods
///
diff --git a/MP-TAB/BasePage.cs b/MP-TAB/BasePage.cs
index bc62a3a1..9158c1fa 100644
--- a/MP-TAB/BasePage.cs
+++ b/MP-TAB/BasePage.cs
@@ -18,6 +18,55 @@ namespace MoonProTablet
#endregion Internal Fields
+ #region Public Fields
+
+ ///
+ /// Abilitazione gestione Controlli periodici
+ ///
+ public bool enableControlli = memLayer.ML.cdvb("enableControlli");
+
+ ///
+ /// Abilitazione gestione Disegno articolo
+ ///
+ public bool enableDisegno = memLayer.ML.cdvb("enableDisegno");
+
+ ///
+ /// Abilitazione gestione grafici JScript
+ ///
+ public bool enableGraphJS = memLayer.ML.cdvb("enableGraphJS");
+
+ ///
+ /// Abilitazione gestione Pezzi LAsciati in macchina
+ ///
+ public bool enablePzProdLasciati = memLayer.ML.cdvb("enablePzProdLasciati");
+
+ ///
+ /// Abilitazione gestione Richieste - Promesse - ODL
+ ///
+ public bool enableRPO = memLayer.ML.cdvb("enableRPO");
+
+ ///
+ /// Abilitazione gestione scarti
+ ///
+ public bool enableScarti = memLayer.ML.cdvb("enableScarti");
+
+ ///
+ /// Abilitazione scheda Tecnica
+ ///
+ public bool enableSchedaTecnica = memLayer.ML.cdvb("enableSchedaTecnica");
+
+ ///
+ /// Abilitazione gestione SplitODL
+ ///
+ public bool enableSplitODL = memLayer.ML.cdvb("enableSplitODL");
+
+ ///
+ /// Abilitazione gestione Set PZ Pallet su tablet
+ ///
+ public bool enableTabSetPzPallet = memLayer.ML.cdvb("enableTabSetPzPallet");
+
+ #endregion Public Fields
+
#region Protected Properties
///
@@ -36,17 +85,6 @@ namespace MoonProTablet
}
}
- ///
- /// Verifica (su tab config) se sia abilitata la gestione flusso RPO (Richieste - Promesse - ODL)
- ///
- protected bool enableRPO
- {
- get
- {
- return memLayer.ML.cdvb("enableRPO");
- }
- }
-
///
/// Verifica se la macchina MAIN sia MASTER
///
diff --git a/MP-TAB/DettaglioMacchina.aspx.cs b/MP-TAB/DettaglioMacchina.aspx.cs
index 941cb8fb..be4148cf 100644
--- a/MP-TAB/DettaglioMacchina.aspx.cs
+++ b/MP-TAB/DettaglioMacchina.aspx.cs
@@ -6,6 +6,20 @@ namespace MoonProTablet
{
public partial class DettaglioMacchina : BasePage
{
+ #region Private Methods
+
+ private void mod_confProd1_eh_newVal(object sender, EventArgs e)
+ {
+ }
+
+ private void mod_confProd1_eh_reset(object sender, EventArgs e)
+ {
+ }
+
+ #endregion Private Methods
+
+ #region Protected Methods
+
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
@@ -18,14 +32,6 @@ namespace MoonProTablet
mod_confProd1.eh_reset += mod_confProd1_eh_reset;
}
- void mod_confProd1_eh_reset(object sender, EventArgs e)
- {
- }
-
- void mod_confProd1_eh_newVal(object sender, EventArgs e)
- {
- }
-
///
/// evento timer
///
@@ -35,25 +41,7 @@ namespace MoonProTablet
{
mod_dettMacchina1.doUpdate();
}
- ///
- /// Verifica abilitazione gestione scarti
- ///
- public bool enableScarti
- {
- get
- {
- return memLayer.ML.cdvb("enableScarti");
- }
- }
- ///
- /// Verifica abilitazione gestione scarti
- ///
- public bool enableControlli
- {
- get
- {
- return memLayer.ML.cdvb("enableControlli");
- }
- }
+
+ #endregion Protected Methods
}
}
\ No newline at end of file
diff --git a/MP-TAB/SheetTech.aspx.cs b/MP-TAB/SheetTech.aspx.cs
index a253255c..642354c0 100644
--- a/MP-TAB/SheetTech.aspx.cs
+++ b/MP-TAB/SheetTech.aspx.cs
@@ -15,7 +15,6 @@ namespace MoonProTablet
private void checkModuleEnabled()
{
- bool enableSchedaTecnica = memLayer.ML.cdvb("enableSchedaTecnica");
cmp_sheetTech.Visible = enableSchedaTecnica;
cmp_disabled.Visible = !enableSchedaTecnica;
}
diff --git a/MP-TAB/Web.config b/MP-TAB/Web.config
index e4bef946..f2f78741 100644
--- a/MP-TAB/Web.config
+++ b/MP-TAB/Web.config
@@ -60,6 +60,7 @@
+
diff --git a/MP-TAB/WebUserControls/BaseUserControl.cs b/MP-TAB/WebUserControls/BaseUserControl.cs
index 57f5193c..aeb722da 100644
--- a/MP-TAB/WebUserControls/BaseUserControl.cs
+++ b/MP-TAB/WebUserControls/BaseUserControl.cs
@@ -32,6 +32,55 @@ namespace MoonProTablet.WebUserControls
#endregion Internal Fields
+ #region Public Fields
+
+ ///
+ /// Abilitazione gestione Controlli periodici
+ ///
+ public bool enableControlli = memLayer.ML.cdvb("enableControlli");
+
+ ///
+ /// Abilitazione gestione Disegno articolo
+ ///
+ public bool enableDisegno = memLayer.ML.cdvb("enableDisegno");
+
+ ///
+ /// Abilitazione gestione grafici JScript
+ ///
+ public bool enableGraphJS = memLayer.ML.cdvb("enableGraphJS");
+
+ ///
+ /// Abilitazione gestione Pezzi LAsciati in macchina
+ ///
+ public bool enablePzProdLasciati = memLayer.ML.cdvb("enablePzProdLasciati");
+
+ ///
+ /// Abilitazione gestione Richieste - Promesse - ODL
+ ///
+ public bool enableRPO = memLayer.ML.cdvb("enableRPO");
+
+ ///
+ /// Abilitazione gestione scarti
+ ///
+ public bool enableScarti = memLayer.ML.cdvb("enableScarti");
+
+ ///
+ /// Abilitazione scheda Tecnica
+ ///
+ public bool enableSchedaTecnica = memLayer.ML.cdvb("enableSchedaTecnica");
+
+ ///
+ /// Abilitazione gestione SplitODL
+ ///
+ public bool enableSplitODL = memLayer.ML.cdvb("enableSplitODL");
+
+ ///
+ /// Abilitazione gestione Set PZ Pallet su tablet
+ ///
+ public bool enableTabSetPzPallet = memLayer.ML.cdvb("enableTabSetPzPallet");
+
+ #endregion Public Fields
+
#region Public Events
///
diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs
index 9101532c..7ec41887 100644
--- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs
+++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs
@@ -46,17 +46,6 @@ namespace MoonProTablet.WebUserControls
}
}
- ///
- /// Verifica (su tab config) se sia abilitata la gestione flusso RPO (Richieste - Promesse - ODL)
- ///
- protected bool enableRPO
- {
- get
- {
- return memLayer.ML.cdvb("enableRPO");
- }
- }
-
///
/// Restituisce il codice IdxMacchina dell'altra tavola (se multi) altrimenti la stessa macchina...
///
@@ -488,7 +477,6 @@ namespace MoonProTablet.WebUserControls
}
// deve controllare abbia ODL o PROMESSE odl...
bool hasNewOdl = DataLayerObj.taSelOdlFree.getUnused(idxMacchinaFix, chkTutti.Checked).Rows.Count > 1;
- bool enableSchedaTecnica = memLayer.ML.CRB("enableSchedaTecnica");
// sistemo buttons!
lbtStartAttr.Enabled = (isEnabled && (!inAttr && hasNewOdl));
lbtEndProd.Enabled = (isEnabled && (!inAttr && currHasOdl));
@@ -677,7 +665,7 @@ namespace MoonProTablet.WebUserControls
cmp_dettPODL.idxODLSel = idxODLSel;
divDettPOdl.Visible = show && idxODLSel > 0;
// se abilitato da config su DB mostro selezione del numPzPallet...
- cmp_selPzPallet.enableSet = memLayer.ML.CRB("enableTabSetPzPallet");
+ cmp_selPzPallet.enableSet = enableTabSetPzPallet;
}
///
@@ -1049,7 +1037,7 @@ namespace MoonProTablet.WebUserControls
TCRichAttr = TCAssegnato(idxODLSel);
}
int idxODL = 0;
- if (memLayer.ML.CRB("enableSplitODL"))
+ if (enableSplitODL)
{
// splitto VECCHIO ODL (se è rimasto qualcosa da produrre e se ce ne è rimasto uno.......)
try
@@ -1220,7 +1208,7 @@ namespace MoonProTablet.WebUserControls
{
DataLayerObj.taODL.fixMachineSlave(idxMacchina, 30, 1);
}
- // se c'è gesitone SchedaTecnica --> chiamo procedura update x lotti
+ // se c'è gestione SchedaTecnica --> chiamo procedura update x lotti
// FixMe-ToDo
diff --git a/MP-TAB/WebUserControls/mod_confProd.ascx.cs b/MP-TAB/WebUserControls/mod_confProd.ascx.cs
index 2e678258..eb6881ef 100644
--- a/MP-TAB/WebUserControls/mod_confProd.ascx.cs
+++ b/MP-TAB/WebUserControls/mod_confProd.ascx.cs
@@ -239,7 +239,6 @@ namespace MoonProTablet.WebUserControls
private void checkConfig()
{
// verifico SE sia permesso gestire i "Pezzi lasciati" in macchina...
- bool enablePzProdLasciati = memLayer.ML.cdvb("enablePzProdLasciati");
lblNumLasciati.Visible = enablePzProdLasciati;
txtNumLasciati.Visible = enablePzProdLasciati;
lblEmptyNumLasciati.Visible = !enablePzProdLasciati;
diff --git a/MP-TAB/WebUserControls/mod_dettMacchina.ascx.cs b/MP-TAB/WebUserControls/mod_dettMacchina.ascx.cs
index 31c2ea22..3d02c507 100644
--- a/MP-TAB/WebUserControls/mod_dettMacchina.ascx.cs
+++ b/MP-TAB/WebUserControls/mod_dettMacchina.ascx.cs
@@ -91,7 +91,7 @@ namespace MoonProTablet.WebUserControls
// default è ND...
bool answ = false;
// SE abilitata gestione controlli...
- if (memLayer.ML.cdvb("enableDisegno"))
+ if (enableDisegno)
{
// recupero da anagrafica articoli...
try
diff --git a/MapoDb/Properties/Settings.Designer.cs b/MapoDb/Properties/Settings.Designer.cs
index 88ea7d19..03df29e4 100644
--- a/MapoDb/Properties/Settings.Designer.cs
+++ b/MapoDb/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace MapoDb.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.7.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -77,5 +77,16 @@ namespace MapoDb.Properties {
return ((string)(this["MoonPro_IS_ArcaConnectionString"]));
}
}
+
+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
+ [global::System.Configuration.DefaultSettingValueAttribute("Data Source=SQL2016DEV;Initial Catalog=MoonPro_MAG;Persist Security Info=True;Use" +
+ "r ID=sa;Password=keyhammer16")]
+ public string MoonPro_MAGConnectionString {
+ get {
+ return ((string)(this["MoonPro_MAGConnectionString"]));
+ }
+ }
}
}
diff --git a/MapoDb/Properties/Settings.settings b/MapoDb/Properties/Settings.settings
index aa8b519d..e9ea1536 100644
--- a/MapoDb/Properties/Settings.settings
+++ b/MapoDb/Properties/Settings.settings
@@ -42,5 +42,13 @@
</SerializableConnectionString>
Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_EdilChim;Persist Security Info=True;User ID=sa;Password=keyhammer16
+
+ <?xml version="1.0" encoding="utf-16"?>
+<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <ConnectionString>Data Source=SQL2016DEV;Initial Catalog=MoonPro_MAG;Persist Security Info=True;User ID=sa;Password=keyhammer16</ConnectionString>
+ <ProviderName>System.Data.SqlClient</ProviderName>
+</SerializableConnectionString>
+ Data Source=SQL2016DEV;Initial Catalog=MoonPro_MAG;Persist Security Info=True;User ID=sa;Password=keyhammer16
+
\ No newline at end of file