diff --git a/GMW/DtxExtraCiclo.aspx b/GMW/DtxExtraCiclo.aspx index 8b83fbcb..e8ef1871 100644 --- a/GMW/DtxExtraCiclo.aspx +++ b/GMW/DtxExtraCiclo.aspx @@ -1,7 +1,34 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" CodeBehind="DtxExtraCiclo.aspx.cs" Inherits="GMW.DtxExtraCiclo" %> +<%@ Register Src="WebUserControls/mod_recAttributiDtx.ascx" TagName="mod_recAttributiDtx" TagPrefix="uc1" %> +
+
+
+   +
+
+
+ +
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+ diff --git a/GMW/DtxExtraCiclo.aspx.designer.cs b/GMW/DtxExtraCiclo.aspx.designer.cs index 914bdd01..e064e7ba 100644 --- a/GMW/DtxExtraCiclo.aspx.designer.cs +++ b/GMW/DtxExtraCiclo.aspx.designer.cs @@ -3,15 +3,49 @@ // This code was generated by a tool. // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ -namespace GMW -{ - - - public partial class DtxExtraCiclo - { +namespace GMW { + + + public partial class DtxExtraCiclo { + + /// + /// pnlAll control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlAll; + + /// + /// lblMessaggi control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblMessaggi; + + /// + /// lblWarning control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblWarning; + + /// + /// mod_recAttributiDtx1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW.WebUserControls.mod_recAttributiDtx mod_recAttributiDtx1; } } diff --git a/GMW/DtxProveDim.aspx b/GMW/DtxProveDim.aspx index ee614ad6..72298d03 100644 --- a/GMW/DtxProveDim.aspx +++ b/GMW/DtxProveDim.aspx @@ -1,11 +1,36 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" CodeBehind="DtxProveDim.aspx.cs" Inherits="GMW.DtxProveDim" %> -<%@ Register src="WebUserControls/mod_recAttributiDtx.ascx" tagname="mod_recAttributiDtx" tagprefix="uc1" %> +<%@ Register Src="WebUserControls/mod_recAttributiDtx.ascx" TagName="mod_recAttributiDtx" TagPrefix="uc1" %> - +
+
+
+   +
+
+
+ +
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+ diff --git a/GMW/DtxProveDim.aspx.designer.cs b/GMW/DtxProveDim.aspx.designer.cs index f4d15f43..284a4e84 100644 --- a/GMW/DtxProveDim.aspx.designer.cs +++ b/GMW/DtxProveDim.aspx.designer.cs @@ -12,6 +12,33 @@ namespace GMW { public partial class DtxProveDim { + /// + /// pnlAll control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlAll; + + /// + /// lblMessaggi control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblMessaggi; + + /// + /// lblWarning control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblWarning; + /// /// mod_recAttributiDtx1 control. /// diff --git a/GMW/DtxProveDistr.aspx b/GMW/DtxProveDistr.aspx index 5bf9e2ec..8be0a78e 100644 --- a/GMW/DtxProveDistr.aspx +++ b/GMW/DtxProveDistr.aspx @@ -1,7 +1,34 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" CodeBehind="DtxProveDistr.aspx.cs" Inherits="GMW.DtxProveDistr" %> +<%@ Register Src="WebUserControls/mod_recAttributiDtx.ascx" TagName="mod_recAttributiDtx" TagPrefix="uc1" %> +
+
+
+   +
+
+
+ +
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+ diff --git a/GMW/DtxProveDistr.aspx.designer.cs b/GMW/DtxProveDistr.aspx.designer.cs index 0428b33b..c937a7f5 100644 --- a/GMW/DtxProveDistr.aspx.designer.cs +++ b/GMW/DtxProveDistr.aspx.designer.cs @@ -3,15 +3,49 @@ // This code was generated by a tool. // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ -namespace GMW -{ - - - public partial class DtxProveDistr - { +namespace GMW { + + + public partial class DtxProveDistr { + + /// + /// pnlAll control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlAll; + + /// + /// lblMessaggi control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblMessaggi; + + /// + /// lblWarning control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblWarning; + + /// + /// mod_recAttributiDtx1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW.WebUserControls.mod_recAttributiDtx mod_recAttributiDtx1; } } diff --git a/GMW/PostProveMecc.aspx b/GMW/PostProveMecc.aspx index 9dff9de2..371ba621 100644 --- a/GMW/PostProveMecc.aspx +++ b/GMW/PostProveMecc.aspx @@ -21,7 +21,7 @@
- +
diff --git a/GMW/WebUserControls/mod_recAttributiDtx.ascx b/GMW/WebUserControls/mod_recAttributiDtx.ascx index 3824616d..cbd6cb70 100644 --- a/GMW/WebUserControls/mod_recAttributiDtx.ascx +++ b/GMW/WebUserControls/mod_recAttributiDtx.ascx @@ -1 +1,30 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_recAttributiDtx.ascx.cs" Inherits="GMW.WebUserControls.mod_recAttributiDtx" %> +
+ <%--
+
+
+ <%: traduci("Origine") %> (AL) +
+
+
+
+
--%> +
+
+
+ <%: traduci(tipologia) %> (<%: traduci("Registrazione") %>) +
+
+
+ <%: traduci("lblDataMatrix") %> +
+ +
+ +
+
+
+
+
diff --git a/GMW/WebUserControls/mod_recAttributiDtx.ascx.cs b/GMW/WebUserControls/mod_recAttributiDtx.ascx.cs index faf57559..55f39140 100644 --- a/GMW/WebUserControls/mod_recAttributiDtx.ascx.cs +++ b/GMW/WebUserControls/mod_recAttributiDtx.ascx.cs @@ -4,19 +4,212 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using SteamWare; +using GMW_data; namespace GMW.WebUserControls { public partial class mod_recAttributiDtx : System.Web.UI.UserControl { + /// + /// Avvio pagina + /// + /// + /// protected void Page_Load(object sender, EventArgs e) { - + if (!Page.IsPostBack) + { + resetIN(); + } + checkBarcode(); + } + /// + /// restta input + /// + private void resetIN() + { + AddAttr = true; + } + /// + /// Aggiungi/Rimuovi attributo + /// + public bool AddAttr + { + get + { + return chkAdd.Checked; + } + set + { + chkAdd.Checked = value; + } + } + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(object lemma) + { + return user_std.UtSn.Traduci(lemma.ToString()); } /// /// tipologia di attributo registrato con DataMatrix /// public tipoAttrDtx tipologia { get; set; } + /// + /// valore barcode + /// + public string barcodeIn + { + get + { + return txtBarcode.Text.Trim(); + } + set + { + txtBarcode.Text = value; + } + } + /// + /// controlla se ci sia un barcode + /// + private void checkBarcode() + { +#if false + if (barcodeIn != "") + { + Postazione.messaggiText = string.Format("{0}: {1}", traduci("BCodeIns"), barcodeIn); + switch (MagClass.tipoBCode(barcodeIn)) + { + case tipoCodiceBarcode.AL: + // verifico AL + if (checkAL(barcodeIn)) + { + sourceAL = barcodeIn; + } + doUpdate(); + break; + case tipoCodiceBarcode.UDC: + // verifico UDC + if (checkUDC(barcodeIn)) + { + string AL = ""; + // recupero da UDC + try + { + AL = MagClass.magazzino.taAL2UDC.getByUDC(barcodeIn)[0].AL; + } + catch + { + Postazione.warningText = traduci("ErroreUdcNonAl"); + Postazione.CssClass = "stileComandoKo"; + } + if (AL != "") + { + // verifico AL + if (checkAL(AL)) + { + sourceAL = AL; + } + } + } + doUpdate(); + break; + case tipoCodiceBarcode.Comando: + // se è reset cancello tutto! + if (barcodeIn == memLayer.ML.confReadString("cmdReset")) + { + resetIN(); + Postazione.messaggiText = ""; + Postazione.warningText = ""; + doUpdate(); + } + Postazione.CssClass = "stileAttesa"; + break; + default: + Postazione.messaggiText = ""; + Postazione.warningText = traduci("CodNonRicon"); + Postazione.CssClass = "stileComandoND"; + break; + } + barcodeIn = ""; + } + else + { + Postazione.messaggiText = traduci("AttesaBCode"); + Postazione.CssClass = "stileAttesa"; + } +#endif + doUpdate(); + } + /// + /// modificato attributo registra/elimina attributo + /// + /// + /// + protected void chkAdd_CheckedChanged(object sender, EventArgs e) + { + doUpdate(); + } + /// + /// aggiorna componenti + focus a barcode + /// + public void doUpdate() + { + if (AddAttr) + { + chkAdd.Text = traduci("AggiungiAttr"); + lblAdd.Attributes.Remove("class"); + lblAdd.Attributes.Add("class", "btn btn-warning"); + } + else + { + chkAdd.Text = traduci("TogliAttr"); + lblAdd.Attributes.Remove("class"); + lblAdd.Attributes.Add("class", "btn btn-danger"); + } +#if false + grViewSource.DataBind(); + updateBtns(); + // raise dell'evento + if (eh_reqUpdate != null) + { + eh_reqUpdate(this, new EventArgs()); + } + // controllo SE ho AL allora seleziono NumTratt o Durezza... + if (sourceAL == "") + { + txtBarcode.Focus(); + } + else + { + if (NumTratt == "") + { + txtNumTratt.Focus(); + } + else + { + if (!Durezza) + { + chkDurezza.Focus(); + } + else + { + if (txtNote.Text.Trim() == "") + { + txtNote.Focus(); + } + else + { + lbtStampaAL.Focus(); + } + } + } + } +#endif + } } } /// diff --git a/GMW/WebUserControls/mod_recAttributiDtx.ascx.designer.cs b/GMW/WebUserControls/mod_recAttributiDtx.ascx.designer.cs index 3c8e0b4e..397d1b0f 100644 --- a/GMW/WebUserControls/mod_recAttributiDtx.ascx.designer.cs +++ b/GMW/WebUserControls/mod_recAttributiDtx.ascx.designer.cs @@ -3,15 +3,49 @@ // This code was generated by a tool. // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ -namespace GMW.WebUserControls -{ - - - public partial class mod_recAttributiDtx - { +namespace GMW.WebUserControls { + + + public partial class mod_recAttributiDtx { + + /// + /// lblDataMatrix control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblDataMatrix; + + /// + /// txtBarcode control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtBarcode; + + /// + /// lblAdd control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl lblAdd; + + /// + /// chkAdd control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.CheckBox chkAdd; } } diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index dff4a96d..f066559b 100644 Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll index 5bfdea12..8454da68 100644 Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll index 11d11e1a..654b0906 100644 Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ