diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index 0731773..ebf17a7 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/WebSCR/WebUserControls/mod_Interventi.ascx b/WebSCR/WebUserControls/mod_Interventi.ascx index bf8f156..948d875 100644 --- a/WebSCR/WebUserControls/mod_Interventi.ascx +++ b/WebSCR/WebUserControls/mod_Interventi.ascx @@ -60,7 +60,7 @@ -
+
@@ -110,7 +110,7 @@ - +
@@ -154,11 +154,15 @@ - -
+
+ +
+ +
+
-
+
diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index ad4a149..7b7a00d 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 1cd1d54..59e4f65 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 9f3ae61..009eb50 100644 --- a/WebSCR_data/DS_Applicazione.Designer.cs +++ b/WebSCR_data/DS_Applicazione.Designer.cs @@ -2317,6 +2317,8 @@ namespace WebSCR_data { private global::System.Data.DataColumn columnIntAperto; + private global::System.Data.DataColumn columnDettImpegno; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public ImpegniDataTable() { @@ -2662,6 +2664,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 DettImpegnoColumn { + get { + return this.columnDettImpegno; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2738,7 +2748,8 @@ namespace WebSCR_data { double LonFine, System.DateTime DataCreaz, string DescrImp, - bool IntAperto) { + bool IntAperto, + string DettImpegno) { ImpegniRow rowImpegniRow = ((ImpegniRow)(this.NewRow())); object[] columnValuesArray = new object[] { IdxImpegno, @@ -2779,7 +2790,8 @@ namespace WebSCR_data { LonFine, DataCreaz, DescrImp, - IntAperto}; + IntAperto, + DettImpegno}; rowImpegniRow.ItemArray = columnValuesArray; this.Rows.Add(rowImpegniRow); return rowImpegniRow; @@ -2848,6 +2860,7 @@ namespace WebSCR_data { this.columnDataCreaz = base.Columns["DataCreaz"]; this.columnDescrImp = base.Columns["DescrImp"]; this.columnIntAperto = base.Columns["IntAperto"]; + this.columnDettImpegno = base.Columns["DettImpegno"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2931,6 +2944,8 @@ namespace WebSCR_data { base.Columns.Add(this.columnDescrImp); this.columnIntAperto = new global::System.Data.DataColumn("IntAperto", typeof(bool), null, global::System.Data.MappingType.Element); 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.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnIdxImpegno}, true)); this.columnIdxImpegno.AllowDBNull = false; @@ -2983,6 +2998,8 @@ namespace WebSCR_data { this.columnDataCreaz.AllowDBNull = false; this.columnDescrImp.MaxLength = 250; this.columnIntAperto.AllowDBNull = false; + this.columnDettImpegno.ReadOnly = true; + this.columnDettImpegno.MaxLength = 2147483647; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -7424,6 +7441,22 @@ namespace WebSCR_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string DettImpegno { + get { + try { + return ((string)(this[this.tableImpegni.DettImpegnoColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'DettImpegno\' in table \'Impegni\' is DBNull.", e); + } + } + set { + this[this.tableImpegni.DettImpegnoColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsCodClienteNull() { @@ -7579,6 +7612,18 @@ namespace WebSCR_data { public void SetDescrImpNull() { this[this.tableImpegni.DescrImpColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsDettImpegnoNull() { + return this.IsNull(this.tableImpegni.DettImpegnoColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetDettImpegnoNull() { + this[this.tableImpegni.DettImpegnoColumn] = global::System.Convert.DBNull; + } } /// @@ -12394,6 +12439,7 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca tableMapping.ColumnMappings.Add("DataCreaz", "DataCreaz"); tableMapping.ColumnMappings.Add("DescrImp", "DescrImp"); tableMapping.ColumnMappings.Add("IntAperto", "IntAperto"); + tableMapping.ColumnMappings.Add("DettImpegno", "DettImpegno"); this._adapter.TableMappings.Add(tableMapping); } diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd index 1bc0a67..0d5fbb1 100644 --- a/WebSCR_data/DS_Applicazione.xsd +++ b/WebSCR_data/DS_Applicazione.xsd @@ -596,9 +596,10 @@ FROM v_elencoImpegni + - + dbo.stp_Imp_deleteQuery @@ -658,7 +659,7 @@ FROM v_elencoImpegni - + dbo.stp_Imp_insertQuery @@ -673,7 +674,7 @@ FROM v_elencoImpegni - + dbo.stp_Imp_recFineInt @@ -687,7 +688,7 @@ FROM v_elencoImpegni - + dbo.stp_Imp_recStartInt @@ -701,7 +702,7 @@ FROM v_elencoImpegni - + dbo.stp_Imp_updateQuery @@ -723,7 +724,7 @@ FROM v_elencoImpegni - + dbo.stp_Imp_updNoteInt @@ -736,7 +737,7 @@ FROM v_elencoImpegni - + dbo.stp_Imp_updStart @@ -1298,7 +1299,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1330,7 +1331,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1366,7 +1367,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1391,7 +1392,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1475,7 +1476,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1619,10 +1620,17 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) + + + + + + + - + @@ -1632,7 +1640,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1648,7 +1656,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1678,7 +1686,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1695,7 +1703,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1730,7 +1738,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1785,7 +1793,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1931,7 +1939,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1960,7 +1968,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -2056,9 +2064,9 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - - - + + + \ No newline at end of file diff --git a/WebSCR_data/DS_Applicazione.xss b/WebSCR_data/DS_Applicazione.xss index 4bdd2d3..45732d1 100644 --- a/WebSCR_data/DS_Applicazione.xss +++ b/WebSCR_data/DS_Applicazione.xss @@ -10,7 +10,7 @@ - + diff --git a/WebSCR_data/bin/Release/WebSCR_data.dll b/WebSCR_data/bin/Release/WebSCR_data.dll index 1cd1d54..59e4f65 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 a441d70..6f71f71 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 1cd1d54..59e4f65 100644 Binary files a/WebSCR_data/obj/Release/WebSCR_data.dll and b/WebSCR_data/obj/Release/WebSCR_data.dll differ