+
-
+ <%--
-
+
+ --%>
+
@@ -105,6 +117,8 @@
+
+
@@ -112,12 +126,14 @@
+
+
@@ -125,12 +141,14 @@
+
+
@@ -144,16 +162,20 @@
+
+
+ Visible='<%# delEnabled(Eval("CodStatoLista")) %>' ImageUrl="~/images/elimina_m.png" />
+
+
diff --git a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs
index 5b96bf6c..fb20f817 100644
--- a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs
+++ b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs
@@ -497,31 +497,6 @@ namespace GMW.WebUserControls
mod_viewRigheListaPrelievo1.Visible = false;
}
-#if false
- ///
- /// nasconde il modulo al cambiare dello stato checkbox
- ///
- ///
- ///
- 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
- ///
- ///
- ///
- protected void chkCompletata_CheckedChanged(object sender, EventArgs e)
- {
- mod_viewRigheListaPrelievo1.Visible = false;
- grView.SelectedIndex = -1;
- grView.DataBind();
- }
-#endif
-
///
/// salvo in session che il prox comando รจ iniziare attivare prelievo...
///
@@ -717,7 +692,7 @@ namespace GMW.WebUserControls
///
public string pathImgTipo(object codice)
{
- return string.Format("~/images/lista_{0}_s.png", codice);
+ return string.Format("~/images/lista_{0}_m.png", codice);
}
///
/// restituisce tooltip da mostrare x TIPO lista
@@ -728,7 +703,6 @@ namespace GMW.WebUserControls
{
return traduci(codice.ToString());
}
-
///
/// mostra controllo per creare nuove liste di prelievo
///
@@ -739,6 +713,23 @@ namespace GMW.WebUserControls
mod_nuovaListaPrelievo1.Visible = true;
btnNewLista.Visible = false;
}
+ ///
+ /// traduce il cod soggetto in cognome-nome operatore
+ ///
+ ///
+ ///
+ public string traduciCodSogg(object CodSogg)
+ {
+ string answ = "-";
+ try
+ {
+ DS_Applicazione.AnagOperatoriRow oper = DataProxy.obj.taAnagOperatore.getByCodSoggetto(CodSogg.ToString())[0];
+ answ = string.Format("In carico a: {0} {1} ({2})", oper.Cognome, oper.Nome, oper.CodDipendente); // Ermanno: traduzione testo!
+ }
+ catch
+ { }
+ return answ;
+ }
#endregion
}
diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index 0dc1f28e..08c928eb 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 74a2d071..1704174c 100644
Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ
diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll
index 0dc1f28e..08c928eb 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 05f5e494..158df41d 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/DS_magazzino.Designer.cs b/GMW/GMW_data/DS_magazzino.Designer.cs
index 77d62241..bdfd17cc 100644
--- a/GMW/GMW_data/DS_magazzino.Designer.cs
+++ b/GMW/GMW_data/DS_magazzino.Designer.cs
@@ -19712,7 +19712,7 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co
this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCS", global::System.Data.SqlDbType.NChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCliente", global::System.Data.SqlDbType.NVarChar, 6, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RagSociale", global::System.Data.SqlDbType.NVarChar, 35, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.NChar, 16, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.NChar, 17, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Particolare", global::System.Data.SqlDbType.NVarChar, 15, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DescParticolare", global::System.Data.SqlDbType.NVarChar, 30, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DisegnoGrezzo", global::System.Data.SqlDbType.NVarChar, 30, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
diff --git a/GMW/GMW_data/DS_magazzino.xsd b/GMW/GMW_data/DS_magazzino.xsd
index 761310cf..8e813442 100644
--- a/GMW/GMW_data/DS_magazzino.xsd
+++ b/GMW/GMW_data/DS_magazzino.xsd
@@ -1782,7 +1782,7 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co
-
+
diff --git a/GMW/GMW_data/DS_magazzino.xss b/GMW/GMW_data/DS_magazzino.xss
index 87eca52e..f86684b5 100644
--- a/GMW/GMW_data/DS_magazzino.xss
+++ b/GMW/GMW_data/DS_magazzino.xss
@@ -19,9 +19,9 @@
-
-
-
+
+
+
@@ -114,7 +114,7 @@
- 393
+ 430
949
diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll
index 74a2d071..1704174c 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 74a2d071..1704174c 100644
Binary files a/GMW/GMW_data/obj/Debug/GMW_data.dll and b/GMW/GMW_data/obj/Debug/GMW_data.dll differ
diff --git a/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll
index a27a1600..2fb14434 100644
Binary files a/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll and b/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll differ