From e38d8fe95556f0ae7858d3e1e66659fa082a4d46 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 15 Feb 2017 09:35:55 +0100 Subject: [PATCH] completato review grafico... --- XPS/WebUserControls/mod_ULP.ascx | 363 +++++++++--------- XPS/WebUserControls/mod_ULP.ascx.cs | 41 +- XPS/WebUserControls/mod_ULP.ascx.designer.cs | 18 + XPS/WebUserControls/mod_dettComm.ascx | 260 +++++++------ XPS/WebUserControls/mod_dettComm.ascx.cs | 33 +- .../mod_dettComm.ascx.designer.cs | 54 ++- XPS/WebUserControls/mod_elencoComm.ascx | 115 ++++-- 7 files changed, 527 insertions(+), 357 deletions(-) diff --git a/XPS/WebUserControls/mod_ULP.ascx b/XPS/WebUserControls/mod_ULP.ascx index edd8e9b..5151e5b 100644 --- a/XPS/WebUserControls/mod_ULP.ascx +++ b/XPS/WebUserControls/mod_ULP.ascx @@ -1,178 +1,199 @@ -<%@ Control Language="C#" AutoEventWireup="true" Inherits="XPS.WebUserControls.mod_ULP" Codebehind="mod_ULP.ascx.cs" %> +<%@ Control Language="C#" AutoEventWireup="true" Inherits="XPS.WebUserControls.mod_ULP" CodeBehind="mod_ULP.ascx.cs" %> <%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> <%@ Register Src="mod_navPath.ascx" TagName="mod_navPath" TagPrefix="uc2" %> <%@ Register Src="mod_logStati.ascx" TagName="mod_logStati" TagPrefix="uc3" %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  Kg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
-
-
- - - - - - 09:00 - 14:00 - -
-
- -    + +
+
+
+ +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +  Kg + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+
+
+ + + + + 09:00 + 14:00 + +
+
+ +    +
+
+ + +
+ +
+ + + + +
- - -
- -
- - - - +
+ diff --git a/XPS/WebUserControls/mod_ULP.ascx.cs b/XPS/WebUserControls/mod_ULP.ascx.cs index 5575712..49cc941 100644 --- a/XPS/WebUserControls/mod_ULP.ascx.cs +++ b/XPS/WebUserControls/mod_ULP.ascx.cs @@ -144,6 +144,16 @@ namespace XPS.WebUserControls { traduciObj(); } + mod_logStati1.eh_reset += Mod_logStati1_eh_reset; + } + + private void Mod_logStati1_eh_reset(object sender, EventArgs e) + { + pnlLogStati.Visible = false; + showDetailPnl(false); + // resetto grView + grView.SelectedIndex = -1; + grView.DataBind(); } /// @@ -344,7 +354,7 @@ namespace XPS.WebUserControls /// /// /// - protected void imgMostraLogStati_Click(object sender, ImageClickEventArgs e) + protected void lbMostraLogStati_Click(object sender, EventArgs e) { SteamWare.memLayer.ML.setSessionVal("nextObjCommand", "mostraLog"); } @@ -366,11 +376,13 @@ namespace XPS.WebUserControls case "schedulaObj": // non è vero select ma un show del log di cambio stato pnlSetDueDate.Visible = true; pnlLogStati.Visible = false; + showDetailPnl(true); break; case "mostraLog": // non è vero select ma un show del log di cambio stato pnlSetDueDate.Visible = false; pnlLogStati.Visible = true; mod_logStati1.idxObj = grView.SelectedValue.ToString(); + showDetailPnl(true); break; default: // è select... // salvo in session il valore selezionato... @@ -384,6 +396,25 @@ namespace XPS.WebUserControls } } + /// + /// Imposta classi css x mostrare o meno panel dettaglio + /// + /// + private void showDetailPnl(bool doShow) + { + divMain.Attributes.Remove("class"); + divDet.Attributes.Remove("class"); + if (doShow) + { + divMain.Attributes.Add("class", "col-sm-10"); + divDet.Attributes.Add("class", "col-sm-2"); + } + else + { + divMain.Attributes.Add("class", "col-sm-12"); + divDet.Attributes.Add("class", "col-sm-0"); + } + } protected void btnOk_Click(object sender, EventArgs e) { // significa che mi chiedono di impostare la data a tutti i child... @@ -396,6 +427,7 @@ namespace XPS.WebUserControls protected void btnCancel_Click(object sender, EventArgs e) { pnlSetDueDate.Visible = false; + showDetailPnl(true); resetSelezione(); } /// @@ -427,6 +459,7 @@ namespace XPS.WebUserControls { // nascondo i vari controlli... pnlSetDueDate.Visible = false; + showDetailPnl(true); setupControlli(); resetSelezione(); if (eh_nuovoValore != null) @@ -447,11 +480,11 @@ namespace XPS.WebUserControls /// /// /// - protected void btnPrintScheda_Click(object sender, ImageClickEventArgs e) + protected void lbPrintScheda_Click(object sender, EventArgs e) { - ImageButton imgBtn = (ImageButton)sender; + LinkButton lnkBtn = (LinkButton)sender; // stampo! - reportPrinter.obj.printReport(reportRichiesto.SchedaIdentificazione, memLayer.ML.confReadString("printerSchedaIdentificazione"), imgBtn.CommandArgument); + reportPrinter.obj.printReport(reportRichiesto.SchedaIdentificazione, memLayer.ML.confReadString("printerSchedaIdentificazione"), lnkBtn.CommandArgument); } #endregion diff --git a/XPS/WebUserControls/mod_ULP.ascx.designer.cs b/XPS/WebUserControls/mod_ULP.ascx.designer.cs index 2ed1360..58d7ea5 100644 --- a/XPS/WebUserControls/mod_ULP.ascx.designer.cs +++ b/XPS/WebUserControls/mod_ULP.ascx.designer.cs @@ -21,6 +21,15 @@ namespace XPS.WebUserControls { /// protected global::System.Web.UI.WebControls.Label lblULP; + /// + /// divMain control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divMain; + /// /// grView control. /// @@ -57,6 +66,15 @@ namespace XPS.WebUserControls { /// protected global::System.Web.UI.WebControls.Label lblWarning; + /// + /// divDet control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDet; + /// /// pnlSetDueDate control. /// diff --git a/XPS/WebUserControls/mod_dettComm.ascx b/XPS/WebUserControls/mod_dettComm.ascx index 4851fd6..45874d2 100644 --- a/XPS/WebUserControls/mod_dettComm.ascx +++ b/XPS/WebUserControls/mod_dettComm.ascx @@ -4,120 +4,150 @@ <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> <%@ Register Src="mod_navPath.ascx" TagName="mod_navPath" TagPrefix="uc2" %> <%@ Register Src="mod_logStati.ascx" TagName="mod_logStati" TagPrefix="uc3" %> -
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- --> -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- + +
+
+
+ +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + +
+
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ + + +
+
+
+
diff --git a/XPS/WebUserControls/mod_dettComm.ascx.cs b/XPS/WebUserControls/mod_dettComm.ascx.cs index 94de437..e3e6449 100644 --- a/XPS/WebUserControls/mod_dettComm.ascx.cs +++ b/XPS/WebUserControls/mod_dettComm.ascx.cs @@ -143,6 +143,29 @@ namespace XPS.WebUserControls void mod_logStati1_eh_reset(object sender, EventArgs e) { pnlLogStati.Visible = false; + showDetailPnl(false); + // resetto grView + grView.SelectedIndex = -1; + grView.DataBind(); + } + /// + /// Imposta classi css x mostrare o meno panel dettaglio + /// + /// + private void showDetailPnl(bool doShow) + { + divMain.Attributes.Remove("class"); + divDet.Attributes.Remove("class"); + if (doShow) + { + divMain.Attributes.Add("class", "col-sm-10"); + divDet.Attributes.Add("class", "col-sm-2"); + } + else + { + divMain.Attributes.Add("class", "col-sm-12"); + divDet.Attributes.Add("class", "col-sm-0"); + } } /// /// aggiorno navbar @@ -230,20 +253,13 @@ namespace XPS.WebUserControls { grView.FooterRow.Visible = true; } -#if false - // sollevo evento nuovo valore... - if (eh_nuovoValore != null) - { - eh_nuovoValore(this, new EventArgs()); - } -#endif } /// /// salvo in session che il prox comando è clonare... /// /// /// - protected void imgMostraLogStati_Click(object sender, ImageClickEventArgs e) + protected void lbMostraLogStati_Click(object sender, EventArgs e) { SteamWare.memLayer.ML.setSessionVal("nextObjCommand", "mostraLog"); } @@ -266,6 +282,7 @@ namespace XPS.WebUserControls case "mostraLog": // non è vero select ma un show del log di cambio stato pnlLogStati.Visible = true; mod_logStati1.idxObj = grView.SelectedValue.ToString(); + showDetailPnl(true); break; default: // è select... // salvo in session il valore selezionato... diff --git a/XPS/WebUserControls/mod_dettComm.ascx.designer.cs b/XPS/WebUserControls/mod_dettComm.ascx.designer.cs index 0809369..2d7bb59 100644 --- a/XPS/WebUserControls/mod_dettComm.ascx.designer.cs +++ b/XPS/WebUserControls/mod_dettComm.ascx.designer.cs @@ -21,24 +21,6 @@ namespace XPS.WebUserControls { /// protected global::XPS.WebUserControls.mod_navPath mod_navPath1; - /// - /// pnlLogStati control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel pnlLogStati; - - /// - /// mod_logStati1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::XPS.WebUserControls.mod_logStati mod_logStati1; - /// /// lblRowsDDT control. /// @@ -48,6 +30,15 @@ namespace XPS.WebUserControls { /// protected global::System.Web.UI.WebControls.Label lblRowsDDT; + /// + /// divMain control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divMain; + /// /// grView control. /// @@ -83,5 +74,32 @@ namespace XPS.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblWarning; + + /// + /// divDet control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDet; + + /// + /// pnlLogStati control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlLogStati; + + /// + /// mod_logStati1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::XPS.WebUserControls.mod_logStati mod_logStati1; } } diff --git a/XPS/WebUserControls/mod_elencoComm.ascx b/XPS/WebUserControls/mod_elencoComm.ascx index 9a09b95..5326cc1 100644 --- a/XPS/WebUserControls/mod_elencoComm.ascx +++ b/XPS/WebUserControls/mod_elencoComm.ascx @@ -30,7 +30,9 @@ -
+ +
+
@@ -67,7 +69,9 @@ + @@ -89,11 +93,21 @@
- - 09:0014:00
+ + + 09:00 + 14:00 + +
+
-    -
+    + + + + + +

@@ -108,8 +122,13 @@
-    -
+    + + + + + + @@ -133,7 +152,9 @@ - + + +
@@ -167,14 +188,22 @@ - num: + num: +
- del: + del: + - + + + + - + + + + @@ -187,7 +216,9 @@
-
+ +
+
@@ -219,38 +250,40 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
- - - - - - - - - - - - - - - - - - - - - - -
-
-
-
- + +