diff --git a/VersGen/WebSC.cs b/VersGen/WebSC.cs index 08f285e..fbd9074 100644 --- a/VersGen/WebSC.cs +++ b/VersGen/WebSC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("0.6.021.41")] -[assembly: AssemblyFileVersion("0.6.021.41")] +[assembly: AssemblyVersion("0.7.023.41")] +[assembly: AssemblyFileVersion("0.7.023.41")] [assembly: AssemblyCopyright("Steamware © 2015-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/WebSC.tt b/VersGen/WebSC.tt index f68af0e..d32b921 100644 --- a/VersGen/WebSC.tt +++ b/VersGen/WebSC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("0.6.021.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("0.6.021.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("0.7.023.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("0.7.023.<#= 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 be609d2..5badbf3 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 7257b41..f99114c 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 be609d2..5badbf3 100644 Binary files a/VersGen/obj/Release/VersGen.dll and b/VersGen/obj/Release/VersGen.dll differ diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index 4e86c05..8bf132a 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/Squadra.aspx b/WebSCR/Squadra.aspx index 7a24482..3d55306 100644 --- a/WebSCR/Squadra.aspx +++ b/WebSCR/Squadra.aspx @@ -2,11 +2,19 @@ <%@ Register Src="~/WebUserControls/mod_consegne.ascx" TagPrefix="uc1" TagName="mod_consegne" %> <%@ Register Src="~/WebUserControls/mod_squadre.ascx" TagPrefix="uc1" TagName="mod_squadre" %> +<%@ Register Src="~/WebUserControls/mod_impegno.ascx" TagPrefix="uc1" TagName="mod_impegno" %> +<%@ Register Src="~/WebUserControls/mod_dettInt.ascx" TagPrefix="uc1" TagName="mod_dettInt" %> + + - - +
+ + + + +
diff --git a/WebSCR/Squadra.aspx.cs b/WebSCR/Squadra.aspx.cs index f9fd438..6313d98 100644 --- a/WebSCR/Squadra.aspx.cs +++ b/WebSCR/Squadra.aspx.cs @@ -1,4 +1,5 @@ -using System; +using SteamWare; +using System; using System.Collections.Generic; using System.Linq; using System.Web; @@ -11,7 +12,38 @@ namespace WebSCR { protected void Page_Load(object sender, EventArgs e) { - + fixVisibility(); + } + /// + /// recupera valore querystring + /// + /// + /// + protected string qsVal(string nome) + { + return memLayer.ML.QSS(nome); + } + /// + /// imposta visibilità dato elementi già impostati + /// + private void fixVisibility() + { + mod_consegne.Visible = true; + mod_dettInt.Visible = false; + mod_impegno.Visible = false; + if (qsVal("Data") != "") + { + if (qsVal("IdxImpegno") != "") + { + mod_impegno.Visible = true; + mod_dettInt.Visible = true; + mod_consegne.Visible = false; + } + else + { + mod_consegne.Visible = true; + } + } } } } \ No newline at end of file diff --git a/WebSCR/Squadra.aspx.designer.cs b/WebSCR/Squadra.aspx.designer.cs index df60ec0..26498fe 100644 --- a/WebSCR/Squadra.aspx.designer.cs +++ b/WebSCR/Squadra.aspx.designer.cs @@ -29,5 +29,23 @@ namespace WebSCR { /// To modify move field declaration from designer file to code-behind file. /// protected global::WebSCR.WebUserControls.mod_consegne mod_consegne; + + /// + /// mod_impegno control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebSCR.WebUserControls.mod_impegno mod_impegno; + + /// + /// mod_dettInt control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebSCR.WebUserControls.mod_dettInt mod_dettInt; } } diff --git a/WebSCR/Squadre.aspx b/WebSCR/Squadre.aspx deleted file mode 100644 index f0a423a..0000000 --- a/WebSCR/Squadre.aspx +++ /dev/null @@ -1,5 +0,0 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="Squadre.aspx.cs" Inherits="WebSCR.Squadre" %> - - - - diff --git a/WebSCR/Squadre.aspx.cs b/WebSCR/Squadre.aspx.cs deleted file mode 100644 index bef6618..0000000 --- a/WebSCR/Squadre.aspx.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace WebSCR -{ - public partial class Squadre : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/WebSCR/Squadre.aspx.designer.cs b/WebSCR/Squadre.aspx.designer.cs deleted file mode 100644 index 426117b..0000000 --- a/WebSCR/Squadre.aspx.designer.cs +++ /dev/null @@ -1,17 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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 WebSCR -{ - - - public partial class Squadre - { - } -} diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj index b84feb2..7e6e476 100644 --- a/WebSCR/WebSCR.csproj +++ b/WebSCR/WebSCR.csproj @@ -346,7 +346,6 @@ - @@ -466,13 +465,6 @@ Squadra.aspx - - Squadre.aspx - ASPXCodeBehind - - - Squadre.aspx - UserAdmin.aspx ASPXCodeBehind diff --git a/WebSCR/WebUserControls/mod_Interventi.ascx.cs b/WebSCR/WebUserControls/mod_Interventi.ascx.cs index 6941b29..ca98698 100644 --- a/WebSCR/WebUserControls/mod_Interventi.ascx.cs +++ b/WebSCR/WebUserControls/mod_Interventi.ascx.cs @@ -191,12 +191,8 @@ namespace WebSCR.WebUserControls logger.lg.scriviLog(string.Format("Errore in rimando clienti --> interventi: {0}{1}", Environment.NewLine, exc)); riga = DtProxy.man.taImp.GetData()[0]; } - - //if (lastCmd == "select") - //{ - // mando su PIANIFICAZIONE intervento cliente! - Response.Redirect(string.Format("{0}?CodCliente={1}&Indir={2}&Data={3:yyyy-MM-dd}&IdxImpegno={4}", "Pianificazione", riga.CodCliente, riga.Indir, riga.DataOra, IdxImpegno)); - //} + // rimando su pagina! + Response.Redirect(string.Format("{0}?CodCliente={1}&Indir={2}&Data={3:yyyy-MM-dd}&IdxImpegno={4}", "Pianificazione", riga.CodCliente, riga.Indir, riga.DataOra, IdxImpegno)); } } diff --git a/WebSCR/WebUserControls/mod_consegne.ascx b/WebSCR/WebUserControls/mod_consegne.ascx index 7f6541c..73c4c28 100644 --- a/WebSCR/WebUserControls/mod_consegne.ascx +++ b/WebSCR/WebUserControls/mod_consegne.ascx @@ -1,10 +1,5 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_consegne.ascx.cs" Inherits="WebSCR.WebUserControls.mod_consegne" %> -Consegne: prevede -

-

- 2) vedere impegni (di oggi) -

3) possibilità di cliccare "inizio", "fine", mostra Allegati, carica foto (allegati) ad ogni TASK

@@ -27,96 +22,42 @@ Consegne: prevede -
-
- - +
+
+ +
-
- - +
+ ' + ' + | + +
-
- - -
-
-
-
- - -   +   - - -
+
+
+ +
+
+ +
+
+
+
+ + + | + +
+
+
- - -
- -
- - - - - - - - - - - - - -
- -
- <%-- - - - --%> -
- -
- -
- - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - -
@@ -126,7 +67,7 @@ Consegne: prevede - + <%--FilterExpression="CodSquadra LIKE '%{0}%' OR DescrSquadra LIKE '%{0}%' OR CodCliente LIKE '%{0}%' OR RagSoc LIKE '%{0}%' OR RifOC LIKE '%{0}%' " @@ -135,7 +76,7 @@ Consegne: prevede - +
diff --git a/WebSCR/WebUserControls/mod_consegne.ascx.cs b/WebSCR/WebUserControls/mod_consegne.ascx.cs index e2d6d18..848c575 100644 --- a/WebSCR/WebUserControls/mod_consegne.ascx.cs +++ b/WebSCR/WebUserControls/mod_consegne.ascx.cs @@ -13,8 +13,9 @@ namespace WebSCR.WebUserControls { protected void Page_Load(object sender, EventArgs e) { - } + + /// /// verifica se valore passato è NON NULLO /// @@ -63,12 +64,8 @@ namespace WebSCR.WebUserControls logger.lg.scriviLog(string.Format("Errore in rimando clienti --> interventi: {0}{1}", Environment.NewLine, exc)); riga = DtProxy.man.taImp.GetData()[0]; } - - //if (lastCmd == "select") - //{ - // mando su PIANIFICAZIONE intervento cliente! - Response.Redirect(string.Format("{0}?CodCliente={1}&Indir={2}&Data={3:yyyy-MM-dd}&IdxImpegno={4}", "Pianificazione", riga.CodCliente, riga.Indir, riga.DataOra, IdxImpegno)); - //} + // ricarico! + Response.Redirect(string.Format("{0}?CodCliente={1}&Indir={2}&Data={3:yyyy-MM-dd}&IdxImpegno={4}", devicesAuthProxy.pagCorrente, riga.CodCliente, riga.Indir, riga.DataOra, IdxImpegno)); } } } \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_dettInt.ascx b/WebSCR/WebUserControls/mod_dettInt.ascx index 3475dc2..af58c9a 100644 --- a/WebSCR/WebUserControls/mod_dettInt.ascx +++ b/WebSCR/WebUserControls/mod_dettInt.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dettInt.ascx.cs" Inherits="WebSCR.WebUserControls.mod_dettInt" %> -
+
- +
@@ -28,11 +28,11 @@
- +
- + @@ -63,7 +63,7 @@ - + diff --git a/WebSCR/WebUserControls/mod_dettInt.ascx.cs b/WebSCR/WebUserControls/mod_dettInt.ascx.cs index ec1fe84..b9a1559 100644 --- a/WebSCR/WebUserControls/mod_dettInt.ascx.cs +++ b/WebSCR/WebUserControls/mod_dettInt.ascx.cs @@ -23,6 +23,25 @@ namespace WebSCR.WebUserControls } } /// + /// disabilita modalità EDIT record... + /// + public bool disableEdit { get; set; } + /// + /// determina se sia visibile... + /// + public string isVisible + { + get + { + string answ = "visible"; + if (disableEdit) + { + answ = "hidden"; + } + return answ; + } + } + /// /// impegno corrente /// public int idxImpegno @@ -57,7 +76,6 @@ namespace WebSCR.WebUserControls } protected void Page_Load(object sender, EventArgs e) { - } /// /// aggiunge il task corrente all'elenco dei task... diff --git a/WebSCR/WebUserControls/mod_header.ascx b/WebSCR/WebUserControls/mod_header.ascx index 44a7ee1..70334de 100644 --- a/WebSCR/WebUserControls/mod_header.ascx +++ b/WebSCR/WebUserControls/mod_header.ascx @@ -6,7 +6,7 @@
- + User Admin
diff --git a/WebSCR/WebUserControls/mod_header.ascx.cs b/WebSCR/WebUserControls/mod_header.ascx.cs index bc1fbb3..fdae356 100644 --- a/WebSCR/WebUserControls/mod_header.ascx.cs +++ b/WebSCR/WebUserControls/mod_header.ascx.cs @@ -256,6 +256,11 @@ namespace WebSCR.WebUserControls memLayer.ML.emptyCookieVal("CodSquadra"); memLayer.ML.emptyCookieVal("DataRif"); memLayer.ML.emptyCookieVal("NumGg"); + memLayer.ML.emptyCookieVal("Data"); + memLayer.ML.emptyCookieVal("IdxImpegno"); + memLayer.ML.emptyCookieVal("CodCliente"); + memLayer.ML.emptyCookieVal("Indir"); + memLayer.ML.emptySessionVal("Cliente"); Response.Redirect(devicesAuthProxy.pagCorrente); } } diff --git a/WebSCR/WebUserControls/mod_impegno.ascx b/WebSCR/WebUserControls/mod_impegno.ascx index fca978c..025380d 100644 --- a/WebSCR/WebUserControls/mod_impegno.ascx +++ b/WebSCR/WebUserControls/mod_impegno.ascx @@ -102,9 +102,9 @@
- +   - +
@@ -207,7 +207,8 @@
- + +
diff --git a/WebSCR/WebUserControls/mod_impegno.ascx.cs b/WebSCR/WebUserControls/mod_impegno.ascx.cs index 6724385..859c558 100644 --- a/WebSCR/WebUserControls/mod_impegno.ascx.cs +++ b/WebSCR/WebUserControls/mod_impegno.ascx.cs @@ -17,7 +17,10 @@ namespace WebSCR.WebUserControls doUpdate(); } } - + /// + /// disabilita modalità EDIT record... + /// + public bool disableEdit { get; set; } /// /// impegno corrente /// diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index f3b4304..ba4b6ba 100644 Binary files a/WebSCR/bin/SteamWare.dll and b/WebSCR/bin/SteamWare.dll differ diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index e84f8d6..8523865 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 429b5e7..5a2aac6 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 51f5132..0fa5266 100644 --- a/WebSCR_data/DS_Applicazione.Designer.cs +++ b/WebSCR_data/DS_Applicazione.Designer.cs @@ -2147,6 +2147,14 @@ namespace WebSCR_data { private global::System.Data.DataColumn columnNoteInt; + private global::System.Data.DataColumn columnLatInizio; + + private global::System.Data.DataColumn columnLonInizio; + + private global::System.Data.DataColumn columnLatFine; + + private global::System.Data.DataColumn columnLonFine; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public ImpegniDataTable() { @@ -2436,6 +2444,38 @@ 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 LatInizioColumn { + get { + return this.columnLatInizio; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn LonInizioColumn { + get { + return this.columnLonInizio; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn LatFineColumn { + get { + return this.columnLatFine; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn LonFineColumn { + get { + return this.columnLonFine; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2505,7 +2545,11 @@ namespace WebSCR_data { string STATO, System.DateTime InizioInt, System.DateTime FineInt, - string NoteInt) { + string NoteInt, + double LatInizio, + double LonInizio, + double LatFine, + double LonFine) { ImpegniRow rowImpegniRow = ((ImpegniRow)(this.NewRow())); object[] columnValuesArray = new object[] { IdxImpegno, @@ -2539,7 +2583,11 @@ namespace WebSCR_data { STATO, InizioInt, FineInt, - NoteInt}; + NoteInt, + LatInizio, + LonInizio, + LatFine, + LonFine}; rowImpegniRow.ItemArray = columnValuesArray; this.Rows.Add(rowImpegniRow); return rowImpegniRow; @@ -2601,6 +2649,10 @@ namespace WebSCR_data { this.columnInizioInt = base.Columns["InizioInt"]; this.columnFineInt = base.Columns["FineInt"]; this.columnNoteInt = base.Columns["NoteInt"]; + this.columnLatInizio = base.Columns["LatInizio"]; + this.columnLonInizio = base.Columns["LonInizio"]; + this.columnLatFine = base.Columns["LatFine"]; + this.columnLonFine = base.Columns["LonFine"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2670,6 +2722,14 @@ namespace WebSCR_data { base.Columns.Add(this.columnFineInt); this.columnNoteInt = new global::System.Data.DataColumn("NoteInt", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnNoteInt); + this.columnLatInizio = new global::System.Data.DataColumn("LatInizio", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnLatInizio); + this.columnLonInizio = new global::System.Data.DataColumn("LonInizio", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnLonInizio); + this.columnLatFine = new global::System.Data.DataColumn("LatFine", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnLatFine); + this.columnLonFine = new global::System.Data.DataColumn("LonFine", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnLonFine); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnIdxImpegno}, true)); this.columnIdxImpegno.AllowDBNull = false; @@ -2718,6 +2778,7 @@ namespace WebSCR_data { this.columnSTATO.ReadOnly = true; this.columnSTATO.MaxLength = 8; this.columnNoteInt.MaxLength = 2147483647; + this.columnLatFine.Caption = "LatFin"; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -5508,6 +5569,70 @@ namespace WebSCR_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public double LatInizio { + get { + try { + return ((double)(this[this.tableImpegni.LatInizioColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'LatInizio\' in table \'Impegni\' is DBNull.", e); + } + } + set { + this[this.tableImpegni.LatInizioColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public double LonInizio { + get { + try { + return ((double)(this[this.tableImpegni.LonInizioColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'LonInizio\' in table \'Impegni\' is DBNull.", e); + } + } + set { + this[this.tableImpegni.LonInizioColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public double LatFine { + get { + try { + return ((double)(this[this.tableImpegni.LatFineColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'LatFine\' in table \'Impegni\' is DBNull.", e); + } + } + set { + this[this.tableImpegni.LatFineColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public double LonFine { + get { + try { + return ((double)(this[this.tableImpegni.LonFineColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'LonFine\' in table \'Impegni\' is DBNull.", e); + } + } + set { + this[this.tableImpegni.LonFineColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsCodClienteNull() { @@ -5603,6 +5728,54 @@ namespace WebSCR_data { public void SetNoteIntNull() { this[this.tableImpegni.NoteIntColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsLatInizioNull() { + return this.IsNull(this.tableImpegni.LatInizioColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetLatInizioNull() { + this[this.tableImpegni.LatInizioColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsLonInizioNull() { + return this.IsNull(this.tableImpegni.LonInizioColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetLonInizioNull() { + this[this.tableImpegni.LonInizioColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsLatFineNull() { + return this.IsNull(this.tableImpegni.LatFineColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetLatFineNull() { + this[this.tableImpegni.LatFineColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsLonFineNull() { + return this.IsNull(this.tableImpegni.LonFineColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetLonFineNull() { + this[this.tableImpegni.LonFineColumn] = global::System.Convert.DBNull; + } } /// @@ -9182,6 +9355,11 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca tableMapping.ColumnMappings.Add("InizioInt", "InizioInt"); tableMapping.ColumnMappings.Add("FineInt", "FineInt"); tableMapping.ColumnMappings.Add("NoteInt", "NoteInt"); + tableMapping.ColumnMappings.Add("LatInizio", "LatInizio"); + tableMapping.ColumnMappings.Add("LonInizio", "LonInizio"); + tableMapping.ColumnMappings.Add("LatFin", "LatFine"); + tableMapping.ColumnMappings.Add("LonFine", "LonFine"); + tableMapping.ColumnMappings.Add("LatFine", "LatFine"); this._adapter.TableMappings.Add(tableMapping); } @@ -9195,7 +9373,7 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[7]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[10]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_elencoImpegni"; @@ -9232,27 +9410,52 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RifOC", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[5].Connection = this.Connection; - this._commandCollection[5].CommandText = "dbo.stp_Imp_updateQuery"; + this._commandCollection[5].CommandText = "dbo.stp_Imp_recFineInt"; this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[5].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[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxImpegno", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TipoOrario", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSquadra", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RifOC", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NoteGen", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UrlDoc", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumOp", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RitUsato", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Ascensore", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PianoCons", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserMod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxImpegno", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@FineInt", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@LatFine", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@LonFine", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[6].Connection = this.Connection; - this._commandCollection[6].CommandText = "dbo.stp_Imp_updStart"; + this._commandCollection[6].CommandText = "dbo.stp_Imp_recStartInt"; this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[6].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[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxImpegno", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataOraNew", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@InizioInt", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@LatInizio", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@LonInizio", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 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_Imp_updateQuery"; + 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_IdxImpegno", 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("@TipoOrario", global::System.Data.SqlDbType.NVarChar, 10, 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("@CodSquadra", 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("@RifOC", 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("@NoteGen", global::System.Data.SqlDbType.NVarChar, 250, 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("@UrlDoc", global::System.Data.SqlDbType.NVarChar, 2147483647, 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("@NumOp", 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("@RitUsato", 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("@Ascensore", 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("@PianoCons", 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("@UserMod", 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_Imp_updNoteInt"; + 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("@IdxImpegno", 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("@NoteInt", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[9].Connection = this.Connection; + this._commandCollection[9].CommandText = "dbo.stp_Imp_updStart"; + this._commandCollection[9].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[9].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[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxImpegno", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataOraNew", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9397,8 +9600,100 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int updateQuery(global::System.Nullable Original_IdxImpegno, string TipoOrario, string CodSquadra, string RifOC, string NoteGen, string UrlDoc, global::System.Nullable NumOp, global::System.Nullable RitUsato, global::System.Nullable Ascensore, global::System.Nullable PianoCons, string UserMod) { + public virtual int recFineInt(global::System.Nullable IdxImpegno, global::System.Nullable FineInt, global::System.Nullable LatFine, global::System.Nullable LonFine) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; + if ((IdxImpegno.HasValue == true)) { + command.Parameters[1].Value = ((int)(IdxImpegno.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + if ((FineInt.HasValue == true)) { + command.Parameters[2].Value = ((System.DateTime)(FineInt.Value)); + } + else { + command.Parameters[2].Value = global::System.DBNull.Value; + } + if ((LatFine.HasValue == true)) { + command.Parameters[3].Value = ((double)(LatFine.Value)); + } + else { + command.Parameters[3].Value = global::System.DBNull.Value; + } + if ((LonFine.HasValue == true)) { + command.Parameters[4].Value = ((double)(LonFine.Value)); + } + else { + command.Parameters[4].Value = global::System.DBNull.Value; + } + 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", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int recStartInt(global::System.Nullable IdxImpegno, global::System.Nullable InizioInt, global::System.Nullable LatInizio, global::System.Nullable LonInizio) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; + if ((IdxImpegno.HasValue == true)) { + command.Parameters[1].Value = ((int)(IdxImpegno.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + if ((InizioInt.HasValue == true)) { + command.Parameters[2].Value = ((System.DateTime)(InizioInt.Value)); + } + else { + command.Parameters[2].Value = global::System.DBNull.Value; + } + if ((LatInizio.HasValue == true)) { + command.Parameters[3].Value = ((double)(LatInizio.Value)); + } + else { + command.Parameters[3].Value = global::System.DBNull.Value; + } + if ((LonInizio.HasValue == true)) { + command.Parameters[4].Value = ((double)(LonInizio.Value)); + } + else { + command.Parameters[4].Value = global::System.DBNull.Value; + } + 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", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int updateQuery(global::System.Nullable Original_IdxImpegno, string TipoOrario, string CodSquadra, string RifOC, string NoteGen, string UrlDoc, global::System.Nullable NumOp, global::System.Nullable RitUsato, global::System.Nullable Ascensore, global::System.Nullable PianoCons, string UserMod) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; if ((Original_IdxImpegno.HasValue == true)) { command.Parameters[1].Value = ((int)(Original_IdxImpegno.Value)); } @@ -9482,11 +9777,45 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca return returnValue; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int updNoteInt(global::System.Nullable IdxImpegno, string NoteInt) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[8]; + if ((IdxImpegno.HasValue == true)) { + command.Parameters[1].Value = ((int)(IdxImpegno.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + if ((NoteInt == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(NoteInt)); + } + 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", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int updStart(global::System.Nullable IdxImpegno, global::System.Nullable DataOraNew) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[9]; if ((IdxImpegno.HasValue == true)) { command.Parameters[1].Value = ((int)(IdxImpegno.Value)); } diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd index 742865b..1374f04 100644 --- a/WebSCR_data/DS_Applicazione.xsd +++ b/WebSCR_data/DS_Applicazione.xsd @@ -545,6 +545,11 @@ FROM v_elencoImpegni + + + + + @@ -597,6 +602,34 @@ FROM v_elencoImpegni + + + + dbo.stp_Imp_recFineInt + + + + + + + + + + + + + + dbo.stp_Imp_recStartInt + + + + + + + + + + @@ -618,6 +651,18 @@ FROM v_elencoImpegni + + + + dbo.stp_Imp_updNoteInt + + + + + + + + @@ -889,7 +934,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -921,7 +966,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -957,7 +1002,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -982,7 +1027,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1066,7 +1111,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1197,10 +1242,14 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq + + + + - + @@ -1210,7 +1259,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1226,7 +1275,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1256,7 +1305,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1273,7 +1322,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1352,7 +1401,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + \ No newline at end of file diff --git a/WebSCR_data/DS_Applicazione.xss b/WebSCR_data/DS_Applicazione.xss index 0eea7bd..499f226 100644 --- a/WebSCR_data/DS_Applicazione.xss +++ b/WebSCR_data/DS_Applicazione.xss @@ -9,8 +9,8 @@ - - + + diff --git a/WebSCR_data/bin/Release/SteamWare.dll b/WebSCR_data/bin/Release/SteamWare.dll index bd6b654..ba4b6ba 100644 Binary files a/WebSCR_data/bin/Release/SteamWare.dll and b/WebSCR_data/bin/Release/SteamWare.dll differ diff --git a/WebSCR_data/bin/Release/WebSCR_data.dll b/WebSCR_data/bin/Release/WebSCR_data.dll index 76d4778..5a2aac6 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/DesignTimeResolveAssemblyReferences.cache b/WebSCR_data/obj/Release/DesignTimeResolveAssemblyReferences.cache index 504ccbc..5d3662f 100644 Binary files a/WebSCR_data/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/WebSCR_data/obj/Release/DesignTimeResolveAssemblyReferences.cache 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 7135587..3b9106b 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.csprojResolveAssemblyReference.cache b/WebSCR_data/obj/Release/WebSCR_data.csprojResolveAssemblyReference.cache index 5658a41..80410df 100644 Binary files a/WebSCR_data/obj/Release/WebSCR_data.csprojResolveAssemblyReference.cache and b/WebSCR_data/obj/Release/WebSCR_data.csprojResolveAssemblyReference.cache differ diff --git a/WebSCR_data/obj/Release/WebSCR_data.dll b/WebSCR_data/obj/Release/WebSCR_data.dll index 76d4778..5a2aac6 100644 Binary files a/WebSCR_data/obj/Release/WebSCR_data.dll and b/WebSCR_data/obj/Release/WebSCR_data.dll differ