diff --git a/ETS_Data/Ds_ProjEts.xsd b/ETS_Data/Ds_ProjEts.xsd index 67b3dc9..92f0aaa 100644 --- a/ETS_Data/Ds_ProjEts.xsd +++ b/ETS_Data/Ds_ProjEts.xsd @@ -1257,15 +1257,14 @@ SELECT Anno, Sett, idxDipendente, idxFase, OreTot FROM ImpiegoRisorse WHERE (Ann - + - dbo.stp_IR_getFullSettByDip + dbo.stp_IR_getFullSettPareto - @@ -1292,7 +1291,7 @@ SELECT Anno, Sett, idxDipendente, idxFase, OreTot FROM ImpiegoRisorse WHERE (Ann - + @@ -1335,7 +1334,7 @@ SELECT Anno, Sett, idxDipendente, idxFase, OreTot FROM ImpiegoRisorse WHERE (Ann - + @@ -1385,7 +1384,7 @@ SELECT Anno, Sett, idxDipendente, idxFase, OreTot FROM ImpiegoRisorse WHERE (Ann - + @@ -1474,7 +1473,7 @@ SELECT Anno, Sett, idxDipendente, idxFase, OreTot FROM ImpiegoRisorse WHERE (Ann - + @@ -1518,7 +1517,7 @@ SELECT Anno, Sett, idxDipendente, idxFase, OreTot FROM ImpiegoRisorse WHERE (Ann - + @@ -1563,7 +1562,7 @@ SELECT Anno, Sett, idxDipendente, idxFase, OreTot FROM ImpiegoRisorse WHERE (Ann - + @@ -1643,7 +1642,7 @@ SELECT Anno, Sett, idxDipendente, idxFase, OreTot FROM ImpiegoRisorse WHERE (Ann - + @@ -1691,7 +1690,7 @@ SELECT Anno, Sett, idxDipendente, idxFase, OreTot FROM ImpiegoRisorse WHERE (Ann - + @@ -1708,7 +1707,7 @@ SELECT Anno, Sett, idxDipendente, idxFase, OreTot FROM ImpiegoRisorse WHERE (Ann - + @@ -1729,7 +1728,7 @@ SELECT Anno, Sett, idxDipendente, idxFase, OreTot FROM ImpiegoRisorse WHERE (Ann - + @@ -1750,7 +1749,7 @@ SELECT Anno, Sett, idxDipendente, idxFase, OreTot FROM ImpiegoRisorse WHERE (Ann - + @@ -1885,7 +1884,7 @@ SELECT Anno, Sett, idxDipendente, idxFase, OreTot FROM ImpiegoRisorse WHERE (Ann - + @@ -1904,7 +1903,7 @@ SELECT Anno, Sett, idxDipendente, idxFase, OreTot FROM ImpiegoRisorse WHERE (Ann - + @@ -1980,12 +1979,12 @@ SELECT Anno, Sett, idxDipendente, idxFase, OreTot FROM ImpiegoRisorse WHERE (Ann - - - - - - + + + + + + \ No newline at end of file diff --git a/ETS_Data/Ds_ProjEts1.Designer.cs b/ETS_Data/Ds_ProjEts1.Designer.cs index 7b4ed3f..c7517c8 100644 --- a/ETS_Data/Ds_ProjEts1.Designer.cs +++ b/ETS_Data/Ds_ProjEts1.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18051 +// Runtime Version:4.0.30319.33440 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -16545,12 +16545,11 @@ SELECT Anno, Sett, idxDipendente, idxFase, OreTot FROM ImpiegoRisorse WHERE (Ann this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Settimana", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = "dbo.stp_IR_getFullSettByDip"; + this._commandCollection[2].CommandText = "dbo.stp_IR_getFullSettPareto"; this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[2].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[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Anno", 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("@Settimana", 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("@idxDipendente", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 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_IR_importSettimana"; @@ -16611,7 +16610,7 @@ SELECT Anno, Sett, idxDipendente, idxFase, OreTot FROM ImpiegoRisorse WHERE (Ann [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_ProjEts.ImpiegoRisorseDataTable getFullWeekDip(global::System.Nullable Anno, global::System.Nullable Settimana, global::System.Nullable idxDipendente) { + public virtual Ds_ProjEts.ImpiegoRisorseDataTable getFullWeekPareto(global::System.Nullable Anno, global::System.Nullable Settimana) { this.Adapter.SelectCommand = this.CommandCollection[2]; if ((Anno.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(Anno.Value)); @@ -16625,12 +16624,6 @@ SELECT Anno, Sett, idxDipendente, idxFase, OreTot FROM ImpiegoRisorse WHERE (Ann else { this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; } - if ((idxDipendente.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[3].Value = ((int)(idxDipendente.Value)); - } - else { - this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; - } Ds_ProjEts.ImpiegoRisorseDataTable dataTable = new Ds_ProjEts.ImpiegoRisorseDataTable(); this.Adapter.Fill(dataTable); return dataTable; diff --git a/ETS_Data/obj/Debug/TempPE/Ds_ProjEts.Designer.cs.dll b/ETS_Data/obj/Debug/TempPE/Ds_ProjEts.Designer.cs.dll index 115323f..fec2725 100644 Binary files a/ETS_Data/obj/Debug/TempPE/Ds_ProjEts.Designer.cs.dll and b/ETS_Data/obj/Debug/TempPE/Ds_ProjEts.Designer.cs.dll differ diff --git a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj index 69be862..2f2c4b8 100644 --- a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj +++ b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj @@ -323,6 +323,7 @@ + @@ -650,6 +651,13 @@ mod_navDettComm.ascx + + mod_navigaWeek.ascx + ASPXCodeBehind + + + mod_navigaWeek.ascx + mod_periodoAnalisi.ascx ASPXCodeBehind diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs index 1dc03b1..7539282 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs @@ -24,7 +24,7 @@ namespace PROJ_ETS.WebUserControls protected Ds_ProjEts.DipendentiDataTable tabDip = new Ds_ProjEts.DipendentiDataTable(); protected Ds_ProjEts.Dip2ATRDataTable tabD2ATR = new Ds_ProjEts.Dip2ATRDataTable(); protected Ds_ProjEts.ImpiegoRisorseDataTable tabIR = new Ds_ProjEts.ImpiegoRisorseDataTable(); - protected Ds_ProjEts.ImpiegoRisorseDataTable tabIRSingle = new Ds_ProjEts.ImpiegoRisorseDataTable(); + protected Ds_ProjEts.ImpiegoRisorseDataTable tabIRPareto = new Ds_ProjEts.ImpiegoRisorseDataTable(); protected DS_utilsProjEts.v_selCommesseDataTable tabComm = new DS_utilsProjEts.v_selCommesseDataTable(); protected Ds_ProjEts.ImpiegoRisorseRow rigaIR; protected Ds_ProjEts.DipendentiRow rigaDip; @@ -142,16 +142,17 @@ namespace PROJ_ETS.WebUserControls tabComm = DataProxy_ProjEts.DP.taSelCom.GetData(); // leggo tutte commesse... !!!FARE ordinamento pareto ore totali!! // calcolo il primo dip idxDip = tabIR[0].idxDipendente; - // calcolo num celel totali + // calcolo num celle totali totCelle = tabIR.Rows.Count; // calcolo numero commesse! - tabIRSingle = DataProxy_ProjEts.DP.taIR.getFullWeekDip(anno, settimana, idxDip); - numComm = tabIRSingle.Rows.Count; + tabIRPareto = DataProxy_ProjEts.DP.taIR.getFullWeekPareto(anno, settimana); + numComm = tabIRPareto.Rows.Count; // calcolo num commesse! numDip = totCelle / numComm; } - catch + catch (Exception exc) { + lg.ErrorException("Errore in fase recupero dati: {0}", exc); numDip = 0; numComm = 0; } @@ -169,9 +170,9 @@ namespace PROJ_ETS.WebUserControls // carico valori x la singola cella try { - rigaIR = (Ds_ProjEts.ImpiegoRisorseRow)tabIR.Select(string.Format("idxDipendente={0} AND idxFase={1}", tabD2ATR[pos_x].idxDipendente, tabIRSingle[pos_y].idxFase))[0]; - rigaDip = (Ds_ProjEts.DipendentiRow)tabDip.Select(string.Format("idxDipendente={0}", tabD2ATR[pos_x].idxDipendente))[0]; - rigaComm = (DS_utilsProjEts.v_selCommesseRow)tabComm.Select(string.Format("value = {0}", tabIRSingle[pos_y].idxFase))[0]; + rigaIR = (Ds_ProjEts.ImpiegoRisorseRow)tabIR.Select(string.Format("idxDipendente={0} AND idxFase={1}", tabD2ATR[pos_x].idxDipendente, tabIRPareto[pos_y].idxFase))[0]; + rigaDip = (Ds_ProjEts.DipendentiRow)tabDip.Select(string.Format("idxDipendente={0}", tabD2ATR[pos_x].idxDipendente))[0]; + rigaComm = (DS_utilsProjEts.v_selCommesseRow)tabComm.Select(string.Format("value = {0}", tabIRPareto[pos_y].idxFase))[0]; } catch (Exception exc) { @@ -270,7 +271,7 @@ namespace PROJ_ETS.WebUserControls cell.CssClass = "cRBia"; try { - rigaComm = (DS_utilsProjEts.v_selCommesseRow)tabComm.Select(string.Format("value = {0}", tabIRSingle[pos_y].idxFase))[0]; + rigaComm = (DS_utilsProjEts.v_selCommesseRow)tabComm.Select(string.Format("value = {0}", tabIRPareto[pos_y].idxFase))[0]; if (showOre) { cell.Text = string.Format("{0:0##} h", oreTotComm[pos_y]); @@ -282,7 +283,7 @@ namespace PROJ_ETS.WebUserControls cell.ToolTip = rigaComm.label; } } - catch(Exception exc) + catch (Exception exc) { lg.ErrorException("Errore in setupCellaComm", exc); } diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll index 1232b0d..eca29e3 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll and b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll differ diff --git a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll index dc24224..8a9b0fa 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ