diff --git a/MP-Tablet/Commenti.aspx.cs b/MP-Tablet/Commenti.aspx.cs index cd4dda24..2302b34b 100644 --- a/MP-Tablet/Commenti.aspx.cs +++ b/MP-Tablet/Commenti.aspx.cs @@ -26,7 +26,6 @@ namespace MoonProTablet void mod_insComm1_eh_inserting(object sender, EventArgs e) { - mod_dettMacchina1.detailLevel(false); } void mod_commenti1_eh_reqEdit(object sender, EventArgs e) @@ -38,13 +37,11 @@ namespace MoonProTablet { showPnlDichiaraz(false); mod_commenti1.doUpdate(); - mod_dettMacchina1.detailLevel(true); } void mod_insComm1_eh_newVal(object sender, EventArgs e) { mod_commenti1.doUpdate(); - mod_dettMacchina1.detailLevel(true); } void mod_dichiarazione1_eh_newVal(object sender, EventArgs e) diff --git a/MP-Tablet/DettaglioMacchina.aspx b/MP-Tablet/DettaglioMacchina.aspx index dc93cdcd..1936bcfb 100644 --- a/MP-Tablet/DettaglioMacchina.aspx +++ b/MP-Tablet/DettaglioMacchina.aspx @@ -11,7 +11,7 @@
-
+

/// evento timer diff --git a/MP-Tablet/Dichiarazione.aspx.cs b/MP-Tablet/Dichiarazione.aspx.cs index 7c1bf96b..d5dc788d 100644 --- a/MP-Tablet/Dichiarazione.aspx.cs +++ b/MP-Tablet/Dichiarazione.aspx.cs @@ -11,7 +11,6 @@ namespace MoonProTablet if (!Page.IsPostBack) { Session["TipoLink"] = "EditMacch"; - mod_dettMacchina1.detailLevel(true); // se c'รจ una data/ora in sessione la imposto... if (memLayer.ML.isInSessionObject("inizioStato")) { @@ -19,7 +18,6 @@ namespace MoonProTablet { DateTime dataOraEv = Convert.ToDateTime(memLayer.ML.objSessionObj("inizioStato")); mod_insComm.dataEv = dataOraEv; - mod_dettMacchina1.detailLevel(false); memLayer.ML.emptySessionVal("inizioStato"); } catch @@ -33,12 +31,10 @@ namespace MoonProTablet void mod_insComm1_eh_reset(object sender, EventArgs e) { - mod_dettMacchina1.detailLevel(true); } void mod_insComm1_eh_inserting(object sender, EventArgs e) { - mod_dettMacchina1.detailLevel(false); } /// /// chiama udpate x evento in controller dichiarazioni diff --git a/MP-Tablet/Web.config b/MP-Tablet/Web.config index 8d8b9338..c8f6293b 100644 --- a/MP-Tablet/Web.config +++ b/MP-Tablet/Web.config @@ -57,7 +57,7 @@ - + diff --git a/MP-Tablet/WebUserControls/mod_confProd.ascx b/MP-Tablet/WebUserControls/mod_confProd.ascx index e14f8ce1..404018c7 100644 --- a/MP-Tablet/WebUserControls/mod_confProd.ascx +++ b/MP-Tablet/WebUserControls/mod_confProd.ascx @@ -33,7 +33,7 @@
- Conferma produzione + CONFERMA
diff --git a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx index f0fa4854..6303a7da 100644 --- a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx +++ b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx @@ -2,65 +2,51 @@ <%--Riporto dettaglio singola macchina--%> - -
- - -
-
- <%# Eval("CodMacchina") %> -
-
+
+ + +
+
+
+
+
+ + +
+
-
-
-
-
-

-

-
-
-
-
- - -
-
- -
+
+
+
+ + +
+
+
-
-
-
- - / +
+
+
+
+ + / -
-
- -
+
+
+
- - -
- - - - -
-
-
+
diff --git a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs index 88b64854..4436018a 100644 --- a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs +++ b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs @@ -90,17 +90,6 @@ namespace MoonProTablet.WebUserControls ScriptManager.RegisterStartupScript(Page, GetType(), "temp", "", false); } /// - /// determina se nascondere la visualizzazione completa (e mostrare solo nome macchina) - /// - /// mostra tutto (true) o solo header(false) - public void detailLevel(bool full) - { - // mostro sempre minimo... - full = false; - pnlFullDet.Visible = full; - pnlLessDet.Visible = !full; - } - /// /// Determina se il refresh (via timer) sia o meno abilitato /// public bool refreshEnabled diff --git a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.designer.cs b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.designer.cs index 343834f6..4ad2bf7a 100644 --- a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.designer.cs +++ b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.designer.cs @@ -21,15 +21,6 @@ namespace MoonProTablet.WebUserControls { /// protected global::System.Web.UI.UpdatePanel UpdatePanel1; - /// - /// Controllo pnlFullDet. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Panel pnlFullDet; - /// /// Controllo repLI. /// @@ -39,24 +30,6 @@ namespace MoonProTablet.WebUserControls { /// protected global::System.Web.UI.WebControls.Repeater repLI; - /// - /// Controllo pnlLessDet. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Panel pnlLessDet; - - /// - /// Controllo repTestata. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Repeater repTestata; - /// /// Controllo ods. ///