diff --git a/GMW/GMW/GMW.csproj b/GMW/GMW/GMW.csproj index 518bb329..c6992265 100644 --- a/GMW/GMW/GMW.csproj +++ b/GMW/GMW/GMW.csproj @@ -803,6 +803,9 @@ + + + diff --git a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx index 9bb2d06c..4d26f34e 100644 --- a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx +++ b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx @@ -10,170 +10,98 @@ -
- - - - - - - - - - - - - - - - - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - -
-
- -
+
+ + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +    + + + OnInserted="ods_Updated" OnUpdated="ods_Updated"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
+ +
diff --git a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs index 7617a2fd..4ee99c9f 100644 --- a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs @@ -1,5 +1,6 @@ using System; using System.Data; +using System.Web.UI; using System.Web.UI.WebControls; using SteamWare; using GMW_data; @@ -200,7 +201,7 @@ namespace GMW.WebUserControls { resetSelezione(); } - + /// /// collega i controlli /// @@ -303,8 +304,8 @@ namespace GMW.WebUserControls mod_viewRigheListaPrelievo1.Visible = false; chkIniziata.Checked = false; chkCompletata.Checked = false; - chkIniziata.Text = traduci("Mostra Iniziate"); - chkCompletata.Text = traduci("Mostra Completate"); + chkIniziata.Text = traduci("MostraIniziate"); + chkCompletata.Text = traduci("MostraCompletate"); } } /// @@ -345,6 +346,18 @@ namespace GMW.WebUserControls return answ; } + public bool iniziaEnabled(object statoIniziata) + { + bool answ = false;// isWritable(); + try + { + answ = !Convert.ToBoolean(statoIniziata); + } + catch + { } + return answ; + } + /// /// gestione cambio selezione valore /// @@ -370,7 +383,6 @@ namespace GMW.WebUserControls mod_viewRigheListaPrelievo1.Visible = false; } - #endregion /// /// nasconde il modulo al cambiare dello stato checkbox /// @@ -379,6 +391,8 @@ namespace GMW.WebUserControls protected void chkIniziata_CheckedChanged(object sender, EventArgs e) { mod_viewRigheListaPrelievo1.Visible = false; + grView.SelectedIndex = -1; + grView.DataBind(); } /// /// nasconde il modulo al cambiare dello stato checkbox @@ -388,7 +402,67 @@ namespace GMW.WebUserControls protected void chkCompletata_CheckedChanged(object sender, EventArgs e) { mod_viewRigheListaPrelievo1.Visible = false; + grView.SelectedIndex = -1; + grView.DataBind(); } + /// + /// aggiorno visualizzazione + /// + private void updateOdsDaFiltro() + { + grView.DataBind(); + } + /// + /// salvo in session che il prox comando è iniziare lista prelievo... + /// + /// + /// + protected void imgIniziaLista_Click(object sender, ImageClickEventArgs e) + { + SteamWare.memLayer.ML.setSessionVal("nextObjCommand", "iniziaListaPrelievo"); + } + /// + /// in caso di aggiornamento verifico se sia salvato un comando inizia o completa lista prelievo... + /// + /// + /// + protected void grView_RowUpdating(object sender, GridViewUpdateEventArgs e) + { + // carico l'idx dell'oggetto + string codLista = e.Keys["CodLista"].ToString(); + // quale comando? + string _comando = ""; + if (SteamWare.memLayer.ML.isInSessionObject("nextObjCommand")) + { + _comando = SteamWare.memLayer.ML.StringSessionObj("nextObjCommand"); + SteamWare.memLayer.ML.emptySessionVal("nextObjCommand"); + } + // verifico il tipo di richiesta (up/down level, clona o update normale + switch (_comando) + { + case "iniziaListaPrelievo": + string CodSoggetto = "O0000000000000069"; // operatore a caso, POI sarà da cercare da operatore correntemente loggato... + GMW_data.MagClass.magazzino.iniziaListaPrelievo(memLayer.ML.StringSessionObj("CodCS"), codLista, CodSoggetto); + updateOdsDaFiltro(); + grView.EditIndex = -1; + grView.DataBind(); + // sollevo evento nuovo valore... + if (eh_nuovoValore != null) + { + eh_nuovoValore(this, new EventArgs()); + } + // blocco update! + e.Cancel = true; + break; + default: + // faccio update! + break; + } + + } + + #endregion + } } \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.designer.cs index 8f76d0d5..fb10c922 100644 --- a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.designer.cs @@ -58,15 +58,6 @@ namespace GMW.WebUserControls { /// protected global::System.Web.UI.WebControls.Label lblWarning; - /// - /// mod_viewRigheListaPrelievo1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::GMW.WebUserControls.mod_viewRigheListaPrelievo mod_viewRigheListaPrelievo1; - /// /// ods control. /// @@ -75,5 +66,14 @@ namespace GMW.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource ods; + + /// + /// mod_viewRigheListaPrelievo1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW.WebUserControls.mod_viewRigheListaPrelievo mod_viewRigheListaPrelievo1; } } diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 3e9272bc..f51ae288 100644 Binary files a/GMW/GMW/bin/GMW.dll and b/GMW/GMW/bin/GMW.dll differ diff --git a/GMW/GMW/bin/GMW_data.dll b/GMW/GMW/bin/GMW_data.dll index 2bd882d0..c76565c7 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/images/Start_16.png b/GMW/GMW/images/Start_16.png new file mode 100644 index 00000000..4e033c90 Binary files /dev/null and b/GMW/GMW/images/Start_16.png differ diff --git a/GMW/GMW/images/Start_22.png b/GMW/GMW/images/Start_22.png new file mode 100644 index 00000000..2040a00e Binary files /dev/null and b/GMW/GMW/images/Start_22.png differ diff --git a/GMW/GMW/images/Start_32.png b/GMW/GMW/images/Start_32.png new file mode 100644 index 00000000..2ce93313 Binary files /dev/null and b/GMW/GMW/images/Start_32.png differ diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 3e9272bc..f51ae288 100644 Binary files a/GMW/GMW/obj/Debug/GMW.dll and b/GMW/GMW/obj/Debug/GMW.dll differ diff --git a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache index ed451fc7..d3490537 100644 Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 2bd882d0..c76565c7 100644 Binary files a/GMW/GMW_data/bin/Debug/GMW_data.dll and b/GMW/GMW_data/bin/Debug/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll index 2bd882d0..c76565c7 100644 Binary files a/GMW/GMW_data/obj/Debug/GMW_data.dll and b/GMW/GMW_data/obj/Debug/GMW_data.dll differ