From 4f06461dd59f40db3ba018719f2f0769fd99ca4d Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 8 Aug 2018 21:46:56 +0200 Subject: [PATCH] prima versione fix statusRow PAM --- Data/DS_app.Designer.cs | 134 ++++++++++++++++- Data/DS_app.xsd | 8 +- Data/DS_app.xss | 18 +-- PUB/WebUserContols/mod_statusRowPAM.ascx | 181 +++++++++++------------ 4 files changed, 232 insertions(+), 109 deletions(-) diff --git a/Data/DS_app.Designer.cs b/Data/DS_app.Designer.cs index 0074c87..d743fb2 100644 --- a/Data/DS_app.Designer.cs +++ b/Data/DS_app.Designer.cs @@ -4857,8 +4857,14 @@ namespace Data { private global::System.Data.DataColumn columnnRichieste; + private global::System.Data.DataColumn columnnPrevReq; + + private global::System.Data.DataColumn columnnPrevAppr; + private global::System.Data.DataColumn columnnAperte; + private global::System.Data.DataColumn columnnSospese; + private global::System.Data.DataColumn columnnConcluse; private global::System.Data.DataColumn columnnFatturate; @@ -4922,6 +4928,22 @@ namespace Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn nPrevReqColumn { + get { + return this.columnnPrevReq; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn nPrevApprColumn { + get { + return this.columnnPrevAppr; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn nAperteColumn { @@ -4930,6 +4952,14 @@ namespace Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn nSospeseColumn { + get { + return this.columnnSospese; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn nConcluseColumn { @@ -4991,13 +5021,16 @@ namespace Data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public PAM_DashStatsRow AddPAM_DashStatsRow(int numUsers, int reqUsers, int nRichieste, int nAperte, int nConcluse, int nFatturate, int nPagate) { + public PAM_DashStatsRow AddPAM_DashStatsRow(int numUsers, int reqUsers, int nRichieste, int nPrevReq, int nPrevAppr, int nAperte, int nSospese, int nConcluse, int nFatturate, int nPagate) { PAM_DashStatsRow rowPAM_DashStatsRow = ((PAM_DashStatsRow)(this.NewRow())); object[] columnValuesArray = new object[] { numUsers, reqUsers, nRichieste, + nPrevReq, + nPrevAppr, nAperte, + nSospese, nConcluse, nFatturate, nPagate}; @@ -5026,7 +5059,10 @@ namespace Data { this.columnnumUsers = base.Columns["numUsers"]; this.columnreqUsers = base.Columns["reqUsers"]; this.columnnRichieste = base.Columns["nRichieste"]; + this.columnnPrevReq = base.Columns["nPrevReq"]; + this.columnnPrevAppr = base.Columns["nPrevAppr"]; this.columnnAperte = base.Columns["nAperte"]; + this.columnnSospese = base.Columns["nSospese"]; this.columnnConcluse = base.Columns["nConcluse"]; this.columnnFatturate = base.Columns["nFatturate"]; this.columnnPagate = base.Columns["nPagate"]; @@ -5041,8 +5077,14 @@ namespace Data { base.Columns.Add(this.columnreqUsers); this.columnnRichieste = new global::System.Data.DataColumn("nRichieste", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnnRichieste); + this.columnnPrevReq = new global::System.Data.DataColumn("nPrevReq", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnnPrevReq); + this.columnnPrevAppr = new global::System.Data.DataColumn("nPrevAppr", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnnPrevAppr); this.columnnAperte = new global::System.Data.DataColumn("nAperte", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnnAperte); + this.columnnSospese = new global::System.Data.DataColumn("nSospese", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnnSospese); this.columnnConcluse = new global::System.Data.DataColumn("nConcluse", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnnConcluse); this.columnnFatturate = new global::System.Data.DataColumn("nFatturate", typeof(int), null, global::System.Data.MappingType.Element); @@ -5052,7 +5094,10 @@ namespace Data { this.columnnumUsers.ReadOnly = true; this.columnreqUsers.ReadOnly = true; this.columnnRichieste.ReadOnly = true; + this.columnnPrevReq.ReadOnly = true; + this.columnnPrevAppr.ReadOnly = true; this.columnnAperte.ReadOnly = true; + this.columnnSospese.ReadOnly = true; this.columnnConcluse.ReadOnly = true; this.columnnFatturate.ReadOnly = true; this.columnnPagate.ReadOnly = true; @@ -8393,6 +8438,38 @@ namespace Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public int nPrevReq { + get { + try { + return ((int)(this[this.tablePAM_DashStats.nPrevReqColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'nPrevReq\' nella tabella \'PAM_DashStats\' è DBNull.", e); + } + } + set { + this[this.tablePAM_DashStats.nPrevReqColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public int nPrevAppr { + get { + try { + return ((int)(this[this.tablePAM_DashStats.nPrevApprColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'nPrevAppr\' nella tabella \'PAM_DashStats\' è DBNull.", e); + } + } + set { + this[this.tablePAM_DashStats.nPrevApprColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public int nAperte { @@ -8409,6 +8486,22 @@ namespace Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public int nSospese { + get { + try { + return ((int)(this[this.tablePAM_DashStats.nSospeseColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'nSospese\' nella tabella \'PAM_DashStats\' è DBNull.", e); + } + } + set { + this[this.tablePAM_DashStats.nSospeseColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public int nConcluse { @@ -8493,6 +8586,30 @@ namespace Data { this[this.tablePAM_DashStats.nRichiesteColumn] = global::System.Convert.DBNull; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsnPrevReqNull() { + return this.IsNull(this.tablePAM_DashStats.nPrevReqColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetnPrevReqNull() { + this[this.tablePAM_DashStats.nPrevReqColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsnPrevApprNull() { + return this.IsNull(this.tablePAM_DashStats.nPrevApprColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetnPrevApprNull() { + this[this.tablePAM_DashStats.nPrevApprColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsnAperteNull() { @@ -8505,6 +8622,18 @@ namespace Data { this[this.tablePAM_DashStats.nAperteColumn] = global::System.Convert.DBNull; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsnSospeseNull() { + return this.IsNull(this.tablePAM_DashStats.nSospeseColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetnSospeseNull() { + this[this.tablePAM_DashStats.nSospeseColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsnConcluseNull() { @@ -13240,7 +13369,10 @@ SELECT idxStato, stato, descrizione, cssStato FROM AnagStati WHERE (idxStato = @ tableMapping.ColumnMappings.Add("numUsers", "numUsers"); tableMapping.ColumnMappings.Add("reqUsers", "reqUsers"); tableMapping.ColumnMappings.Add("nRichieste", "nRichieste"); + tableMapping.ColumnMappings.Add("nPrevReq", "nPrevReq"); + tableMapping.ColumnMappings.Add("nPrevAppr", "nPrevAppr"); tableMapping.ColumnMappings.Add("nAperte", "nAperte"); + tableMapping.ColumnMappings.Add("nSospese", "nSospese"); tableMapping.ColumnMappings.Add("nConcluse", "nConcluse"); tableMapping.ColumnMappings.Add("nFatturate", "nFatturate"); tableMapping.ColumnMappings.Add("nPagate", "nPagate"); diff --git a/Data/DS_app.xsd b/Data/DS_app.xsd index 94cb0e0..51f66fa 100644 --- a/Data/DS_app.xsd +++ b/Data/DS_app.xsd @@ -738,7 +738,7 @@ SELECT idxStato, stato, descrizione, cssStato FROM AnagStati WHERE (idxStato = @ - + dbo.stp_PAM_DashStats @@ -754,7 +754,10 @@ SELECT idxStato, stato, descrizione, cssStato FROM AnagStati WHERE (idxStato = @ + + + @@ -1355,7 +1358,10 @@ FROM v_ER_Acts + + + diff --git a/Data/DS_app.xss b/Data/DS_app.xss index cbfe5f9..6c70d74 100644 --- a/Data/DS_app.xss +++ b/Data/DS_app.xss @@ -4,22 +4,22 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - - - - - - - + + + + + + + diff --git a/PUB/WebUserContols/mod_statusRowPAM.ascx b/PUB/WebUserContols/mod_statusRowPAM.ascx index e341eb5..e996fe9 100644 --- a/PUB/WebUserContols/mod_statusRowPAM.ascx +++ b/PUB/WebUserContols/mod_statusRowPAM.ascx @@ -20,119 +20,104 @@ -
-
-
- -
-
- -
-
- Condomini -
-
- -
-
-
- - registrati -
-
- - da approvare -
+
+ +
+
+ +
+
+ Condomini +
+ + / +  (reg/rich)
-
-
-
- -
-
- -
-
- Richieste -
+
- -
-
-
- - attive -
+
+ +
+
+ +
+
+ Richieste +
+ + aperte
-
- <%--
-
- -
-
- -
-
- Dashboard -
-
- -
- -
--%> -
-
- -
-
- -
-
- Interventi aperti -
+
- -
-
-
- - in corso -
+
+ +
+
+ +
+
+ Interventi +
+ + in corso
-
-
-
- -
-
- -
-
- Conclusi -
+
- -
-
-
- - chiusi -
-
- - - maturati -
+
+ +
+
+ +
+
+ Sospesi +
+ +
-
+ +
+
+ +
+
+ +
+
+ Chiusi +
+ + +
+
+
+ +
+
+ +
+
+ +
+
+ Fatture +
+ + / + +
+
+
+ +