diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index f733cdb..5d78b26 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj index 153eba0..c8d3aee 100644 --- a/WebSCR/WebSCR.csproj +++ b/WebSCR/WebSCR.csproj @@ -363,6 +363,7 @@ + @@ -582,6 +583,13 @@ mod_pianificazione.ascx + + mod_resocontoImpegni.ascx + ASPXCodeBehind + + + mod_resocontoImpegni.ascx + mod_schedaGiorno.ascx ASPXCodeBehind diff --git a/WebSCR/WebUserControls/mod_elencoZone.ascx b/WebSCR/WebUserControls/mod_elencoZone.ascx index 58ec3bf..8cec762 100644 --- a/WebSCR/WebUserControls/mod_elencoZone.ascx +++ b/WebSCR/WebUserControls/mod_elencoZone.ascx @@ -34,6 +34,7 @@ + @@ -59,13 +60,15 @@ - + + - + + \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_elencoZone.ascx.cs b/WebSCR/WebUserControls/mod_elencoZone.ascx.cs index 2e94c09..781b556 100644 --- a/WebSCR/WebUserControls/mod_elencoZone.ascx.cs +++ b/WebSCR/WebUserControls/mod_elencoZone.ascx.cs @@ -31,7 +31,7 @@ namespace WebSCR.WebUserControls protected void btnNew_Click(object sender, EventArgs e) { // creo novo record e vado in editing... - DtProxy.man.taAZ.InsertQuery("00000", "Inserire Località", "ND", -1); + DtProxy.man.taAZ.InsertQuery("00000", "Inserire Località", "ND", 0, "Z00"); grView.EditIndex = 0; grView.DataBind(); } diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs index cfde877..3b59aeb 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs @@ -35,32 +35,45 @@ namespace WebSCR.WebUserControls /// imposta visibilità dato elementi già impostati /// private void fixVisibility() - { - // controllo se c'è CodCliente - if ((qsVal("CodCliente") != "") && memLayer.ML.isInSessionObject("CodCliente") && memLayer.ML.isInSessionObject("Cliente")) - { - mod_selettoreIndirizzo1.Visible = true; - } - // controllo se c'è indirizzo... - if (qsVal("Indir") != "") + { + if (true) { // imposto zona... - mod_selettoreSlot1.zona = mod_selettoreIndirizzo1.selAddr.zona; + mod_selettoreSlot1.zona = "Z00"; // mod_selettoreIndirizzo1.selAddr.zona; mod_selettoreSlot1.Visible = true; } + // vecchia modalità con selezione "Pre" dell'indirizzo... else { - mod_selettoreSlot1.Visible = false; + // controllo se c'è CodCliente + if ((qsVal("CodCliente") != "") && memLayer.ML.isInSessionObject("CodCliente") && memLayer.ML.isInSessionObject("Cliente")) + { + mod_selettoreIndirizzo1.Visible = true; + } + // controllo se c'è indirizzo... + if (qsVal("Indir") != "") + { + // imposto zona... + mod_selettoreSlot1.zona = "Z00"; // mod_selettoreIndirizzo1.selAddr.zona; + mod_selettoreSlot1.Visible = true; + } + else + { + mod_selettoreSlot1.Visible = false; + } } + } /// - /// evento seleizone indirizzo, allora mostro il resto + /// evento selezione indirizzo, allora mostro il resto /// /// /// void mod_selettoreIndirizzo1_eh_selIndir(object sender, EventArgs e) { - Response.Redirect(string.Format("Pianificazione?CodCliente={0}&Indir={1}", Request.QueryString["CodCliente"], mod_selettoreIndirizzo1.selAddr.selBtn)); +#if false + Response.Redirect(string.Format("Pianificazione?CodCliente={0}&Indir={1}", Request.QueryString["CodCliente"], mod_selettoreIndirizzo1.selAddr.selBtn)); +#endif } } diff --git a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx new file mode 100644 index 0000000..79cbbed --- /dev/null +++ b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx @@ -0,0 +1,37 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_resocontoImpegni.ascx.cs" Inherits="WebSCR.WebUserControls.mod_resocontoImpegni" %> +<%@ Register Src="~/WebUserControls/mod_schedaGiorno.ascx" TagPrefix="uc1" TagName="mod_schedaGiorno" %> +<%@ Register Src="~/WebUserControls/mod_dettImpegno.ascx" TagPrefix="uc1" TagName="mod_dettImpegno" %> + +
+
+
+ + + +
+
+ <%#Eval("Data","{0:ddd dd/MM/yy}") %> +
+
+ disp: <%# Eval("ScoreDisp","{0:P0}") %> +
+ zona: <%# Eval("ScoreZona","{0:P0}") %> +
+
+ + + + + + + + + + +
+
+
+ + +
+
diff --git a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.cs b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.cs new file mode 100644 index 0000000..d4aa60e --- /dev/null +++ b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.cs @@ -0,0 +1,118 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; + +namespace WebSCR.WebUserControls +{ + public partial class mod_resocontoImpegni : System.Web.UI.UserControl + { + /// + /// data selezionata + /// + public DateTime dataSel { get; set; } + /// + /// avvio componente + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + mod_schedaGiorno.eh_newData += mod_schedaGiorno_eh_newData; + + mod_schedaGiorno.Visible = false; + mod_dettImpegno.Visible = false; + if (qsVal("Data") != "") + { + if (qsVal("IdxImpegno") != "") + { + mod_dettImpegno.Visible = true; + } + else + { + mod_schedaGiorno.Visible = true; + } + } + } + /// + /// nuovo record impegno... + /// + /// + /// + void mod_schedaGiorno_eh_newData(object sender, EventArgs e) + { + repSlot.DataBind(); + } + /// + /// recupera valore querystring + /// + /// + /// + protected string qsVal(string nome) + { + string answ = ""; + try + { + answ = Request.QueryString[nome].ToString(); + } + catch + { } + return answ; + } + /// + /// restituisce il codice css x il frame dati score x disponibilità e zona + /// + /// + /// + /// + /// + public string frameFromDispZona(object _scoreDisp, object _scoreZona) + { + string answ = ""; + double scoreDisp = Convert.ToDouble(_scoreDisp); + double scoreZona = Convert.ToDouble(_scoreZona); + if (scoreDisp > 0.75) + { + answ = "greenBox"; + } + else if (scoreDisp > 0.50) + { + answ = "yellowBox"; + } + else if (scoreDisp > 0.25) + { + answ = "orangeBox"; + } + else + { + answ = "redBox"; + } + // aggiungo classi base + answ += " ui-shadow ui-corner-all"; + return answ; + } + /// + /// evento selezione data + /// + /// + /// + protected void lbSelect_Click(object sender, EventArgs e) + { + LinkButton lb = (LinkButton)sender; + dataSel = Convert.ToDateTime(lb.CommandArgument); + + Response.Redirect(string.Format("Pianificazione?CodCliente={0}&Indir={1}&Data={2:yyyy-MM-dd}", qsVal("CodCliente"), qsVal("Indir"), dataSel)); + //mod_schedaGiorno.data = dataSel; + } + /// + /// esegue update componenti + /// + public void doUpdate() + { + repSlot.DataBind(); + } + } +} \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.designer.cs b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.designer.cs new file mode 100644 index 0000000..3813bb3 --- /dev/null +++ b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.designer.cs @@ -0,0 +1,51 @@ +//------------------------------------------------------------------------------ +// +// 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.WebUserControls { + + + public partial class mod_resocontoImpegni { + + /// + /// repSlot control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater repSlot; + + /// + /// odsSlot control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsSlot; + + /// + /// mod_schedaGiorno control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebSCR.WebUserControls.mod_schedaGiorno mod_schedaGiorno; + + /// + /// mod_dettImpegno control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebSCR.WebUserControls.mod_dettImpegno mod_dettImpegno; + } +} diff --git a/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx b/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx index c589374..eb9ebfb 100644 --- a/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx +++ b/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx @@ -1,5 +1,21 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_selettoreIndirizzo.ascx.cs" Inherits="WebSCR.WebUserControls.mod_selettoreIndirizzo" %> -
+ +
+
+
+
+ dati cliente(post ricerca...) +
+
+ +
+
+ indirizzo (post ricerca...) +
+
+
+
+<%--
@@ -20,4 +36,4 @@
-
+
--%> diff --git a/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.cs b/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.cs index 3fe5186..206a1cc 100644 --- a/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.cs +++ b/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.cs @@ -11,6 +11,11 @@ namespace WebSCR.WebUserControls public partial class mod_selettoreIndirizzo : System.Web.UI.UserControl { public event EventHandler eh_selIndir; + + protected void Page_Load(object sender, EventArgs e) + { + } +#if false protected void Page_Load(object sender, EventArgs e) { if (memLayer.ML.StringSessionObj("CodCliente") != "") @@ -74,7 +79,8 @@ namespace WebSCR.WebUserControls newAdd.cap = 12345; newAdd.localita = "localita 12345"; newAdd.prov = "BG"; - newAdd.zona = 5; + newAdd.tempo = 10; + newAdd.zona = "Z01"; newAdd.selBtn = "btn01"; selAddr = newAdd; fixBtnMode("btn01", true); @@ -87,7 +93,8 @@ namespace WebSCR.WebUserControls newAdd.cap = 12345; newAdd.localita = "localita 12345"; newAdd.prov = "BG"; - newAdd.zona = 10; + newAdd.tempo = 10; + newAdd.zona = "Z01"; newAdd.selBtn = "btn02"; selAddr = newAdd; fixBtnMode("btn02", true); @@ -100,7 +107,8 @@ namespace WebSCR.WebUserControls newAdd.cap = 12345; newAdd.localita = "localita 12345"; newAdd.prov = "BG"; - newAdd.zona = 20; + newAdd.tempo = 20; + newAdd.zona = "Z02"; newAdd.selBtn = "btn03"; selAddr = newAdd; fixBtnMode("btn03", true); @@ -113,21 +121,26 @@ namespace WebSCR.WebUserControls newAdd.cap = 12345; newAdd.localita = "localita 12345"; newAdd.prov = "BG"; - newAdd.zona = 30; + newAdd.tempo = 30; + newAdd.zona = "Z03"; newAdd.selBtn = "btn04"; selAddr = newAdd; fixBtnMode("btn04", true); - } + } +#endif } +#if false public struct address { public string via { get; set; } public int cap { get; set; } public string localita { get; set; } public string prov { get; set; } - public int zona { get; set; } + public int tempo { get; set; } + public string zona { get; set; } public string selBtn { get; set; } - } + } +#endif } \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.designer.cs b/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.designer.cs index e708eb1..368746d 100644 --- a/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.designer.cs @@ -13,84 +13,12 @@ namespace WebSCR.WebUserControls { public partial class mod_selettoreIndirizzo { /// - /// divIndirizzo control. + /// txtCerca control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divIndirizzo; - - /// - /// btn1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton btn1; - - /// - /// lblInd_01 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblInd_01; - - /// - /// btn2 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton btn2; - - /// - /// lblInd_02 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblInd_02; - - /// - /// btn3 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton btn3; - - /// - /// lblInd_03 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblInd_03; - - /// - /// btn4 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton btn4; - - /// - /// lblInd_04 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblInd_04; + protected global::System.Web.UI.WebControls.TextBox txtCerca; } } diff --git a/WebSCR/WebUserControls/mod_selettoreSlot.ascx b/WebSCR/WebUserControls/mod_selettoreSlot.ascx index bb09b2a..622fda8 100644 --- a/WebSCR/WebUserControls/mod_selettoreSlot.ascx +++ b/WebSCR/WebUserControls/mod_selettoreSlot.ascx @@ -1,7 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_selettoreSlot.ascx.cs" Inherits="WebSCR.WebUserControls.mod_selettoreSlot" %> -<%@ Register Src="~/WebUserControls/mod_schedaGiorno.ascx" TagPrefix="uc1" TagName="mod_schedaGiorno" %> -<%@ Register Src="~/WebUserControls/mod_dettImpegno.ascx" TagPrefix="uc1" TagName="mod_dettImpegno" %> +<%@ Register src="mod_resocontoImpegni.ascx" tagname="mod_resocontoImpegni" tagprefix="uc1" %>
@@ -46,37 +45,6 @@
-
-
-
- - - -
-
- <%#Eval("Data","{0:ddd dd/MM/yy}") %> -
-
- disp: <%# Eval("ScoreDisp","{0:P0}") %> -
- zona: <%# Eval("ScoreZona","{0:P0}") %> -
-
- - - - - - - - - - -
-
-
- - -
-
+ + diff --git a/WebSCR/WebUserControls/mod_selettoreSlot.ascx.cs b/WebSCR/WebUserControls/mod_selettoreSlot.ascx.cs index 6a89817..dc3e9df 100644 --- a/WebSCR/WebUserControls/mod_selettoreSlot.ascx.cs +++ b/WebSCR/WebUserControls/mod_selettoreSlot.ascx.cs @@ -23,10 +23,6 @@ namespace WebSCR.WebUserControls } } /// - /// data selezionata - /// - public DateTime dataSel {get; set;} - /// /// numero giorni selezionati /// protected int numGG @@ -52,13 +48,13 @@ namespace WebSCR.WebUserControls /// /// zona target selezionata /// - public int zona + public string zona { set { - int newVal = 0; - if (value >= newVal) newVal = value; - lblZona.Text = newVal.ToString(); + string newVal = "Z00"; + if (value != newVal) newVal = value; + lblZona.Text = newVal; } } /// @@ -82,37 +78,38 @@ namespace WebSCR.WebUserControls txtDataFrom.Text = value.ToString("yyyy-MM-dd"); } } + /// + /// data selezionata (da query string o inizializzata... + /// + protected DateTime dataSel + { + get + { + DateTime answ = DateTime.Now; + if (memLayer.ML.isInSessionObject("DataStart")) + { + try + { + answ = Convert.ToDateTime(memLayer.ML.StringSessionObj("DataStart")); + } + catch + { } + } + return answ; + } + set + { + memLayer.ML.setSessionVal("DataStart", value); + } + } protected void Page_Load(object sender, EventArgs e) { if (!Page.IsPostBack) { numGG = memLayer.ML.confReadInt("numGgDef"); - dataFrom = DateTime.Now; + dataFrom = dataSel; } - mod_schedaGiorno.eh_newData += mod_schedaGiorno_eh_newData; - mod_schedaGiorno.Visible = false; - mod_dettImpegno.Visible = false; - if (qsVal("Data") != "") - { - if (qsVal("IdxImpegno") != "") - { - mod_dettImpegno.Visible = true; - } - else - { - mod_schedaGiorno.Visible = true; - } - } - } - /// - /// nuovo record impegno... - /// - /// - /// - void mod_schedaGiorno_eh_newData(object sender, EventArgs e) - { - repSlot.DataBind(); } /// /// aggiungo/tolgo all'intervallo selezione @@ -134,44 +131,13 @@ namespace WebSCR.WebUserControls protected void txtDataFrom_TextChanged(object sender, EventArgs e) { - repSlot.DataBind(); + dataSel = Convert.ToDateTime(txtDataFrom.Text); + mod_resocontoImpegni1.doUpdate(); } protected void txtNumGG_TextChanged(object sender, EventArgs e) { - repSlot.DataBind(); - } - /// - /// restituisce il codice css x il frame dati score x disponibilità e zona - /// - /// - /// - /// - /// - public string frameFromDispZona(object _scoreDisp, object _scoreZona) - { - string answ = ""; - double scoreDisp = Convert.ToDouble(_scoreDisp); - double scoreZona = Convert.ToDouble(_scoreZona); - if (scoreDisp > 0.75) - { - answ = "greenBox"; - } - else if (scoreDisp > 0.50) - { - answ = "yellowBox"; - } - else if (scoreDisp > 0.25) - { - answ = "orangeBox"; - } - else - { - answ = "redBox"; - } - // aggiungo classi base - answ += " ui-shadow ui-corner-all"; - return answ; + mod_resocontoImpegni1.doUpdate(); } /// /// recupera valore querystring @@ -189,18 +155,5 @@ namespace WebSCR.WebUserControls { } return answ; } - /// - /// evento selezione data - /// - /// - /// - protected void lbSelect_Click(object sender, EventArgs e) - { - LinkButton lb = (LinkButton)sender; - dataSel = Convert.ToDateTime(lb.CommandArgument); - - Response.Redirect(string.Format("Pianificazione?CodCliente={0}&Indir={1}&Data={2:yyyy-MM-dd}", qsVal("CodCliente"), qsVal("Indir"), dataSel)); - //mod_schedaGiorno.data = dataSel; - } } } \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_selettoreSlot.ascx.designer.cs b/WebSCR/WebUserControls/mod_selettoreSlot.ascx.designer.cs index 09b53d3..f595bcf 100644 --- a/WebSCR/WebUserControls/mod_selettoreSlot.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_selettoreSlot.ascx.designer.cs @@ -85,39 +85,12 @@ namespace WebSCR.WebUserControls { protected global::System.Web.UI.WebControls.Label lblZona; /// - /// repSlot control. + /// mod_resocontoImpegni1 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Repeater repSlot; - - /// - /// odsSlot control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ObjectDataSource odsSlot; - - /// - /// mod_schedaGiorno control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::WebSCR.WebUserControls.mod_schedaGiorno mod_schedaGiorno; - - /// - /// mod_dettImpegno control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::WebSCR.WebUserControls.mod_dettImpegno mod_dettImpegno; + protected global::WebSCR.WebUserControls.mod_resocontoImpegni mod_resocontoImpegni1; } } diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index 4f2b4d5..5ebbed0 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 6583cee..ee65153 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 2f66afc..e21679e 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR/logs/20150429.txt.zip b/WebSCR/logs/20150429.txt.zip new file mode 100644 index 0000000..b417936 Binary files /dev/null and b/WebSCR/logs/20150429.txt.zip differ diff --git a/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 9a5f24e..5c16238 100644 Binary files a/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache index dbe891e..de3606c 100644 Binary files a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache and b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache differ diff --git a/WebSCR/obj/Debug/WebSCR.dll b/WebSCR/obj/Debug/WebSCR.dll index 6583cee..ee65153 100644 Binary files a/WebSCR/obj/Debug/WebSCR.dll and b/WebSCR/obj/Debug/WebSCR.dll differ diff --git a/WebSCR_data/DS_Applicazione.Designer.cs b/WebSCR_data/DS_Applicazione.Designer.cs index e8a8f87..1c05c78 100644 --- a/WebSCR_data/DS_Applicazione.Designer.cs +++ b/WebSCR_data/DS_Applicazione.Designer.cs @@ -909,6 +909,8 @@ namespace WebSCR_data { private global::System.Data.DataColumn columnProv; + private global::System.Data.DataColumn columnTempo; + private global::System.Data.DataColumn columnZona; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -976,6 +978,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 TempoColumn { + get { + return this.columnTempo; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public global::System.Data.DataColumn ZonaColumn { @@ -1021,13 +1031,14 @@ namespace WebSCR_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public AnagZoneRow AddAnagZoneRow(string Cap, string Localita, string Prov, int Zona) { + public AnagZoneRow AddAnagZoneRow(string Cap, string Localita, string Prov, int Tempo, string Zona) { AnagZoneRow rowAnagZoneRow = ((AnagZoneRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, Cap, Localita, Prov, + Tempo, Zona}; rowAnagZoneRow.ItemArray = columnValuesArray; this.Rows.Add(rowAnagZoneRow); @@ -1062,6 +1073,7 @@ namespace WebSCR_data { this.columnCap = base.Columns["Cap"]; this.columnLocalita = base.Columns["Localita"]; this.columnProv = base.Columns["Prov"]; + this.columnTempo = base.Columns["Tempo"]; this.columnZona = base.Columns["Zona"]; } @@ -1076,7 +1088,9 @@ namespace WebSCR_data { base.Columns.Add(this.columnLocalita); this.columnProv = new global::System.Data.DataColumn("Prov", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnProv); - this.columnZona = new global::System.Data.DataColumn("Zona", typeof(int), null, global::System.Data.MappingType.Element); + this.columnTempo = new global::System.Data.DataColumn("Tempo", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnTempo); + this.columnZona = new global::System.Data.DataColumn("Zona", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnZona); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidxZona}, true)); @@ -1086,10 +1100,15 @@ namespace WebSCR_data { this.columnidxZona.AllowDBNull = false; this.columnidxZona.ReadOnly = true; this.columnidxZona.Unique = true; + this.columnCap.AllowDBNull = false; this.columnCap.MaxLength = 10; + this.columnLocalita.AllowDBNull = false; this.columnLocalita.MaxLength = 50; + this.columnProv.AllowDBNull = false; this.columnProv.MaxLength = 2; + this.columnTempo.AllowDBNull = false; this.columnZona.AllowDBNull = false; + this.columnZona.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2117,6 +2136,8 @@ namespace WebSCR_data { private global::System.Data.DataColumn columnProv; + private global::System.Data.DataColumn columnTempo; + private global::System.Data.DataColumn columnZona; private global::System.Data.DataColumn columnNoteGen; @@ -2330,6 +2351,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 TempoColumn { + get { + return this.columnTempo; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public global::System.Data.DataColumn ZonaColumn { @@ -2406,7 +2435,8 @@ namespace WebSCR_data { string Cap, string Localita, string Prov, - int Zona, + int Tempo, + string Zona, string NoteGen) { ImpegniRow rowImpegniRow = ((ImpegniRow)(this.NewRow())); object[] columnValuesArray = new object[] { @@ -2432,6 +2462,7 @@ namespace WebSCR_data { Cap, Localita, Prov, + Tempo, Zona, NoteGen}; rowImpegniRow.ItemArray = columnValuesArray; @@ -2487,6 +2518,7 @@ namespace WebSCR_data { this.columnCap = base.Columns["Cap"]; this.columnLocalita = base.Columns["Localita"]; this.columnProv = base.Columns["Prov"]; + this.columnTempo = base.Columns["Tempo"]; this.columnZona = base.Columns["Zona"]; this.columnNoteGen = base.Columns["NoteGen"]; } @@ -2538,7 +2570,9 @@ namespace WebSCR_data { base.Columns.Add(this.columnLocalita); this.columnProv = new global::System.Data.DataColumn("Prov", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnProv); - this.columnZona = new global::System.Data.DataColumn("Zona", typeof(int), null, global::System.Data.MappingType.Element); + this.columnTempo = new global::System.Data.DataColumn("Tempo", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnTempo); + this.columnZona = new global::System.Data.DataColumn("Zona", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnZona); this.columnNoteGen = new global::System.Data.DataColumn("NoteGen", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnNoteGen); @@ -2577,8 +2611,9 @@ namespace WebSCR_data { this.columnLocalita.MaxLength = 50; this.columnProv.AllowDBNull = false; this.columnProv.MaxLength = 2; - this.columnZona.AllowDBNull = false; - this.columnZona.Caption = "idxZona"; + this.columnTempo.ReadOnly = true; + this.columnZona.ReadOnly = true; + this.columnZona.MaxLength = 50; this.columnNoteGen.AllowDBNull = false; this.columnNoteGen.MaxLength = 250; } @@ -4089,12 +4124,7 @@ namespace WebSCR_data { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public string Cap { get { - try { - return ((string)(this[this.tableAnagZone.CapColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Cap\' in table \'AnagZone\' is DBNull.", e); - } + return ((string)(this[this.tableAnagZone.CapColumn])); } set { this[this.tableAnagZone.CapColumn] = value; @@ -4105,12 +4135,7 @@ namespace WebSCR_data { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public string Localita { get { - try { - return ((string)(this[this.tableAnagZone.LocalitaColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Localita\' in table \'AnagZone\' is DBNull.", e); - } + return ((string)(this[this.tableAnagZone.LocalitaColumn])); } set { this[this.tableAnagZone.LocalitaColumn] = value; @@ -4121,12 +4146,7 @@ namespace WebSCR_data { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public string Prov { get { - try { - return ((string)(this[this.tableAnagZone.ProvColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Prov\' in table \'AnagZone\' is DBNull.", e); - } + return ((string)(this[this.tableAnagZone.ProvColumn])); } set { this[this.tableAnagZone.ProvColumn] = value; @@ -4135,50 +4155,25 @@ namespace WebSCR_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public int Zona { + public int Tempo { get { - return ((int)(this[this.tableAnagZone.ZonaColumn])); + return ((int)(this[this.tableAnagZone.TempoColumn])); + } + set { + this[this.tableAnagZone.TempoColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string Zona { + get { + return ((string)(this[this.tableAnagZone.ZonaColumn])); } set { this[this.tableAnagZone.ZonaColumn] = value; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public bool IsCapNull() { - return this.IsNull(this.tableAnagZone.CapColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public void SetCapNull() { - this[this.tableAnagZone.CapColumn] = global::System.Convert.DBNull; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public bool IsLocalitaNull() { - return this.IsNull(this.tableAnagZone.LocalitaColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public void SetLocalitaNull() { - this[this.tableAnagZone.LocalitaColumn] = global::System.Convert.DBNull; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public bool IsProvNull() { - return this.IsNull(this.tableAnagZone.ProvColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public void SetProvNull() { - this[this.tableAnagZone.ProvColumn] = global::System.Convert.DBNull; - } } /// @@ -4997,9 +4992,30 @@ namespace WebSCR_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public int Zona { + public int Tempo { get { - return ((int)(this[this.tableImpegni.ZonaColumn])); + try { + return ((int)(this[this.tableImpegni.TempoColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'Tempo\' in table \'Impegni\' is DBNull.", e); + } + } + set { + this[this.tableImpegni.TempoColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string Zona { + get { + try { + return ((string)(this[this.tableImpegni.ZonaColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'Zona\' in table \'Impegni\' is DBNull.", e); + } } set { this[this.tableImpegni.ZonaColumn] = value; @@ -5064,6 +5080,30 @@ namespace WebSCR_data { public void SetCodFisNull() { this[this.tableImpegni.CodFisColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsTempoNull() { + return this.IsNull(this.tableImpegni.TempoColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetTempoNull() { + this[this.tableImpegni.TempoColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsZonaNull() { + return this.IsNull(this.tableImpegni.ZonaColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetZonaNull() { + this[this.tableImpegni.ZonaColumn] = global::System.Convert.DBNull; + } } /// @@ -6440,47 +6480,48 @@ SELECT CodSquadra, DescrSquadra, NumOp, Elettrod, Clima, Inform FROM AnagSquadre tableMapping.ColumnMappings.Add("Cap", "Cap"); tableMapping.ColumnMappings.Add("Localita", "Localita"); tableMapping.ColumnMappings.Add("Prov", "Prov"); + tableMapping.ColumnMappings.Add("Tempo", "Tempo"); tableMapping.ColumnMappings.Add("Zona", "Zona"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = @"DELETE FROM [AnagZone] WHERE (([idxZona] = @Original_idxZona) AND ((@IsNull_Cap = 1 AND [Cap] IS NULL) OR ([Cap] = @Original_Cap)) AND ((@IsNull_Localita = 1 AND [Localita] IS NULL) OR ([Localita] = @Original_Localita)) AND ((@IsNull_Prov = 1 AND [Prov] IS NULL) OR ([Prov] = @Original_Prov)) AND ([Zona] = @Original_Zona))"; + this._adapter.DeleteCommand.CommandText = "DELETE FROM [AnagZone] WHERE (([idxZona] = @Original_idxZona) AND ([Cap] = @Origi" + + "nal_Cap) AND ([Localita] = @Original_Localita) AND ([Prov] = @Original_Prov) AND" + + " ([Tempo] = @Original_Tempo) AND ([Zona] = @Original_Zona))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxZona", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxZona", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Cap", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Cap", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Cap", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Cap", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Localita", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Localita", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Localita", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Localita", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Prov", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Prov", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Prov", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Prov", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Zona", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Zona", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Tempo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Tempo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Zona", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Zona", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = "INSERT INTO [AnagZone] ([Cap], [Localita], [Prov], [Zona]) VALUES (@Cap, @Localit" + - "a, @Prov, @Zona);\r\nSELECT idxZona, Cap, Localita, Prov, Zona FROM AnagZone WHERE" + - " (idxZona = SCOPE_IDENTITY()) ORDER BY Zona"; + this._adapter.InsertCommand.CommandText = "INSERT INTO [AnagZone] ([Cap], [Localita], [Prov], [Tempo], [Zona]) VALUES (@Cap," + + " @Localita, @Prov, @Tempo, @Zona);\r\nSELECT idxZona, Cap, Localita, Prov, Tempo, " + + "Zona FROM AnagZone WHERE (idxZona = SCOPE_IDENTITY()) ORDER BY Zona"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Cap", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Cap", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Localita", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Localita", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Prov", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Prov", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Zona", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Zona", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Tempo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Tempo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Zona", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Zona", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE [AnagZone] SET [Cap] = @Cap, [Localita] = @Localita, [Prov] = @Prov, [Zona] = @Zona WHERE (([idxZona] = @Original_idxZona) AND ((@IsNull_Cap = 1 AND [Cap] IS NULL) OR ([Cap] = @Original_Cap)) AND ((@IsNull_Localita = 1 AND [Localita] IS NULL) OR ([Localita] = @Original_Localita)) AND ((@IsNull_Prov = 1 AND [Prov] IS NULL) OR ([Prov] = @Original_Prov)) AND ([Zona] = @Original_Zona)); -SELECT idxZona, Cap, Localita, Prov, Zona FROM AnagZone WHERE (idxZona = @idxZona) ORDER BY Zona"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [AnagZone] SET [Cap] = @Cap, [Localita] = @Localita, [Prov] = @Prov, [Tempo] = @Tempo, [Zona] = @Zona WHERE (([idxZona] = @Original_idxZona) AND ([Cap] = @Original_Cap) AND ([Localita] = @Original_Localita) AND ([Prov] = @Original_Prov) AND ([Tempo] = @Original_Tempo) AND ([Zona] = @Original_Zona)); +SELECT idxZona, Cap, Localita, Prov, Tempo, Zona FROM AnagZone WHERE (idxZona = @idxZona) ORDER BY Zona"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Cap", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Cap", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Localita", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Localita", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Prov", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Prov", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Zona", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Zona", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Tempo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Tempo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Zona", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Zona", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxZona", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxZona", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Cap", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Cap", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Cap", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Cap", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Localita", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Localita", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Localita", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Localita", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Prov", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Prov", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Prov", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Prov", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Zona", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Zona", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Tempo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Tempo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Zona", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Zona", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxZona", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idxZona", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -6497,8 +6538,7 @@ SELECT idxZona, Cap, Localita, Prov, Zona FROM AnagZone WHERE (idxZona = @idxZon 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 idxZona, Cap, Localita, Prov, Zona\r\nFROM AnagZone\r\nORDER" + - " BY Zona"; + this._commandCollection[0].CommandText = "SELECT * FROM AnagZone ORDER BY Zona"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; @@ -6514,7 +6554,8 @@ SELECT idxZona, Cap, Localita, Prov, Zona FROM AnagZone WHERE (idxZona = @idxZon this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Cap", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Localita", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Prov", global::System.Data.SqlDbType.NVarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Zona", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Tempo", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Zona", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; this._commandCollection[3].CommandText = "dbo.stp_AZ_UpdateQuery"; @@ -6523,7 +6564,8 @@ SELECT idxZona, Cap, Localita, Prov, Zona FROM AnagZone WHERE (idxZona = @idxZon this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Cap", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Localita", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Prov", global::System.Data.SqlDbType.NVarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Zona", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Tempo", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Zona", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxZona", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -6584,33 +6626,33 @@ SELECT idxZona, Cap, Localita, Prov, Zona FROM AnagZone WHERE (idxZona = @idxZon [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(int Original_idxZona, string Original_Cap, string Original_Localita, string Original_Prov, int Original_Zona) { + public virtual int Delete(int Original_idxZona, string Original_Cap, string Original_Localita, string Original_Prov, int Original_Tempo, string Original_Zona) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idxZona)); if ((Original_Cap == null)) { - this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[2].Value = global::System.DBNull.Value; + throw new global::System.ArgumentNullException("Original_Cap"); } else { - this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_Cap)); + this.Adapter.DeleteCommand.Parameters[1].Value = ((string)(Original_Cap)); } if ((Original_Localita == null)) { - this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[4].Value = global::System.DBNull.Value; + throw new global::System.ArgumentNullException("Original_Localita"); } else { - this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_Localita)); + this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_Localita)); } if ((Original_Prov == null)) { - this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[6].Value = global::System.DBNull.Value; + throw new global::System.ArgumentNullException("Original_Prov"); } else { - this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[6].Value = ((string)(Original_Prov)); + this.Adapter.DeleteCommand.Parameters[3].Value = ((string)(Original_Prov)); + } + this.Adapter.DeleteCommand.Parameters[4].Value = ((int)(Original_Tempo)); + if ((Original_Zona == null)) { + throw new global::System.ArgumentNullException("Original_Zona"); + } + else { + this.Adapter.DeleteCommand.Parameters[5].Value = ((string)(Original_Zona)); } - this.Adapter.DeleteCommand.Parameters[7].Value = ((int)(Original_Zona)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -6631,26 +6673,32 @@ SELECT idxZona, Cap, Localita, Prov, Zona FROM AnagZone WHERE (idxZona = @idxZon [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] - public virtual int Insert(string Cap, string Localita, string Prov, int Zona) { + public virtual int Insert(string Cap, string Localita, string Prov, int Tempo, string Zona) { if ((Cap == null)) { - this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; + throw new global::System.ArgumentNullException("Cap"); } else { this.Adapter.InsertCommand.Parameters[0].Value = ((string)(Cap)); } if ((Localita == null)) { - this.Adapter.InsertCommand.Parameters[1].Value = global::System.DBNull.Value; + throw new global::System.ArgumentNullException("Localita"); } else { this.Adapter.InsertCommand.Parameters[1].Value = ((string)(Localita)); } if ((Prov == null)) { - this.Adapter.InsertCommand.Parameters[2].Value = global::System.DBNull.Value; + throw new global::System.ArgumentNullException("Prov"); } else { this.Adapter.InsertCommand.Parameters[2].Value = ((string)(Prov)); } - this.Adapter.InsertCommand.Parameters[3].Value = ((int)(Zona)); + this.Adapter.InsertCommand.Parameters[3].Value = ((int)(Tempo)); + if ((Zona == null)) { + throw new global::System.ArgumentNullException("Zona"); + } + else { + this.Adapter.InsertCommand.Parameters[4].Value = ((string)(Zona)); + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -6671,53 +6719,59 @@ SELECT idxZona, Cap, Localita, Prov, Zona FROM AnagZone WHERE (idxZona = @idxZon [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update(string Cap, string Localita, string Prov, int Zona, int Original_idxZona, string Original_Cap, string Original_Localita, string Original_Prov, int Original_Zona, int idxZona) { + public virtual int Update(string Cap, string Localita, string Prov, int Tempo, string Zona, int Original_idxZona, string Original_Cap, string Original_Localita, string Original_Prov, int Original_Tempo, string Original_Zona, int idxZona) { if ((Cap == null)) { - this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; + throw new global::System.ArgumentNullException("Cap"); } else { this.Adapter.UpdateCommand.Parameters[0].Value = ((string)(Cap)); } if ((Localita == null)) { - this.Adapter.UpdateCommand.Parameters[1].Value = global::System.DBNull.Value; + throw new global::System.ArgumentNullException("Localita"); } else { this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(Localita)); } if ((Prov == null)) { - this.Adapter.UpdateCommand.Parameters[2].Value = global::System.DBNull.Value; + throw new global::System.ArgumentNullException("Prov"); } else { this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(Prov)); } - this.Adapter.UpdateCommand.Parameters[3].Value = ((int)(Zona)); - this.Adapter.UpdateCommand.Parameters[4].Value = ((int)(Original_idxZona)); - if ((Original_Cap == null)) { - this.Adapter.UpdateCommand.Parameters[5].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[6].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[3].Value = ((int)(Tempo)); + if ((Zona == null)) { + throw new global::System.ArgumentNullException("Zona"); + } + else { + this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(Zona)); + } + this.Adapter.UpdateCommand.Parameters[5].Value = ((int)(Original_idxZona)); + if ((Original_Cap == null)) { + throw new global::System.ArgumentNullException("Original_Cap"); } else { - this.Adapter.UpdateCommand.Parameters[5].Value = ((object)(0)); this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(Original_Cap)); } if ((Original_Localita == null)) { - this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[8].Value = global::System.DBNull.Value; + throw new global::System.ArgumentNullException("Original_Localita"); } else { - this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(Original_Localita)); + this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(Original_Localita)); } if ((Original_Prov == null)) { - this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value; + throw new global::System.ArgumentNullException("Original_Prov"); } else { - this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_Prov)); + this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(Original_Prov)); } - this.Adapter.UpdateCommand.Parameters[11].Value = ((int)(Original_Zona)); - this.Adapter.UpdateCommand.Parameters[12].Value = ((int)(idxZona)); + this.Adapter.UpdateCommand.Parameters[9].Value = ((int)(Original_Tempo)); + if ((Original_Zona == null)) { + throw new global::System.ArgumentNullException("Original_Zona"); + } + else { + this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_Zona)); + } + this.Adapter.UpdateCommand.Parameters[11].Value = ((int)(idxZona)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -6738,8 +6792,8 @@ SELECT idxZona, Cap, Localita, Prov, Zona FROM AnagZone WHERE (idxZona = @idxZon [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update(string Cap, string Localita, string Prov, int Zona, int Original_idxZona, string Original_Cap, string Original_Localita, string Original_Prov, int Original_Zona) { - return this.Update(Cap, Localita, Prov, Zona, Original_idxZona, Original_Cap, Original_Localita, Original_Prov, Original_Zona, Original_idxZona); + public virtual int Update(string Cap, string Localita, string Prov, int Tempo, string Zona, int Original_idxZona, string Original_Cap, string Original_Localita, string Original_Prov, int Original_Tempo, string Original_Zona) { + return this.Update(Cap, Localita, Prov, Tempo, Zona, Original_idxZona, Original_Cap, Original_Localita, Original_Prov, Original_Tempo, Original_Zona, Original_idxZona); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -6775,7 +6829,7 @@ SELECT idxZona, Cap, Localita, Prov, Zona FROM AnagZone WHERE (idxZona = @idxZon [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, false)] - public virtual int InsertQuery(string Cap, string Localita, string Prov, global::System.Nullable Zona) { + public virtual int InsertQuery(string Cap, string Localita, string Prov, global::System.Nullable Tempo, string Zona) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; if ((Cap == null)) { command.Parameters[1].Value = global::System.DBNull.Value; @@ -6795,12 +6849,18 @@ SELECT idxZona, Cap, Localita, Prov, Zona FROM AnagZone WHERE (idxZona = @idxZon else { command.Parameters[3].Value = ((string)(Prov)); } - if ((Zona.HasValue == true)) { - command.Parameters[4].Value = ((int)(Zona.Value)); + if ((Tempo.HasValue == true)) { + command.Parameters[4].Value = ((int)(Tempo.Value)); } else { command.Parameters[4].Value = global::System.DBNull.Value; } + if ((Zona == null)) { + command.Parameters[5].Value = global::System.DBNull.Value; + } + else { + command.Parameters[5].Value = ((string)(Zona)); + } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -6822,7 +6882,7 @@ SELECT idxZona, Cap, Localita, Prov, Zona FROM AnagZone WHERE (idxZona = @idxZon [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, false)] - public virtual int UpdateQuery(string Cap, string Localita, string Prov, global::System.Nullable Zona, global::System.Nullable Original_idxZona) { + public virtual int UpdateQuery(string Cap, string Localita, string Prov, global::System.Nullable Tempo, string Zona, global::System.Nullable Original_idxZona) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; if ((Cap == null)) { command.Parameters[1].Value = global::System.DBNull.Value; @@ -6842,17 +6902,23 @@ SELECT idxZona, Cap, Localita, Prov, Zona FROM AnagZone WHERE (idxZona = @idxZon else { command.Parameters[3].Value = ((string)(Prov)); } - if ((Zona.HasValue == true)) { - command.Parameters[4].Value = ((int)(Zona.Value)); + if ((Tempo.HasValue == true)) { + command.Parameters[4].Value = ((int)(Tempo.Value)); } else { command.Parameters[4].Value = global::System.DBNull.Value; } - if ((Original_idxZona.HasValue == true)) { - command.Parameters[5].Value = ((int)(Original_idxZona.Value)); + if ((Zona == null)) { + command.Parameters[5].Value = global::System.DBNull.Value; } else { - command.Parameters[5].Value = global::System.DBNull.Value; + command.Parameters[5].Value = ((string)(Zona)); + } + if ((Original_idxZona.HasValue == true)) { + command.Parameters[6].Value = ((int)(Original_idxZona.Value)); + } + else { + command.Parameters[6].Value = global::System.DBNull.Value; } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) @@ -8572,7 +8638,8 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo tableMapping.ColumnMappings.Add("Cap", "Cap"); tableMapping.ColumnMappings.Add("Localita", "Localita"); tableMapping.ColumnMappings.Add("Prov", "Prov"); - tableMapping.ColumnMappings.Add("idxZona", "Zona"); + tableMapping.ColumnMappings.Add("Tempo", "Tempo"); + tableMapping.ColumnMappings.Add("Zona", "Zona"); tableMapping.ColumnMappings.Add("NoteGen", "NoteGen"); this._adapter.TableMappings.Add(tableMapping); } @@ -8590,7 +8657,7 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_elencoImpegni"; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_elencoImpegni"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; @@ -8939,7 +9006,7 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo this._commandCollection[1].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[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataFrom", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumGG", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Zona", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Zona", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -8970,7 +9037,7 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_Applicazione.DispImpTotDataTable getByDataRange(global::System.Nullable DataFrom, global::System.Nullable NumGG, global::System.Nullable Zona) { + public virtual DS_Applicazione.DispImpTotDataTable getByDataRange(global::System.Nullable DataFrom, global::System.Nullable NumGG, string Zona) { this.Adapter.SelectCommand = this.CommandCollection[1]; if ((DataFrom.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((System.DateTime)(DataFrom.Value)); @@ -8984,11 +9051,11 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo else { this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; } - if ((Zona.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[3].Value = ((int)(Zona.Value)); + if ((Zona == null)) { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(Zona)); } DS_Applicazione.DispImpTotDataTable dataTable = new DS_Applicazione.DispImpTotDataTable(); this.Adapter.Fill(dataTable); diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd index 6acda5c..e1c3a04 100644 --- a/WebSCR_data/DS_Applicazione.xsd +++ b/WebSCR_data/DS_Applicazione.xsd @@ -125,56 +125,52 @@ SELECT CodSquadra, DescrSquadra, NumOp, Elettrod, Clima, Inform FROM AnagSquadre - DELETE FROM [AnagZone] WHERE (([idxZona] = @Original_idxZona) AND ((@IsNull_Cap = 1 AND [Cap] IS NULL) OR ([Cap] = @Original_Cap)) AND ((@IsNull_Localita = 1 AND [Localita] IS NULL) OR ([Localita] = @Original_Localita)) AND ((@IsNull_Prov = 1 AND [Prov] IS NULL) OR ([Prov] = @Original_Prov)) AND ([Zona] = @Original_Zona)) + DELETE FROM [AnagZone] WHERE (([idxZona] = @Original_idxZona) AND ([Cap] = @Original_Cap) AND ([Localita] = @Original_Localita) AND ([Prov] = @Original_Prov) AND ([Tempo] = @Original_Tempo) AND ([Zona] = @Original_Zona)) - - - - - - - + + + + + - INSERT INTO [AnagZone] ([Cap], [Localita], [Prov], [Zona]) VALUES (@Cap, @Localita, @Prov, @Zona); -SELECT idxZona, Cap, Localita, Prov, Zona FROM AnagZone WHERE (idxZona = SCOPE_IDENTITY()) ORDER BY Zona + INSERT INTO [AnagZone] ([Cap], [Localita], [Prov], [Tempo], [Zona]) VALUES (@Cap, @Localita, @Prov, @Tempo, @Zona); +SELECT idxZona, Cap, Localita, Prov, Tempo, Zona FROM AnagZone WHERE (idxZona = SCOPE_IDENTITY()) ORDER BY Zona - - - - + + + + + - SELECT idxZona, Cap, Localita, Prov, Zona -FROM AnagZone -ORDER BY Zona + SELECT * FROM AnagZone ORDER BY Zona - UPDATE [AnagZone] SET [Cap] = @Cap, [Localita] = @Localita, [Prov] = @Prov, [Zona] = @Zona WHERE (([idxZona] = @Original_idxZona) AND ((@IsNull_Cap = 1 AND [Cap] IS NULL) OR ([Cap] = @Original_Cap)) AND ((@IsNull_Localita = 1 AND [Localita] IS NULL) OR ([Localita] = @Original_Localita)) AND ((@IsNull_Prov = 1 AND [Prov] IS NULL) OR ([Prov] = @Original_Prov)) AND ([Zona] = @Original_Zona)); -SELECT idxZona, Cap, Localita, Prov, Zona FROM AnagZone WHERE (idxZona = @idxZona) ORDER BY Zona + UPDATE [AnagZone] SET [Cap] = @Cap, [Localita] = @Localita, [Prov] = @Prov, [Tempo] = @Tempo, [Zona] = @Zona WHERE (([idxZona] = @Original_idxZona) AND ([Cap] = @Original_Cap) AND ([Localita] = @Original_Localita) AND ([Prov] = @Original_Prov) AND ([Tempo] = @Original_Tempo) AND ([Zona] = @Original_Zona)); +SELECT idxZona, Cap, Localita, Prov, Tempo, Zona FROM AnagZone WHERE (idxZona = @idxZona) ORDER BY Zona - - - - + + + + + - - - - - - - + + + + + @@ -186,6 +182,7 @@ SELECT idxZona, Cap, Localita, Prov, Zona FROM AnagZone WHERE (idxZona = @idxZon + @@ -209,7 +206,8 @@ SELECT idxZona, Cap, Localita, Prov, Zona FROM AnagZone WHERE (idxZona = @idxZon - + + @@ -223,7 +221,8 @@ SELECT idxZona, Cap, Localita, Prov, Zona FROM AnagZone WHERE (idxZona = @idxZon - + + @@ -516,8 +515,8 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo - SELECT * -FROM v_elencoImpegni + SELECT * +FROM v_elencoImpegni @@ -547,7 +546,8 @@ FROM v_elencoImpegni - + + @@ -631,7 +631,7 @@ FROM v_elencoImpegni - + @@ -774,7 +774,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -798,36 +798,43 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + - + - + - + - + + + + + + + + - + @@ -852,7 +859,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -970,7 +977,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1067,7 +1074,14 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + + + + + + + + @@ -1078,7 +1092,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1088,7 +1102,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1104,7 +1118,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1134,7 +1148,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1192,7 +1206,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + \ No newline at end of file diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index 4f2b4d5..5ebbed0 100644 Binary files a/WebSCR_data/bin/Debug/SteamWare.dll and b/WebSCR_data/bin/Debug/SteamWare.dll differ diff --git a/WebSCR_data/bin/Debug/WebSCR_data.dll b/WebSCR_data/bin/Debug/WebSCR_data.dll index 2f66afc..e21679e 100644 Binary files a/WebSCR_data/bin/Debug/WebSCR_data.dll and b/WebSCR_data/bin/Debug/WebSCR_data.dll differ diff --git a/WebSCR_data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/WebSCR_data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d893c05..711333a 100644 Binary files a/WebSCR_data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/WebSCR_data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll b/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll index afb776b..9aa7b42 100644 Binary files a/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache index ef0e01f..961eed2 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache and b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.dll b/WebSCR_data/obj/Debug/WebSCR_data.dll index 2f66afc..e21679e 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ