diff --git a/GMW/DettaglioBlocco.aspx b/GMW/DettaglioBlocco.aspx index 007e7c11..eec15b79 100644 --- a/GMW/DettaglioBlocco.aspx +++ b/GMW/DettaglioBlocco.aspx @@ -1,6 +1,21 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxTitle.master" +<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" CodeBehind="DettaglioBlocco.aspx.cs" Inherits="GMW.DettaglioBlocco" %> -<%@ Register src="WebUserControls/mod_dettaglioBlocco.ascx" tagname="mod_dettaglioBlocco" tagprefix="uc1" %> - - + +<%@ Register Src="WebUserControls/mod_dettaglioBlocco.ascx" TagName="mod_dettaglioBlocco" TagPrefix="uc1" %> + + + + + +
+
+
+
+ <%: traduci("DettaglioBlocco") %> +
+
+ +
+
+
diff --git a/GMW/DettaglioBlocco.aspx.cs b/GMW/DettaglioBlocco.aspx.cs index 606a0699..22dec02f 100644 --- a/GMW/DettaglioBlocco.aspx.cs +++ b/GMW/DettaglioBlocco.aspx.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using SteamWare; namespace GMW { @@ -13,6 +14,14 @@ namespace GMW { } - + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(object lemma) + { + return user_std.UtSn.Traduci(lemma.ToString()); + } } } diff --git a/GMW/DettaglioBlocco.aspx.designer.cs b/GMW/DettaglioBlocco.aspx.designer.cs index fec0378a..e654ff85 100644 --- a/GMW/DettaglioBlocco.aspx.designer.cs +++ b/GMW/DettaglioBlocco.aspx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/GMW/WebUserControls/mod_anagCelle.ascx b/GMW/WebUserControls/mod_anagCelle.ascx index 12571dd7..4247efd2 100644 --- a/GMW/WebUserControls/mod_anagCelle.ascx +++ b/GMW/WebUserControls/mod_anagCelle.ascx @@ -1,273 +1,263 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_anagCelle.ascx.cs" Inherits="GMW.WebUserControls.mod_anagCelle" %> -<%--<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> -<%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %>--%> - -<%--
-
- <%: traduci("DettagliCelle") %> +
+
+ + + + + + + + + + + + +
-
--%> -
-
- - - - - - - - - - - - - - -
-
-
-
- - - - - - - - - - - - - - - - - - - -   +
+
+
+
+ + + + + + + + + + + + + + + + + + + +   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%----%> - <%: traduci("New") %> - - - - <%-- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%----%> + <%: traduci("New") %> + + + + <%-- --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +    - - - - - - - - - - - - -
-
-<%--
-
--%> + + + + + + + + + + + + +
+
diff --git a/GMW/WebUserControls/mod_dettaglioBlocco.ascx b/GMW/WebUserControls/mod_dettaglioBlocco.ascx index 249d8586..a619538f 100644 --- a/GMW/WebUserControls/mod_dettaglioBlocco.ascx +++ b/GMW/WebUserControls/mod_dettaglioBlocco.ascx @@ -1,123 +1,99 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dettaglioBlocco.ascx.cs" Inherits="GMW.WebUserControls.mod_dettaglioBlocco" %> -<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> +<%--<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>--%> <%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %> <%@ Register Src="mod_paretoUdcBlocco.ascx" TagName="mod_paretoUdcBlocco" TagPrefix="uc1" %> <%@ Register Src="mod_dettCelleBlocco.ascx" TagName="mod_dettCelleBlocco" TagPrefix="uc2" %> <%@ Register Src="mod_paretoPartByFullSpec.ascx" TagName="mod_paretoPartByFullSpec" TagPrefix="uc3" %> <%@ Register Src="mod_operazioniUdc.ascx" TagName="mod_operazioniUdc" TagPrefix="uc4" %> - - - - -
-
-
- -
-
- -
-
-
- - - - - - -
- - - - - - - - - - - - - - - - - - - - - -
-
- + + +
+
+ + + + + + + + + + + + + + <%--non usato!--%> + + + + + + +
+
+
+ + + + + +
+
+
+
+
+ +
+
+ +
+
+
+ +
+
+
+
+ + + +
+
+
+
+ Legenda +
- - - - - - - - - - + + + + + + +
-
- -
+ 		 
- + Piena
-
- -
-
- - - -
+ 		Occupata
-
- Legenda - - - - - - - - - - - - -
- Piena - - Occupata - - Libera - - Bloccata - -   - - Selezionata (modifica) - -   - - Selezione SX - - Selezione DX -
-
+ 		Libera + Bloccata +   + Selezionata (modifica) +   + Selezione SX + Selezione DX +  
-
+
+ + diff --git a/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs b/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs index 62aa64f5..70348af9 100644 --- a/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs +++ b/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs @@ -35,8 +35,10 @@ namespace GMW.WebUserControls protected override void OnInit(EventArgs e) { base.OnInit(e); - mod_filtroBlock.eh_selValore += new EventHandler(mod_filtroBlock_eh_selValore); +#if false + mod_filtroBlock.eh_selValore += new EventHandler(mod_filtroBlock_eh_selValore); mod_filtroMagLog.eh_selValore += new EventHandler(mod_filtroMagLog_eh_selValore); +#endif mod_paretoUdcBlocco1.eh_selValore += new EventHandler(mod_paretoUdcBlocco1_eh_selValore); mod_paretoUdcBlocco1.eh_resetSelezione += new EventHandler(mod_paretoUdcBlocco1_eh_resetSelezione); mod_paretoPartByFullSpec1.eh_selValore += new EventHandler(mod_paretoPartByFullSpec1_eh_selValore); @@ -48,23 +50,29 @@ namespace GMW.WebUserControls { lnkReturn.Text = traduci("TornaStatoMag"); lnkReturn2.Text = traduci("TornaStatoMagLogico"); - mod_filtroMag.ods = odsFiltroMag; +#if false + mod_filtroMag.ods = odsFiltroMag; mod_filtroBlock.ods = odsFiltroBlock; +#endif mod_filtroMagLog.ods = odsFiltroMagLog; mod_filtroMagLog.filterChekText = "SetFiltroMagLog"; mod_filtroMagLog.filterUnchekText = "UnSetFiltroMagLog"; // imposto corretto valore x filtro Mag if (memLayer.ML.isInSessionObject("CodMag_sel")) { - mod_filtroMag.valore = memLayer.ML.StringSessionObj("CodMag_sel"); +#if false + mod_filtroMag.valore = memLayer.ML.StringSessionObj("CodMag_sel"); if (memLayer.ML.isInSessionObject("IdxBlocco_sel")) { mod_filtroBlock.valore = memLayer.ML.StringSessionObj("IdxBlocco_sel"); } +#endif } else { - memLayer.ML.setSessionVal("CodMag_sel", mod_filtroMag.valore, false); +#if false + memLayer.ML.setSessionVal("CodMag_sel", mod_filtroMag.valore, false); +#endif } // imposto corretto valore x filtro Mag logico if (memLayer.ML.isInSessionObject("CodMagLogico_sel")) @@ -158,6 +166,7 @@ namespace GMW.WebUserControls // aggiorno la visualizzazione del magazzino! Response.Redirect("~/DettaglioBlocco.aspx"); } +#if false /// /// selezione valore mag logico /// @@ -199,7 +208,8 @@ namespace GMW.WebUserControls // chiamo procedura che aggiorna ods principale mod_dettCelleBlocco1.doUpdate(); updateControlli(); - } + } +#endif private void updateControlli() { @@ -209,34 +219,78 @@ namespace GMW.WebUserControls /// - /// chiamato post modifica valore check/selezione nel selettore filtro impianto + /// cambio valore magazzino /// /// /// - public void eh_selectedMagazzino(object sender, EventArgs e) + protected void ddlFiltroMag_SelectedIndexChanged(object sender, EventArgs e) { +#if false if (mod_filtroMag.valore != "") + { + + if (!mod_filtroBlock.Visible) { - if (!mod_filtroBlock.Visible) - { - mod_filtroBlock.Visible = true; - } - else - { - mod_filtroBlock.reset(); - memLayer.ML.emptySessionVal("IdxBlocco_sel"); - } - mod_filtroBlock.ods = odsFiltroBlock; + mod_filtroBlock.Visible = true; } + else + { + mod_filtroBlock.reset(); + memLayer.ML.emptySessionVal("IdxBlocco_sel"); + } + mod_filtroBlock.ods = odsFiltroBlock; + + } else { mod_filtroBlock.reset(); mod_filtroBlock.Visible = false; memLayer.ML.emptySessionVal("IdxBlocco_sel"); - } + } +#endif + // salvo in sessione il valore selezionato... + memLayer.ML.setSessionVal("CodMag_sel", ddlFiltroMag.SelectedValue, false); + memLayer.ML.emptySessionVal("IdxBlocco_sel"); + //odsFiltroBlock.DataBind(); + ddlFiltroBlock.DataBind(); // chiamo procedura che aggiorna ods principale updateControlli(); } + /// + /// cambio valore blocco mag + /// + /// + /// + protected void ddlFiltroBlock_SelectedIndexChanged(object sender, EventArgs e) + { + // salvo in sessione il valore selezionato... + memLayer.ML.setSessionVal("IdxBlocco_sel", ddlFiltroBlock.SelectedValue, false); + // chiamo procedura che aggiorna ods principale + updateControlli(); + } + protected void ddlFiltroMag_DataBound(object sender, EventArgs e) + { + // imposto corretto valore x filtro Mag + if (memLayer.ML.isInSessionObject("CodMag_sel")) + { + ddlFiltroMag.SelectedValue = memLayer.ML.StringSessionObj("CodMag_sel"); + } + else + { + memLayer.ML.setSessionVal("CodMag_sel", ddlFiltroMag.SelectedValue, false); + } + } + protected void ddlFiltroBlock_DataBound(object sender, EventArgs e) + { + if (memLayer.ML.isInSessionObject("IdxBlocco_sel")) + { + ddlFiltroBlock.SelectedValue = memLayer.ML.StringSessionObj("IdxBlocco_sel"); + } + else + { + memLayer.ML.setSessionVal("IdxBlocco_sel", ddlFiltroBlock.SelectedValue, false); + } + } /// /// ritorno ad elenco magazzini diff --git a/GMW/WebUserControls/mod_dettaglioBlocco.ascx.designer.cs b/GMW/WebUserControls/mod_dettaglioBlocco.ascx.designer.cs index 6438f2ef..47e2ff54 100644 --- a/GMW/WebUserControls/mod_dettaglioBlocco.ascx.designer.cs +++ b/GMW/WebUserControls/mod_dettaglioBlocco.ascx.designer.cs @@ -13,31 +13,13 @@ namespace GMW.WebUserControls { public partial class mod_dettaglioBlocco { /// - /// lnkReturn control. + /// ddlFiltroMag control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.LinkButton lnkReturn; - - /// - /// lnkReturn2 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton lnkReturn2; - - /// - /// mod_filtroMag control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::mod_filtro mod_filtroMag; + protected global::System.Web.UI.WebControls.DropDownList ddlFiltroMag; /// /// odsFiltroMag control. @@ -49,13 +31,13 @@ namespace GMW.WebUserControls { protected global::System.Web.UI.WebControls.ObjectDataSource odsFiltroMag; /// - /// mod_filtroBlock control. + /// ddlFiltroBlock control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::mod_filtro mod_filtroBlock; + protected global::System.Web.UI.WebControls.DropDownList ddlFiltroBlock; /// /// odsFiltroBlock control. @@ -84,6 +66,33 @@ namespace GMW.WebUserControls { /// protected global::System.Web.UI.WebControls.ObjectDataSource odsFiltroMagLog; + /// + /// lbtReturn control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtReturn; + + /// + /// lnkReturn control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lnkReturn; + + /// + /// lnkReturn2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lnkReturn2; + /// /// mod_operazioniUdc1 control. /// diff --git a/GMW/WebUserControls/mod_paretoPartByFullSpec.ascx b/GMW/WebUserControls/mod_paretoPartByFullSpec.ascx index 7653cd3a..553662fb 100644 --- a/GMW/WebUserControls/mod_paretoPartByFullSpec.ascx +++ b/GMW/WebUserControls/mod_paretoPartByFullSpec.ascx @@ -1,5 +1,4 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_paretoPartByFullSpec.ascx.cs" Inherits="GMW.WebUserControls.mod_paretoPartByFullSpec" %> -<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> - + <%: traduci("Reset") %> -<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> <%@ Register Src="mod_barPlot.ascx" TagName="mod_barPlot" TagPrefix="uc2" %> - + <%: traduci("Reset") %>