From 2bec8cfa6e061b0b9dbe89ac83fd19b226d31228 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 4 Sep 2020 18:55:57 +0200 Subject: [PATCH] Aggiunto check rilTemp ADM: giallo >37, rosso > 37.5 --- GPW_Admin/BaseUserControl.cs | 83 +++ GPW_Admin/Content/Site.css | 23 +- GPW_Admin/Content/Site.less | 26 +- GPW_Admin/Content/Site.min.css | 2 +- GPW_Admin/GPW_Admin.csproj | 3 + .../WebUserControls/mod_reviewTimbrature.ascx | 627 +++++++++--------- .../mod_reviewTimbrature.ascx.cs | 11 +- .../WebUserControls/mod_commUtLog.ascx | 5 +- .../WebUserControls/mod_elencoTimbr.ascx | 11 - GPW_Data/DS_Applicazione.Designer.cs | 48 +- GPW_Data/DS_Applicazione.xsd | 60 +- GPW_Data/DS_Applicazione.xss | 2 +- 12 files changed, 531 insertions(+), 370 deletions(-) create mode 100644 GPW_Admin/BaseUserControl.cs diff --git a/GPW_Admin/BaseUserControl.cs b/GPW_Admin/BaseUserControl.cs new file mode 100644 index 0000000..017983b --- /dev/null +++ b/GPW_Admin/BaseUserControl.cs @@ -0,0 +1,83 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; +using GPW_data; +using System.Globalization; +using System.Data; + +namespace GPW_Admin +{ + public class BaseUserControl : System.Web.UI.UserControl + { + + /// + /// effettua traduzione del lemma + /// + /// + /// + public string traduci(string lemma) + { + return user_std.UtSn.Traduci(lemma); + } + /// + /// Verifica se il valore sia > 0 + /// + /// + /// + public bool gtZero(object _valore) + { + bool answ = false; + decimal valore = 0; + decimal.TryParse(_valore.ToString(), out valore); + answ = valore > 0; + return answ; + } + /// + /// Verifica se il valore sia > limitValue + /// + /// + /// + /// + public bool gtVal(object _valore, double maxVal) + { + bool answ = false; + double valore = 0; + double.TryParse(_valore.ToString(), out valore); + answ = valore > maxVal; + return answ; + } + /// + /// Verifica se il valore sia < minVal + /// + /// + /// + /// + public bool ltVal(object _valore, double minVal) + { + bool answ = false; + double valore = 0; + double.TryParse(_valore.ToString(), out valore); + answ = valore < minVal; + return answ; + } + /// + /// Verifica se il valore sia > limitValue + /// + /// + /// + /// + /// + public bool betweenVal(object _valore, double minVal, double maxVal) + { + bool answ = false; + double valore = 0; + double.TryParse(_valore.ToString(), out valore); + answ = valore <= maxVal && valore >= minVal; + return answ; + } + } +} \ No newline at end of file diff --git a/GPW_Admin/Content/Site.css b/GPW_Admin/Content/Site.css index 7ad4654..ba9215d 100644 --- a/GPW_Admin/Content/Site.css +++ b/GPW_Admin/Content/Site.css @@ -36,5 +36,26 @@ textarea { line-height: 1.3em; } .ui-input-btn input { - opacity: .5; + opacity: 0.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; + /*border-top: 1px solid #969696; + border-bottom: 1px solid #969696;*/ +} +.GridPager span { + background-color: #A1DCF2; + color: #000; + /*border-top: 1px solid #3AC0F2; + border-bottom: 1px solid #3AC0F2;*/ + font-weight: bold; } \ No newline at end of file diff --git a/GPW_Admin/Content/Site.less b/GPW_Admin/Content/Site.less index 67a625c..29b83ce 100644 --- a/GPW_Admin/Content/Site.less +++ b/GPW_Admin/Content/Site.less @@ -47,4 +47,28 @@ textarea { .ui-input-btn input { opacity: .5; -} \ No newline at end of file +} + + +.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; + /*border-top: 1px solid #969696; + border-bottom: 1px solid #969696;*/ +} + +.GridPager span { + background-color: #A1DCF2; + color: #000; + /*border-top: 1px solid #3AC0F2; + border-bottom: 1px solid #3AC0F2;*/ + font-weight: bold; +} diff --git a/GPW_Admin/Content/Site.min.css b/GPW_Admin/Content/Site.min.css index f98214b..6d93ca8 100644 --- a/GPW_Admin/Content/Site.min.css +++ b/GPW_Admin/Content/Site.min.css @@ -1 +1 @@ -body{padding-top:50px;padding-bottom:20px;}.body-content{padding-left:15px;padding-right:15px;}input,select,textarea{max-width:280px;}@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;} \ No newline at end of file +body{padding-top:50px;padding-bottom:20px;}.body-content{padding-left:15px;padding-right:15px;}input,select,textarea{max-width:280px;}@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/GPW_Admin.csproj b/GPW_Admin/GPW_Admin.csproj index 38d4bcb..5085f54 100644 --- a/GPW_Admin/GPW_Admin.csproj +++ b/GPW_Admin/GPW_Admin.csproj @@ -627,6 +627,9 @@ + + ASPXCodeBehind + chLang.aspx ASPXCodeBehind diff --git a/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx b/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx index 83b2031..6400c0c 100644 --- a/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx +++ b/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx @@ -6,320 +6,327 @@ <%@ Register Src="mod_commAttivitaDesk.ascx" TagName="mod_commAttivitaDesk" TagPrefix="uc4" %>
-
-
- - +
+
+ + +
+
+ +
+
+ +
+
+ +
-
- +
+ +
-
- -
-
- -
-
-
- - -
-
- - - - - - - - - - - - - - Nessun record trovato - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%----%> - - - - - - - <%----%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-

Timbrature e Giustificativi

-
-
- -
- - - - - - - - - - - - - -
- Nessun GIUSTIFICATIVO attivo: -
- - (tipo PERM, editabile) -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + + + + + Nessun record trovato + + - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-

Record Commesse

-
-
- -
-
-
- -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%----%> + + + + + + + <%----%> + + + + + + +
+ +
+
+ +
+ + + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+

Timbrature e Giustificativi

+
+
+ +
+ + + + + + + + + + + + + +
+ Nessun GIUSTIFICATIVO attivo: +
+ + (tipo PERM, editabile) +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+
+

Record Commesse

+
+
+ +
+
+
+
+
diff --git a/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx.cs b/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx.cs index c2e2cd8..cf1d1c6 100644 --- a/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx.cs +++ b/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx.cs @@ -12,18 +12,9 @@ using System.Drawing; namespace GPW_Admin.WebUserControls { - public partial class mod_reviewTimbrature : System.Web.UI.UserControl + public partial class mod_reviewTimbrature : BaseUserControl { - /// - /// effettua traduzione del lemma - /// - /// - /// - public string traduci(string lemma) - { - return user_std.UtSn.Traduci(lemma); - } /// /// caricamento pagina /// diff --git a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx index 4f605ea..233de4d 100644 --- a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx +++ b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx @@ -95,10 +95,7 @@
- - - - +
diff --git a/GPW_Commesse/WebUserControls/mod_elencoTimbr.ascx b/GPW_Commesse/WebUserControls/mod_elencoTimbr.ascx index ebaeddb..a58c582 100644 --- a/GPW_Commesse/WebUserControls/mod_elencoTimbr.ascx +++ b/GPW_Commesse/WebUserControls/mod_elencoTimbr.ascx @@ -11,17 +11,6 @@ - <%-- - - - - - - - - - - --%>
Nessun record TIMBRATURA diff --git a/GPW_Data/DS_Applicazione.Designer.cs b/GPW_Data/DS_Applicazione.Designer.cs index 25f3ea6..c4fdb9e 100644 --- a/GPW_Data/DS_Applicazione.Designer.cs +++ b/GPW_Data/DS_Applicazione.Designer.cs @@ -7630,6 +7630,8 @@ namespace GPW_data { private global::System.Data.DataColumn columnmin104; + private global::System.Data.DataColumn columntempRil; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public TE_RA_ExplDataTable() { @@ -7943,6 +7945,14 @@ namespace GPW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn tempRilColumn { + get { + return this.columntempRil; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -8014,7 +8024,8 @@ namespace GPW_data { string chkFunRes, int minMpp, int minCassa, - int min104) { + int min104, + decimal tempRil) { TE_RA_ExplRow rowTE_RA_ExplRow = ((TE_RA_ExplRow)(this.NewRow())); object[] columnValuesArray = new object[] { dataLav, @@ -8051,7 +8062,8 @@ namespace GPW_data { chkFunRes, minMpp, minCassa, - min104}; + min104, + tempRil}; rowTE_RA_ExplRow.ItemArray = columnValuesArray; this.Rows.Add(rowTE_RA_ExplRow); return rowTE_RA_ExplRow; @@ -8117,6 +8129,7 @@ namespace GPW_data { this.columnminMpp = base.Columns["minMpp"]; this.columnminCassa = base.Columns["minCassa"]; this.columnmin104 = base.Columns["min104"]; + this.columntempRil = base.Columns["tempRil"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -8192,6 +8205,8 @@ namespace GPW_data { base.Columns.Add(this.columnminCassa); this.columnmin104 = new global::System.Data.DataColumn("min104", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnmin104); + this.columntempRil = new global::System.Data.DataColumn("tempRil", typeof(decimal), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columntempRil); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columndataLav, this.columnidxDipendente}, true)); @@ -15467,6 +15482,22 @@ namespace GPW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public decimal tempRil { + get { + try { + return ((decimal)(this[this.tableTE_RA_Expl.tempRilColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'tempRil\' nella tabella \'TE_RA_Expl\' è DBNull.", e); + } + } + set { + this[this.tableTE_RA_Expl.tempRilColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsCognomeNomeNull() { @@ -15862,6 +15893,18 @@ namespace GPW_data { public void Setmin104Null() { this[this.tableTE_RA_Expl.min104Column] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IstempRilNull() { + return this.IsNull(this.tableTE_RA_Expl.tempRilColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SettempRilNull() { + this[this.tableTE_RA_Expl.tempRilColumn] = global::System.Convert.DBNull; + } } /// @@ -29690,6 +29733,7 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi tableMapping.ColumnMappings.Add("minMpp", "minMpp"); tableMapping.ColumnMappings.Add("minCassa", "minCassa"); tableMapping.ColumnMappings.Add("min104", "min104"); + tableMapping.ColumnMappings.Add("tempRil", "tempRil"); this._adapter.TableMappings.Add(tableMapping); } diff --git a/GPW_Data/DS_Applicazione.xsd b/GPW_Data/DS_Applicazione.xsd index 0a965fd..af1ee60 100644 --- a/GPW_Data/DS_Applicazione.xsd +++ b/GPW_Data/DS_Applicazione.xsd @@ -2535,6 +2535,7 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi + @@ -2865,7 +2866,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -2889,7 +2890,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -2946,7 +2947,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -2984,7 +2985,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3112,7 +3113,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3205,7 +3206,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3250,7 +3251,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3264,7 +3265,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3314,7 +3315,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3350,7 +3351,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3370,7 +3371,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3391,7 +3392,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3427,7 +3428,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3452,7 +3453,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3468,7 +3469,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3489,10 +3490,10 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + - + @@ -3551,10 +3552,11 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt + - + @@ -3602,7 +3604,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3643,7 +3645,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3664,7 +3666,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3673,7 +3675,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3777,13 +3779,13 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - - - - - - - + + + + + + + \ No newline at end of file diff --git a/GPW_Data/DS_Applicazione.xss b/GPW_Data/DS_Applicazione.xss index b8e590b..c0b80df 100644 --- a/GPW_Data/DS_Applicazione.xss +++ b/GPW_Data/DS_Applicazione.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - +