diff --git a/CMS-SC-Data/DS_Applicazione.Designer.cs b/CMS-SC-Data/DS_Applicazione.Designer.cs index c0e5bbb..dcd6efd 100644 --- a/CMS-SC-Data/DS_Applicazione.Designer.cs +++ b/CMS-SC-Data/DS_Applicazione.Designer.cs @@ -3275,16 +3275,16 @@ namespace CMS_SC_Data { private global::System.Data.DataColumn columnVers; - private global::System.Data.DataColumn columnNumSchede; - - private global::System.Data.DataColumn columnDescrizione; - private global::System.Data.DataColumn columnCodSchedaVers; private global::System.Data.DataColumn columnDescrScheda; private global::System.Data.DataColumn columnPath; + private global::System.Data.DataColumn columnNumSchede; + + private global::System.Data.DataColumn columnDescrizione; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public SchemaCollFamMaccDataTable() { @@ -3342,22 +3342,6 @@ namespace CMS_SC_Data { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public global::System.Data.DataColumn NumSchedeColumn { - get { - return this.columnNumSchede; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public global::System.Data.DataColumn DescrizioneColumn { - get { - return this.columnDescrizione; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public global::System.Data.DataColumn CodSchedaVersColumn { @@ -3382,6 +3366,22 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn NumSchedeColumn { + get { + return this.columnNumSchede; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn DescrizioneColumn { + get { + return this.columnDescrizione; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -3419,17 +3419,17 @@ namespace CMS_SC_Data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public SchemaCollFamMaccRow AddSchemaCollFamMaccRow(ElencoFamMaccRow parentElencoFamMaccRowByFK_SchemaCollFamMacc_ElencoFamMacc, string CodScheda, int Vers, int NumSchede, string Descrizione, string CodSchedaVers, string DescrScheda, string Path) { + public SchemaCollFamMaccRow AddSchemaCollFamMaccRow(ElencoFamMaccRow parentElencoFamMaccRowByFK_SchemaCollFamMacc_ElencoFamMacc, string CodScheda, int Vers, string CodSchedaVers, string DescrScheda, string Path, int NumSchede, string Descrizione) { SchemaCollFamMaccRow rowSchemaCollFamMaccRow = ((SchemaCollFamMaccRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, CodScheda, Vers, - NumSchede, - Descrizione, CodSchedaVers, DescrScheda, - Path}; + Path, + NumSchede, + Descrizione}; if ((parentElencoFamMaccRowByFK_SchemaCollFamMacc_ElencoFamMacc != null)) { columnValuesArray[0] = parentElencoFamMaccRowByFK_SchemaCollFamMacc_ElencoFamMacc[0]; } @@ -3467,11 +3467,11 @@ namespace CMS_SC_Data { this.columnCodFam = base.Columns["CodFam"]; this.columnCodScheda = base.Columns["CodScheda"]; this.columnVers = base.Columns["Vers"]; - this.columnNumSchede = base.Columns["NumSchede"]; - this.columnDescrizione = base.Columns["Descrizione"]; this.columnCodSchedaVers = base.Columns["CodSchedaVers"]; this.columnDescrScheda = base.Columns["DescrScheda"]; this.columnPath = base.Columns["Path"]; + this.columnNumSchede = base.Columns["NumSchede"]; + this.columnDescrizione = base.Columns["Descrizione"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3483,16 +3483,16 @@ namespace CMS_SC_Data { base.Columns.Add(this.columnCodScheda); this.columnVers = new global::System.Data.DataColumn("Vers", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnVers); - this.columnNumSchede = new global::System.Data.DataColumn("NumSchede", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnNumSchede); - this.columnDescrizione = new global::System.Data.DataColumn("Descrizione", typeof(string), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnDescrizione); this.columnCodSchedaVers = new global::System.Data.DataColumn("CodSchedaVers", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCodSchedaVers); this.columnDescrScheda = new global::System.Data.DataColumn("DescrScheda", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnDescrScheda); this.columnPath = new global::System.Data.DataColumn("Path", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnPath); + this.columnNumSchede = new global::System.Data.DataColumn("NumSchede", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumSchede); + this.columnDescrizione = new global::System.Data.DataColumn("Descrizione", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDescrizione); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnCodFam, this.columnCodScheda, @@ -3502,14 +3502,14 @@ namespace CMS_SC_Data { this.columnCodScheda.AllowDBNull = false; this.columnCodScheda.MaxLength = 50; this.columnVers.AllowDBNull = false; - this.columnNumSchede.AllowDBNull = false; - this.columnDescrizione.MaxLength = 250; this.columnCodSchedaVers.ReadOnly = true; this.columnCodSchedaVers.MaxLength = 101; this.columnDescrScheda.AllowDBNull = false; this.columnDescrScheda.MaxLength = 250; this.columnPath.AllowDBNull = false; this.columnPath.MaxLength = 2147483647; + this.columnNumSchede.AllowDBNull = false; + this.columnDescrizione.MaxLength = 250; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4492,33 +4492,6 @@ namespace CMS_SC_Data { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public int NumSchede { - get { - return ((int)(this[this.tableSchemaCollFamMacc.NumSchedeColumn])); - } - set { - this[this.tableSchemaCollFamMacc.NumSchedeColumn] = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public string Descrizione { - get { - try { - return ((string)(this[this.tableSchemaCollFamMacc.DescrizioneColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Descrizione\' in table \'SchemaCollFamMacc\' is DBNull.", e); - } - } - set { - this[this.tableSchemaCollFamMacc.DescrizioneColumn] = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public string CodSchedaVers { @@ -4557,6 +4530,33 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int NumSchede { + get { + return ((int)(this[this.tableSchemaCollFamMacc.NumSchedeColumn])); + } + set { + this[this.tableSchemaCollFamMacc.NumSchedeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string Descrizione { + get { + try { + return ((string)(this[this.tableSchemaCollFamMacc.DescrizioneColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'Descrizione\' in table \'SchemaCollFamMacc\' is DBNull.", e); + } + } + set { + this[this.tableSchemaCollFamMacc.DescrizioneColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public AnagSchedeRow AnagSchedeRowParent { @@ -4579,18 +4579,6 @@ namespace CMS_SC_Data { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public bool IsDescrizioneNull() { - return this.IsNull(this.tableSchemaCollFamMacc.DescrizioneColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public void SetDescrizioneNull() { - this[this.tableSchemaCollFamMacc.DescrizioneColumn] = global::System.Convert.DBNull; - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsCodSchedaVersNull() { @@ -4602,6 +4590,18 @@ namespace CMS_SC_Data { public void SetCodSchedaVersNull() { this[this.tableSchemaCollFamMacc.CodSchedaVersColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsDescrizioneNull() { + return this.IsNull(this.tableSchemaCollFamMacc.DescrizioneColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetDescrizioneNull() { + this[this.tableSchemaCollFamMacc.DescrizioneColumn] = global::System.Convert.DBNull; + } } /// @@ -9328,11 +9328,11 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH tableMapping.ColumnMappings.Add("CodFam", "CodFam"); tableMapping.ColumnMappings.Add("CodScheda", "CodScheda"); tableMapping.ColumnMappings.Add("Vers", "Vers"); - tableMapping.ColumnMappings.Add("NumSchede", "NumSchede"); - tableMapping.ColumnMappings.Add("Descrizione", "Descrizione"); tableMapping.ColumnMappings.Add("CodSchedaVers", "CodSchedaVers"); tableMapping.ColumnMappings.Add("DescrScheda", "DescrScheda"); tableMapping.ColumnMappings.Add("Path", "Path"); + tableMapping.ColumnMappings.Add("NumSchede", "NumSchede"); + tableMapping.ColumnMappings.Add("Descrizione", "Descrizione"); this._adapter.TableMappings.Add(tableMapping); } @@ -9349,7 +9349,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT * FROM dbo.v_SchemaCollFamMacc"; + this._commandCollection[0].CommandText = "SELECT * FROM v_SchemaCollFamMacc"; 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 5458b00..181fbc2 100644 --- a/CMS-SC-Data/DS_Applicazione.xsd +++ b/CMS-SC-Data/DS_Applicazione.xsd @@ -821,10 +821,10 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH - + - SELECT * FROM dbo.v_SchemaCollFamMacc + SELECT * FROM v_SchemaCollFamMacc @@ -834,11 +834,11 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH - - + + @@ -887,7 +887,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH - + @@ -907,7 +907,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH - + @@ -941,7 +941,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH - + @@ -961,7 +961,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH - + @@ -989,7 +989,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH - + @@ -1031,7 +1031,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH - + @@ -1091,7 +1091,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH - + @@ -1116,7 +1116,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH - + @@ -1145,7 +1145,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH - + @@ -1163,14 +1163,6 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH - - - - - - - - @@ -1192,6 +1184,14 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH + + + + + + + + @@ -1252,15 +1252,15 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll index f33422a..60a25d9 100644 Binary files a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll and b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/bin/Debug/SteamWare.dll b/CMS-SC-Data/bin/Debug/SteamWare.dll index 8da0193..ada14f9 100644 Binary files a/CMS-SC-Data/bin/Debug/SteamWare.dll and b/CMS-SC-Data/bin/Debug/SteamWare.dll differ diff --git a/CMS-SC-Data/bin/Debug/SteamWare.xml b/CMS-SC-Data/bin/Debug/SteamWare.xml index 1485da2..70ff845 100644 --- a/CMS-SC-Data/bin/Debug/SteamWare.xml +++ b/CMS-SC-Data/bin/Debug/SteamWare.xml @@ -4572,5 +4572,24 @@ + + + classe gestione valori percentuali per semplificare edit utente (moltiplicati x 100 appunto) + + + + + converte da percentuale a numero (es 5,3% --> 0.053) + + + + + + + converte da numero a percentuale (es 0.053 --> 5,3%) + + + + diff --git a/CMS-SC-Data/bin/Release/CMS-SC-Data.dll b/CMS-SC-Data/bin/Release/CMS-SC-Data.dll index b0731f7..3b69ac9 100644 Binary files a/CMS-SC-Data/bin/Release/CMS-SC-Data.dll and b/CMS-SC-Data/bin/Release/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/bin/Release/CMS-SC-Data.dll.config b/CMS-SC-Data/bin/Release/CMS-SC-Data.dll.config new file mode 100644 index 0000000..e0a1490 --- /dev/null +++ b/CMS-SC-Data/bin/Release/CMS-SC-Data.dll.config @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/CMS-SC-Data/bin/Release/Flesk.ViewState.dll b/CMS-SC-Data/bin/Release/Flesk.ViewState.dll new file mode 100644 index 0000000..862a6ac Binary files /dev/null and b/CMS-SC-Data/bin/Release/Flesk.ViewState.dll differ diff --git a/CMS-SC-Data/bin/Release/ICSharpCode.SharpZipLib.dll b/CMS-SC-Data/bin/Release/ICSharpCode.SharpZipLib.dll new file mode 100644 index 0000000..a2a6f25 Binary files /dev/null and b/CMS-SC-Data/bin/Release/ICSharpCode.SharpZipLib.dll differ diff --git a/CMS-SC-Data/bin/Release/NLog.config b/CMS-SC-Data/bin/Release/NLog.config new file mode 100644 index 0000000..ede1596 --- /dev/null +++ b/CMS-SC-Data/bin/Release/NLog.config @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CMS-SC-Data/bin/Release/SteamWare.dll b/CMS-SC-Data/bin/Release/SteamWare.dll new file mode 100644 index 0000000..6bdd749 Binary files /dev/null and b/CMS-SC-Data/bin/Release/SteamWare.dll differ diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll index f33422a..60a25d9 100644 Binary files a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll and b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll 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 9b3f332..2f60ea3 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-Data/obj/Debug/build.force b/CMS-SC-Data/obj/Debug/build.force new file mode 100644 index 0000000..e69de29 diff --git a/CMS-SC-Data/obj/Release/CMS-SC-Data.csproj.FileListAbsolute.txt b/CMS-SC-Data/obj/Release/CMS-SC-Data.csproj.FileListAbsolute.txt index 1a3ada3..b7f6b27 100644 --- a/CMS-SC-Data/obj/Release/CMS-SC-Data.csproj.FileListAbsolute.txt +++ b/CMS-SC-Data/obj/Release/CMS-SC-Data.csproj.FileListAbsolute.txt @@ -3,3 +3,8 @@ C:\Users\samuele\Documents\Visual Studio 2012\Projects\CMS-SC\CMS-SC-Data\bin\Re C:\Users\samuele\Documents\Visual Studio 2012\Projects\CMS-SC\CMS-SC-Data\obj\Release\CMS-SC-Data.csprojResolveAssemblyReference.cache C:\Users\samuele\Documents\Visual Studio 2012\Projects\CMS-SC\CMS-SC-Data\obj\Release\CMS-SC-Data.dll C:\Users\samuele\Documents\Visual Studio 2012\Projects\CMS-SC\CMS-SC-Data\obj\Release\CMS-SC-Data.pdb +C:\Users\samuele\Documents\Visual Studio 2012\Projects\CMS-SC\CMS-SC-Data\bin\Release\NLog.config +C:\Users\samuele\Documents\Visual Studio 2012\Projects\CMS-SC\CMS-SC-Data\bin\Release\CMS-SC-Data.dll.config +C:\Users\samuele\Documents\Visual Studio 2012\Projects\CMS-SC\CMS-SC-Data\bin\Release\SteamWare.dll +C:\Users\samuele\Documents\Visual Studio 2012\Projects\CMS-SC\CMS-SC-Data\bin\Release\Flesk.ViewState.dll +C:\Users\samuele\Documents\Visual Studio 2012\Projects\CMS-SC\CMS-SC-Data\bin\Release\ICSharpCode.SharpZipLib.dll diff --git a/CMS-SC-Data/obj/Release/CMS-SC-Data.dll b/CMS-SC-Data/obj/Release/CMS-SC-Data.dll index b0731f7..3b69ac9 100644 Binary files a/CMS-SC-Data/obj/Release/CMS-SC-Data.dll and b/CMS-SC-Data/obj/Release/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll b/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll index 0397b2a..9ac1c67 100644 Binary files a/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/CMS-SC-Data/obj/Release/TempPE/DS_Utility.Designer.cs.dll b/CMS-SC-Data/obj/Release/TempPE/DS_Utility.Designer.cs.dll index 3acd83c..a8b2d9f 100644 Binary files a/CMS-SC-Data/obj/Release/TempPE/DS_Utility.Designer.cs.dll and b/CMS-SC-Data/obj/Release/TempPE/DS_Utility.Designer.cs.dll differ diff --git a/CMS_SC/CMS_SC.csproj b/CMS_SC/CMS_SC.csproj index 13e7aec..1cecbd9 100644 --- a/CMS_SC/CMS_SC.csproj +++ b/CMS_SC/CMS_SC.csproj @@ -232,6 +232,7 @@ variables.less + @@ -257,7 +258,10 @@ + + + @@ -280,7 +284,11 @@ + + + + @@ -430,6 +438,13 @@ DettScheda.aspx + + ElencoSchede.aspx + ASPXCodeBehind + + + ElencoSchede.aspx + Global.asax @@ -448,7 +463,42 @@ jumper.aspx + + ListValues.aspx + ASPXCodeBehind + + + ListValues.aspx + + + Misure.aspx + ASPXCodeBehind + + + Misure.aspx + + + ReportCliente.aspx + ASPXCodeBehind + + + ReportCliente.aspx + + + ReportCompatto.aspx + ASPXCodeBehind + + + ReportCompatto.aspx + + + ReportCompleto.aspx + ASPXCodeBehind + + + ReportCompleto.aspx + SchemaCollFamMacc.aspx ASPXCodeBehind @@ -456,6 +506,13 @@ SchemaCollFamMacc.aspx + + SchemaCollMacc.aspx + ASPXCodeBehind + + + SchemaCollMacc.aspx + Site.Master ASPXCodeBehind diff --git a/CMS_SC/ElencoSchede.aspx b/CMS_SC/ElencoSchede.aspx new file mode 100644 index 0000000..5635910 --- /dev/null +++ b/CMS_SC/ElencoSchede.aspx @@ -0,0 +1,8 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="ElencoSchede.aspx.cs" Inherits="CMS_SC.ElencoSchede" %> + + + + + + + diff --git a/CMS_SC/ElencoSchede.aspx.cs b/CMS_SC/ElencoSchede.aspx.cs new file mode 100644 index 0000000..5f80df9 --- /dev/null +++ b/CMS_SC/ElencoSchede.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace CMS_SC +{ + public partial class ElencoSchede : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/CMS_SC/ElencoSchede.aspx.designer.cs b/CMS_SC/ElencoSchede.aspx.designer.cs new file mode 100644 index 0000000..71c7e8d --- /dev/null +++ b/CMS_SC/ElencoSchede.aspx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace CMS_SC +{ + + + public partial class ElencoSchede + { + } +} diff --git a/CMS_SC/Images/WorkInProgress.jpg b/CMS_SC/Images/WorkInProgress.jpg new file mode 100644 index 0000000..196209f Binary files /dev/null and b/CMS_SC/Images/WorkInProgress.jpg differ diff --git a/CMS_SC/ListValues.aspx b/CMS_SC/ListValues.aspx new file mode 100644 index 0000000..6cef664 --- /dev/null +++ b/CMS_SC/ListValues.aspx @@ -0,0 +1,8 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="ListValues.aspx.cs" Inherits="CMS_SC.ListValues" %> + + + + + + + diff --git a/CMS_SC/ListValues.aspx.cs b/CMS_SC/ListValues.aspx.cs new file mode 100644 index 0000000..df53cc1 --- /dev/null +++ b/CMS_SC/ListValues.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace CMS_SC +{ + public partial class ListValues : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/CMS_SC/ListValues.aspx.designer.cs b/CMS_SC/ListValues.aspx.designer.cs new file mode 100644 index 0000000..c9ab932 --- /dev/null +++ b/CMS_SC/ListValues.aspx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace CMS_SC +{ + + + public partial class ListValues + { + } +} diff --git a/CMS_SC/Misure.aspx b/CMS_SC/Misure.aspx new file mode 100644 index 0000000..df2e667 --- /dev/null +++ b/CMS_SC/Misure.aspx @@ -0,0 +1,8 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="Misure.aspx.cs" Inherits="CMS_SC.Misure" %> + + + + + + + diff --git a/CMS_SC/Misure.aspx.cs b/CMS_SC/Misure.aspx.cs new file mode 100644 index 0000000..6db70b1 --- /dev/null +++ b/CMS_SC/Misure.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace CMS_SC +{ + public partial class Misure : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/CMS_SC/Misure.aspx.designer.cs b/CMS_SC/Misure.aspx.designer.cs new file mode 100644 index 0000000..d4fa90d --- /dev/null +++ b/CMS_SC/Misure.aspx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace CMS_SC +{ + + + public partial class Misure + { + } +} diff --git a/CMS_SC/Properties/PublishProfiles/IIS02.pubxml b/CMS_SC/Properties/PublishProfiles/IIS02.pubxml index 48069ed..5007119 100644 --- a/CMS_SC/Properties/PublishProfiles/IIS02.pubxml +++ b/CMS_SC/Properties/PublishProfiles/IIS02.pubxml @@ -31,6 +31,26 @@ by editing this MSBuild file. In order to learn more about this please visit htt + + + + + + + + + + + + + + + + + + + + diff --git a/CMS_SC/ReportCliente.aspx b/CMS_SC/ReportCliente.aspx new file mode 100644 index 0000000..9bda087 --- /dev/null +++ b/CMS_SC/ReportCliente.aspx @@ -0,0 +1,9 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="ReportCliente.aspx.cs" Inherits="CMS_SC.ReportCliente" %> + + + + + + + + diff --git a/CMS_SC/ReportCliente.aspx.cs b/CMS_SC/ReportCliente.aspx.cs new file mode 100644 index 0000000..39fe895 --- /dev/null +++ b/CMS_SC/ReportCliente.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace CMS_SC +{ + public partial class ReportCliente : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/CMS_SC/ReportCliente.aspx.designer.cs b/CMS_SC/ReportCliente.aspx.designer.cs new file mode 100644 index 0000000..d2d2d50 --- /dev/null +++ b/CMS_SC/ReportCliente.aspx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace CMS_SC +{ + + + public partial class ReportCliente + { + } +} diff --git a/CMS_SC/ReportCompatto.aspx b/CMS_SC/ReportCompatto.aspx new file mode 100644 index 0000000..3d8fbbb --- /dev/null +++ b/CMS_SC/ReportCompatto.aspx @@ -0,0 +1,8 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="ReportCompatto.aspx.cs" Inherits="CMS_SC.ReportCompatto" %> + + + + + + + diff --git a/CMS_SC/ReportCompatto.aspx.cs b/CMS_SC/ReportCompatto.aspx.cs new file mode 100644 index 0000000..a087dc9 --- /dev/null +++ b/CMS_SC/ReportCompatto.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace CMS_SC +{ + public partial class ReportCompatto : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/CMS_SC/ReportCompatto.aspx.designer.cs b/CMS_SC/ReportCompatto.aspx.designer.cs new file mode 100644 index 0000000..8a2be18 --- /dev/null +++ b/CMS_SC/ReportCompatto.aspx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace CMS_SC +{ + + + public partial class ReportCompatto + { + } +} diff --git a/CMS_SC/ReportCompleto.aspx b/CMS_SC/ReportCompleto.aspx new file mode 100644 index 0000000..77a51da --- /dev/null +++ b/CMS_SC/ReportCompleto.aspx @@ -0,0 +1,8 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="ReportCompleto.aspx.cs" Inherits="CMS_SC.ReportCompleto" %> + + + + + + + diff --git a/CMS_SC/ReportCompleto.aspx.cs b/CMS_SC/ReportCompleto.aspx.cs new file mode 100644 index 0000000..8b0ec6a --- /dev/null +++ b/CMS_SC/ReportCompleto.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace CMS_SC +{ + public partial class ReportCompleto : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/CMS_SC/ReportCompleto.aspx.designer.cs b/CMS_SC/ReportCompleto.aspx.designer.cs new file mode 100644 index 0000000..8c1459e --- /dev/null +++ b/CMS_SC/ReportCompleto.aspx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace CMS_SC +{ + + + public partial class ReportCompleto + { + } +} diff --git a/CMS_SC/SchemaCollMacc.aspx b/CMS_SC/SchemaCollMacc.aspx new file mode 100644 index 0000000..2957b43 --- /dev/null +++ b/CMS_SC/SchemaCollMacc.aspx @@ -0,0 +1,8 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="SchemaCollMacc.aspx.cs" Inherits="CMS_SC.SchemaCollMacc" %> + + + + + + + diff --git a/CMS_SC/SchemaCollMacc.aspx.cs b/CMS_SC/SchemaCollMacc.aspx.cs new file mode 100644 index 0000000..537b1be --- /dev/null +++ b/CMS_SC/SchemaCollMacc.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace CMS_SC +{ + public partial class SchemaCollMacc : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/CMS_SC/SchemaCollMacc.aspx.designer.cs b/CMS_SC/SchemaCollMacc.aspx.designer.cs new file mode 100644 index 0000000..ef5327f --- /dev/null +++ b/CMS_SC/SchemaCollMacc.aspx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace CMS_SC +{ + + + public partial class SchemaCollMacc + { + } +} diff --git a/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx b/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx index dea2f85..ebd29ed 100644 --- a/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx +++ b/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx @@ -17,22 +17,20 @@ + - <%----%> - + - <%----%> - + - diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index f33422a..3b69ac9 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/CMS_SC.dll b/CMS_SC/bin/CMS_SC.dll index af0c447..112e8aa 100644 Binary files a/CMS_SC/bin/CMS_SC.dll and b/CMS_SC/bin/CMS_SC.dll differ diff --git a/CMS_SC/bin/SteamWare.dll b/CMS_SC/bin/SteamWare.dll index 8da0193..6bdd749 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 1485da2..70ff845 100644 --- a/CMS_SC/bin/SteamWare.xml +++ b/CMS_SC/bin/SteamWare.xml @@ -4572,5 +4572,24 @@ + + + classe gestione valori percentuali per semplificare edit utente (moltiplicati x 100 appunto) + + + + + converte da percentuale a numero (es 5,3% --> 0.053) + + + + + + + converte da numero a percentuale (es 0.053 --> 5,3%) + + + + diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index f01d7fc..60397ed 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ