diff --git a/CMS-SC-Data/DS_Applicazione.Designer.cs b/CMS-SC-Data/DS_Applicazione.Designer.cs index db980ce..beef016 100644 --- a/CMS-SC-Data/DS_Applicazione.Designer.cs +++ b/CMS-SC-Data/DS_Applicazione.Designer.cs @@ -4753,6 +4753,8 @@ namespace CMS_SC_Data { private global::System.Data.DataColumn columnDescMacchina; + private global::System.Data.DataColumn columnNoteVersione; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public ReportDataDataTable() { @@ -5010,6 +5012,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 NoteVersioneColumn { + get { + return this.columnNoteVersione; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -5075,7 +5085,8 @@ namespace CMS_SC_Data { string DescFase, string Cliente, string MatrMacchina, - string DescMacchina) { + string DescMacchina, + string NoteVersione) { ReportDataRow rowReportDataRow = ((ReportDataRow)(this.NewRow())); object[] columnValuesArray = new object[] { IdxDossier, @@ -5105,7 +5116,8 @@ namespace CMS_SC_Data { DescFase, Cliente, MatrMacchina, - DescMacchina}; + DescMacchina, + NoteVersione}; rowReportDataRow.ItemArray = columnValuesArray; this.Rows.Add(rowReportDataRow); return rowReportDataRow; @@ -5156,6 +5168,7 @@ namespace CMS_SC_Data { this.columnCliente = base.Columns["Cliente"]; this.columnMatrMacchina = base.Columns["MatrMacchina"]; this.columnDescMacchina = base.Columns["DescMacchina"]; + this.columnNoteVersione = base.Columns["NoteVersione"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -5217,6 +5230,8 @@ namespace CMS_SC_Data { base.Columns.Add(this.columnMatrMacchina); this.columnDescMacchina = new global::System.Data.DataColumn("DescMacchina", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnDescMacchina); + this.columnNoteVersione = new global::System.Data.DataColumn("NoteVersione", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNoteVersione); this.columnIdxDossier.AllowDBNull = false; this.columnCodSchedaVersNum.ReadOnly = true; this.columnCodSchedaVersNum.MaxLength = 152; @@ -5260,6 +5275,8 @@ namespace CMS_SC_Data { this.columnMatrMacchina.MaxLength = 50; this.columnDescMacchina.AllowDBNull = false; this.columnDescMacchina.MaxLength = 50; + this.columnNoteVersione.ReadOnly = true; + this.columnNoteVersione.MaxLength = 2147483647; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -8882,6 +8899,22 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string NoteVersione { + get { + try { + return ((string)(this[this.tableReportData.NoteVersioneColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'NoteVersione\' nella tabella \'ReportData\' è DBNull.", e); + } + } + set { + this[this.tableReportData.NoteVersioneColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsCodSchedaVersNumNull() { @@ -8989,6 +9022,18 @@ namespace CMS_SC_Data { public void SetDescFaseNull() { this[this.tableReportData.DescFaseColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsNoteVersioneNull() { + return this.IsNull(this.tableReportData.NoteVersioneColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetNoteVersioneNull() { + this[this.tableReportData.NoteVersioneColumn] = global::System.Convert.DBNull; + } } /// @@ -14978,7 +15023,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin [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[8]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[9]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT * FROM v_Misure"; @@ -15040,7 +15085,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin this._commandCollection[6].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[7] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[7].Connection = this.Connection; - this._commandCollection[7].CommandText = "dbo.stp_Mis_updateMis"; + this._commandCollection[7].CommandText = "dbo.stp_Mis_SetVisib"; this._commandCollection[7].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[7].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[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxDossier", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -15050,11 +15095,24 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodMisura", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Fase", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Rev", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Operatore", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ValorePar", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ValoreMis", global::System.Data.SqlDbType.NVarChar, 4000, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodVisib", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodDeroga", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[8].Connection = this.Connection; + this._commandCollection[8].CommandText = "dbo.stp_Mis_updateMis"; + this._commandCollection[8].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[8].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[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxDossier", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodScheda", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Vers", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_NumScheda", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodMisura", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Fase", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Rev", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Operatore", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ValorePar", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ValoreMis", global::System.Data.SqlDbType.NVarChar, 4000, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodVisib", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodDeroga", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -15333,7 +15391,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin [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")] - public virtual int updateMis(global::System.Nullable Original_IdxDossier, string Original_CodScheda, global::System.Nullable Original_Vers, global::System.Nullable Original_NumScheda, string Original_CodMisura, string Original_Fase, global::System.Nullable Original_Rev, string Operatore, global::System.Nullable ValorePar, string ValoreMis, string CodVisib, string CodDeroga) { + public virtual int SetVisib(global::System.Nullable Original_IdxDossier, string Original_CodScheda, global::System.Nullable Original_Vers, global::System.Nullable Original_NumScheda, string Original_CodMisura, string Original_Fase, global::System.Nullable Original_Rev, string CodVisib) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; if ((Original_IdxDossier.HasValue == true)) { command.Parameters[1].Value = ((int)(Original_IdxDossier.Value)); @@ -15377,6 +15435,76 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin else { command.Parameters[7].Value = global::System.DBNull.Value; } + if ((CodVisib == null)) { + command.Parameters[8].Value = global::System.DBNull.Value; + } + else { + command.Parameters[8].Value = ((string)(CodVisib)); + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + + [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")] + public virtual int updateMis(global::System.Nullable Original_IdxDossier, string Original_CodScheda, global::System.Nullable Original_Vers, global::System.Nullable Original_NumScheda, string Original_CodMisura, string Original_Fase, global::System.Nullable Original_Rev, string Operatore, global::System.Nullable ValorePar, string ValoreMis, string CodVisib, string CodDeroga) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[8]; + if ((Original_IdxDossier.HasValue == true)) { + command.Parameters[1].Value = ((int)(Original_IdxDossier.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + if ((Original_CodScheda == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(Original_CodScheda)); + } + if ((Original_Vers.HasValue == true)) { + command.Parameters[3].Value = ((int)(Original_Vers.Value)); + } + else { + command.Parameters[3].Value = global::System.DBNull.Value; + } + if ((Original_NumScheda.HasValue == true)) { + command.Parameters[4].Value = ((int)(Original_NumScheda.Value)); + } + else { + command.Parameters[4].Value = global::System.DBNull.Value; + } + if ((Original_CodMisura == null)) { + command.Parameters[5].Value = global::System.DBNull.Value; + } + else { + command.Parameters[5].Value = ((string)(Original_CodMisura)); + } + if ((Original_Fase == null)) { + command.Parameters[6].Value = global::System.DBNull.Value; + } + else { + command.Parameters[6].Value = ((string)(Original_Fase)); + } + if ((Original_Rev.HasValue == true)) { + command.Parameters[7].Value = ((int)(Original_Rev.Value)); + } + else { + command.Parameters[7].Value = global::System.DBNull.Value; + } if ((Operatore == null)) { command.Parameters[8].Value = global::System.DBNull.Value; } @@ -15574,6 +15702,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin tableMapping.ColumnMappings.Add("Cliente", "Cliente"); tableMapping.ColumnMappings.Add("MatrMacchina", "MatrMacchina"); tableMapping.ColumnMappings.Add("DescMacchina", "DescMacchina"); + tableMapping.ColumnMappings.Add("NoteVersione", "NoteVersione"); this._adapter.TableMappings.Add(tableMapping); } diff --git a/CMS-SC-Data/DS_Applicazione.xsd b/CMS-SC-Data/DS_Applicazione.xsd index e54414b..e542267 100644 --- a/CMS-SC-Data/DS_Applicazione.xsd +++ b/CMS-SC-Data/DS_Applicazione.xsd @@ -1148,6 +1148,24 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin + + + + dbo.stp_Mis_SetVisib + + + + + + + + + + + + + + @@ -1219,6 +1237,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin + @@ -1551,7 +1570,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1572,7 +1591,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1610,7 +1629,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1630,7 +1649,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1672,7 +1691,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1721,7 +1740,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1746,7 +1765,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1804,7 +1823,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1851,7 +1870,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1889,7 +1908,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1984,7 +2003,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -2111,10 +2130,17 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa + + + + + + + - + @@ -2134,7 +2160,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -2154,7 +2180,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -2181,7 +2207,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -2238,7 +2264,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -2334,16 +2360,16 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/CMS-SC-Data/DS_Applicazione.xss b/CMS-SC-Data/DS_Applicazione.xss index 091d265..d07c1b1 100644 --- a/CMS-SC-Data/DS_Applicazione.xss +++ b/CMS-SC-Data/DS_Applicazione.xss @@ -16,7 +16,7 @@ - + diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache index 81395e3..9147403 100644 --- a/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache +++ b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -73bbb3de17cae454ab54595b2c5a3ff7389a549e +c355ee6932ff22a2f6c7d84b3449927b5b4b5506 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 3ef38d9..6cdeb45 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 7abf15f..1bf1df4 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 7151369..261a92b 100644 --- a/CMS_SC/CMS_SC.csproj +++ b/CMS_SC/CMS_SC.csproj @@ -284,7 +284,7 @@ - + diff --git a/CMS_SC/Content/Style.css b/CMS_SC/Content/Style.css index caa7d51..a37435c 100644 --- a/CMS_SC/Content/Style.css +++ b/CMS_SC/Content/Style.css @@ -15,6 +15,9 @@ .fontSmall { font-size: 0.7em; } +.textStrike { + text-decoration: line-through; +} /* Gestione switch*/ /* The switch - the box around the slider */ .switch { diff --git a/CMS_SC/Content/Style.less b/CMS_SC/Content/Style.less index 108d69f..d6922cd 100644 --- a/CMS_SC/Content/Style.less +++ b/CMS_SC/Content/Style.less @@ -21,6 +21,10 @@ font-size: 0.7em; } +.textStrike{ + text-decoration: line-through; +} + /* Gestione switch*/ /* The switch - the box around the slider */ .switch { diff --git a/CMS_SC/Content/Style.min.css b/CMS_SC/Content/Style.min.css index dd266af..562140c 100644 --- a/CMS_SC/Content/Style.min.css +++ b/CMS_SC/Content/Style.min.css @@ -1 +1 @@ -#uppFeatured{margin-top:78px}.table{margin:.25em}.table-striped>tbody>tr:nth-child(odd)>th{background-image:linear-gradient(to bottom,#e3e3e3 0,#acacac 100%)}.table-striped>tbody>tr:nth-child(odd){background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%)}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{padding:2px}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:4px 8px;font-size:12px;line-height:1.5;border-radius:3px}.paginatore{text-align:center;margin:auto}.paginatore>td>table>tbody>tr>td{padding:0 4px}.paginatore>td>table>tbody>tr>td>a{text-decoration:underline}body{font:12px/1.5em 'Open Sans';color:#333;background-color:#fafafa}a{color:#f90;text-decoration:none}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.divHalf{width:50%;float:left}.bottomLine{padding-bottom:1px;border-bottom:1px solid #ccc}.bg-default{background-color:#fff}.limitText{display:inline-block;max-width:100%;overflow:hidden;-ms-text-overflow:ellipsis;-o-text-overflow:ellipsis;text-overflow:ellipsis;white-space:nowrap}.sc{font-weight:bold}.sc_0{color:#666}.sc_1{color:#bababa}.sc_2{color:#000}.sc_3{color:#f33}.sc_4{color:#cc6}.sc_5{color:#00bd00}.didascalia{color:#696969;font-size:7pt}.didascaliaMed{color:#696969;font-size:9pt}.menuAddNew{padding:4px;background-color:#d0eeee;font-size:1.2em}.warnRed{color:#f00}.warnOrange{color:#ffa500}.allOk{color:#008000}.running{color:#242499}.navbar{min-height:15px}.navbar-text{margin-top:1px;margin-bottom:1px}.navbar.navbar-inverse .navbar-form .search-query{width:225px;margin-top:2px;background-color:#ededed;font-size:11px;font-weight:bold;line-height:20px;border-color:#000;border-radius:20px;box-shadow:inset 0 1px 2px rgba(0,0,0,.1),0 1px 0 rgba(255,255,255,.15)}.navbar.navbar-inverse .navbar-form .search-query:focus{border-color:#9cf;border-width:2px}.navbar.navbar-inverse .navbar-form .search-query::-webkit-input-placeholder{color:#666}.navbar.navbar-inverse .navbar-form .search-query::-moz-placeholder{color:#666}.titleBar{color:#f90}.navbar-brand{padding-left:20px;margin-top:-10px}.subnavbar{margin-bottom:.5em}.subnavbar .subnav-toggle{display:none;padding:.5em 0;margin:0 auto;font-size:18px;text-align:center;color:#f90}.subnavbar .subnav-toggle:hover{text-decoration:none}.subnavbar .subnavbar-inner{height:70px;border-bottom:1px solid #000}.subnavbar .btn-subnavbar{display:none;padding:10px 0 8px;color:#f90;font-size:16px;text-align:center;cursor:pointer}.subnavbar .btn-subnavbar:hover{text-decoration:none}.subnavbar .dropdown .caret{margin-top:-16px;border-bottom-color:#888;opacity:35;filter:alpha(opacity=3500)}.subnavbar .dropdown.open .caret{display:none}.subnavbar .mainnav{display:inline-block;height:70px;padding:0;margin:0}.subnavbar .mainnav>li{float:left;min-width:80px;height:70px;padding:0;margin:0;text-align:center;list-style:none}.subnavbar .mainnav>li>a{display:block;height:100%;padding:0 15px;font-size:12px;font-weight:bold;color:#363636;text-shadow:1px 1px 1px rgba(0,0,0,.2)}.subnavbar .mainnav>li>a:hover{color:#888;text-decoration:none}.subnavbar .mainnav>li>a>i{position:relative;top:2px;display:inline-block;width:24px;height:24px;margin-top:2px;margin-bottom:9px;font-size:28px}.subnavbar .mainnav>li>a>span{display:block;padding-bottom:2px}.subnavbar .mainnav>li.open>a{text-decoration:none}.subnavbar .mainnav>li.active>a{background:#333;color:#33afff}.subnavbar .mainnav>li.active>a .caret{border-top-color:#33afff;border-bottom-color:#33afff}.subnavbar .dropdown>.dropdown-menu{top:97%;text-align:left;-webkit-border-top-left-radius:0;-webkit-border-top-right-radius:0;-moz-border-radius-topleft:0;-moz-border-radius-topright:0;border-top-left-radius:0;border-top-right-radius:0}.subnavbar .dropdown>.dropdown-menu a{font-size:12px}.subnavbar .dropdown>.dropdown-menu::before,.subnavbar .dropdown>.dropdown-menu::after{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0,0,0,.2);position:absolute;top:-7px;left:9px}.subnavbar .dropdown>.dropdown-menu::after{border-left-width:6px;border-right-width:6px;border-bottom-width:6px;border-bottom-color:#fff;top:-6px;left:10px}.subnavbar .dropdown-submenu .dropdown-menu:after,.subnavbar .dropdown-submenu .dropdown-menu:before{display:none}.subnavbar .subnav-collapse.collapse{height:auto\9;overflow:visible\9}.shortcuts{text-align:center}.shortcuts .shortcut{min-width:160px;min-height:100px;display:inline-block;padding:8px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px}.shortcuts .shortcut-sm{min-width:90px;min-height:60px;display:inline-block;padding:5px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:36px;color:#555}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:36px;color:#555}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0)}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0)}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.shortcuts .shortcut:hover .shortcut-icon{color:#666}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666}.widget{position:relative;clear:both;width:auto;margin-bottom:2em}.widget .widget-header{position:relative;height:40px;line-height:40px;background:#e9e9e9;background:-moz-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#fafafa),color-stop(100%,#e9e9e9));background:-webkit-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:-o-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:-ms-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:linear-gradient(top,#fafafa 0%,#e9e9e9 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA',endColorstr='#E9E9E9');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA', endColorstr='#E9E9E9')";border:1px solid #d5d5d5;-webkit-border-top-left-radius:4px;-webkit-border-top-right-radius:4px;-moz-border-radius-topleft:4px;-moz-border-radius-topright:4px;border-top-left-radius:4px;border-top-right-radius:4px;-webkit-background-clip:padding-box}.widget .widget-header h3{top:0;position:relative;left:10px;display:inline-block;margin-right:3em;font-size:15px;font-weight:400;color:#555;line-height:18px;text-shadow:1px 1px 2px rgba(255,255,255,.5)}.widget .widget-header [class^="fa-"],.widget .widget-header [class*=" fa-"]{display:inline-block;margin-top:-3px;margin-left:13px;margin-right:-2px;font-size:16px;color:#555;vertical-align:middle}.widget .widget-content{padding:25px 15px 15px;background:#fff;border:1px solid #d5d5d5;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}.widget .widget-header+.widget-content{border-top:none;-webkit-border-top-left-radius:0;-webkit-border-top-right-radius:0;-moz-border-radius-topleft:0;-moz-border-radius-topright:0;border-top-left-radius:0;border-top-right-radius:0}.widget.widget-nopad .widget-content{padding:0}.widget .widget-content:before,.widget .widget-content:after{content:" ";display:table}.widget .widget-content:after{clear:both}.widget .widget-content:before,.widget .widget-content:after{content:" ";display:table}.widget .widget-content:after{clear:both}.widget.widget-table .widget-content{padding:0}.widget.widget-table .table{margin-bottom:0;border:none}.widget.widget-table .table tr td:first-child,.widget.widget-table .table tr th:first-child{border-left:none}.widget.widget-plain{background:transparent;border:none}.widget.widget-plain .widget-content{padding:0;background:transparent;border:none}.widget.widget-box .widget-content{background:#e3e3e3;background:#fff}.stacked{position:relative}.stacked:after,.stacked:before{content:'';position:absolute;display:block;height:1px;bottom:-2px;left:3px;right:3px;background-color:#fff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;border:1px solid #d3d3d3;border-top:0}.stacked:before{bottom:-4px;left:6px;right:6px}.stats{width:100%;display:table;padding:0 0 0 10px;margin-top:.5em;margin-bottom:1.9em}.stats .stat{display:table-cell;width:40%;vertical-align:top;font-size:11px;font-weight:bold;color:#999}.stat-value{display:block;margin-bottom:.55em;font-size:30px;font-weight:bold;letter-spacing:-2px;color:#444}.stat-time{text-align:center;padding-top:1.5em}.stat-time .stat-value{color:#f90;font-size:40px}.stats #donut-chart{height:100px;margin-left:-20px}.news-items{padding:0;margin:1em 0 0}.news-items li{display:table;padding:0 2em 0 1.5em;padding-bottom:1em;margin-bottom:1em;border-bottom:1px dotted #ccc}.news-items li:last-child{padding-bottom:0;border:none}.news-item-date{display:table-cell}.news-item-detail{display:table-cell}.news-item-title{font-size:13px;font-weight:600}.news-item-date{width:75px;vertical-align:middle;text-align:right}.news-item-day{display:block;margin-bottom:.25em;font-size:24px;color:#888}.news-item-preview{margin-bottom:0;color:#777}.news-item-month{display:block;padding-right:1px;font-size:12px;font-weight:600;color:#888}.action-table .btn-small{padding:4px 5px 5px;font-size:10px}.action-table .td-actions{width:80px;text-align:center}.action-table .td-actions .btn{margin-right:.5em}.action-table .td-actions .btn:last-child{margin-rigth:0}@media(max-width:480px){.stats .stat{margin-bottom:3em}.stats .stat .stat-value{margin-bottom:.15em;font-size:20px}.stats{float:left;display:block;margin-bottom:0}#chart-stats{margin:2em 0 1em}}@media(max-width:480px){.error-container h1{font-size:72px}.shortcuts .shortcut{width:95px}.shortcuts .shortcut .shortcut-label{font-size:12px}.shortcuts .shortcut .shortcut-icon{font-size:24px}}@media(max-width:979px){.navbar-fixed-top{position:static;margin-bottom:0}.navbar .btn-navbar{font-size:18px;background:none;filter:none;border:none;-webkit-box-shadow:none;box-shadow:none}.navbar .container{padding:0 10px}.subnavbar .subnavbar .container{width:auto}}@media(max-width:768px){.navbar{padding-left:10px;padding-right:10px;margin-right:-20px;margin-left:-20px}.navbar .navbar-nav>li>.dropdown-menu::before,.navbar .navbar-nav>li>.dropdown-menu::after{display:none}.subnavbar .subnav-toggle{display:block}#main{padding:0 10px;margin-right:-20px;margin-left:-20px}.extra{margin-right:-20px;margin-left:-20px}.main .container{padding:0}.main .row{margin-right:-15px;margin-left:-15px}.footer{margin-right:-20px;margin-left:-20px}.footer #footer-terms{margin-top:1em;text-align:left}.footer #footer-terms a{margin-left:0;margin-right:1em}.item-row{display:block}.item-row:before,.item-row:after{content:" ";display:table}.item-row:after{clear:both}.item-row .item-label{display:block;width:100%;margin-bottom:1.5em}.item-row .item-content{display:block;width:100%}.subnavbar{margin-left:-20px;margin-right:-20px}.subnavbar .btn-subnavbar{display:block}.subnavbar .subnavbar-inner{height:auto}.subnavbar .mainnav{display:block;width:100%;height:auto;margin-top:1em;margin-bottom:1.5em;border:none}.subnavbar .mainnav>li{float:none;width:100%;height:auto;margin-bottom:1em;text-align:left;border:none}.subnavbar .mainnav>li>a{display:block;padding-top:5px;padding-bottom:5px;margin-right:.5em;color:#ccc;font-size:13px;font-weight:600}.subnavbar .mainnav>li>a>span{display:inline}.subnavbar .mainnav>li>a>i{display:inline;margin-right:.5em;margin-bottom:0;font-size:14px}.subnavbar .mainnav>li>a .caret{margin-top:-2px;margin-left:3px}.subnavbar .mainnav>li.active>a{color:#f90;background:transparent}.subnavbar .dropdown .dropdown-menu{position:static;float:none;width:100%;background:transparent;border:none;box-shadow:none}.subnavbar .dropdown .dropdown-menu a{padding:12px 40px;color:#fff;font-weight:600}.subnavbar .dropdown .dropdown-menu a:active,.subnavbar .dropdown .dropdown-menu a:focus{background:#555 !important;outline:none}.subnavbar .dropdown .dropdown-menu::before,.subnavbar .dropdown .dropdown-menu::after{display:none}.subnavbar .dropdown.open .caret{display:inline-block}.subnavbar .dropdown-submenu>a:after{display:none}.subnavbar .dropdown-submenu>.dropdown-menu{display:block}.subnavbar .dropdown-submenu>.dropdown-menu>li>a{padding-right:20px;padding-left:60px}}@media(min-width:768px){.subnav-collapse.collapse{display:block !important;height:auto !important;padding-bottom:0;overflow:visible !important}}@media(min-width:1200px){.navbar .container,.subnavbar .container{padding-right:0;padding-left:0}.page-title{margin-left:-15px}}.GridPager a,.GridPager span{display:block;height:1.6em;width:2em;text-align:center;text-decoration:none}.GridPager a{background-color:#f5f5f5;color:#969696}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold}.hiddenBtn{height:0;width:0;visibility:hidden}.checkOk{color:#9f9}.checkKo{color:#5f2121} \ No newline at end of file +#uppFeatured{margin-top:78px}.table{margin:.25em}.table-striped>tbody>tr:nth-child(odd)>th{background-image:linear-gradient(to bottom,#e3e3e3 0,#acacac 100%)}.table-striped>tbody>tr:nth-child(odd){background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%)}.fontSmall{font-size:.7em}.textStrike{text-decoration:line-through}.switch{position:relative;display:inline-block;width:60px;height:34px}.switch input{display:none}.slider{position:absolute;cursor:pointer;top:0;left:0;right:0;bottom:0;background-color:#ccc;-webkit-transition:.4s;transition:.4s}.slider:before{position:absolute;content:"";height:26px;width:26px;left:4px;bottom:4px;background-color:#fff;-webkit-transition:.4s;transition:.4s}input:checked+.slider{background-color:#2196f3}input:focus+.slider{box-shadow:0 0 1px #2196f3}input:checked+.slider:before{-webkit-transform:translateX(26px);-ms-transform:translateX(26px);transform:translateX(26px)}.slider.round{border-radius:34px}.slider.round:before{border-radius:50%}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{padding:2px}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:4px 8px;font-size:12px;line-height:1.5;border-radius:3px}.paginatore{text-align:center;margin:auto}.paginatore>td>table>tbody>tr>td{padding:0 4px}.paginatore>td>table>tbody>tr>td>a{text-decoration:underline}body{font:12px/1.5em 'Open Sans';color:#333;background-color:#fafafa}a{color:#f90;text-decoration:none}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.divHalf{width:50%;float:left}.bottomLine{padding-bottom:1px;border-bottom:1px solid #ccc}.bg-default{background-color:#fff}.limitText{display:inline-block;max-width:100%;overflow:hidden;-ms-text-overflow:ellipsis;-o-text-overflow:ellipsis;text-overflow:ellipsis;white-space:nowrap}.sc{font-weight:bold}.sc_0{color:#666}.sc_1{color:#bababa}.sc_2{color:#000}.sc_3{color:#f33}.sc_4{color:#cc6}.sc_5{color:#00bd00}.didascalia{color:#696969;font-size:7pt}.didascaliaMed{color:#696969;font-size:9pt}.menuAddNew{padding:4px;background-color:#d0eeee;font-size:1.2em}.warnRed{color:#f00}.warnOrange{color:#ffa500}.allOk{color:#008000}.running{color:#242499}.navbar{min-height:15px}.navbar-text{margin-top:1px;margin-bottom:1px}.navbar.navbar-inverse .navbar-form .search-query{width:225px;margin-top:2px;background-color:#ededed;font-size:11px;font-weight:bold;line-height:20px;border-color:#000;border-radius:20px;box-shadow:inset 0 1px 2px rgba(0,0,0,.1),0 1px 0 rgba(255,255,255,.15)}.navbar.navbar-inverse .navbar-form .search-query:focus{border-color:#9cf;border-width:2px}.navbar.navbar-inverse .navbar-form .search-query::-webkit-input-placeholder{color:#666}.navbar.navbar-inverse .navbar-form .search-query::-moz-placeholder{color:#666}.titleBar{color:#f90}.navbar-brand{padding-left:20px;margin-top:-10px}.subnavbar{margin-bottom:.5em}.subnavbar .subnav-toggle{display:none;padding:.5em 0;margin:0 auto;font-size:18px;text-align:center;color:#f90}.subnavbar .subnav-toggle:hover{text-decoration:none}.subnavbar .subnavbar-inner{height:70px;border-bottom:1px solid #000}.subnavbar .btn-subnavbar{display:none;padding:10px 0 8px;color:#f90;font-size:16px;text-align:center;cursor:pointer}.subnavbar .btn-subnavbar:hover{text-decoration:none}.subnavbar .dropdown .caret{margin-top:-16px;border-bottom-color:#888;opacity:35;filter:alpha(opacity=3500)}.subnavbar .dropdown.open .caret{display:none}.subnavbar .mainnav{display:inline-block;height:70px;padding:0;margin:0}.subnavbar .mainnav>li{float:left;min-width:80px;height:70px;padding:0;margin:0;text-align:center;list-style:none}.subnavbar .mainnav>li>a{display:block;height:100%;padding:0 15px;font-size:12px;font-weight:bold;color:#363636;text-shadow:1px 1px 1px rgba(0,0,0,.2)}.subnavbar .mainnav>li>a:hover{color:#888;text-decoration:none}.subnavbar .mainnav>li>a>i{position:relative;top:2px;display:inline-block;width:24px;height:24px;margin-top:2px;margin-bottom:9px;font-size:28px}.subnavbar .mainnav>li>a>span{display:block;padding-bottom:2px}.subnavbar .mainnav>li.open>a{text-decoration:none}.subnavbar .mainnav>li.active>a{background:#333;color:#33afff}.subnavbar .mainnav>li.active>a .caret{border-top-color:#33afff;border-bottom-color:#33afff}.subnavbar .dropdown>.dropdown-menu{top:97%;text-align:left;-webkit-border-top-left-radius:0;-webkit-border-top-right-radius:0;-moz-border-radius-topleft:0;-moz-border-radius-topright:0;border-top-left-radius:0;border-top-right-radius:0}.subnavbar .dropdown>.dropdown-menu a{font-size:12px}.subnavbar .dropdown>.dropdown-menu::before,.subnavbar .dropdown>.dropdown-menu::after{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0,0,0,.2);position:absolute;top:-7px;left:9px}.subnavbar .dropdown>.dropdown-menu::after{border-left-width:6px;border-right-width:6px;border-bottom-width:6px;border-bottom-color:#fff;top:-6px;left:10px}.subnavbar .dropdown-submenu .dropdown-menu:after,.subnavbar .dropdown-submenu .dropdown-menu:before{display:none}.subnavbar .subnav-collapse.collapse{height:auto\9;overflow:visible\9}.shortcuts{text-align:center}.shortcuts .shortcut{min-width:160px;min-height:100px;display:inline-block;padding:8px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px}.shortcuts .shortcut-sm{min-width:90px;min-height:60px;display:inline-block;padding:5px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:36px;color:#555}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:36px;color:#555}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0)}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0)}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.shortcuts .shortcut:hover .shortcut-icon{color:#666}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666}.widget{position:relative;clear:both;width:auto;margin-bottom:2em}.widget .widget-header{position:relative;height:40px;line-height:40px;background:#e9e9e9;background:-moz-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#fafafa),color-stop(100%,#e9e9e9));background:-webkit-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:-o-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:-ms-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:linear-gradient(top,#fafafa 0%,#e9e9e9 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA',endColorstr='#E9E9E9');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA', endColorstr='#E9E9E9')";border:1px solid #d5d5d5;-webkit-border-top-left-radius:4px;-webkit-border-top-right-radius:4px;-moz-border-radius-topleft:4px;-moz-border-radius-topright:4px;border-top-left-radius:4px;border-top-right-radius:4px;-webkit-background-clip:padding-box}.widget .widget-header h3{top:0;position:relative;left:10px;display:inline-block;margin-right:3em;font-size:15px;font-weight:400;color:#555;line-height:18px;text-shadow:1px 1px 2px rgba(255,255,255,.5)}.widget .widget-header [class^="fa-"],.widget .widget-header [class*=" fa-"]{display:inline-block;margin-top:-3px;margin-left:13px;margin-right:-2px;font-size:16px;color:#555;vertical-align:middle}.widget .widget-content{padding:25px 15px 15px;background:#fff;border:1px solid #d5d5d5;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}.widget .widget-header+.widget-content{border-top:none;-webkit-border-top-left-radius:0;-webkit-border-top-right-radius:0;-moz-border-radius-topleft:0;-moz-border-radius-topright:0;border-top-left-radius:0;border-top-right-radius:0}.widget.widget-nopad .widget-content{padding:0}.widget .widget-content:before,.widget .widget-content:after{content:" ";display:table}.widget .widget-content:after{clear:both}.widget .widget-content:before,.widget .widget-content:after{content:" ";display:table}.widget .widget-content:after{clear:both}.widget.widget-table .widget-content{padding:0}.widget.widget-table .table{margin-bottom:0;border:none}.widget.widget-table .table tr td:first-child,.widget.widget-table .table tr th:first-child{border-left:none}.widget.widget-plain{background:transparent;border:none}.widget.widget-plain .widget-content{padding:0;background:transparent;border:none}.widget.widget-box .widget-content{background:#e3e3e3;background:#fff}.stacked{position:relative}.stacked:after,.stacked:before{content:'';position:absolute;display:block;height:1px;bottom:-2px;left:3px;right:3px;background-color:#fff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;border:1px solid #d3d3d3;border-top:0}.stacked:before{bottom:-4px;left:6px;right:6px}.stats{width:100%;display:table;padding:0 0 0 10px;margin-top:.5em;margin-bottom:1.9em}.stats .stat{display:table-cell;width:40%;vertical-align:top;font-size:11px;font-weight:bold;color:#999}.stat-value{display:block;margin-bottom:.55em;font-size:30px;font-weight:bold;letter-spacing:-2px;color:#444}.stat-time{text-align:center;padding-top:1.5em}.stat-time .stat-value{color:#f90;font-size:40px}.stats #donut-chart{height:100px;margin-left:-20px}.news-items{padding:0;margin:1em 0 0}.news-items li{display:table;padding:0 2em 0 1.5em;padding-bottom:1em;margin-bottom:1em;border-bottom:1px dotted #ccc}.news-items li:last-child{padding-bottom:0;border:none}.news-item-date{display:table-cell}.news-item-detail{display:table-cell}.news-item-title{font-size:13px;font-weight:600}.news-item-date{width:75px;vertical-align:middle;text-align:right}.news-item-day{display:block;margin-bottom:.25em;font-size:24px;color:#888}.news-item-preview{margin-bottom:0;color:#777}.news-item-month{display:block;padding-right:1px;font-size:12px;font-weight:600;color:#888}.action-table .btn-small{padding:4px 5px 5px;font-size:10px}.action-table .td-actions{width:80px;text-align:center}.action-table .td-actions .btn{margin-right:.5em}.action-table .td-actions .btn:last-child{margin-rigth:0}@media(max-width:480px){.stats .stat{margin-bottom:3em}.stats .stat .stat-value{margin-bottom:.15em;font-size:20px}.stats{float:left;display:block;margin-bottom:0}#chart-stats{margin:2em 0 1em}}@media(max-width:480px){.error-container h1{font-size:72px}.shortcuts .shortcut{width:95px}.shortcuts .shortcut .shortcut-label{font-size:12px}.shortcuts .shortcut .shortcut-icon{font-size:24px}}@media(max-width:979px){.navbar-fixed-top{position:static;margin-bottom:0}.navbar .btn-navbar{font-size:18px;background:none;filter:none;border:none;-webkit-box-shadow:none;box-shadow:none}.navbar .container{padding:0 10px}.subnavbar .subnavbar .container{width:auto}}@media(max-width:768px){body{font-size:.75em}.navbar{padding-left:10px;padding-right:10px;margin-right:-20px;margin-left:-20px}.navbar .navbar-nav>li>.dropdown-menu::before,.navbar .navbar-nav>li>.dropdown-menu::after{display:none}.subnavbar .subnav-toggle{display:block}#main{padding:0 10px;margin-right:-20px;margin-left:-20px}.extra{margin-right:-20px;margin-left:-20px}.main .container{padding:0}.main .row{margin-right:-15px;margin-left:-15px}.footer{margin-right:-20px;margin-left:-20px}.footer #footer-terms{margin-top:1em;text-align:left}.footer #footer-terms a{margin-left:0;margin-right:1em}.item-row{display:block}.item-row:before,.item-row:after{content:" ";display:table}.item-row:after{clear:both}.item-row .item-label{display:block;width:100%;margin-bottom:1.5em}.item-row .item-content{display:block;width:100%}.subnavbar{margin-left:-20px;margin-right:-20px}.subnavbar .btn-subnavbar{display:block}.subnavbar .subnavbar-inner{height:auto}.subnavbar .mainnav{display:block;width:100%;height:auto;margin-top:1em;margin-bottom:1.5em;border:none}.subnavbar .mainnav>li{float:none;width:100%;height:auto;margin-bottom:1em;text-align:left;border:none}.subnavbar .mainnav>li>a{display:block;padding-top:5px;padding-bottom:5px;margin-right:.5em;color:#ccc;font-size:13px;font-weight:600}.subnavbar .mainnav>li>a>span{display:inline}.subnavbar .mainnav>li>a>i{display:inline;margin-right:.5em;margin-bottom:0;font-size:14px}.subnavbar .mainnav>li>a .caret{margin-top:-2px;margin-left:3px}.subnavbar .mainnav>li.active>a{color:#f90;background:transparent}.subnavbar .dropdown .dropdown-menu{position:static;float:none;width:100%;background:transparent;border:none;box-shadow:none}.subnavbar .dropdown .dropdown-menu a{padding:12px 40px;color:#fff;font-weight:600}.subnavbar .dropdown .dropdown-menu a:active,.subnavbar .dropdown .dropdown-menu a:focus{background:#555 !important;outline:none}.subnavbar .dropdown .dropdown-menu::before,.subnavbar .dropdown .dropdown-menu::after{display:none}.subnavbar .dropdown.open .caret{display:inline-block}.subnavbar .dropdown-submenu>a:after{display:none}.subnavbar .dropdown-submenu>.dropdown-menu{display:block}.subnavbar .dropdown-submenu>.dropdown-menu>li>a{padding-right:20px;padding-left:60px}}@media(min-width:768px){body{font-size:.7em}.subnav-collapse.collapse{display:block !important;height:auto !important;padding-bottom:0;overflow:visible !important}}@media(min-width:1024px){body{font-size:.8em}}@media(min-width:1200px){body{font-size:.9em}.navbar .container,.subnavbar .container{padding-right:0;padding-left:0}.page-title{margin-left:-15px}}@media(min-width:1440px){body{font-size:1em}}.table-sm td{padding:.1rem}.GridPager{background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%)}.GridPager a,.GridPager span{display:block;height:2em;width:2em;text-align:center;text-decoration:none;padding:.1rem}.GridPager a{background-color:#f5f5f5;color:#969696}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold}.hiddenBtn{height:0;width:0;visibility:hidden}.checkOk{color:#9f9}.checkKo{color:#5f2121} \ No newline at end of file diff --git a/CMS_SC/ElencoSchede.aspx b/CMS_SC/ElencoSchede.aspx index b88b830..a759d3b 100644 --- a/CMS_SC/ElencoSchede.aspx +++ b/CMS_SC/ElencoSchede.aspx @@ -43,7 +43,7 @@ F | <%: traduci("btnShowReportFull") %>
- C | <%: traduci("btnShowReportComp") %> + C | <%: traduci("btnShowReportComp") %>
S | <%: traduci("btnShowReportCli") %> diff --git a/CMS_SC/Home.aspx b/CMS_SC/Home.aspx index 61af624..6f8b3d5 100644 --- a/CMS_SC/Home.aspx +++ b/CMS_SC/Home.aspx @@ -3,7 +3,7 @@
- CMS + CMS
diff --git a/CMS_SC/WebUserControls/mod_collaudi.ascx b/CMS_SC/WebUserControls/mod_collaudi.ascx index 0b49e49..337e3db 100644 --- a/CMS_SC/WebUserControls/mod_collaudi.ascx +++ b/CMS_SC/WebUserControls/mod_collaudi.ascx @@ -31,6 +31,8 @@ + + @@ -38,16 +40,27 @@ -   +   - - + - + - + + + + + + + + + + + + + @@ -61,13 +74,13 @@
- +
- + <%--Visible='<%# Eval("NomePar").ToString() != "" %>' --%>
- <%# contaAllegati(Eval("ValoreMis")) %> + <%# contaAllegati(Eval("ValoreMis")) %>
diff --git a/CMS_SC/WebUserControls/mod_collaudi.ascx.cs b/CMS_SC/WebUserControls/mod_collaudi.ascx.cs index 298469f..4e3bbdd 100644 --- a/CMS_SC/WebUserControls/mod_collaudi.ascx.cs +++ b/CMS_SC/WebUserControls/mod_collaudi.ascx.cs @@ -225,6 +225,12 @@ namespace CMS_SC.WebUserControls case "REM": DtProxy.man.taMis.deroga(IdxDossier, CodScheda, Vers, NumScheda, CodMisura, Fase, Rev, ""); break; + case "HIDE": + DtProxy.man.taMis.SetVisib(IdxDossier, CodScheda, Vers, NumScheda, CodMisura, Fase, Rev, "X"); + break; + case "SHOW": + DtProxy.man.taMis.SetVisib(IdxDossier, CodScheda, Vers, NumScheda, CodMisura, Fase, Rev, "FCS"); + break; } grView.SelectedIndex = -1; grView.DataBind(); @@ -386,5 +392,13 @@ namespace CMS_SC.WebUserControls if (TipoValMis.ToString() == "TEXTAREA") answ = TextBoxMode.MultiLine; return answ; } + + public string isHidden(object codVisib) + { + string answ = ""; + // verifico, se ha "X" nei cod visib è HIDDEN... + if (codVisib.ToString().ToUpper() == "X") answ = "textStrike"; + return answ; + } } } \ No newline at end of file diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index ca957b9..837a12e 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/bin/SteamWare.dll b/CMS_SC/bin/SteamWare.dll index de5038e..f055051 100644 Binary files a/CMS_SC/bin/SteamWare.dll and b/CMS_SC/bin/SteamWare.dll differ diff --git a/CMS_SC/bin/SteamWare.xml b/CMS_SC/bin/SteamWare.xml index f462ec1..bfc9a87 100644 --- a/CMS_SC/bin/SteamWare.xml +++ b/CMS_SC/bin/SteamWare.xml @@ -3096,6 +3096,15 @@ + + + scrive il file dallo stream byte[] inviato + + + + + + scrive il file dallo stream byte[] inviato @@ -3104,6 +3113,15 @@ + + + scrive il file dalla stringa inviata + + + + + + scrive il file dalla stringa inviata diff --git a/CMS_SC/sql/Update_3.2.sql b/CMS_SC/sql/Update_3.2.sql index 6866287..aac2f45 100644 --- a/CMS_SC/sql/Update_3.2.sql +++ b/CMS_SC/sql/Update_3.2.sql @@ -93,3 +93,45 @@ GO +-- 2018.03.26 Aggiunta stored x setVisib + +/****** Object: StoredProcedure [dbo].[stp_Mis_SetVisib] Script Date: 26/03/2018 15:38:06 ******/ +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + + +-- ============================================= +-- Author: S.E. Locatelli +-- Create date: 2018.03.26 +-- Description: Imposta lo stato visibile/non visibile (tipicamente FCS / X) +-- ============================================= +CREATE PROCEDURE [dbo].[stp_Mis_SetVisib] +( + @Original_IdxDossier INT + ,@Original_CodScheda NVARCHAR(50) + ,@Original_Vers INT + ,@Original_NumScheda INT + ,@Original_CodMisura NVARCHAR(50) + ,@Original_Fase NVARCHAR(50) + ,@Original_Rev INT + ,@CodVisib NVARCHAR(50) +) +AS + + +UPDATE Misure +SET CodVisib = @CodVisib +WHERE IdxDossier = @Original_IdxDossier + AND CodScheda = @Original_CodScheda + AND Vers = @Original_Vers + AND NumScheda = @Original_NumScheda + AND CodMisura = @Original_CodMisura + AND Fase = @Original_Fase + AND Rev = @Original_Rev + +RETURN +GO + diff --git a/Jenkinsfile b/Jenkinsfile index 66ece49..ffdd63f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=4245']) { + withEnv(['NEXT_BUILD_NUMBER=4248']) { // env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'CMS-SC'