diff --git a/GMW/GMW_Term/GMW_Term.csproj b/GMW/GMW_Term/GMW_Term.csproj index b7b7eb44..a1547366 100644 --- a/GMW/GMW_Term/GMW_Term.csproj +++ b/GMW/GMW_Term/GMW_Term.csproj @@ -343,6 +343,23 @@ + + + + + + + + + + + + + + + + + diff --git a/GMW/GMW_Term/SmartList.aspx b/GMW/GMW_Term/SmartList.aspx index f2e444e4..aee6d808 100644 --- a/GMW/GMW_Term/SmartList.aspx +++ b/GMW/GMW_Term/SmartList.aspx @@ -1,7 +1,9 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/CompactBCode.Master" AutoEventWireup="true" CodeBehind="SmartList.aspx.cs" Inherits="GMW_Term.SmartList" %> <%@ Register src="WebUserControls/mod_smartList.ascx" tagname="mod_smartList" tagprefix="uc1" %> +<%@ Register src="WebUserControls/mod_barcode.ascx" tagname="mod_barcode" tagprefix="uc2" %> + diff --git a/GMW/GMW_Term/SmartList.aspx.cs b/GMW/GMW_Term/SmartList.aspx.cs index e7aeca70..3b37eb14 100644 --- a/GMW/GMW_Term/SmartList.aspx.cs +++ b/GMW/GMW_Term/SmartList.aspx.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using SteamWare; namespace GMW_Term { @@ -11,7 +11,29 @@ namespace GMW_Term { protected void Page_Load(object sender, EventArgs e) { - + // imposto valori visibilità barcode specifici (nascondo testo...) + mod_barcode1.showHeaderText = true; + mod_barcode1.showNoteText = true; + // imposto controllo valori scansionati + mod_barcode1.eh_scannedUdc += new EventHandler(mod_barcode1_eh_scannedUdc); + mod_barcode1.eh_scannedUser += new EventHandler(mod_barcode1_eh_scannedUser); + mod_barcode1.eh_resetUser += new EventHandler(mod_barcode1_eh_resetUser); } + + void mod_barcode1_eh_resetUser(object sender, EventArgs e) + { + Response.Redirect("~/Barcode.aspx"); + } + + void mod_barcode1_eh_scannedUser(object sender, EventArgs e) + { + Response.Redirect("~/Home.aspx"); + } + + void mod_barcode1_eh_scannedUdc(object sender, EventArgs e) + { + Response.Redirect("~/SmartList.aspx"); + } + } } diff --git a/GMW/GMW_Term/SmartList.aspx.designer.cs b/GMW/GMW_Term/SmartList.aspx.designer.cs index d468cd43..b9399e1e 100644 --- a/GMW/GMW_Term/SmartList.aspx.designer.cs +++ b/GMW/GMW_Term/SmartList.aspx.designer.cs @@ -13,6 +13,15 @@ namespace GMW_Term { public partial class SmartList { + /// + /// mod_barcode1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW_Term.WebUserControls.mod_barcode mod_barcode1; + /// /// mod_smartList1 control. /// diff --git a/GMW/GMW_Term/Style.css b/GMW/GMW_Term/Style.css index e5c59b94..79b7da2a 100644 --- a/GMW/GMW_Term/Style.css +++ b/GMW/GMW_Term/Style.css @@ -468,3 +468,63 @@ color: Red; font-weight: bold; } +.clearAll +{ + clear: both; + height: 0px; +} + + +.styleBtnComposito +{ + font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; + font-size: 0.9em; + font-weight:bold; + display: inline-block; + position: relative; + padding: 0; + margin: .2em; + text-decoration: none !important; + cursor: pointer; + text-align: center; + zoom: 1; + overflow: visible; + border: solid 1px #696969; + background: #f6f6f6 url(images/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; + color: Black; /* was #1c94c4 */ + -moz-border-radius-topleft: 4px; + -webkit-border-top-left-radius: 4px; + -khtml-border-top-left-radius: 4px; + border-top-left-radius: 4px; + -moz-border-radius-topright: 4px; + -webkit-border-top-right-radius: 4px; + -khtml-border-top-right-radius: 4px; + border-top-right-radius: 4px; + -moz-border-radius-bottomleft: 4px; + -webkit-border-bottom-left-radius: 4px; + -khtml-border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; + -moz-border-radius-bottomright: 4px; + -webkit-border-bottom-right-radius: 4px; + -khtml-border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; + padding-top: .2em; + padding-right: .4em; + padding-bottom: .2em; + padding-left: .4em; +} + +.styleBtnComposito:hover +{ + color: White; + background-image: none; + background-color: #696969; +} +.styleBtnComposito:active +{ + position:relative; + top:1px; + color: Yellow; + background-image: none; + background-color: #ACACAC; +} \ No newline at end of file diff --git a/GMW/GMW_Term/Web.config b/GMW/GMW_Term/Web.config index cbe0244c..7b2bd0a5 100644 --- a/GMW/GMW_Term/Web.config +++ b/GMW/GMW_Term/Web.config @@ -116,6 +116,10 @@ + + + + diff --git a/GMW/GMW_Term/WebUserControls/mod_home.ascx b/GMW/GMW_Term/WebUserControls/mod_home.ascx index ff6fd31d..56be1662 100644 --- a/GMW/GMW_Term/WebUserControls/mod_home.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_home.ascx @@ -3,7 +3,7 @@ -
+
diff --git a/GMW/GMW_Term/WebUserControls/mod_smartList.ascx b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx index 2186bb00..894b1de5 100644 --- a/GMW/GMW_Term/WebUserControls/mod_smartList.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx @@ -1,2 +1,51 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_smartList.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_smartList" %> -prova prova prova \ No newline at end of file +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_smartList.ascx.cs" + Inherits="GMW_Term.WebUserControls.mod_smartList" %> +
+
+
+ +
+
+ + + +
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+ + + + +
+
+ + + + +
+
+
diff --git a/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs index 42252a71..591a2035 100644 --- a/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs @@ -4,14 +4,193 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using SteamWare; +using GMW_data; namespace GMW_Term.WebUserControls { public partial class mod_smartList : System.Web.UI.UserControl { + /// + /// elenco UDC letti a barcode da cui creare Smart LDP + /// + public Dictionary elencoUdcSmartLDP + { + get + { + Dictionary answ = new Dictionary(); + try + { + answ = (Dictionary)memLayer.ML.objSessionObj("elencoUdcSmartLDP"); + } + catch + { } + return answ; + } + + set + { + memLayer.ML.setSessionVal("elencoUdcSmartLDP", value); + } + } + /// + /// elenco PARTICOLARI per cui creare Smart LDP + /// + public Dictionary elencoParticolariSmartLDP + { + get + { + Dictionary answ = new Dictionary(); + try + { + answ = (Dictionary)memLayer.ML.objSessionObj("elencoParticolariSmartLDP"); + } + catch + { } + return answ; + } + + set + { + memLayer.ML.setSessionVal("elencoParticolariSmartLDP", value); + } + } + + /// + /// wrapper traduzione termini + /// + /// + /// + public string traduci(string lemma) + { + return user_std.UtSn.Traduci(lemma); + } + /// + /// chiamata principale + /// + /// + /// protected void Page_Load(object sender, EventArgs e) + { + updatePackListStatus(); + } + /// + /// aggiorna lo stato della packing list corrente + /// + private void updatePackListStatus() + { + // recupero barcode e controllo sia valido + string barcode = memLayer.ML.StringSessionObj("UDC_sel"); + string particolare = ""; + bool barcodeOk = MagClass.magazzino.checkUDC(barcode); + Dictionary elencoUdc = elencoUdcSmartLDP; + Dictionary elencoParticolari = elencoParticolariSmartLDP; + if (barcodeOk) + { + try + { + // calcolo particolare + particolare = MagClass.magazzino.getParticolareByUDC(barcode); + } + catch + { } + if (particolare != "") + { + /* *************************************************** + * Ricalcola e salva: + * - elenco UDC + * - elenco particolari + * ***************************************************/ + + // controllo se vada aggiunto UDC + if (!elencoUdc.ContainsKey(barcode)) + { + // aggiungo nuovo barcode e salvo + elencoUdc.Add(barcode, particolare); + elencoUdcSmartLDP = elencoUdc; + } + // controllo se vada aggiunto particolare + if (!elencoParticolari.ContainsKey(particolare)) + { + // aggiungo nuovo particolare e salvo + elencoParticolari.Add(particolare, particolare); + elencoParticolariSmartLDP = elencoParticolari; + } + lblErrore.Visible = false; + } + } + + //update visualizzazione + + /* *************************************************** + * Aggiorna: + * - tot UDC + * - tot particolari + * ***************************************************/ + lblGeneraListe.Text = traduci("lblGeneraListe"); + lblResetListe.Text = traduci("lblResetListe"); + lblTotColli.Text = traduci("lblTotColli"); + lblNumColli.Text = string.Format("{0} UDC", elencoUdcSmartLDP.Count); + lblParticolari.Text = traduci("lblParticolari"); + lblNumPart.Text = string.Format("{0} {1}", elencoParticolariSmartLDP.Count, traduci("particolari")); + +#if false + lblListaAttiva.Text = traduci("ListaPrel"); + hlListaAttiva.Text = traduci("noListActive"); + lblDest.Text = ""; + lblProd.Text = ""; + lblPezzi.Text = ""; + try + { + // leggo una riga... + 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); + hlListaAttiva.Text = MagClass.magazzino.codListaAttivaUtente; + } + catch + { } +#endif + + // reload pagina? + } + /// + /// Generazione delle liste di prelievo + /// + /// + /// + protected void btnGeneraListe_Click(object sender, EventArgs e) { } + /// + /// reset UDC x le liste di prelievo + /// + /// + /// + protected void btnResetListe_Click(object sender, EventArgs e) + { + + } + + +#if false + // controllo se barcode è ok x LDP corrente... + if (MagClass.magazzino.verificaDatiUdc(MagClass.magazzino.codListaAttivaUtente, barcode)) + { + MagClass.magazzino.confermaUdcPrelevatoPerLista(MagClass.magazzino.codListaAttivaUtente, barcode); + lblErrore.Visible = false; + } + else + { + // salvo errore + lblErrore.Visible = true; + lblErrore.Text = traduci("BarcodeNonValidoLDP"); + } + // svuoto barcode selezionato + memLayer.ML.emptySessionVal("Barcode_sel"); +#endif + } } \ No newline at end of file diff --git a/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.designer.cs index c0f6efb7..37a8d5cf 100644 --- a/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.designer.cs +++ b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.designer.cs @@ -12,5 +12,86 @@ namespace GMW_Term.WebUserControls { public partial class mod_smartList { + + /// + /// lblTotColli control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblTotColli; + + /// + /// lblNumColli control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblNumColli; + + /// + /// lblParticolari control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblParticolari; + + /// + /// lblNumPart control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblNumPart; + + /// + /// lblErrore control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblErrore; + + /// + /// btnGeneraListe control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton btnGeneraListe; + + /// + /// lblGeneraListe control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblGeneraListe; + + /// + /// btnResetListe control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton btnResetListe; + + /// + /// lblResetListe control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblResetListe; } } diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index 466d71e4..ef42da3e 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 fdabf987..113a7e90 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/images/new_l.png b/GMW/GMW_Term/images/new_l.png new file mode 100644 index 00000000..90fec1df Binary files /dev/null and b/GMW/GMW_Term/images/new_l.png differ diff --git a/GMW/GMW_Term/images/new_m.png b/GMW/GMW_Term/images/new_m.png new file mode 100644 index 00000000..e2823bac Binary files /dev/null and b/GMW/GMW_Term/images/new_m.png differ diff --git a/GMW/GMW_Term/images/new_s.png b/GMW/GMW_Term/images/new_s.png new file mode 100644 index 00000000..e9485082 Binary files /dev/null and b/GMW/GMW_Term/images/new_s.png differ diff --git a/GMW/GMW_Term/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/GMW/GMW_Term/images/ui-bg_diagonals-thick_18_b81900_40x40.png new file mode 100644 index 00000000..954e22db Binary files /dev/null and b/GMW/GMW_Term/images/ui-bg_diagonals-thick_18_b81900_40x40.png differ diff --git a/GMW/GMW_Term/images/ui-bg_diagonals-thick_20_666666_40x40.png b/GMW/GMW_Term/images/ui-bg_diagonals-thick_20_666666_40x40.png new file mode 100644 index 00000000..64ece570 Binary files /dev/null and b/GMW/GMW_Term/images/ui-bg_diagonals-thick_20_666666_40x40.png differ diff --git a/GMW/GMW_Term/images/ui-bg_flat_10_000000_40x100.png b/GMW/GMW_Term/images/ui-bg_flat_10_000000_40x100.png new file mode 100644 index 00000000..abdc0108 Binary files /dev/null and b/GMW/GMW_Term/images/ui-bg_flat_10_000000_40x100.png differ diff --git a/GMW/GMW_Term/images/ui-bg_glass_100_f6f6f6_1x400.png b/GMW/GMW_Term/images/ui-bg_glass_100_f6f6f6_1x400.png new file mode 100644 index 00000000..9b383f4d Binary files /dev/null and b/GMW/GMW_Term/images/ui-bg_glass_100_f6f6f6_1x400.png differ diff --git a/GMW/GMW_Term/images/ui-bg_glass_100_fdf5ce_1x400.png b/GMW/GMW_Term/images/ui-bg_glass_100_fdf5ce_1x400.png new file mode 100644 index 00000000..a23baad2 Binary files /dev/null and b/GMW/GMW_Term/images/ui-bg_glass_100_fdf5ce_1x400.png differ diff --git a/GMW/GMW_Term/images/ui-bg_glass_65_ffffff_1x400.png b/GMW/GMW_Term/images/ui-bg_glass_65_ffffff_1x400.png new file mode 100644 index 00000000..42ccba26 Binary files /dev/null and b/GMW/GMW_Term/images/ui-bg_glass_65_ffffff_1x400.png differ diff --git a/GMW/GMW_Term/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/GMW/GMW_Term/images/ui-bg_gloss-wave_35_f6a828_500x100.png new file mode 100644 index 00000000..39d5824d Binary files /dev/null and b/GMW/GMW_Term/images/ui-bg_gloss-wave_35_f6a828_500x100.png differ diff --git a/GMW/GMW_Term/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/GMW/GMW_Term/images/ui-bg_highlight-soft_100_eeeeee_1x100.png new file mode 100644 index 00000000..f1273672 Binary files /dev/null and b/GMW/GMW_Term/images/ui-bg_highlight-soft_100_eeeeee_1x100.png differ diff --git a/GMW/GMW_Term/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/GMW/GMW_Term/images/ui-bg_highlight-soft_75_ffe45c_1x100.png new file mode 100644 index 00000000..359397ac Binary files /dev/null and b/GMW/GMW_Term/images/ui-bg_highlight-soft_75_ffe45c_1x100.png differ diff --git a/GMW/GMW_Term/images/ui-icons_222222_256x240.png b/GMW/GMW_Term/images/ui-icons_222222_256x240.png new file mode 100644 index 00000000..b273ff11 Binary files /dev/null and b/GMW/GMW_Term/images/ui-icons_222222_256x240.png differ diff --git a/GMW/GMW_Term/images/ui-icons_228ef1_256x240.png b/GMW/GMW_Term/images/ui-icons_228ef1_256x240.png new file mode 100644 index 00000000..a641a371 Binary files /dev/null and b/GMW/GMW_Term/images/ui-icons_228ef1_256x240.png differ diff --git a/GMW/GMW_Term/images/ui-icons_ef8c08_256x240.png b/GMW/GMW_Term/images/ui-icons_ef8c08_256x240.png new file mode 100644 index 00000000..85e63e9f Binary files /dev/null and b/GMW/GMW_Term/images/ui-icons_ef8c08_256x240.png differ diff --git a/GMW/GMW_Term/images/ui-icons_ffd27a_256x240.png b/GMW/GMW_Term/images/ui-icons_ffd27a_256x240.png new file mode 100644 index 00000000..d9dc5093 Binary files /dev/null and b/GMW/GMW_Term/images/ui-icons_ffd27a_256x240.png differ diff --git a/GMW/GMW_Term/images/ui-icons_ffffff_256x240.png b/GMW/GMW_Term/images/ui-icons_ffffff_256x240.png new file mode 100644 index 00000000..42f8f992 Binary files /dev/null and b/GMW/GMW_Term/images/ui-icons_ffffff_256x240.png differ diff --git a/GMW/GMW_Term/mazzAppSettings.config b/GMW/GMW_Term/mazzAppSettings.config index 54d2c598..3316c78e 100644 --- a/GMW/GMW_Term/mazzAppSettings.config +++ b/GMW/GMW_Term/mazzAppSettings.config @@ -66,6 +66,10 @@ + + + + diff --git a/GMW/GMW_Term/mazzAppSettingsSP.config b/GMW/GMW_Term/mazzAppSettingsSP.config index ae94c088..771ca14a 100644 --- a/GMW/GMW_Term/mazzAppSettingsSP.config +++ b/GMW/GMW_Term/mazzAppSettingsSP.config @@ -66,6 +66,10 @@ + + + + diff --git a/GMW/GMW_Term/mazzAppSettingsTK.config b/GMW/GMW_Term/mazzAppSettingsTK.config index 63ff66ef..ad60aca3 100644 --- a/GMW/GMW_Term/mazzAppSettingsTK.config +++ b/GMW/GMW_Term/mazzAppSettingsTK.config @@ -66,6 +66,10 @@ + + + + diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index 466d71e4..ef42da3e 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 95f5c572..d84bec48 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_data/MagClass.cs b/GMW/GMW_data/MagClass.cs index 2ccc0cee..f8374b6f 100644 --- a/GMW/GMW_data/MagClass.cs +++ b/GMW/GMW_data/MagClass.cs @@ -568,7 +568,22 @@ namespace GMW_data } return answ; } - + /// + /// restituisce particolare da UDC + /// + /// + /// + public string getParticolareByUDC(string UDC) + { + string answ = ""; + try + { + answ = (taCartellini.getDetailsUdcByUdc(UDC)[0].Particolare); + } + catch + { } + return answ; + } #endregion #region procedure di verifica e traduzione dati da anagrafiche diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index fdabf987..113a7e90 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 fdabf987..113a7e90 100644 Binary files a/GMW/GMW_data/obj/Debug/GMW_data.dll and b/GMW/GMW_data/obj/Debug/GMW_data.dll differ