diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index b7819a97..92061d75 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 75d766d5..1df6b088 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/bin/SteamWare.dll b/GMW/GMW/bin/SteamWare.dll index 71c329f2..c2f664ca 100644 Binary files a/GMW/GMW/bin/SteamWare.dll and b/GMW/GMW/bin/SteamWare.dll differ diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 8e6761be..92061d75 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 488ce6c9..51fcf874 100644 Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Term/Style.css b/GMW/GMW_Term/Style.css index 3377d754..43b44bf0 100644 --- a/GMW/GMW_Term/Style.css +++ b/GMW/GMW_Term/Style.css @@ -526,7 +526,6 @@ background-color: #AAFFAA; white-space: pre; font-size: 9pt; - font-weight: bold; } .btnLogout { @@ -545,7 +544,6 @@ background-color: #FFCCAA; white-space: pre; font-size: 9pt; - font-weight: bold; } .btnBarcodeSmall { @@ -555,18 +553,16 @@ background-color: #AAFFFF; white-space: pre; font-size: 9pt; - font-weight: bold; } .btnPrendiInCarico { - width: 140px; + width: 90px; height: 40px; border: solid 2px red; background-color: #FFCCAA; white-space: pre; font-size: 9pt; - font-weight: bold; } .errore diff --git a/GMW/GMW_Term/UDC.aspx.cs b/GMW/GMW_Term/UDC.aspx.cs index fd520330..0427710d 100644 --- a/GMW/GMW_Term/UDC.aspx.cs +++ b/GMW/GMW_Term/UDC.aspx.cs @@ -21,6 +21,9 @@ namespace GMW_Term mod_barcode1.eh_scannedUser += new EventHandler(mod_barcode1_eh_scannedUser); mod_barcode1.eh_scannedCella += new EventHandler(mod_barcode1_eh_scannedCella); mod_barcode1.eh_resetUser += new EventHandler(mod_barcode1_eh_resetUser); + // imposto btnHome + mod_barcode1.homeBtnText = "btnTermMenuLDP"; + mod_barcode1.homeBtnLink = "~/menuLDP.aspx"; } void mod_barcode1_eh_scannedCella(object sender, EventArgs e) diff --git a/GMW/GMW_Term/Web.config b/GMW/GMW_Term/Web.config index ac6403e3..39e6e6b1 100644 --- a/GMW/GMW_Term/Web.config +++ b/GMW/GMW_Term/Web.config @@ -58,7 +58,7 @@ - + diff --git a/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx b/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx index 9cd41630..d8726756 100644 --- a/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx @@ -1,84 +1,67 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_interrMov.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_interrMov" %>
- + + + +
- - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
-
- -
-
-
- -
-
-
- -
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- - -
-
-
- -
-
-
- -
-
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ + +
+
+ +
+
+
+
+ +
+
@@ -90,79 +73,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
-
- -
-
-
- -
-
-
- -
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- - -
-
-
- -
-
-
- -
-
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ + +
+
+ +
+
+
+
+ +
+
diff --git a/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx.cs index a1ba0b79..a4bdae81 100644 --- a/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx.cs @@ -21,9 +21,10 @@ namespace GMW_Term.WebUserControls { pnlDetailCella.Visible = false; pnlDetailUdc.Visible = false; - btnResetCtrl.Visible = false; + btnReset.Visible = false; } - btnResetCtrl.Text = traduci("btnResetCtrl"); + lblReset.Text = traduci("btnResetCtrl"); + btnReset.Text = traduci("btnResetCtrl"); } /// /// wrapper traduzione termini @@ -43,7 +44,7 @@ namespace GMW_Term.WebUserControls memLayer.ML.setSessionVal("CodCS", memLayer.ML.confReadString("CodCS")); pnlDetailCella.Visible = false; pnlDetailUdc.Visible = true; - btnResetCtrl.Visible = true; + btnReset.Visible = true; } /// /// mostro i dettagli dell'udc indicato @@ -53,7 +54,7 @@ namespace GMW_Term.WebUserControls memLayer.ML.setSessionVal("codCella4det_sel", codCella); pnlDetailCella.Visible = true; pnlDetailUdc.Visible = false; - btnResetCtrl.Visible = true; + btnReset.Visible = true; } /// /// ricarica apgina corrente diff --git a/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx.designer.cs index be6a7254..d85f00ba 100644 --- a/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx.designer.cs +++ b/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx.designer.cs @@ -14,13 +14,22 @@ namespace GMW_Term.WebUserControls { public partial class mod_interrMov { /// - /// btnResetCtrl control. + /// btnReset control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Button btnResetCtrl; + protected global::System.Web.UI.WebControls.LinkButton btnReset; + + /// + /// lblReset control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblReset; /// /// pnlDetailCella control. diff --git a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx index c1b522cf..fc4bef20 100644 --- a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx @@ -100,13 +100,15 @@ -
+
- + <%----%> +
-
diff --git a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs index 9af90bf4..a9aff3f6 100644 --- a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs @@ -500,7 +500,11 @@ namespace GMW_Term.WebUserControls else if (esitoCompleta == esitoOperazione.errore_noUdc) { GMW_data.MagClass.magazzino.attivaListaPrelievo(memLayer.ML.StringSessionObj("CodCS"), codLista, CodSoggetto); - logger.lg.scriviLog(string.Format("Lista di prelievo {0} rilasciata poiché senza UDC prelevati da aprte dell'opertore {1}", codLista, CodSoggetto), tipoLog.INFO); + logger.lg.scriviLog(string.Format("Lista di prelievo {0} rilasciata poiché senza UDC prelevati da parte dell'opertore {1}", codLista, CodSoggetto), tipoLog.INFO); + // tolgo dalla session la lista prelievo attuale... + memLayer.ML.emptySessionVal("CodLista_sel"); + memLayer.ML.emptySessionVal("CodListaAttiva"); + memLayer.ML.emptySessionVal("activeTask"); } } /// @@ -620,7 +624,7 @@ namespace GMW_Term.WebUserControls } catch { } - btnPrendiInCarico.Text = "[4]-" + traduci(string.Format("txt_{0}", cmdArgStato(codStatoLista))); + btnPrendiInCarico.Text = string.Format("{0}\n[Alt+{1}]", traduci(string.Format("txt_{0}", cmdArgStato(codStatoLista))), 4); btnPrendiInCarico.AccessKey = "4"; btnPrendiInCarico.ToolTip = traduci(cmdArgStato(codStatoLista)); btnPrendiInCarico.CommandArgument = cmdArgStato(codStatoLista); diff --git a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs index 2db00484..1da67940 100644 --- a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs +++ b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4959 +// Runtime Version:2.0.50727.4963 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -112,6 +112,15 @@ namespace GMW_Term.WebUserControls { /// protected global::System.Web.UI.WebControls.Button btnPrendiInCarico; + /// + /// btnShowPeriodo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnShowPeriodo; + /// /// grViewDetail control. /// @@ -129,14 +138,5 @@ namespace GMW_Term.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsDetail; - - /// - /// btnShowPeriodo control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button btnShowPeriodo; } } diff --git a/GMW/GMW_Term/WebUserControls/mod_menuLDP.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_menuLDP.ascx.cs index 6c69d0c0..104aee83 100644 --- a/GMW/GMW_Term/WebUserControls/mod_menuLDP.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_menuLDP.ascx.cs @@ -68,7 +68,7 @@ namespace GMW_Term.WebUserControls protected void btn1_Click(object sender, EventArgs e) { - Response.Redirect("Barcode.aspx"); + Response.Redirect("UDC.aspx"); } protected void btn2_Click(object sender, EventArgs e) diff --git a/GMW/GMW_Term/WebUserControls/mod_processPackList.ascx b/GMW/GMW_Term/WebUserControls/mod_processPackList.ascx index 89028cae..44391eca 100644 --- a/GMW/GMW_Term/WebUserControls/mod_processPackList.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_processPackList.ascx @@ -1,6 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_processPackList.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_processPackList" %> -
+
diff --git a/GMW/GMW_Term/WebUserControls/mod_processPackList.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_processPackList.ascx.cs index cdfc583d..4562fd8b 100644 --- a/GMW/GMW_Term/WebUserControls/mod_processPackList.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_processPackList.ascx.cs @@ -49,8 +49,7 @@ namespace GMW_Term.WebUserControls lblErrore.Visible = true; lblErrore.Text = traduci("BarcodeNonValidoLDP"); } - // svuoto barcode selezionato - memLayer.ML.emptySessionVal("Barcode_sel"); + resetMemoriaBarcode(); } } else @@ -58,6 +57,7 @@ namespace GMW_Term.WebUserControls // indico barcode già caricato lblErrore.Visible = true; lblErrore.Text = string.Format("{0}: {1}", barcode, traduci("udcGiaPrelevato")); + resetMemoriaBarcode(); } //update visualizzazione lblListaAttiva.Text = traduci("ListaPrel"); @@ -71,11 +71,19 @@ namespace GMW_Term.WebUserControls DS_magazzino.ElencoListePrelievoRow riga = MagClass.magazzino.taElencoListePrelievo.getByCodLista(MagClass.magazzino.codListaAttivaUtente)[0]; lblDest.Text = riga.Destinatario; lblProd.Text = riga.Particolare; - lblPezzi.Text = string.Format("{0}/{1} pz", riga.Prelevato, riga.QtaTot); + lblPezzi.Text = string.Format("{0:###}/{1:###} pz", riga.Prelevato, riga.QtaTot); hlListaAttiva.Text = MagClass.magazzino.codListaAttivaUtente; } catch { } } + + private static void resetMemoriaBarcode() + { + // svuoto barcode selezionato ed eventuale UDC + memLayer.ML.emptySessionVal("UDC_sel"); + memLayer.ML.emptySessionVal("Barcode_sel"); + memLayer.ML.emptySessionVal("scannedValue"); + } } } \ No newline at end of file diff --git a/GMW/GMW_Term/WebUserControls/mod_processPackList.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_processPackList.ascx.designer.cs index 0897b6b8..ef97eb87 100644 --- a/GMW/GMW_Term/WebUserControls/mod_processPackList.ascx.designer.cs +++ b/GMW/GMW_Term/WebUserControls/mod_processPackList.ascx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4959 +// Runtime Version:2.0.50727.4963 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/GMW/GMW_Term/WebUserControls/mod_smartList.ascx b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx index 23edfa7f..27b58773 100644 --- a/GMW/GMW_Term/WebUserControls/mod_smartList.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_smartList.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_smartList" %>
-
+
@@ -11,9 +11,7 @@
-
-
-
+
@@ -21,27 +19,23 @@
-
-
-
+
-
-
-
+
+ CssClass="styleBtnComposito" Height="20">
- + diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index 9e02e04b..0cd726c2 100644 Binary files a/GMW/GMW_Term/bin/GMW_Term.dll and b/GMW/GMW_Term/bin/GMW_Term.dll differ diff --git a/GMW/GMW_Term/bin/GMW_data.dll b/GMW/GMW_Term/bin/GMW_data.dll index a00fd41f..0ba21ef8 100644 Binary files a/GMW/GMW_Term/bin/GMW_data.dll and b/GMW/GMW_Term/bin/GMW_data.dll differ diff --git a/GMW/GMW_Term/mazzAppSettingsTK_test.config b/GMW/GMW_Term/mazzAppSettingsTK_test.config index 837ec3ee..dcfddcde 100644 --- a/GMW/GMW_Term/mazzAppSettingsTK_test.config +++ b/GMW/GMW_Term/mazzAppSettingsTK_test.config @@ -67,7 +67,7 @@ - + diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index e3ac3bf3..8772694d 100644 Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ diff --git a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache index 8436dae0..dec724da 100644 Binary files a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj index 7640d7a8..c3c71ce7 100644 --- a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj +++ b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj @@ -344,14 +344,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMWT" - "ProductCode" = "8:{6CD3FC34-539E-41F3-9374-394EF05EAB00}" - "PackageCode" = "8:{00EB130E-692D-454C-9FD3-63A4B5DDC56A}" + "ProductCode" = "8:{CFD2CC0D-5168-49AD-94BD-C9E6BE392983}" + "PackageCode" = "8:{1D4F0A02-7163-4363-AED0-DEE90899086E}" "UpgradeCode" = "8:{B348C50D-8DAD-4430-AEF0-60800C94CB78}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.1.428" + "ProductVersion" = "8:1.1.429" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" diff --git a/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi b/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi index 76aa275b..59d00340 100644 Binary files a/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi and b/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi differ diff --git a/GMW/GMW_data/MagClass.cs b/GMW/GMW_data/MagClass.cs index 6a071efa..10f005b5 100644 --- a/GMW/GMW_data/MagClass.cs +++ b/GMW/GMW_data/MagClass.cs @@ -1080,7 +1080,6 @@ namespace GMW_data { // da chiamare quando clicco e inizio lista prelievo .... vedi sopra esitoOperazione answ = esitoOperazione.errore; - try { // la query recupera la lista in base al CodLista @@ -1096,7 +1095,13 @@ namespace GMW_data taElencoListePrelievo.updateStato(CodSoggetto, CodLista, (int)statoLista.generata); answ = esitoOperazione.ok; } - // se è già completata o iniziata dà errore + // se è solo iniziata permetto di riportarla a generata... + else if (riga.CodStatoLista == (int)statoLista.iniziata) + { + taElencoListePrelievo.updateStato(CodSoggetto, CodLista, (int)statoLista.generata); + answ = esitoOperazione.ok; + } + // se è già completata dà errore else { answ = esitoOperazione.errore_readOnly; @@ -1166,8 +1171,6 @@ namespace GMW_data /// public esitoOperazione completaListaPrelievo(string CodCS, string CodLista, string CodSoggetto) { - memLayer.ML.emptySessionVal("CodListaAttiva"); - memLayer.ML.emptySessionVal("activeTask"); // da chiamare quando clicco e inizio lista prelievo .... vedi sopra esitoOperazione answ = esitoOperazione.errore; try @@ -1216,6 +1219,8 @@ namespace GMW_data // aggiorno stato lista taElencoListePrelievo.updateStato(CodSoggetto, CodLista, (int)statoLista.completata); answ = esitoOperazione.ok; + memLayer.ML.emptySessionVal("CodListaAttiva"); + memLayer.ML.emptySessionVal("activeTask"); } else //nessun UDC prelevato { diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 23580f20..1df6b088 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/bin/Release/GMW_data.dll b/GMW/GMW_data/bin/Release/GMW_data.dll index a00fd41f..0ba21ef8 100644 Binary files a/GMW/GMW_data/bin/Release/GMW_data.dll and b/GMW/GMW_data/bin/Release/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 23580f20..1df6b088 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/Refactor/GMW_data.dll b/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll index 411620a0..74395263 100644 Binary files a/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll and b/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll index a00fd41f..0ba21ef8 100644 Binary files a/GMW/GMW_data/obj/Release/GMW_data.dll and b/GMW/GMW_data/obj/Release/GMW_data.dll differ