diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index 86deb55..e5eab62 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/Content/WebSCR.css b/WebSCR/Content/WebSCR.css new file mode 100644 index 0000000..7d9da09 --- /dev/null +++ b/WebSCR/Content/WebSCR.css @@ -0,0 +1,20 @@ +.greenBox { + background-color: #c3ffc3; + border: 1px solid #00a400; + color: #333333; +} +.orangeBox { + background-color: #ffa05b; + border: 1px solid #be5100; + color: #333333; +} +.redBox { + background-color: #ff9c9c; + border: 1px solid #cb0000; + color: #333333; +} +.grayBox { + background-color: #d6d6d6; + border: 1px solid #707070; + color: #333333; +} diff --git a/WebSCR/Content/WebSCR.less b/WebSCR/Content/WebSCR.less index 46800d1..5181c94 100644 --- a/WebSCR/Content/WebSCR.less +++ b/WebSCR/Content/WebSCR.less @@ -1,2 +1,46 @@ body { } + +@rosso: #FF0000; +@rossoChiaro: #ff9c9c; +@rossoScuro: #cb0000; + + +@verde: #00FF00; +@verdeChiaro: #c3ffc3; +@verdeScuro: #00a400; + +@arancio: #ff6a00; +@arancioChiaro: #ffa05b; +@arancioScuro: #be5100; + + +@grigio: #ACACAC; +@grigioChiaro: #d6d6d6; +@grigioScuro: #707070; + +@testoScuro: #333; + +.greenBox{ + background-color: @verdeChiaro; + border: 1px solid @verdeScuro; + color: @testoScuro; +} + +.orangeBox{ + background-color: @arancioChiaro; + border: 1px solid @arancioScuro; + color: @testoScuro; +} + +.redBox{ + background-color: @rossoChiaro; + border: 1px solid @rossoScuro; + color: @testoScuro; +} + +.grayBox{ + background-color: @grigioChiaro; + border: 1px solid @grigioScuro; + color: @testoScuro; +} \ No newline at end of file diff --git a/WebSCR/Content/WebSCR.min.css b/WebSCR/Content/WebSCR.min.css new file mode 100644 index 0000000..aff2b46 --- /dev/null +++ b/WebSCR/Content/WebSCR.min.css @@ -0,0 +1 @@ +.greenBox{background-color:#c3ffc3;border:1px solid #00a400;color:#333}.orangeBox{background-color:#ffa05b;border:1px solid #be5100;color:#333}.redBox{background-color:#ff9c9c;border:1px solid #cb0000;color:#333}.grayBox{background-color:#d6d6d6;border:1px solid #707070;color:#333} \ No newline at end of file diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj index 457871c..b8e61a6 100644 --- a/WebSCR/WebSCR.csproj +++ b/WebSCR/WebSCR.csproj @@ -318,6 +318,12 @@ + + WebSCR.less + + + WebSCR.less + diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx b/WebSCR/WebUserControls/mod_pianificazione.ascx index 124bcb0..db8aaf7 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx @@ -16,4 +16,4 @@ Permetto di inserire uno o + task
selettore testuale x ADD
-elenco task inseriti (gridview) \ No newline at end of file +elenco task inseriti (gridview) che aggiornano i totali del tempi impegni (togliere da colonna fisica e fare solo calcolata?) \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs index e961946..7565f13 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs @@ -33,6 +33,8 @@ namespace WebSCR.WebUserControls /// void mod_selettoreIndirizzo1_eh_selIndir(object sender, EventArgs e) { + // imposto zona... + mod_selettoreSlot1.zona = mod_selettoreIndirizzo1.selAddr.zona; mod_selettoreSlot1.Visible = true; } diff --git a/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.cs b/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.cs index f6264ac..b8c35c7 100644 --- a/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.cs +++ b/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.cs @@ -78,6 +78,7 @@ namespace WebSCR.WebUserControls newAdd.cap = 12345; newAdd.localita = "localita 12345"; newAdd.prov = "BG"; + newAdd.zona = 5; selAddr = newAdd; fixBtnMode("btn01"); } @@ -89,6 +90,7 @@ namespace WebSCR.WebUserControls newAdd.cap = 12345; newAdd.localita = "localita 12345"; newAdd.prov = "BG"; + newAdd.zona = 10; selAddr = newAdd; fixBtnMode("btn02"); } @@ -100,6 +102,7 @@ namespace WebSCR.WebUserControls newAdd.cap = 12345; newAdd.localita = "localita 12345"; newAdd.prov = "BG"; + newAdd.zona = 20; selAddr = newAdd; fixBtnMode("btn03"); } @@ -111,6 +114,7 @@ namespace WebSCR.WebUserControls newAdd.cap = 12345; newAdd.localita = "localita 12345"; newAdd.prov = "BG"; + newAdd.zona = 30; selAddr = newAdd; fixBtnMode("btn04"); } @@ -123,5 +127,6 @@ namespace WebSCR.WebUserControls public int cap { get; set; } public string localita { get; set; } public string prov { get; set; } + public int zona { get; set; } } } \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_selettoreSlot.ascx b/WebSCR/WebUserControls/mod_selettoreSlot.ascx index 2b6c994..999bab0 100644 --- a/WebSCR/WebUserControls/mod_selettoreSlot.ascx +++ b/WebSCR/WebUserControls/mod_selettoreSlot.ascx @@ -30,36 +30,40 @@
+
+
+ zona consegna +
+ + +
+
+
+
seleziono quale slot, gli slot sono
  • Colorati x vicinanza a zona indirizzo (oppure icona mappa colorata?)
    • -
  • Colorati x tempo disponibile (oppure icona tempo colorata) + indicazione ore imp/disponibili
    • -
+
  • Colorati x tempo disponibile (oppure icona tempo colorata) + indicazione ore imp/disponibili / % impegnato
    • +
    -
    - <%#Eval("Data","{0:dd/MM/yyyy}") %> +
    + <%#Eval("Data","{0:ddd dd/MM/yy}") %>
    - <%#Eval("OreImp") %> / <%#Eval("OreDisp") %> + <%# string.Format("{0:P0}",Convert.ToDouble(Eval("OreImp"))/ Convert.ToDouble(Eval("OreDisp"))) %>
    - -
    - <%#Eval("Data","{0:dd/MM/yyyy}") %> -
    - <%#Eval("OreImp") %> / <%#Eval("OreDisp") %> -
    -     +
    diff --git a/WebSCR/WebUserControls/mod_selettoreSlot.ascx.cs b/WebSCR/WebUserControls/mod_selettoreSlot.ascx.cs index 34ea6d9..525e456 100644 --- a/WebSCR/WebUserControls/mod_selettoreSlot.ascx.cs +++ b/WebSCR/WebUserControls/mod_selettoreSlot.ascx.cs @@ -33,6 +33,18 @@ namespace WebSCR.WebUserControls } } /// + /// numero giorni selezionati + /// + public int zona + { + set + { + int newVal = 0; + if (value >= newVal) newVal = value; + lblZona.Text = newVal.ToString(); + } + } + /// /// data riferimento /// protected DateTime dataFrom @@ -88,5 +100,31 @@ namespace WebSCR.WebUserControls { repSlot.DataBind(); } + /// + /// restituisce il codice css x il frame data zona, ore disp, ore impegnate + /// + /// + /// + /// + /// + public string frameFromDispZona(object _dist, object _oreImp, object _oreDisp) + { + string answ = ""; + double oreImp = Convert.ToDouble(_oreImp); + double oreDisp = Convert.ToDouble(_oreDisp); + if (oreImp < oreDisp/2) + { + answ = "greenBox"; + } + else if (oreImp < oreDisp / 4) + { + answ = "orangeBox"; + } + else + { + answ = "redBox"; + } + return answ; + } } } \ 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 08b9c30..1ea9545 100644 --- a/WebSCR/WebUserControls/mod_selettoreSlot.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_selettoreSlot.ascx.designer.cs @@ -75,6 +75,15 @@ namespace WebSCR.WebUserControls { /// protected global::System.Web.UI.WebControls.LinkButton lbPlus5; + /// + /// lblZona control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblZona; + /// /// repSlot control. /// diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index d2f0966..bbc2e54 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 fc5a2fb..d8ec75f 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 125b263..67f4767 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 58c972b..2c8fc90 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 ae9fe9f..6ff6259 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 fc5a2fb..d8ec75f 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 2e250f3..9bcf62c 100644 --- a/WebSCR_data/DS_Applicazione.Designer.cs +++ b/WebSCR_data/DS_Applicazione.Designer.cs @@ -2032,6 +2032,18 @@ namespace WebSCR_data { private global::System.Data.DataColumn columnUrlDoc; + private global::System.Data.DataColumn columnIndir; + + private global::System.Data.DataColumn columnCap; + + private global::System.Data.DataColumn columnLocalita; + + private global::System.Data.DataColumn columnProv; + + private global::System.Data.DataColumn columnZona; + + private global::System.Data.DataColumn columnNoteGen; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public ImpegniDataTable() { @@ -2209,6 +2221,54 @@ 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 IndirColumn { + get { + return this.columnIndir; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn CapColumn { + get { + return this.columnCap; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn LocalitaColumn { + get { + return this.columnLocalita; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn ProvColumn { + get { + return this.columnProv; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn ZonaColumn { + get { + return this.columnZona; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn NoteGenColumn { + get { + return this.columnNoteGen; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2264,7 +2324,13 @@ namespace WebSCR_data { string CodFis, bool OraIndic, string RifOC, - string UrlDoc) { + string UrlDoc, + string Indir, + string Cap, + string Localita, + string Prov, + int Zona, + string NoteGen) { ImpegniRow rowImpegniRow = ((ImpegniRow)(this.NewRow())); object[] columnValuesArray = new object[] { IdxImpegno, @@ -2284,7 +2350,13 @@ namespace WebSCR_data { CodFis, OraIndic, RifOC, - UrlDoc}; + UrlDoc, + Indir, + Cap, + Localita, + Prov, + Zona, + NoteGen}; rowImpegniRow.ItemArray = columnValuesArray; this.Rows.Add(rowImpegniRow); return rowImpegniRow; @@ -2334,6 +2406,12 @@ namespace WebSCR_data { this.columnOraIndic = base.Columns["OraIndic"]; this.columnRifOC = base.Columns["RifOC"]; this.columnUrlDoc = base.Columns["UrlDoc"]; + this.columnIndir = base.Columns["Indir"]; + this.columnCap = base.Columns["Cap"]; + this.columnLocalita = base.Columns["Localita"]; + this.columnProv = base.Columns["Prov"]; + this.columnZona = base.Columns["Zona"]; + this.columnNoteGen = base.Columns["NoteGen"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2375,6 +2453,18 @@ namespace WebSCR_data { base.Columns.Add(this.columnRifOC); this.columnUrlDoc = new global::System.Data.DataColumn("UrlDoc", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnUrlDoc); + this.columnIndir = new global::System.Data.DataColumn("Indir", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnIndir); + this.columnCap = new global::System.Data.DataColumn("Cap", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCap); + this.columnLocalita = new global::System.Data.DataColumn("Localita", typeof(string), null, global::System.Data.MappingType.Element); + 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); + 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); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnIdxImpegno, this.columnCodSquadra, @@ -2402,6 +2492,18 @@ namespace WebSCR_data { this.columnRifOC.MaxLength = 50; this.columnUrlDoc.AllowDBNull = false; this.columnUrlDoc.MaxLength = 2147483647; + this.columnIndir.AllowDBNull = false; + this.columnIndir.MaxLength = 50; + 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.columnZona.AllowDBNull = false; + this.columnZona.Caption = "idxZona"; + this.columnNoteGen.AllowDBNull = false; + this.columnNoteGen.MaxLength = 250; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2541,6 +2643,8 @@ namespace WebSCR_data { private global::System.Data.DataColumn columnOreImp; + private global::System.Data.DataColumn columnDistMed; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public DispImpTotDataTable() { @@ -2598,6 +2702,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 DistMedColumn { + get { + return this.columnDistMed; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2635,12 +2747,13 @@ namespace WebSCR_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public DispImpTotRow AddDispImpTotRow(System.DateTime Data, int OreDisp, int OreImp) { + public DispImpTotRow AddDispImpTotRow(System.DateTime Data, int OreDisp, int OreImp, int DistMed) { DispImpTotRow rowDispImpTotRow = ((DispImpTotRow)(this.NewRow())); object[] columnValuesArray = new object[] { Data, OreDisp, - OreImp}; + OreImp, + DistMed}; rowDispImpTotRow.ItemArray = columnValuesArray; this.Rows.Add(rowDispImpTotRow); return rowDispImpTotRow; @@ -2666,6 +2779,7 @@ namespace WebSCR_data { this.columnData = base.Columns["Data"]; this.columnOreDisp = base.Columns["OreDisp"]; this.columnOreImp = base.Columns["OreImp"]; + this.columnDistMed = base.Columns["DistMed"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2677,7 +2791,10 @@ namespace WebSCR_data { base.Columns.Add(this.columnOreDisp); this.columnOreImp = new global::System.Data.DataColumn("OreImp", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnOreImp); + this.columnDistMed = new global::System.Data.DataColumn("DistMed", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDistMed); this.columnData.AllowDBNull = false; + this.columnDistMed.ReadOnly = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4081,6 +4198,72 @@ namespace WebSCR_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string Indir { + get { + return ((string)(this[this.tableImpegni.IndirColumn])); + } + set { + this[this.tableImpegni.IndirColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string Cap { + get { + return ((string)(this[this.tableImpegni.CapColumn])); + } + set { + this[this.tableImpegni.CapColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string Localita { + get { + return ((string)(this[this.tableImpegni.LocalitaColumn])); + } + set { + this[this.tableImpegni.LocalitaColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string Prov { + get { + return ((string)(this[this.tableImpegni.ProvColumn])); + } + set { + this[this.tableImpegni.ProvColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int Zona { + get { + return ((int)(this[this.tableImpegni.ZonaColumn])); + } + set { + this[this.tableImpegni.ZonaColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string NoteGen { + get { + return ((string)(this[this.tableImpegni.NoteGenColumn])); + } + set { + this[this.tableImpegni.NoteGenColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsFinePrevNull() { @@ -4187,6 +4370,22 @@ namespace WebSCR_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int DistMed { + get { + try { + return ((int)(this[this.tableDispImpTot.DistMedColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'DistMed\' in table \'DispImpTot\' is DBNull.", e); + } + } + set { + this[this.tableDispImpTot.DistMedColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsOreDispNull() { @@ -4210,6 +4409,18 @@ namespace WebSCR_data { public void SetOreImpNull() { this[this.tableDispImpTot.OreImpColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsDistMedNull() { + return this.IsNull(this.tableDispImpTot.DistMedColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetDistMedNull() { + this[this.tableDispImpTot.DistMedColumn] = global::System.Convert.DBNull; + } } /// @@ -7340,6 +7551,12 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo tableMapping.ColumnMappings.Add("RifOC", "RifOC"); tableMapping.ColumnMappings.Add("UrlDoc", "UrlDoc"); tableMapping.ColumnMappings.Add("NumOp", "NumOp"); + tableMapping.ColumnMappings.Add("Indir", "Indir"); + tableMapping.ColumnMappings.Add("Cap", "Cap"); + tableMapping.ColumnMappings.Add("Localita", "Localita"); + tableMapping.ColumnMappings.Add("Prov", "Prov"); + tableMapping.ColumnMappings.Add("idxZona", "Zona"); + tableMapping.ColumnMappings.Add("NoteGen", "NoteGen"); this._adapter.TableMappings.Add(tableMapping); } @@ -7356,9 +7573,7 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT IdxImpegno, DataOra, CodSquadra, DescrSquadra, Elettrod, Clima, Inf" + - "orm, MinTotCons, MinViaggio, FinePrev, NumOp, CodCliente, Cognome, Nome, CodFis," + - " OraIndic, RifOC, UrlDoc\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; @@ -7557,6 +7772,7 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo tableMapping.ColumnMappings.Add("Data", "Data"); tableMapping.ColumnMappings.Add("OreDisp", "OreDisp"); tableMapping.ColumnMappings.Add("OreImp", "OreImp"); + tableMapping.ColumnMappings.Add("DistMed", "DistMed"); this._adapter.TableMappings.Add(tableMapping); } @@ -7573,7 +7789,7 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT Data, OreDisp, OreImp FROM dbo.v_DispImpTot"; + this._commandCollection[0].CommandText = "SELECT * FROM dbo.v_DispImpTot"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; @@ -7582,6 +7798,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, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -7612,7 +7829,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) { + public virtual DS_Applicazione.DispImpTotDataTable getByDataRange(global::System.Nullable DataFrom, global::System.Nullable NumGG, global::System.Nullable Zona) { this.Adapter.SelectCommand = this.CommandCollection[1]; if ((DataFrom.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((System.DateTime)(DataFrom.Value)); @@ -7626,6 +7843,12 @@ 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)); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } DS_Applicazione.DispImpTotDataTable dataTable = new DS_Applicazione.DispImpTotDataTable(); this.Adapter.Fill(dataTable); return dataTable; diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd index 2915e69..900e532 100644 --- a/WebSCR_data/DS_Applicazione.xsd +++ b/WebSCR_data/DS_Applicazione.xsd @@ -513,10 +513,10 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo - + - - SELECT IdxImpegno, DataOra, CodSquadra, DescrSquadra, Elettrod, Clima, Inform, MinTotCons, MinViaggio, FinePrev, NumOp, CodCliente, Cognome, Nome, CodFis, OraIndic, RifOC, UrlDoc + + SELECT * FROM v_elencoImpegni @@ -543,6 +543,12 @@ FROM v_elencoImpegni + + + + + + @@ -571,10 +577,10 @@ FROM v_elencoImpegni - + - - SELECT Data, OreDisp, OreImp FROM dbo.v_DispImpTot + + SELECT * FROM dbo.v_DispImpTot @@ -584,6 +590,7 @@ FROM v_elencoImpegni + @@ -594,6 +601,7 @@ FROM v_elencoImpegni + @@ -892,6 +900,42 @@ FROM v_elencoImpegni + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -901,6 +945,7 @@ FROM v_elencoImpegni + diff --git a/WebSCR_data/DS_Applicazione.xss b/WebSCR_data/DS_Applicazione.xss index 67c8baa..ed149ab 100644 --- a/WebSCR_data/DS_Applicazione.xss +++ b/WebSCR_data/DS_Applicazione.xss @@ -6,11 +6,13 @@ --> - - - - - + + + + + + + \ No newline at end of file diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index d2f0966..bbc2e54 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 125b263..67f4767 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/TempPE/DS_Applicazione.Designer.cs.dll b/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll index d3bbf58..d63ec59 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 03d260e..3faf567 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 125b263..67f4767 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ