diff --git a/Data/DS_app.Designer.cs b/Data/DS_app.Designer.cs index 63796c0..0074c87 100644 --- a/Data/DS_app.Designer.cs +++ b/Data/DS_app.Designer.cs @@ -9616,11 +9616,17 @@ namespace Data.DS_appTableAdapters { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT *\r\nFROM dbo.v_AnagAmministratori"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[1].Connection = this.Connection; + this._commandCollection[1].CommandText = "dbo.stp_AA_getByKey"; + this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxAmm", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9646,6 +9652,23 @@ namespace Data.DS_appTableAdapters { this.Adapter.Fill(dataTable); return dataTable; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_app.AnagAmministratoriDataTable getByKey(global::System.Nullable idxAmm) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((idxAmm.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(idxAmm.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + DS_app.AnagAmministratoriDataTable dataTable = new DS_app.AnagAmministratoriDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } } /// diff --git a/Data/DS_app.xsd b/Data/DS_app.xsd index bb26408..94cb0e0 100644 --- a/Data/DS_app.xsd +++ b/Data/DS_app.xsd @@ -30,7 +30,19 @@ FROM dbo.v_AnagAmministratori - + + + + + dbo.stp_AA_getByKey + + + + + + + + @@ -598,7 +610,7 @@ FROM v_AssF2C - + dbo.stp_ER_UpdateStato @@ -610,7 +622,7 @@ FROM v_AssF2C - + dbo.stp_ER_UpdateText @@ -903,7 +915,7 @@ FROM v_ER_Acts - + @@ -930,7 +942,7 @@ FROM v_ER_Acts - + @@ -981,7 +993,7 @@ FROM v_ER_Acts - + @@ -1010,7 +1022,7 @@ FROM v_ER_Acts - + @@ -1074,7 +1086,7 @@ FROM v_ER_Acts - + @@ -1083,7 +1095,7 @@ FROM v_ER_Acts - + @@ -1165,7 +1177,7 @@ FROM v_ER_Acts - + @@ -1179,7 +1191,7 @@ FROM v_ER_Acts - + @@ -1284,7 +1296,7 @@ FROM v_ER_Acts - + @@ -1312,7 +1324,7 @@ FROM v_ER_Acts - + @@ -1337,7 +1349,7 @@ FROM v_ER_Acts - + @@ -1350,7 +1362,7 @@ FROM v_ER_Acts - + @@ -1365,7 +1377,7 @@ FROM v_ER_Acts - + @@ -1437,7 +1449,7 @@ FROM v_ER_Acts - + @@ -1499,11 +1511,11 @@ FROM v_ER_Acts - - - - - + + + + + \ No newline at end of file diff --git a/Data/DS_app.xss b/Data/DS_app.xss index 4b4d69b..cbfe5f9 100644 --- a/Data/DS_app.xss +++ b/Data/DS_app.xss @@ -6,23 +6,23 @@ --> - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + 355 @@ -34,7 +34,7 @@ - + 900 @@ -46,7 +46,7 @@ - + 933 @@ -58,7 +58,7 @@ - + 723 @@ -70,7 +70,7 @@ - + 976 diff --git a/Data/DtProxy.cs b/Data/DtProxy.cs index e831afd..a67b143 100644 --- a/Data/DtProxy.cs +++ b/Data/DtProxy.cs @@ -18,6 +18,7 @@ namespace Data /// protected virtual void avvioTableAdapters() { + taAA = new DS_appTableAdapters.AnagAmministratoriTableAdapter(); taAF = new DS_appTableAdapters.AnagFornitoriTableAdapter(); taAP = new DS_appTableAdapters.AnagPriorTableAdapter(); taAS = new DS_appTableAdapters.AnagStatiTableAdapter(); @@ -37,6 +38,7 @@ namespace Data string connStr = memLayer.ML.confReadString("B2BCondConnectionString"); //string connStrFiles = memLayer.ML.confReadString("B2BCondFilesConnectionString"); // connections del db vocabolario + taAA.Connection.ConnectionString = connStr; taAF.Connection.ConnectionString = connStr; taAP.Connection.ConnectionString = connStr; taAS.Connection.ConnectionString = connStr; @@ -53,6 +55,7 @@ namespace Data #region area public + public DS_appTableAdapters.AnagAmministratoriTableAdapter taAA; public DS_appTableAdapters.AnagFornitoriTableAdapter taAF; public DS_appTableAdapters.AnagPriorTableAdapter taAP; public DS_appTableAdapters.AssF2ATableAdapter taAssF2A; diff --git a/Jenkinsfile b/Jenkinsfile index e7a8c07..66302a8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=117']) { + withEnv(['NEXT_BUILD_NUMBER=118']) { // env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'SOSCONDOMINI' diff --git a/PUB/PAM/MyDashboard.aspx.cs b/PUB/PAM/MyDashboard.aspx.cs index 2c8b0f2..57c3d12 100644 --- a/PUB/PAM/MyDashboard.aspx.cs +++ b/PUB/PAM/MyDashboard.aspx.cs @@ -21,9 +21,37 @@ namespace PUB.PAM { } memLayer.ML.setSessionVal("idxAmm", idxAmm); memLayer.ML.setSessionVal("idxFornitore", "0"); + try + { + nomeAmm = rigaAmministratore(idxAmm).RagSociale; + } + catch + { } } divDash.Visible = userAuth; divAuthError.Visible = !userAuth; } + protected DS_app.AnagAmministratoriRow rigaAmministratore(int idxAmm) + { + DS_app.AnagAmministratoriRow answ = null; + try + { + answ = DtProxy.man.taAA.getByKey(idxAmm)[0]; + } + catch + { } + return answ; + } + public string nomeAmm + { + get + { + return memLayer.ML.StringSessionObj("nomeAmm"); + } + set + { + memLayer.ML.setSessionVal("nomeAmm", value); + } + } } } \ No newline at end of file diff --git a/PUB/WebUserContols/mod_statusRowPAM.ascx b/PUB/WebUserContols/mod_statusRowPAM.ascx index 3dd7123..e341eb5 100644 --- a/PUB/WebUserContols/mod_statusRowPAM.ascx +++ b/PUB/WebUserContols/mod_statusRowPAM.ascx @@ -1,10 +1,29 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_statusRowPAM.ascx.cs" Inherits="PUB.WebUserContols.mod_statusRowPAM" %> - - -
-
-
- + +
+
+ +
+
+ +
+
+
+ Dashboard amministratore +
+
+ <%: nomeAmm %> +
+
+
+ +
+ + +
+
+
+
@@ -13,24 +32,24 @@ Condomini
- -
-
-
- - registrati -
-
- - da approvare + +
+
+
+ + registrati +
+
+ + da approvare +
-
-
-
- +
+
+
@@ -39,18 +58,18 @@ Richieste
- -
-
-
- - attive + +
+
+
+ + attive +
-
-
+ <%--
@@ -64,10 +83,10 @@
-
-
-
- +
--%> +
+
+
@@ -76,20 +95,20 @@ Interventi aperti
- -
-
-
- - in corso + +
+
+
+ + in corso +
-
-
-
- +
+
+
@@ -98,26 +117,27 @@ Conclusi
- -
-
-
- - chiusi -
-
- - maturati + +
+
+
+ + chiusi +
+
+ + + maturati +
-
-
- - - - - - - + + + + + + + +
diff --git a/PUB/WebUserContols/mod_statusRowPAM.ascx.cs b/PUB/WebUserContols/mod_statusRowPAM.ascx.cs index 54d26b7..122b0c8 100644 --- a/PUB/WebUserContols/mod_statusRowPAM.ascx.cs +++ b/PUB/WebUserContols/mod_statusRowPAM.ascx.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; +using SteamWare; +using System; namespace PUB.WebUserContols { @@ -13,5 +9,26 @@ namespace PUB.WebUserContols { } + /// + /// titolo pagina + /// + public string titolo + { + get + { + return devicesAuthProxy.getPage(Request.Url).Replace(".aspx", ""); + } + } + public string nomeAmm + { + get + { + return memLayer.ML.StringSessionObj("nomeAmm"); + } + set + { + memLayer.ML.setSessionVal("nomeAmm", value); + } + } } } \ No newline at end of file diff --git a/PUB/WebUserContols/mod_statusRowPAM.ascx.designer.cs b/PUB/WebUserContols/mod_statusRowPAM.ascx.designer.cs index 12bf097..5e0ab6a 100644 --- a/PUB/WebUserContols/mod_statusRowPAM.ascx.designer.cs +++ b/PUB/WebUserContols/mod_statusRowPAM.ascx.designer.cs @@ -12,6 +12,24 @@ namespace PUB.WebUserContols { public partial class mod_statusRowPAM { + /// + /// Controllo divDash. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDash; + + /// + /// Controllo HyperLink1. + /// + /// + /// 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.HyperLink HyperLink1; + /// /// Controllo repStats. /// diff --git a/PUB/WebUserContols/mod_statusRowPAZ.ascx b/PUB/WebUserContols/mod_statusRowPAZ.ascx index 307896c..c2b35b2 100644 --- a/PUB/WebUserContols/mod_statusRowPAZ.ascx +++ b/PUB/WebUserContols/mod_statusRowPAZ.ascx @@ -12,7 +12,7 @@
Dashboard fornitore
-
+
<%: nomeForn %>