diff --git a/CMS-SC-Data/DS_Applicazione.Designer.cs b/CMS-SC-Data/DS_Applicazione.Designer.cs index 0cfb885..ca41d71 100644 --- a/CMS-SC-Data/DS_Applicazione.Designer.cs +++ b/CMS-SC-Data/DS_Applicazione.Designer.cs @@ -4701,6 +4701,8 @@ namespace CMS_SC_Data { private global::System.Data.DataColumn columnCodSchedaVersNum; + private global::System.Data.DataColumn columnDescrizioneScheda; + private global::System.Data.DataColumn columnCodScheda; private global::System.Data.DataColumn columnVers; @@ -4800,6 +4802,14 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn DescrizioneSchedaColumn { + get { + return this.columnDescrizioneScheda; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn CodSchedaColumn { @@ -5040,6 +5050,7 @@ namespace CMS_SC_Data { public ReportDataRow AddReportDataRow( int IdxDossier, string CodSchedaVersNum, + string DescrizioneScheda, string CodScheda, int Vers, int NumScheda, @@ -5069,6 +5080,7 @@ namespace CMS_SC_Data { object[] columnValuesArray = new object[] { IdxDossier, CodSchedaVersNum, + DescrizioneScheda, CodScheda, Vers, NumScheda, @@ -5118,6 +5130,7 @@ namespace CMS_SC_Data { internal void InitVars() { this.columnIdxDossier = base.Columns["IdxDossier"]; this.columnCodSchedaVersNum = base.Columns["CodSchedaVersNum"]; + this.columnDescrizioneScheda = base.Columns["DescrizioneScheda"]; this.columnCodScheda = base.Columns["CodScheda"]; this.columnVers = base.Columns["Vers"]; this.columnNumScheda = base.Columns["NumScheda"]; @@ -5152,6 +5165,8 @@ namespace CMS_SC_Data { base.Columns.Add(this.columnIdxDossier); this.columnCodSchedaVersNum = new global::System.Data.DataColumn("CodSchedaVersNum", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCodSchedaVersNum); + this.columnDescrizioneScheda = new global::System.Data.DataColumn("DescrizioneScheda", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDescrizioneScheda); this.columnCodScheda = new global::System.Data.DataColumn("CodScheda", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCodScheda); this.columnVers = new global::System.Data.DataColumn("Vers", typeof(int), null, global::System.Data.MappingType.Element); @@ -5205,6 +5220,8 @@ namespace CMS_SC_Data { this.columnIdxDossier.AllowDBNull = false; this.columnCodSchedaVersNum.ReadOnly = true; this.columnCodSchedaVersNum.MaxLength = 152; + this.columnDescrizioneScheda.ReadOnly = true; + this.columnDescrizioneScheda.MaxLength = 4000; this.columnCodScheda.AllowDBNull = false; this.columnCodScheda.MaxLength = 50; this.columnVers.AllowDBNull = false; @@ -5223,12 +5240,12 @@ namespace CMS_SC_Data { this.columnOkValMis.AllowDBNull = false; this.columnCodDeroga.AllowDBNull = false; this.columnCodDeroga.MaxLength = 50; - this.columnNomeMisura.AllowDBNull = false; - this.columnNomeMisura.MaxLength = 500; + this.columnNomeMisura.ReadOnly = true; + this.columnNomeMisura.MaxLength = 4000; this.columnTipoValMisura.AllowDBNull = false; this.columnTipoValMisura.MaxLength = 50; - this.columnNomePar.AllowDBNull = false; - this.columnNomePar.MaxLength = 100; + this.columnNomePar.ReadOnly = true; + this.columnNomePar.MaxLength = 4000; this.columnMinPar.ReadOnly = true; this.columnMaxPar.ReadOnly = true; this.columnLIVal.ReadOnly = true; @@ -8539,6 +8556,22 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string DescrizioneScheda { + get { + try { + return ((string)(this[this.tableReportData.DescrizioneSchedaColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'DescrizioneScheda\' nella tabella \'ReportData\' è DBNull.", e); + } + } + set { + this[this.tableReportData.DescrizioneSchedaColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string CodScheda { @@ -8675,7 +8708,12 @@ namespace CMS_SC_Data { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string NomeMisura { get { - return ((string)(this[this.tableReportData.NomeMisuraColumn])); + try { + return ((string)(this[this.tableReportData.NomeMisuraColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'NomeMisura\' nella tabella \'ReportData\' è DBNull.", e); + } } set { this[this.tableReportData.NomeMisuraColumn] = value; @@ -8697,7 +8735,12 @@ namespace CMS_SC_Data { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string NomePar { get { - return ((string)(this[this.tableReportData.NomeParColumn])); + try { + return ((string)(this[this.tableReportData.NomeParColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'NomePar\' nella tabella \'ReportData\' è DBNull.", e); + } } set { this[this.tableReportData.NomeParColumn] = value; @@ -8851,6 +8894,42 @@ namespace CMS_SC_Data { this[this.tableReportData.CodSchedaVersNumColumn] = global::System.Convert.DBNull; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsDescrizioneSchedaNull() { + return this.IsNull(this.tableReportData.DescrizioneSchedaColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetDescrizioneSchedaNull() { + this[this.tableReportData.DescrizioneSchedaColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsNomeMisuraNull() { + return this.IsNull(this.tableReportData.NomeMisuraColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetNomeMisuraNull() { + this[this.tableReportData.NomeMisuraColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsNomeParNull() { + return this.IsNull(this.tableReportData.NomeParColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetNomeParNull() { + this[this.tableReportData.NomeParColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsMinParNull() { @@ -15469,6 +15548,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin tableMapping.DataSetTable = "ReportData"; tableMapping.ColumnMappings.Add("IdxDossier", "IdxDossier"); tableMapping.ColumnMappings.Add("CodSchedaVersNum", "CodSchedaVersNum"); + tableMapping.ColumnMappings.Add("DescrizioneScheda", "DescrizioneScheda"); tableMapping.ColumnMappings.Add("CodScheda", "CodScheda"); tableMapping.ColumnMappings.Add("Vers", "Vers"); tableMapping.ColumnMappings.Add("NumScheda", "NumScheda"); @@ -15516,13 +15596,14 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxDossier", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Fase", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Rev", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Lingua", global::System.Data.SqlDbType.NVarChar, 3, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [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.Fill, true)] - public virtual int Fill(DS_Applicazione.ReportDataDataTable dataTable, global::System.Nullable IdxDossier, string Fase, global::System.Nullable Rev) { + public virtual int Fill(DS_Applicazione.ReportDataDataTable dataTable, global::System.Nullable IdxDossier, string Fase, global::System.Nullable Rev, string Lingua) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((IdxDossier.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(IdxDossier.Value)); @@ -15542,6 +15623,12 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin else { this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } + if ((Lingua == null)) { + this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[4].Value = ((string)(Lingua)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -15553,7 +15640,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin [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, true)] - public virtual DS_Applicazione.ReportDataDataTable GetData(global::System.Nullable IdxDossier, string Fase, global::System.Nullable Rev) { + public virtual DS_Applicazione.ReportDataDataTable GetData(global::System.Nullable IdxDossier, string Fase, global::System.Nullable Rev, string Lingua) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((IdxDossier.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(IdxDossier.Value)); @@ -15573,6 +15660,12 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin else { this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } + if ((Lingua == null)) { + this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[4].Value = ((string)(Lingua)); + } DS_Applicazione.ReportDataDataTable dataTable = new DS_Applicazione.ReportDataDataTable(); this.Adapter.Fill(dataTable); return dataTable; diff --git a/CMS-SC-Data/DS_Applicazione.xsd b/CMS-SC-Data/DS_Applicazione.xsd index 0d0402b..3e36a26 100644 --- a/CMS-SC-Data/DS_Applicazione.xsd +++ b/CMS-SC-Data/DS_Applicazione.xsd @@ -1183,6 +1183,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin + @@ -1191,6 +1192,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin + @@ -1548,7 +1550,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1569,7 +1571,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1607,7 +1609,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1627,7 +1629,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1669,7 +1671,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1718,7 +1720,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1743,7 +1745,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1801,7 +1803,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1848,7 +1850,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1886,7 +1888,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1981,7 +1983,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1992,6 +1994,13 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa + + + + + + + @@ -2040,10 +2049,10 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + - + @@ -2054,10 +2063,10 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + - + @@ -2104,7 +2113,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -2124,7 +2133,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -2144,7 +2153,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -2171,7 +2180,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -2228,7 +2237,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -2324,16 +2333,16 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll b/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll index 7a1eb0d..26b16d4 100644 Binary files a/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/CMS_SC/CMS_SC.csproj b/CMS_SC/CMS_SC.csproj index 3fb6823..cf6dcfa 100644 --- a/CMS_SC/CMS_SC.csproj +++ b/CMS_SC/CMS_SC.csproj @@ -995,9 +995,14 @@ Designer + Always + + + Always + + + Always - - diff --git a/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs b/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs index e3320ec..5a7efa0 100644 --- a/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs +++ b/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs @@ -62,7 +62,7 @@ namespace CMS_SC.WebUserControls // 2) caricamento tab dati DataTable tabDati = new DataTable(); DataTable tabVoc = new DataTable(); - tabDati = (DataTable)DtProxy.man.taRep.GetData(IdxDossier, Fase, Rev); + tabDati = (DataTable)DtProxy.man.taRep.GetData(IdxDossier, Fase, Rev, Lingua); tabVoc = (DataTable)DtProxy.man.taVoc.getByLinguaLemmaLike(Lingua, "SC_PRT"); // 3) inserimento dataset nel report diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index 63cfe2a..20b07b3 100644 Binary files a/CMS_SC/bin/CMS-SC-Data.dll and b/CMS_SC/bin/CMS-SC-Data.dll differ diff --git a/CMS_SC/sql/Update_3.2.sql b/CMS_SC/sql/Update_3.2.sql index ab6547b..a7e6974 100644 --- a/CMS_SC/sql/Update_3.2.sql +++ b/CMS_SC/sql/Update_3.2.sql @@ -22,12 +22,14 @@ exec voc.stp_insNewLemma 'EnableIfCompiled','(in presenza di record misure)' exec voc.stp_insNewLemma 'FiltroSearchMatr','Filtro Ricerca Matricola (elenco)' -- 2018.03.19 - update getDossier -/****** Object: StoredProcedure [dbo].[stp_rep_getDossier] Script Date: 19/03/2018 09:37:05 ******/ +/****** Object: StoredProcedure [dbo].[stp_rep_getDossier] Script Date: 19/03/2018 10:48:24 ******/ SET ANSI_NULLS ON GO + SET QUOTED_IDENTIFIER ON GO + -- ============================================= -- Author: Steamware -- Create date: 2015.06.18 @@ -38,19 +40,43 @@ ALTER PROCEDURE [dbo].[stp_rep_getDossier] @IdxDossier INT ,@Fase NVARCHAR(50) ,@Rev INT = 0 --- ,@Lingua NVARCHAR(3) + ,@Lingua NVARCHAR(3) = 'IT' ) AS -SELECT mi.*, - fa.Descrizione AS DescFase, - em.Cliente AS Cliente, - em.Matricola AS MatrMacchina, - em.Descrizione AS DescMacchina -FROM dbo.v_Misure AS mi - INNER JOIN dbo.AnagFasi AS fa ON mi.Fase = fa.Fase - INNER JOIN dbo.ElencoDossier AS do ON mi.IdxDossier = do.IdxDossier - INNER JOIN dbo.ElencoMacchineCN AS em ON do.Matricola = em.Matricola +SELECT mi.IdxDossier, + mi.CodSchedaVersNum, + dbo.f_getStringLang(sc.Descrizione, @Lingua,0) AS DescrizioneScheda, + mi.CodScheda, + mi.Vers, + mi.NumScheda, + mi.CodMisura, + mi.Fase, + mi.Rev, + mi.Operatore, + mi.DataOra, + mi.ValorePar, + mi.ValoreMis, + mi.OkValMis, + mi.CodDeroga, + dbo.f_getStringLang(mi.NomeMisura, @Lingua,0) AS NomeMisura, + mi.TipoValMisura, + dbo.f_getStringLang(mi.NomePar, @Lingua,0) AS NomePar, + mi.MinPar, + mi.MaxPar, + mi.LIVal, + mi.LSVal, + mi.CodVisib, + mi.Ordinale, + fa.Descrizione AS DescFase, + em.Cliente, + em.Matricola AS MatrMacchina, + em.Descrizione AS DescMacchina +FROM v_Misure AS mi INNER JOIN + AnagFasi AS fa ON mi.Fase = fa.Fase INNER JOIN + ElencoDossier AS do ON mi.IdxDossier = do.IdxDossier INNER JOIN + ElencoMacchineCN AS em ON do.Matricola = em.Matricola INNER JOIN + AnagSchede AS sc ON mi.CodScheda = sc.CodScheda AND mi.Vers = sc.Vers WHERE ( mi.IdxDossier = @IdxDossier OR @IdxDossier = 0 ) -- mettere ISNULL su variabile x estrarre anche con NULL? AND ( mi.Fase = @Fase OR @Fase = '' ) AND ( mi.Rev = @Rev) @@ -64,4 +90,7 @@ WHERE IdxDossier = CASE WHEN @IdxDossier <> 0 THEN @IdxDossier ELSE IdxDossie ORDER BY CodScheda, Vers, NumScheda, CodMisura, NomeMisura */ RETURN +GO + +