From 769945b669ca4f75844da50c80bcecdf321e582a Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 11 Jan 2021 12:48:36 +0100 Subject: [PATCH] fix vari admin (by Mara) --- GPW_Admin/About.aspx | 8 ++- GPW_Admin/Contact.aspx | 29 +++++++-- GPW_Admin/Content/Site.css | 4 ++ GPW_Admin/Content/Site.less | 4 ++ GPW_Admin/Content/Site.min.css | 2 +- .../WebUserControls/mod_adminClienti.ascx | 2 +- .../WebUserControls/mod_adminDipendenti.ascx | 5 +- .../mod_adminDipendenti.ascx.cs | 7 --- .../WebUserControls/mod_adminProgetti.ascx | 20 +++--- .../WebUserControls/mod_adminProgetti.ascx.cs | 35 ++++++++++- .../mod_adminProgetti.ascx.designer.cs | 63 +++++++++++-------- GPW_Admin/WebUserControls/mod_filtro.ascx | 4 +- GPW_Admin/WebUserControls/mod_filtro.ascx.cs | 10 +-- .../mod_filtro.ascx.designer.cs | 18 ++++++ .../WebUserControls/mod_reviewTimbrature.ascx | 38 ++++++----- .../mod_reviewTimbrature.ascx.cs | 6 ++ .../mod_reviewTimbrature.ascx.designer.cs | 9 +++ GPW_Admin/WebUserControls/mod_spostaOre.ascx | 25 ++++---- .../WebUserControls/mod_spostaOre.ascx.cs | 7 --- 19 files changed, 202 insertions(+), 94 deletions(-) diff --git a/GPW_Admin/About.aspx b/GPW_Admin/About.aspx index a71e61c..b10a253 100644 --- a/GPW_Admin/About.aspx +++ b/GPW_Admin/About.aspx @@ -2,11 +2,15 @@
-
+
- <%: traduci(titolo) %> +

<%: traduci(titolo) %>

+

<%: traduci("GpwPresentationText") %>

+ <%: traduci("GpwPresentationTextDetailed") %> +
+

<%: traduci("LearnMore") %> »

diff --git a/GPW_Admin/Contact.aspx b/GPW_Admin/Contact.aspx index 242d08c..aeee854 100644 --- a/GPW_Admin/Contact.aspx +++ b/GPW_Admin/Contact.aspx @@ -1,12 +1,29 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/BMP.Master" AutoEventWireup="true" CodeBehind="Contact.aspx.cs" Inherits="GPW_Admin.Contact" %> -
-
-
- <%: traduci(titolo) %> -
-
+
+
+

Contacts

+
+
+
+
+ +
+
+
+ Steamware srl
+
+ via Nazionale 93
+ 24068 Seriate
+ Bergamo – Italy
+ + +39 035-460560 +
+
+ info@steamware.net +
+
diff --git a/GPW_Admin/Content/Site.css b/GPW_Admin/Content/Site.css index e03e6c6..84bc566 100644 --- a/GPW_Admin/Content/Site.css +++ b/GPW_Admin/Content/Site.css @@ -22,6 +22,10 @@ body { .textBig { font-size: 1.5em; } +.table-sm th, +.table-sm td { + padding: 0.2rem; +} /*------------------------------------------------------------------ [ Shortcuts / .shortcuts ] */ diff --git a/GPW_Admin/Content/Site.less b/GPW_Admin/Content/Site.less index 1a70058..0080181 100644 --- a/GPW_Admin/Content/Site.less +++ b/GPW_Admin/Content/Site.less @@ -27,6 +27,10 @@ body { font-size: 1.5em; } +.table-sm th, .table-sm td { + padding: .2rem; +} + /*------------------------------------------------------------------ [ Shortcuts / .shortcuts ] */ diff --git a/GPW_Admin/Content/Site.min.css b/GPW_Admin/Content/Site.min.css index df9f274..c5fe75d 100644 --- a/GPW_Admin/Content/Site.min.css +++ b/GPW_Admin/Content/Site.min.css @@ -1 +1 @@ -body{font:'Roboto',sans-serif;}.body-content{font:'Roboto',sans-serif;}.textCondens{font-family:'Roboto Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}.textBig{font-size:1.5em;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:.66666667rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:.25rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}@media(max-width:992px){.shortcuts .shortcut{min-width:8rem;min-height:4rem;}}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}input,select,textarea{max-width:100%;}}.elTimbSmart{padding:.2em;font-size:1.1em;line-height:1.3em;}.ui-input-btn input{opacity:.5;}.GridPager a,.GridPager span{display:block;height:1.5em;min-width:1.1em;text-align:center;text-decoration:none;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold;} \ No newline at end of file +body{font:'Roboto',sans-serif;}.body-content{font:'Roboto',sans-serif;}.textCondens{font-family:'Roboto Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}.textBig{font-size:1.5em;}.table-sm th,.table-sm td{padding:.2rem;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:.66666667rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:.25rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}@media(max-width:992px){.shortcuts .shortcut{min-width:8rem;min-height:4rem;}}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}input,select,textarea{max-width:100%;}}.elTimbSmart{padding:.2em;font-size:1.1em;line-height:1.3em;}.ui-input-btn input{opacity:.5;}.GridPager a,.GridPager span{display:block;height:1.5em;min-width:1.1em;text-align:center;text-decoration:none;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold;} \ No newline at end of file diff --git a/GPW_Admin/WebUserControls/mod_adminClienti.ascx b/GPW_Admin/WebUserControls/mod_adminClienti.ascx index 18a53fc..4fda3d0 100644 --- a/GPW_Admin/WebUserControls/mod_adminClienti.ascx +++ b/GPW_Admin/WebUserControls/mod_adminClienti.ascx @@ -9,7 +9,7 @@ Filtro visualizzazione
- +
diff --git a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx index 2e49777..7c9d71f 100644 --- a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx +++ b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx @@ -235,6 +235,9 @@ + + + @@ -248,8 +251,8 @@ - + diff --git a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.cs b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.cs index 61c5cea..d0de240 100644 --- a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.cs +++ b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.cs @@ -70,13 +70,6 @@ namespace GPW_Admin.WebUserControls protected void chkshowAll_CheckedChanged(object sender, EventArgs e) { - // in base a selezione cambio metodo ods - string selMethod = "GetData"; - if (!chkshowAll.Checked) - { - selMethod = "getAttivi"; - } - ods.SelectMethod = selMethod; grView.DataBind(); } diff --git a/GPW_Admin/WebUserControls/mod_adminProgetti.ascx b/GPW_Admin/WebUserControls/mod_adminProgetti.ascx index a552fc8..d93f087 100644 --- a/GPW_Admin/WebUserControls/mod_adminProgetti.ascx +++ b/GPW_Admin/WebUserControls/mod_adminProgetti.ascx @@ -13,25 +13,28 @@
-
-
+
+
- + Reset Filt
- + +
+
+
- Reset + +
+
+
-
- -
@@ -188,6 +191,7 @@ + diff --git a/GPW_Admin/WebUserControls/mod_adminProgetti.ascx.cs b/GPW_Admin/WebUserControls/mod_adminProgetti.ascx.cs index 9d340c0..808d6b0 100644 --- a/GPW_Admin/WebUserControls/mod_adminProgetti.ascx.cs +++ b/GPW_Admin/WebUserControls/mod_adminProgetti.ascx.cs @@ -19,13 +19,15 @@ namespace GPW_Admin.WebUserControls /// /// Init con valori specifici /// + /// /// /// /// /// /// - public filtroProj(bool fCli, intervalloDate interv, bool onlStar, bool showA, bool showE) + public filtroProj(bool fGrp, bool fCli, intervalloDate interv, bool onlStar, bool showA, bool showE) { + this.filtGrp = fGrp; this.filtCli = fCli; this.intAnalys = interv; this.onlyStarred = onlStar; @@ -38,6 +40,7 @@ namespace GPW_Admin.WebUserControls /// public filtroProj() { + filtGrp = false; filtCli = false; // imposto intervallo dal 2000.01.01... intervalloDate date = new intervalloDate(); @@ -54,6 +57,7 @@ namespace GPW_Admin.WebUserControls #region Public Properties public bool filtCli { get; set; } + public bool filtGrp { get; set; } public intervalloDate intAnalys { get; set; } public bool onlyStarred { get; set; } public bool showArch { get; set; } @@ -211,6 +215,28 @@ namespace GPW_Admin.WebUserControls grView.DataBind(); } + /// + /// selezionato valore, filtro! + /// + /// + /// + private void filtroGrp_eh_selValore(object sender, EventArgs e) + { + if (filtroGrp.isChecked) + { + memLayer.ML.setSessionVal("gruppo_sel", filtroGrp.valore); + } + else + { + memLayer.ML.setSessionVal("gruppo_sel", ""); + } + // salvo! + var tempFilt = currFiltProj; + tempFilt.filtGrp = filtroGrp.isChecked; + currFiltProj = tempFilt; + grView.DataBind(); + } + /// /// cambiati dati dettaglio (attivo/inattivo) /// @@ -242,12 +268,18 @@ namespace GPW_Admin.WebUserControls showVuoti = currFilt.showEmpty; showOnlyStarred = currFilt.onlyStarred; filtroCli.isChecked = currFilt.filtCli; + filtroGrp.isChecked = currFilt.filtGrp; // se deselezionato --> svuoto + if (!currFilt.filtGrp) + { + filtroGrp.valore = ""; + } if (!currFilt.filtCli) { filtroCli.valore = ""; } // salvo ulteriori valori + filtroGrp.ods = odsGruppi; filtroCli.ods = odsClienti; currFiltProj = currFilt; grView.DataBind(); @@ -516,6 +548,7 @@ namespace GPW_Admin.WebUserControls setupFilter(currFiltProj); mod_dettaglioProgetto1.Visible = false; } + filtroGrp.eh_selValore += new EventHandler(filtroGrp_eh_selValore); filtroCli.eh_selValore += new EventHandler(filtroCli_eh_selValore); mod_dettaglioProgetto1.eh_nuovoValore += new EventHandler(mod_dettaglioProgetto1_eh_nuovoValore); cmp_periodoAnalisi.eh_doRefresh += Cmp_periodoAnalisi_eh_doRefresh; diff --git a/GPW_Admin/WebUserControls/mod_adminProgetti.ascx.designer.cs b/GPW_Admin/WebUserControls/mod_adminProgetti.ascx.designer.cs index 92de57a..5b68e72 100644 --- a/GPW_Admin/WebUserControls/mod_adminProgetti.ascx.designer.cs +++ b/GPW_Admin/WebUserControls/mod_adminProgetti.ascx.designer.cs @@ -23,33 +23,6 @@ namespace GPW_Admin.WebUserControls /// protected global::GPW_Admin.WebUserControls.cmp_periodoAnalisi cmp_periodoAnalisi; - /// - /// Controllo chkShowChiusi. - /// - /// - /// 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.CheckBox chkShowChiusi; - - /// - /// Controllo chkShowVuoti. - /// - /// - /// 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.CheckBox chkShowVuoti; - - /// - /// Controllo chkShowOnlyStarred. - /// - /// - /// 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.CheckBox chkShowOnlyStarred; - /// /// Controllo lbtResetFilt. /// @@ -68,6 +41,42 @@ namespace GPW_Admin.WebUserControls /// protected global::mod_filtro filtroCli; + /// + /// Controllo filtroGrp. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::mod_filtro filtroGrp; + + /// + /// Controllo chkShowOnlyStarred. + /// + /// + /// 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.CheckBox chkShowOnlyStarred; + + /// + /// Controllo chkShowVuoti. + /// + /// + /// 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.CheckBox chkShowVuoti; + + /// + /// Controllo chkShowChiusi. + /// + /// + /// 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.CheckBox chkShowChiusi; + /// /// Controllo grView. /// diff --git a/GPW_Admin/WebUserControls/mod_filtro.ascx b/GPW_Admin/WebUserControls/mod_filtro.ascx index e8603af..04b84e8 100644 --- a/GPW_Admin/WebUserControls/mod_filtro.ascx +++ b/GPW_Admin/WebUserControls/mod_filtro.ascx @@ -3,8 +3,10 @@
- +
+ +
\ No newline at end of file diff --git a/GPW_Admin/WebUserControls/mod_filtro.ascx.cs b/GPW_Admin/WebUserControls/mod_filtro.ascx.cs index b87a4a1..3d16030 100644 --- a/GPW_Admin/WebUserControls/mod_filtro.ascx.cs +++ b/GPW_Admin/WebUserControls/mod_filtro.ascx.cs @@ -42,11 +42,11 @@ public partial class mod_filtro : ApplicationUserControl { get { - return memLayer.ML.StringSessionObj($"_showAll_{this.UniqueID}".Replace("$", "_")); + return hfShowAll.Value; ; } set { - memLayer.ML.setSessionVal($"_showAll_{this.UniqueID}".Replace("$", "_"), value); + hfShowAll.Value = value; traduciObj(); } } @@ -55,11 +55,11 @@ public partial class mod_filtro : ApplicationUserControl { get { - return memLayer.ML.StringSessionObj($"_showFiltered_{this.UniqueID}".Replace("$", "_")); + return hfShowFiltered.Value; } set { - memLayer.ML.setSessionVal($"_showFiltered_{this.UniqueID}".Replace("$", "_"), value); + hfShowFiltered.Value = value; traduciObj(); } } @@ -194,7 +194,7 @@ public partial class mod_filtro : ApplicationUserControl /// /// get/set messaggio di attivazione filtraggio /// - public string filterChekText + public string filterCheckText { get { diff --git a/GPW_Admin/WebUserControls/mod_filtro.ascx.designer.cs b/GPW_Admin/WebUserControls/mod_filtro.ascx.designer.cs index dde8c97..4fd8942 100644 --- a/GPW_Admin/WebUserControls/mod_filtro.ascx.designer.cs +++ b/GPW_Admin/WebUserControls/mod_filtro.ascx.designer.cs @@ -38,4 +38,22 @@ public partial class mod_filtro /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.Label where; + + /// + /// Controllo hfShowAll. + /// + /// + /// 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.HiddenField hfShowAll; + + /// + /// Controllo hfShowFiltered. + /// + /// + /// 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.HiddenField hfShowFiltered; } diff --git a/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx b/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx index ab8cfb9..a1f43ee 100644 --- a/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx +++ b/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx @@ -6,12 +6,19 @@ <%@ Register Src="~/WebUserControls/cmp_periodoAnalisi.ascx" TagPrefix="uc1" TagName="cmp_periodoAnalisi" %>
+
+ +
- + + + + +
-
+
@@ -47,8 +54,8 @@ - - + + @@ -60,49 +67,49 @@ - + - + - + - + - + - + - + - + @@ -110,7 +117,7 @@ <%----%> + ToolTip='<%# tooltipPermStra(Eval("minStra"),Eval("minPerm"),Eval("minMpp")) %>' Font-Size="1.5em" /> @@ -154,7 +161,7 @@ - + @@ -166,6 +173,7 @@ + @@ -181,7 +189,7 @@
+ CssClass="table table-sm table-striped table-warning" Visible="False"> diff --git a/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx.cs b/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx.cs index fa4dcf5..cf7ca3a 100644 --- a/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx.cs +++ b/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx.cs @@ -210,6 +210,12 @@ namespace GPW_Admin.WebUserControls checkFixOds(); } + protected void chkshowAll_CheckedChanged(object sender, EventArgs e) + { + filtroDip.ods = odsDip; + grViewExpl.DataBind(); + } + /// /// cambia stato visibilità week-end... /// diff --git a/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx.designer.cs b/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx.designer.cs index 203da58..0ab189a 100644 --- a/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx.designer.cs +++ b/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx.designer.cs @@ -14,6 +14,15 @@ namespace GPW_Admin.WebUserControls public partial class mod_reviewTimbrature { + /// + /// Controllo chkshowAll. + /// + /// + /// 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.CheckBox chkshowAll; + /// /// Controllo filtroDip. /// diff --git a/GPW_Admin/WebUserControls/mod_spostaOre.ascx b/GPW_Admin/WebUserControls/mod_spostaOre.ascx index 2d3b522..abcb076 100644 --- a/GPW_Admin/WebUserControls/mod_spostaOre.ascx +++ b/GPW_Admin/WebUserControls/mod_spostaOre.ascx @@ -11,7 +11,11 @@
- + + + + +
@@ -25,8 +29,7 @@
- + @@ -35,8 +38,7 @@
- + @@ -46,8 +48,7 @@
- + @@ -60,12 +61,12 @@
-
+
-
+
@@ -134,7 +135,7 @@ h
-
+
| @@ -159,12 +160,12 @@
-
+
|
-
+
diff --git a/GPW_Admin/WebUserControls/mod_spostaOre.ascx.cs b/GPW_Admin/WebUserControls/mod_spostaOre.ascx.cs index 38a45c8..52beb0c 100644 --- a/GPW_Admin/WebUserControls/mod_spostaOre.ascx.cs +++ b/GPW_Admin/WebUserControls/mod_spostaOre.ascx.cs @@ -351,13 +351,6 @@ namespace GPW_Admin.WebUserControls protected void chkshowAll_CheckedChanged(object sender, EventArgs e) { - // in base a selezione cambio metodo ods - string selMethod = "GetData"; - if (!chkshowAll.Checked) - { - selMethod = "getAttivi"; - } - odsDip.SelectMethod = selMethod; filtroDip.ods = odsDip; filtroDip.reselFirst(); }