diff --git a/XPS/WebUserControls/mod_elencoComm.ascx b/XPS/WebUserControls/mod_elencoComm.ascx index 0cb7ffb..c326de4 100644 --- a/XPS/WebUserControls/mod_elencoComm.ascx +++ b/XPS/WebUserControls/mod_elencoComm.ascx @@ -21,9 +21,7 @@ - - -
+
@@ -60,9 +58,7 @@ - @@ -75,28 +71,18 @@
-
+

- - - 09:00 - 14:00 - -
-
+ + 09:0014:00
-    - - -
-
-
- +    +

@@ -111,19 +97,14 @@
-    - - -
-
-
+    +
+
-
-
-
+
@@ -143,26 +124,18 @@ - - - +
<%--
--%> -   - +   <%--
--%> - - + - - <%--
--%> -
-
- + <%--
--%>
@@ -183,16 +156,11 @@ - num: - + num:
- del: - + del: - -
- - + @@ -209,9 +177,7 @@
- -
-
+
@@ -243,9 +209,7 @@ - - - + diff --git a/XPS/WebUserControls/mod_elencoComm.ascx.cs b/XPS/WebUserControls/mod_elencoComm.ascx.cs index b967aad..ef0189e 100644 --- a/XPS/WebUserControls/mod_elencoComm.ascx.cs +++ b/XPS/WebUserControls/mod_elencoComm.ascx.cs @@ -203,7 +203,28 @@ namespace XPS.WebUserControls void mod_logStati1_eh_reset(object sender, EventArgs e) { pnlLogStati.Visible = false; + showDetailPnl(false); } + /// + /// 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"); + } + } + /// /// nascondo i pannelli accessori x sicurezza... /// @@ -215,6 +236,7 @@ namespace XPS.WebUserControls pnlLogStati.Visible = false; pnlNew.Visible = false; pnlSetDueDate.Visible = false; + showDetailPnl(false); } /// /// sistemo permessi utente e in cascata sistemo visualizzazione filtri e controlli @@ -639,18 +661,21 @@ namespace XPS.WebUserControls pnlSetDueDate.Visible = true; pnlCambiaStato.Visible = false; pnlLogStati.Visible = false; + showDetailPnl(true); break; case "cambiaStato": // non è vero select ma un edit dello stato... setStatiRewindAmmessi(); pnlCambiaStato.Visible = true; pnlSetDueDate.Visible = false; pnlLogStati.Visible = false; + showDetailPnl(true); break; case "mostraLog": // non è vero select ma un show del log di cambio stato pnlLogStati.Visible = true; pnlSetDueDate.Visible = false; pnlCambiaStato.Visible = false; mod_logStati1.idxObj = grView.SelectedValue.ToString(); + showDetailPnl(true); break; default: // è select... // salvo in session il valore selezionato... diff --git a/XPS/WebUserControls/mod_elencoComm.ascx.designer.cs b/XPS/WebUserControls/mod_elencoComm.ascx.designer.cs index 43046f0..321aeb6 100644 --- a/XPS/WebUserControls/mod_elencoComm.ascx.designer.cs +++ b/XPS/WebUserControls/mod_elencoComm.ascx.designer.cs @@ -399,6 +399,15 @@ namespace XPS.WebUserControls { /// protected global::AjaxControlToolkit.ConfirmButtonExtender cbeOkStati; + /// + /// 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. /// @@ -417,6 +426,15 @@ namespace XPS.WebUserControls { /// protected global::XPS.WebUserControls.mod_logStati mod_logStati1; + /// + /// 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. /// diff --git a/XPS/WebUserControls/mod_logStati.ascx b/XPS/WebUserControls/mod_logStati.ascx index f3b7585..435caea 100644 --- a/XPS/WebUserControls/mod_logStati.ascx +++ b/XPS/WebUserControls/mod_logStati.ascx @@ -2,7 +2,7 @@ CodeBehind="mod_logStati.ascx.cs" %>
- + @@ -26,8 +26,7 @@ - - - -
+ + <%----%> +
\ No newline at end of file
- - +