diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index c791c87..e1f9f77 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/VersGen/WebSC.cs b/VersGen/WebSC.cs index 550a956..d4f0280 100644 --- a/VersGen/WebSC.cs +++ b/VersGen/WebSC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.9.063.191")] -[assembly: AssemblyFileVersion("1.9.063.191")] +[assembly: AssemblyVersion("1.9.064.191")] +[assembly: AssemblyFileVersion("1.9.064.191")] [assembly: AssemblyCopyright("Steamware © 2015-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/WebSC.tt b/VersGen/WebSC.tt index 6a7c35f..1847d20 100644 --- a/VersGen/WebSC.tt +++ b/VersGen/WebSC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("1.9.063.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("1.9.063.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("1.9.064.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("1.9.064.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2015-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/VersGen/bin/Release/VersGen.dll b/VersGen/bin/Release/VersGen.dll index 2ce6449..4797155 100644 Binary files a/VersGen/bin/Release/VersGen.dll and b/VersGen/bin/Release/VersGen.dll differ diff --git a/VersGen/obj/Release/TempPE/WebSC.cs.dll b/VersGen/obj/Release/TempPE/WebSC.cs.dll index 90be449..0a50ae9 100644 Binary files a/VersGen/obj/Release/TempPE/WebSC.cs.dll and b/VersGen/obj/Release/TempPE/WebSC.cs.dll differ diff --git a/VersGen/obj/Release/VersGen.dll b/VersGen/obj/Release/VersGen.dll index 2ce6449..4797155 100644 Binary files a/VersGen/obj/Release/VersGen.dll and b/VersGen/obj/Release/VersGen.dll differ diff --git a/WebSCR/WebUserControls/mod_ImpegnoSmall.ascx b/WebSCR/WebUserControls/mod_ImpegnoSmall.ascx index a1ed117..74aba0a 100644 --- a/WebSCR/WebUserControls/mod_ImpegnoSmall.ascx +++ b/WebSCR/WebUserControls/mod_ImpegnoSmall.ascx @@ -6,7 +6,12 @@
- +
+ +
+
+ +
diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index b27499d..de680ea 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ diff --git a/WebSCR/bin/WebSCR_data.dll b/WebSCR/bin/WebSCR_data.dll index fcead20..cbf6698 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR_data/DS_Applicazione.Designer.cs b/WebSCR_data/DS_Applicazione.Designer.cs index 009eb50..57312be 100644 --- a/WebSCR_data/DS_Applicazione.Designer.cs +++ b/WebSCR_data/DS_Applicazione.Designer.cs @@ -2319,6 +2319,8 @@ namespace WebSCR_data { private global::System.Data.DataColumn columnDettImpegno; + private global::System.Data.DataColumn columnTel; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public ImpegniDataTable() { @@ -2672,6 +2674,14 @@ namespace WebSCR_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn TelColumn { + get { + return this.columnTel; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2749,7 +2759,8 @@ namespace WebSCR_data { System.DateTime DataCreaz, string DescrImp, bool IntAperto, - string DettImpegno) { + string DettImpegno, + string Tel) { ImpegniRow rowImpegniRow = ((ImpegniRow)(this.NewRow())); object[] columnValuesArray = new object[] { IdxImpegno, @@ -2791,7 +2802,8 @@ namespace WebSCR_data { DataCreaz, DescrImp, IntAperto, - DettImpegno}; + DettImpegno, + Tel}; rowImpegniRow.ItemArray = columnValuesArray; this.Rows.Add(rowImpegniRow); return rowImpegniRow; @@ -2861,6 +2873,7 @@ namespace WebSCR_data { this.columnDescrImp = base.Columns["DescrImp"]; this.columnIntAperto = base.Columns["IntAperto"]; this.columnDettImpegno = base.Columns["DettImpegno"]; + this.columnTel = base.Columns["Tel"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2946,6 +2959,8 @@ namespace WebSCR_data { base.Columns.Add(this.columnIntAperto); this.columnDettImpegno = new global::System.Data.DataColumn("DettImpegno", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnDettImpegno); + this.columnTel = new global::System.Data.DataColumn("Tel", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnTel); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnIdxImpegno}, true)); this.columnIdxImpegno.AllowDBNull = false; @@ -3000,6 +3015,8 @@ namespace WebSCR_data { this.columnIntAperto.AllowDBNull = false; this.columnDettImpegno.ReadOnly = true; this.columnDettImpegno.MaxLength = 2147483647; + this.columnTel.ReadOnly = true; + this.columnTel.MaxLength = 103; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -7457,6 +7474,22 @@ namespace WebSCR_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string Tel { + get { + try { + return ((string)(this[this.tableImpegni.TelColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'Tel\' in table \'Impegni\' is DBNull.", e); + } + } + set { + this[this.tableImpegni.TelColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsCodClienteNull() { @@ -7624,6 +7657,18 @@ namespace WebSCR_data { public void SetDettImpegnoNull() { this[this.tableImpegni.DettImpegnoColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsTelNull() { + return this.IsNull(this.tableImpegni.TelColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetTelNull() { + this[this.tableImpegni.TelColumn] = global::System.Convert.DBNull; + } } /// @@ -12440,6 +12485,7 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca tableMapping.ColumnMappings.Add("DescrImp", "DescrImp"); tableMapping.ColumnMappings.Add("IntAperto", "IntAperto"); tableMapping.ColumnMappings.Add("DettImpegno", "DettImpegno"); + tableMapping.ColumnMappings.Add("Tel", "Tel"); this._adapter.TableMappings.Add(tableMapping); } diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd index 0d5fbb1..0b85086 100644 --- a/WebSCR_data/DS_Applicazione.xsd +++ b/WebSCR_data/DS_Applicazione.xsd @@ -597,6 +597,7 @@ FROM v_elencoImpegni + @@ -1299,7 +1300,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1331,7 +1332,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1367,7 +1368,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1392,7 +1393,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1476,7 +1477,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1627,10 +1628,17 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) + + + + + + + - + @@ -1640,7 +1648,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1656,7 +1664,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1686,7 +1694,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1703,7 +1711,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1738,7 +1746,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1793,7 +1801,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1939,7 +1947,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1968,7 +1976,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -2064,9 +2072,9 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - - - + + + \ No newline at end of file diff --git a/WebSCR_data/bin/Release/WebSCR_data.dll b/WebSCR_data/bin/Release/WebSCR_data.dll index fcead20..cbf6698 100644 Binary files a/WebSCR_data/bin/Release/WebSCR_data.dll and b/WebSCR_data/bin/Release/WebSCR_data.dll differ diff --git a/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll b/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll index 552fc39..d79662a 100644 Binary files a/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/WebSCR_data/obj/Release/WebSCR_data.dll b/WebSCR_data/obj/Release/WebSCR_data.dll index fcead20..cbf6698 100644 Binary files a/WebSCR_data/obj/Release/WebSCR_data.dll and b/WebSCR_data/obj/Release/WebSCR_data.dll differ