diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index e5eab62..00b0589 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/Web.config b/WebSCR/Web.config index 43fa849..0cbd4bd 100644 --- a/WebSCR/Web.config +++ b/WebSCR/Web.config @@ -11,6 +11,7 @@ + diff --git a/WebSCR/WebUserControls/mod_selettoreSlot.ascx b/WebSCR/WebUserControls/mod_selettoreSlot.ascx index 999bab0..0c83b29 100644 --- a/WebSCR/WebUserControls/mod_selettoreSlot.ascx +++ b/WebSCR/WebUserControls/mod_selettoreSlot.ascx @@ -42,21 +42,23 @@ - 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 / % impegnato
  • -
-
- <%#Eval("Data","{0:ddd dd/MM/yy}") %> + +
+
+ <%#Eval("Data","{0:ddd dd/MM/yy}") %> +
+
+ disp: <%# Eval("ScoreDisp","{0:P0}") %>
- <%# string.Format("{0:P0}",Convert.ToDouble(Eval("OreImp"))/ Convert.ToDouble(Eval("OreDisp"))) %> + zona: <%# Eval("ScoreZona","{0:P0}") %> +
+
diff --git a/WebSCR/WebUserControls/mod_selettoreSlot.ascx.cs b/WebSCR/WebUserControls/mod_selettoreSlot.ascx.cs index 525e456..87663b2 100644 --- a/WebSCR/WebUserControls/mod_selettoreSlot.ascx.cs +++ b/WebSCR/WebUserControls/mod_selettoreSlot.ascx.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using SteamWare; namespace WebSCR.WebUserControls { @@ -69,7 +70,7 @@ namespace WebSCR.WebUserControls { if (!Page.IsPostBack) { - numGG = 10; + numGG = memLayer.ML.confReadInt("numGgDef"); dataFrom = DateTime.Now; } } @@ -101,22 +102,22 @@ namespace WebSCR.WebUserControls repSlot.DataBind(); } /// - /// restituisce il codice css x il frame data zona, ore disp, ore impegnate + /// restituisce il codice css x il frame dati score x disponibilità e zona /// - /// - /// + /// + /// /// /// - public string frameFromDispZona(object _dist, object _oreImp, object _oreDisp) + public string frameFromDispZona(object _scoreDisp, object _scoreZona) { string answ = ""; - double oreImp = Convert.ToDouble(_oreImp); - double oreDisp = Convert.ToDouble(_oreDisp); - if (oreImp < oreDisp/2) + double scoreDisp = Convert.ToDouble(_scoreDisp); + double scoreZona = Convert.ToDouble(_scoreZona); + if (scoreDisp > 0.5) { answ = "greenBox"; } - else if (oreImp < oreDisp / 4) + else if (scoreDisp > 0.25) { answ = "orangeBox"; } @@ -124,6 +125,8 @@ namespace WebSCR.WebUserControls { answ = "redBox"; } + // aggiungo classi base + answ += " ui-shadow ui-corner-all"; return answ; } } diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index bbc2e54..7bad353 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 d8ec75f..4ee3109 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 67f4767..165a7de 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache index 6ff6259..04746b2 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 d8ec75f..4ee3109 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 9bcf62c..c84bb0d 100644 --- a/WebSCR_data/DS_Applicazione.Designer.cs +++ b/WebSCR_data/DS_Applicazione.Designer.cs @@ -2639,11 +2639,11 @@ namespace WebSCR_data { private global::System.Data.DataColumn columnData; - private global::System.Data.DataColumn columnOreDisp; + private global::System.Data.DataColumn columnNumOp; - private global::System.Data.DataColumn columnOreImp; + private global::System.Data.DataColumn columnScoreDisp; - private global::System.Data.DataColumn columnDistMed; + private global::System.Data.DataColumn columnScoreZona; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] @@ -2688,25 +2688,25 @@ 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 OreDispColumn { + public global::System.Data.DataColumn NumOpColumn { get { - return this.columnOreDisp; + return this.columnNumOp; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public global::System.Data.DataColumn OreImpColumn { + public global::System.Data.DataColumn ScoreDispColumn { get { - return this.columnOreImp; + return this.columnScoreDisp; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public global::System.Data.DataColumn DistMedColumn { + public global::System.Data.DataColumn ScoreZonaColumn { get { - return this.columnDistMed; + return this.columnScoreZona; } } @@ -2747,13 +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, int DistMed) { + public DispImpTotRow AddDispImpTotRow(System.DateTime Data, int NumOp, double ScoreDisp, decimal ScoreZona) { DispImpTotRow rowDispImpTotRow = ((DispImpTotRow)(this.NewRow())); object[] columnValuesArray = new object[] { Data, - OreDisp, - OreImp, - DistMed}; + NumOp, + ScoreDisp, + ScoreZona}; rowDispImpTotRow.ItemArray = columnValuesArray; this.Rows.Add(rowDispImpTotRow); return rowDispImpTotRow; @@ -2777,9 +2777,9 @@ namespace WebSCR_data { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] internal void InitVars() { this.columnData = base.Columns["Data"]; - this.columnOreDisp = base.Columns["OreDisp"]; - this.columnOreImp = base.Columns["OreImp"]; - this.columnDistMed = base.Columns["DistMed"]; + this.columnNumOp = base.Columns["NumOp"]; + this.columnScoreDisp = base.Columns["ScoreDisp"]; + this.columnScoreZona = base.Columns["ScoreZona"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2787,14 +2787,16 @@ namespace WebSCR_data { private void InitClass() { this.columnData = new global::System.Data.DataColumn("Data", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnData); - this.columnOreDisp = new global::System.Data.DataColumn("OreDisp", typeof(int), null, global::System.Data.MappingType.Element); - 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.columnNumOp = new global::System.Data.DataColumn("NumOp", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumOp); + this.columnScoreDisp = new global::System.Data.DataColumn("ScoreDisp", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnScoreDisp); + this.columnScoreZona = new global::System.Data.DataColumn("ScoreZona", typeof(decimal), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnScoreZona); this.columnData.AllowDBNull = false; - this.columnDistMed.ReadOnly = true; + this.columnNumOp.AllowDBNull = false; + this.columnScoreDisp.ReadOnly = true; + this.columnScoreZona.ReadOnly = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4340,86 +4342,69 @@ namespace WebSCR_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public int OreDisp { + public int NumOp { + get { + return ((int)(this[this.tableDispImpTot.NumOpColumn])); + } + set { + this[this.tableDispImpTot.NumOpColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public double ScoreDisp { get { try { - return ((int)(this[this.tableDispImpTot.OreDispColumn])); + return ((double)(this[this.tableDispImpTot.ScoreDispColumn])); } catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'OreDisp\' in table \'DispImpTot\' is DBNull.", e); + throw new global::System.Data.StrongTypingException("The value for column \'ScoreDisp\' in table \'DispImpTot\' is DBNull.", e); } } set { - this[this.tableDispImpTot.OreDispColumn] = value; + this[this.tableDispImpTot.ScoreDispColumn] = value; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public int OreImp { + public decimal ScoreZona { get { try { - return ((int)(this[this.tableDispImpTot.OreImpColumn])); + return ((decimal)(this[this.tableDispImpTot.ScoreZonaColumn])); } catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'OreImp\' in table \'DispImpTot\' is DBNull.", e); + throw new global::System.Data.StrongTypingException("The value for column \'ScoreZona\' in table \'DispImpTot\' is DBNull.", e); } } set { - this[this.tableDispImpTot.OreImpColumn] = value; + this[this.tableDispImpTot.ScoreZonaColumn] = value; } } [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; - } + public bool IsScoreDispNull() { + return this.IsNull(this.tableDispImpTot.ScoreDispColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public bool IsOreDispNull() { - return this.IsNull(this.tableDispImpTot.OreDispColumn); + public void SetScoreDispNull() { + this[this.tableDispImpTot.ScoreDispColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public void SetOreDispNull() { - this[this.tableDispImpTot.OreDispColumn] = global::System.Convert.DBNull; + public bool IsScoreZonaNull() { + return this.IsNull(this.tableDispImpTot.ScoreZonaColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public bool IsOreImpNull() { - return this.IsNull(this.tableDispImpTot.OreImpColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - 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; + public void SetScoreZonaNull() { + this[this.tableDispImpTot.ScoreZonaColumn] = global::System.Convert.DBNull; } } @@ -7770,9 +7755,9 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo tableMapping.SourceTable = "Table"; tableMapping.DataSetTable = "DispImpTot"; tableMapping.ColumnMappings.Add("Data", "Data"); - tableMapping.ColumnMappings.Add("OreDisp", "OreDisp"); - tableMapping.ColumnMappings.Add("OreImp", "OreImp"); - tableMapping.ColumnMappings.Add("DistMed", "DistMed"); + tableMapping.ColumnMappings.Add("NumOp", "NumOp"); + tableMapping.ColumnMappings.Add("ScoreDisp", "ScoreDisp"); + tableMapping.ColumnMappings.Add("ScoreZona", "ScoreZona"); this._adapter.TableMappings.Add(tableMapping); } @@ -7789,7 +7774,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 * FROM dbo.v_DispImpTot"; + this._commandCollection[0].CommandText = "SELECT Data, NumOp, ScoreDisp, ScoreZona FROM 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; diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd index 900e532..5fbfdee 100644 --- a/WebSCR_data/DS_Applicazione.xsd +++ b/WebSCR_data/DS_Applicazione.xsd @@ -580,7 +580,7 @@ FROM v_elencoImpegni - SELECT * FROM dbo.v_DispImpTot + SELECT Data, NumOp, ScoreDisp, ScoreZona FROM v_DispImpTot @@ -588,9 +588,9 @@ FROM v_elencoImpegni - - - + + + @@ -635,7 +635,7 @@ FROM v_elencoImpegni - + @@ -659,7 +659,7 @@ FROM v_elencoImpegni - + @@ -688,7 +688,7 @@ FROM v_elencoImpegni - + @@ -713,7 +713,7 @@ FROM v_elencoImpegni - + @@ -831,7 +831,7 @@ FROM v_elencoImpegni - + @@ -939,17 +939,17 @@ FROM v_elencoImpegni - + - - - + + + - + diff --git a/WebSCR_data/DS_Applicazione.xss b/WebSCR_data/DS_Applicazione.xss index ed149ab..52c714e 100644 --- a/WebSCR_data/DS_Applicazione.xss +++ b/WebSCR_data/DS_Applicazione.xss @@ -11,7 +11,7 @@ - + diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index bbc2e54..7bad353 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 67f4767..165a7de 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 d63ec59..b49c6ba 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 3faf567..a3c3967 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 67f4767..165a7de 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ