diff --git a/XPS/App_Code/DS_applicazione.xsd b/XPS/App_Code/DS_applicazione.xsd
index 35f4f6a..303079c 100644
--- a/XPS/App_Code/DS_applicazione.xsd
+++ b/XPS/App_Code/DS_applicazione.xsd
@@ -819,6 +819,25 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat
+
+
+
+
+
+ dbo.sp_contaNonSched
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -842,14 +861,14 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat
-
+
-
+
@@ -862,14 +881,14 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat
-
+
-
+
@@ -882,21 +901,21 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat
-
+
-
+
-
+
@@ -907,199 +926,6 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1116,28 +942,14 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1151,6 +963,20 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1161,16 +987,10 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat
-
+
+
-
-
-
-
-
-
-
-
+
@@ -1178,14 +998,21 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat
-
+
-
+
+
+
+
+
+
+
+
@@ -1195,14 +1022,103 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -1264,6 +1180,7 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat
+
@@ -1272,8 +1189,110 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1286,28 +1305,28 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat
-
+
-
+
-
+
-
+
@@ -1320,56 +1339,56 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1382,44 +1401,44 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat
-
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
@@ -1429,6 +1448,13 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat
+
+
+
+
+
+
+
diff --git a/XPS/App_Code/DS_applicazione.xss b/XPS/App_Code/DS_applicazione.xss
index 1aa11d2..c2c09d4 100644
--- a/XPS/App_Code/DS_applicazione.xss
+++ b/XPS/App_Code/DS_applicazione.xss
@@ -4,23 +4,24 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
-->
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
927
@@ -32,7 +33,7 @@
-
+
1116
@@ -44,7 +45,7 @@
-
+
689
@@ -56,7 +57,7 @@
-
+
660
diff --git a/XPS/Bin/SteamWare.dll b/XPS/Bin/SteamWare.dll
index c517fa6..62ef365 100644
Binary files a/XPS/Bin/SteamWare.dll and b/XPS/Bin/SteamWare.dll differ
diff --git a/XPS/Bin/SteamWare.pdb b/XPS/Bin/SteamWare.pdb
deleted file mode 100644
index 24c65e5..0000000
Binary files a/XPS/Bin/SteamWare.pdb and /dev/null differ
diff --git a/XPS/Bin/SteamWareXPS.dll b/XPS/Bin/SteamWareXPS.dll
index bbe1852..7f6f931 100644
Binary files a/XPS/Bin/SteamWareXPS.dll and b/XPS/Bin/SteamWareXPS.dll differ
diff --git a/XPS/Bin/SteamWareXPS.pdb b/XPS/Bin/SteamWareXPS.pdb
deleted file mode 100644
index a243c72..0000000
Binary files a/XPS/Bin/SteamWareXPS.pdb and /dev/null differ
diff --git a/XPS/Web.config b/XPS/Web.config
index 824489f..f0b2e9d 100644
--- a/XPS/Web.config
+++ b/XPS/Web.config
@@ -101,20 +101,20 @@
-
-
-
+
+
+
-
+
-
diff --git a/XPS/detComm.aspx.cs b/XPS/detComm.aspx.cs
index 535cef8..b1a6bda 100644
--- a/XPS/detComm.aspx.cs
+++ b/XPS/detComm.aspx.cs
@@ -26,5 +26,6 @@ public partial class detComm : System.Web.UI.Page
void mod_dettComm1_eh_selValore(object sender, EventArgs e)
{
mod_ULP1.Visible = true;
+ mod_ULP1.setupControlli();
}
}
diff --git a/XPS/mod_ULP.ascx b/XPS/mod_ULP.ascx
index 539250f..3f96a30 100644
--- a/XPS/mod_ULP.ascx
+++ b/XPS/mod_ULP.ascx
@@ -167,9 +167,11 @@
-
+
+
+
+
diff --git a/XPS/mod_ULP.ascx.cs b/XPS/mod_ULP.ascx.cs
index 79a48ca..03d141b 100644
--- a/XPS/mod_ULP.ascx.cs
+++ b/XPS/mod_ULP.ascx.cs
@@ -138,6 +138,35 @@ public partial class mod_ULP : ApplicationUserControl
_idxGridView = "CodRow";
}
+ protected override void bindControlli()
+ {
+ base.bindControlli();
+ }
+
+ ///
+ /// determino se il pulsante di conferma tutto schedulato sia visibile...
+ ///
+ public void setupControlli()
+ {
+ // calcolo se tutto l'albero cui appartiene la row madre abbia data di schedulazione...
+ bool allSched = false;
+ try
+ {
+ // carico codRow mamma...
+ string codComune = calcObjCommon();
+ DS_applicazioneTableAdapters.sp_contaNonSchedTableAdapter taContaNonSched = new DS_applicazioneTableAdapters.sp_contaNonSchedTableAdapter();
+ allSched = (taContaNonSched.GetData(codComune)[0].quanti == 0);
+ // controllo se loadAllCdC stato sia 2...
+ if (XPS.obj.taObj.getByIdxObj(memLayer.ML.StringSessionObj("CodRow_sel"))[0].CodStato != "02")
+ {
+ allSched = false;
+ }
+ }
+ catch
+ { }
+ pnlSetAllSched.Visible = allSched;
+ }
+
protected override void traduciObj()
{
base.traduciObj();
@@ -149,50 +178,6 @@ public partial class mod_ULP : ApplicationUserControl
btnAllSched.Text = traduci("btnAllSched");
}
- ///
- /// mostra/nasconde pannello nuovo
- ///
- ///
- ///
- protected void btnShowNew_Click(object sender, EventArgs e)
- {
- scambiaVisibPnlNew();
- }
-
- private void scambiaVisibPnlNew()
- {
- // in base alla visibilità indico il testo corretto e seleziono o meno il filtro...
-#if false
- if (!pnlNew.Visible)
- {
- btnShowNew.Text = traduci("btnHideNew");
- mf_cliNew.ods = odsFiltroClienti;
- }
- else
- {
- btnShowNew.Text = traduci("btnShowNew");
- }
- pnlNew.Visible = !pnlNew.Visible;
-#endif
- }
- ///
- /// creazione di un nuovo set...
- ///
- ///
- ///
- protected void btnNewComm_Click(object sender, EventArgs e)
- {
-#if false
- // creazione di un nuovo set...
- DS_applicazioneTableAdapters.v_commesseTableAdapter taComm = new DS_applicazioneTableAdapters.v_commesseTableAdapter();
- taComm.sp_creaSetObj(DateTime.Now.ToString("yyyyMMdd_hhmmss"), "EQUA", mf_cliNew.valore, txtDDT.Text, txtNome.Text, user_std.UtSn.utente, txtDescr.Text);
- // nascondo tutto...
- txtNome.Text = "";
- scambiaVisibPnlNew();
- // aggiorno pannello...
- grView.DataBind();
-#endif
- }
///
/// inserisce nuovo valore da footer
@@ -218,13 +203,6 @@ public partial class mod_ULP : ApplicationUserControl
{
grView.FooterRow.Visible = true;
}
-#if false
- // sollevo evento nuovo valore...
- if (eh_nuovoValore != null)
- {
- eh_nuovoValore(this, new EventArgs());
- }
-#endif
}
///
/// salvo in session che il prox comando è clonare...
@@ -378,6 +356,7 @@ public partial class mod_ULP : ApplicationUserControl
break;
}
}
+
protected void btnOk_Click(object sender, EventArgs e)
{
// significa che mi chiedono di impostare la data a tutti i child...
@@ -410,8 +389,8 @@ public partial class mod_ULP : ApplicationUserControl
///
private string calcObjCommon()
{
- int posR = grView.SelectedValue.ToString().IndexOf("U");
- string codObjCommon = grView.SelectedValue.ToString().Substring(0, posR) + "%";
+ int posR = 8; // grView.SelectedValue.ToString().IndexOf("U");
+ string codObjCommon = memLayer.ML.StringSessionObj("CodRow_sel").Substring(0, posR) + "%";
return codObjCommon;
}
///
@@ -421,6 +400,7 @@ public partial class mod_ULP : ApplicationUserControl
{
// nascondo i vari controlli...
pnlSetDueDate.Visible = false;
+ setupControlli();
resetSelezione();
if (eh_nuovoValore != null)
{