diff --git a/CMS-SC-Data/DS_Applicazione.Designer.cs b/CMS-SC-Data/DS_Applicazione.Designer.cs index c3b6ec3..5c08a8f 100644 --- a/CMS-SC-Data/DS_Applicazione.Designer.cs +++ b/CMS-SC-Data/DS_Applicazione.Designer.cs @@ -2397,7 +2397,7 @@ namespace CMS_SC_Data { this.columnTipoValMisura.AllowDBNull = false; this.columnTipoValMisura.MaxLength = 50; this.columnNomePar.AllowDBNull = false; - this.columnNomePar.MaxLength = 50; + this.columnNomePar.MaxLength = 100; this.columnCodVisib.AllowDBNull = false; this.columnCodVisib.MaxLength = 50; } @@ -4131,6 +4131,8 @@ namespace CMS_SC_Data { private global::System.Data.DataColumn columnOrdinale; + private global::System.Data.DataColumn columnRev; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public MisureDataTable() { @@ -4340,6 +4342,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 RevColumn { + get { + return this.columnRev; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -4399,7 +4409,8 @@ namespace CMS_SC_Data { double LSVal, string CodSchedaVersNum, string CodVisib, - int Ordinale) { + int Ordinale, + int Rev) { MisureRow rowMisureRow = ((MisureRow)(this.NewRow())); object[] columnValuesArray = new object[] { IdxDossier, @@ -4423,7 +4434,8 @@ namespace CMS_SC_Data { LSVal, CodSchedaVersNum, CodVisib, - Ordinale}; + Ordinale, + Rev}; if ((parentAnagFasiRowByFK_IstanzeMisura_AnagFasi1 != null)) { columnValuesArray[5] = parentAnagFasiRowByFK_IstanzeMisura_AnagFasi1[0]; } @@ -4483,6 +4495,7 @@ namespace CMS_SC_Data { this.columnCodSchedaVersNum = base.Columns["CodSchedaVersNum"]; this.columnCodVisib = base.Columns["CodVisib"]; this.columnOrdinale = base.Columns["Ordinale"]; + this.columnRev = base.Columns["Rev"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4532,6 +4545,8 @@ namespace CMS_SC_Data { base.Columns.Add(this.columnCodVisib); this.columnOrdinale = new global::System.Data.DataColumn("Ordinale", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnOrdinale); + this.columnRev = new global::System.Data.DataColumn("Rev", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnRev); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnIdxDossier, this.columnCodScheda, @@ -4558,7 +4573,7 @@ namespace CMS_SC_Data { this.columnCodDeroga.AllowDBNull = false; this.columnCodDeroga.MaxLength = 50; this.columnNomeMisura.AllowDBNull = false; - this.columnNomeMisura.MaxLength = 50; + this.columnNomeMisura.MaxLength = 500; this.columnTipoValMisura.AllowDBNull = false; this.columnTipoValMisura.MaxLength = 50; this.columnNomePar.AllowDBNull = false; @@ -4568,6 +4583,7 @@ namespace CMS_SC_Data { this.columnCodVisib.AllowDBNull = false; this.columnCodVisib.MaxLength = 50; this.columnOrdinale.AllowDBNull = false; + this.columnRev.AllowDBNull = false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -8416,6 +8432,17 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public int Rev { + get { + return ((int)(this[this.tableMisure.RevColumn])); + } + set { + this[this.tableMisure.RevColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public AnagFasiRow AnagFasiRow { @@ -14853,6 +14880,8 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin tableMapping.ColumnMappings.Add("CodVisib", "CodVisib"); tableMapping.ColumnMappings.Add("Codschedaversnum", "Codschedaversnum"); tableMapping.ColumnMappings.Add("Ordinale", "Ordinale"); + tableMapping.ColumnMappings.Add("CodSchedaVersNum", "CodSchedaVersNum"); + tableMapping.ColumnMappings.Add("Rev", "Rev"); this._adapter.TableMappings.Add(tableMapping); } @@ -14869,9 +14898,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin this._commandCollection = new global::System.Data.SqlClient.SqlCommand[8]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT IdxDossier, CodScheda, Vers, NumScheda, CodMisura, Fase, Operatore, DataOr" + - "a, ValorePar, ValoreMis, OkValMis, CodDeroga, NomeMisura, TipoValMisura, NomePar" + - ", MinPar, MaxPar, LIVal, LSVal, CodVisib, Ordinale FROM v_Misure"; + this._commandCollection[0].CommandText = "SELECT * FROM v_Misure"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; diff --git a/CMS-SC-Data/DS_Applicazione.xsd b/CMS-SC-Data/DS_Applicazione.xsd index c04c273..d04871a 100644 --- a/CMS-SC-Data/DS_Applicazione.xsd +++ b/CMS-SC-Data/DS_Applicazione.xsd @@ -1031,7 +1031,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin - SELECT IdxDossier, CodScheda, Vers, NumScheda, CodMisura, Fase, Operatore, DataOra, ValorePar, ValoreMis, OkValMis, CodDeroga, NomeMisura, TipoValMisura, NomePar, MinPar, MaxPar, LIVal, LSVal, CodVisib, Ordinale FROM v_Misure + SELECT * FROM v_Misure @@ -1060,6 +1060,8 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin + + @@ -1699,7 +1701,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1935,7 +1937,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1972,6 +1974,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa + diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.csprojResolveAssemblyReference.cache b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csprojResolveAssemblyReference.cache index 9e9aa6f..a9cf9be 100644 Binary files a/CMS-SC-Data/obj/Debug/CMS-SC-Data.csprojResolveAssemblyReference.cache and b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csprojResolveAssemblyReference.cache differ 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 bd0defe..1fefc26 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/WebUserControls/mod_DettScheda.ascx b/CMS_SC/WebUserControls/mod_DettScheda.ascx index cdda791..abd407f 100644 --- a/CMS_SC/WebUserControls/mod_DettScheda.ascx +++ b/CMS_SC/WebUserControls/mod_DettScheda.ascx @@ -83,9 +83,17 @@ - - - + + + +

[IT]Versione testo in Italiano[/IT]
+ [EN]English version text[/EN]

+
+ + + + +
diff --git a/CMS_SC/WebUserControls/mod_collaudi.ascx b/CMS_SC/WebUserControls/mod_collaudi.ascx index 054302f..39dfb8c 100644 --- a/CMS_SC/WebUserControls/mod_collaudi.ascx +++ b/CMS_SC/WebUserControls/mod_collaudi.ascx @@ -1,5 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_collaudi.ascx.cs" Inherits="CMS_SC.WebUserControls.mod_collaudi" %> <%@ Register Src="~/WebUserControls/mod_fileUpload.ascx" TagPrefix="uc1" TagName="mod_fileUpload" %> +<%@ Register Src="~/WebUserControls/mod_textTrans.ascx" TagPrefix="uc1" TagName="mod_textTrans" %>