diff --git a/Jenkinsfile b/Jenkinsfile
index 8ee11d3e..ffd49d3f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=846']) {
+ withEnv(['NEXT_BUILD_NUMBER=847']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
diff --git a/MAPO.sln b/MAPO.sln
index e19ce0a1..b4bb9396 100644
--- a/MAPO.sln
+++ b/MAPO.sln
@@ -25,8 +25,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
ProjectSection(SolutionItems) = preProject
Appunti.md = Appunti.md
BranchConfSetup.md = BranchConfSetup.md
- webAppSettings.config = webAppSettings.config
- webConnectionString.config = webConnectionString.config
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-MAKE", "MP-MAKE\MP-MAKE.csproj", "{E5A49351-F487-4329-8117-925A8FE662E5}"
@@ -37,8 +35,8 @@ Global
IIS01|Any CPU = IIS01|Any CPU
IIS02|Any CPU = IIS02|Any CPU
OVH-Demo|Any CPU = OVH-Demo|Any CPU
+ Prod|Any CPU = Prod|Any CPU
Release|Any CPU = Release|Any CPU
- Staging|Any CPU = Staging|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{663F7136-F470-4911-A9B6-044447F93168}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -49,10 +47,10 @@ Global
{663F7136-F470-4911-A9B6-044447F93168}.IIS02|Any CPU.Build.0 = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.OVH-Demo|Any CPU.ActiveCfg = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.OVH-Demo|Any CPU.Build.0 = Release|Any CPU
+ {663F7136-F470-4911-A9B6-044447F93168}.Prod|Any CPU.ActiveCfg = Release|Any CPU
+ {663F7136-F470-4911-A9B6-044447F93168}.Prod|Any CPU.Build.0 = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.Release|Any CPU.ActiveCfg = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.Release|Any CPU.Build.0 = Release|Any CPU
- {663F7136-F470-4911-A9B6-044447F93168}.Staging|Any CPU.ActiveCfg = Release|Any CPU
- {663F7136-F470-4911-A9B6-044447F93168}.Staging|Any CPU.Build.0 = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
@@ -61,10 +59,10 @@ Global
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.IIS02|Any CPU.Build.0 = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.OVH-Demo|Any CPU.ActiveCfg = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.OVH-Demo|Any CPU.Build.0 = Release|Any CPU
+ {4617A665-D6E3-4CEB-A689-CE2EECD45713}.Prod|Any CPU.ActiveCfg = Release|Any CPU
+ {4617A665-D6E3-4CEB-A689-CE2EECD45713}.Prod|Any CPU.Build.0 = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Release|Any CPU.Build.0 = Release|Any CPU
- {4617A665-D6E3-4CEB-A689-CE2EECD45713}.Staging|Any CPU.ActiveCfg = Release|Any CPU
- {4617A665-D6E3-4CEB-A689-CE2EECD45713}.Staging|Any CPU.Build.0 = Release|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU
@@ -73,10 +71,10 @@ Global
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.IIS02|Any CPU.Build.0 = IIS02|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.OVH-Demo|Any CPU.ActiveCfg = OVH-Demo|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.OVH-Demo|Any CPU.Build.0 = OVH-Demo|Any CPU
+ {119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
+ {119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Prod|Any CPU.Build.0 = Prod|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Release|Any CPU.Build.0 = Release|Any CPU
- {119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Staging|Any CPU.ActiveCfg = Staging|Any CPU
- {119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Staging|Any CPU.Build.0 = Staging|Any CPU
{18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU
@@ -85,10 +83,10 @@ Global
{18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.IIS02|Any CPU.Build.0 = IIS02|Any CPU
{18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.OVH-Demo|Any CPU.ActiveCfg = OVH-Demo|Any CPU
{18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.OVH-Demo|Any CPU.Build.0 = OVH-Demo|Any CPU
+ {18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
+ {18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Prod|Any CPU.Build.0 = Prod|Any CPU
{18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Release|Any CPU.Build.0 = Release|Any CPU
- {18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Staging|Any CPU.ActiveCfg = Staging|Any CPU
- {18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Staging|Any CPU.Build.0 = Staging|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU
@@ -97,10 +95,10 @@ Global
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.IIS02|Any CPU.Build.0 = IIS02|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.OVH-Demo|Any CPU.ActiveCfg = OVH-demo|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.OVH-Demo|Any CPU.Build.0 = OVH-demo|Any CPU
+ {CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
+ {CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Prod|Any CPU.Build.0 = Prod|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Release|Any CPU.Build.0 = Release|Any CPU
- {CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Staging|Any CPU.ActiveCfg = Staging|Any CPU
- {CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Staging|Any CPU.Build.0 = Staging|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU
@@ -109,10 +107,10 @@ Global
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.IIS02|Any CPU.Build.0 = IIS02|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.OVH-Demo|Any CPU.ActiveCfg = OVH-demo|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.OVH-Demo|Any CPU.Build.0 = OVH-demo|Any CPU
+ {BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
+ {BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Prod|Any CPU.Build.0 = Prod|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Release|Any CPU.Build.0 = Release|Any CPU
- {BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Staging|Any CPU.ActiveCfg = Staging|Any CPU
- {BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Staging|Any CPU.Build.0 = Staging|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Debug|Any CPU.Build.0 = Debug|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU
@@ -121,10 +119,10 @@ Global
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.IIS02|Any CPU.Build.0 = IIS02|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.OVH-Demo|Any CPU.ActiveCfg = OVH-Demo|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.OVH-Demo|Any CPU.Build.0 = OVH-Demo|Any CPU
+ {51F720FE-7BED-4275-93B1-CDA9A9B53670}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
+ {51F720FE-7BED-4275-93B1-CDA9A9B53670}.Prod|Any CPU.Build.0 = Prod|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Release|Any CPU.ActiveCfg = Release|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Release|Any CPU.Build.0 = Release|Any CPU
- {51F720FE-7BED-4275-93B1-CDA9A9B53670}.Staging|Any CPU.ActiveCfg = Staging|Any CPU
- {51F720FE-7BED-4275-93B1-CDA9A9B53670}.Staging|Any CPU.Build.0 = Staging|Any CPU
{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
@@ -133,10 +131,10 @@ Global
{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02|Any CPU.Build.0 = Release|Any CPU
{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.OVH-Demo|Any CPU.ActiveCfg = Release|Any CPU
{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.OVH-Demo|Any CPU.Build.0 = Release|Any CPU
+ {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Prod|Any CPU.ActiveCfg = Release|Any CPU
+ {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Prod|Any CPU.Build.0 = Release|Any CPU
{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.Build.0 = Release|Any CPU
- {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Staging|Any CPU.ActiveCfg = Release|Any CPU
- {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Staging|Any CPU.Build.0 = Release|Any CPU
{616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Debug|Any CPU.Build.0 = Debug|Any CPU
{616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU
@@ -145,10 +143,10 @@ Global
{616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.IIS02|Any CPU.Build.0 = IIS02|Any CPU
{616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.OVH-Demo|Any CPU.ActiveCfg = OVH-Demo|Any CPU
{616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.OVH-Demo|Any CPU.Build.0 = OVH-Demo|Any CPU
+ {616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
+ {616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Prod|Any CPU.Build.0 = Prod|Any CPU
{616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Release|Any CPU.ActiveCfg = Release|Any CPU
{616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Release|Any CPU.Build.0 = Release|Any CPU
- {616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Staging|Any CPU.ActiveCfg = Staging|Any CPU
- {616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Staging|Any CPU.Build.0 = Staging|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
@@ -157,10 +155,10 @@ Global
{E5A49351-F487-4329-8117-925A8FE662E5}.IIS02|Any CPU.Build.0 = Release|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.OVH-Demo|Any CPU.ActiveCfg = Release|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.OVH-Demo|Any CPU.Build.0 = Release|Any CPU
+ {E5A49351-F487-4329-8117-925A8FE662E5}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
+ {E5A49351-F487-4329-8117-925A8FE662E5}.Prod|Any CPU.Build.0 = Prod|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.Release|Any CPU.Build.0 = Release|Any CPU
- {E5A49351-F487-4329-8117-925A8FE662E5}.Staging|Any CPU.ActiveCfg = Staging|Any CPU
- {E5A49351-F487-4329-8117-925A8FE662E5}.Staging|Any CPU.Build.0 = Staging|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/MP-TAB/ODL.aspx b/MP-TAB/ODL.aspx
index 7cef433b..eba5ac81 100644
--- a/MP-TAB/ODL.aspx
+++ b/MP-TAB/ODL.aspx
@@ -11,7 +11,7 @@
-
-
+
+
diff --git a/MP-TAB/WebUserControls/mod_controlliProd.ascx.designer.cs b/MP-TAB/WebUserControls/mod_controlliProd.ascx.designer.cs
index bcd52133..fc3897ea 100644
--- a/MP-TAB/WebUserControls/mod_controlliProd.ascx.designer.cs
+++ b/MP-TAB/WebUserControls/mod_controlliProd.ascx.designer.cs
@@ -67,13 +67,13 @@ namespace MoonProTablet.WebUserControls {
protected global::System.Web.UI.WebControls.DropDownList ddlSubMacc;
///
- /// Controllo ods.
+ /// Controllo odsMacc.
///
///
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
- protected global::System.Web.UI.WebControls.ObjectDataSource ods;
+ protected global::System.Web.UI.WebControls.ObjectDataSource odsMacc;
///
/// Controllo lbtOK.
diff --git a/MP-TAB/WebUserControls/mod_elencoScarti.ascx b/MP-TAB/WebUserControls/mod_elencoScarti.ascx
index 1b24f165..ffe68da0 100644
--- a/MP-TAB/WebUserControls/mod_elencoScarti.ascx
+++ b/MP-TAB/WebUserControls/mod_elencoScarti.ascx
@@ -45,7 +45,7 @@
-
+
diff --git a/MP-TAB/WebUserControls/mod_regScarti.ascx b/MP-TAB/WebUserControls/mod_regScarti.ascx
index be35ebc7..2d6c2fe1 100644
--- a/MP-TAB/WebUserControls/mod_regScarti.ascx
+++ b/MP-TAB/WebUserControls/mod_regScarti.ascx
@@ -11,6 +11,14 @@
+
+
diff --git a/MP-TAB/WebUserControls/mod_regScarti.ascx.cs b/MP-TAB/WebUserControls/mod_regScarti.ascx.cs
index 97a05c33..09d12ebb 100644
--- a/MP-TAB/WebUserControls/mod_regScarti.ascx.cs
+++ b/MP-TAB/WebUserControls/mod_regScarti.ascx.cs
@@ -1,9 +1,6 @@
using MapoDb;
using SteamWare;
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
@@ -35,6 +32,7 @@ namespace MoonProTablet.WebUserControls
private void checkAll()
{
+ fixSelMacc();
fixData();
checkOdl();
lblOut.Text = "";
@@ -75,6 +73,25 @@ namespace MoonProTablet.WebUserControls
lblConfScarti.Visible = !odlOk;
lblMancaODL.Visible = !odlOk;
}
+
+ ///
+ /// Se la machcina è MULTI --> mostro selettore
+ ///
+ private void fixSelMacc()
+ {
+ divSelMacc.Visible = isMulti;
+ fixSelMaccScarti();
+ }
+ ///
+ /// Verifica se la macchina MAIN sia MULTI (da DatiMacchina / redis...)
+ ///
+ protected bool isMulti
+ {
+ get
+ {
+ return DataLayer.isMulti(idxMacchinaSession);
+ }
+ }
///
/// Verifica se la macchina MAIN sia MULTI (da DatiMacchina / redis...)
///
@@ -111,6 +128,7 @@ namespace MoonProTablet.WebUserControls
return answ;
}
}
+
///
/// idx macchina selezionata
///
@@ -119,8 +137,38 @@ namespace MoonProTablet.WebUserControls
get
{
string answ = memLayer.ML.StringSessionObj("IdxMacchina");
+ // verifoc: se multi uso selettore tendina...
+ if (isMulti)
+ {
+ if (ddlSubMacc.SelectedValue == "")
+ {
+ ddlSubMacc.DataBind();
+ }
+ if (ddlSubMacc.SelectedValue != "")
+ {
+ answ = ddlSubMacc.SelectedValue;
+ }
+ }
return answ;
}
+ set
+ {
+ memLayer.ML.setSessionVal("IdxMacchina", value);
+ }
+ }
+ ///
+ /// idx macchina selezionata
+ ///
+ public string idxMacchinaSession
+ {
+ get
+ {
+ return memLayer.ML.StringSessionObj("IdxMacchina");
+ }
+ set
+ {
+ memLayer.ML.setSessionVal("IdxMacchina", value);
+ }
}
///
/// cambio stato visibilità pannello e testo button
@@ -158,6 +206,54 @@ namespace MoonProTablet.WebUserControls
// nascondo!
switchBtnConferma(false);
}
+
+ protected void ddlSubMacc_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ subMaccSel = ddlSubMacc.SelectedValue;
+ fixSelMaccScarti();
+ checkAll();
+ }
+
+ private void fixSelMaccScarti()
+ {
+ if (isMulti)
+ {
+ memLayer.ML.setSessionVal("IdxMacchinaScarti", subMaccSel);
+ }
+ else
+ {
+ memLayer.ML.setSessionVal("IdxMacchinaScarti", idxMacchinaSession);
+ }
+ }
+
+ protected void ddlSubMacc_DataBound(object sender, EventArgs e)
+ {
+ // se ho in memoria un valore LO REIMPOSTO...
+ if (subMaccSel != "")
+ {
+ // provo a preselezionare...
+ try
+ {
+ ddlSubMacc.SelectedValue = subMaccSel;
+ }
+ catch
+ { }
+ }
+ }
+ ///
+ /// Sotto sistema (macchina) selezionato
+ ///
+ public string subMaccSel
+ {
+ get
+ {
+ return memLayer.ML.StringSessionObj("subMaccSel");
+ }
+ set
+ {
+ memLayer.ML.setSessionVal("subMaccSel", value);
+ }
+ }
///
/// salvo produzione
///
@@ -216,7 +312,7 @@ namespace MoonProTablet.WebUserControls
if (eh_newVal != null)
{
eh_newVal(this, new EventArgs());
- }
+ }
}
}
}
\ No newline at end of file
diff --git a/MP-TAB/WebUserControls/mod_regScarti.ascx.designer.cs b/MP-TAB/WebUserControls/mod_regScarti.ascx.designer.cs
index 3c5abd21..2acac3d4 100644
--- a/MP-TAB/WebUserControls/mod_regScarti.ascx.designer.cs
+++ b/MP-TAB/WebUserControls/mod_regScarti.ascx.designer.cs
@@ -48,6 +48,33 @@ namespace MoonProTablet.WebUserControls {
///
protected global::System.Web.UI.WebControls.Label lblShowScarti;
+ ///
+ /// Controllo divSelMacc.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSelMacc;
+
+ ///
+ /// Controllo ddlSubMacc.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ protected global::System.Web.UI.WebControls.DropDownList ddlSubMacc;
+
+ ///
+ /// Controllo odsMacc.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ protected global::System.Web.UI.WebControls.ObjectDataSource odsMacc;
+
///
/// Controllo divDetail.
///
diff --git a/MP/MP.csproj b/MP/MP.csproj
index c10b6a45..723925b1 100644
--- a/MP/MP.csproj
+++ b/MP/MP.csproj
@@ -308,21 +308,12 @@
Web.config
-
- Web.config
-
-
- Web.config
-
-
- Web.config
-
-
- Web.config
-
Web.config
+
+ Web.config
+
@@ -397,7 +388,7 @@
prompt
MinimumRecommendedRules.ruleset
-
+
bin\
TRACE
true
diff --git a/MP/MP.csproj.user b/MP/MP.csproj.user
index 2c1916eb..4d6036df 100644
--- a/MP/MP.csproj.user
+++ b/MP/MP.csproj.user
@@ -10,7 +10,7 @@
- Prod|Any CPU
+ Debug|Any CPU