diff --git a/PROJ-ETS/PROJ-ETS/Web.config b/PROJ-ETS/PROJ-ETS/Web.config index 670f7aa..4d1f1d1 100644 --- a/PROJ-ETS/PROJ-ETS/Web.config +++ b/PROJ-ETS/PROJ-ETS/Web.config @@ -26,7 +26,7 @@ - + diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs index 38423c3..352038e 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs @@ -131,6 +131,14 @@ namespace PROJ_ETS.WebUserControls TabellaRisorse = new ETS_Data.Type.ImpiegoRes[numDip, numComm]; oreTotDip = new int[numDip]; oreTotComm = new int[numComm]; + for (int ii = 0; ii < numDip; ii++) + { + oreTotDip[ii] = 0; + } + for (int ii = 0; ii < numComm; ii++) + { + oreTotComm[ii] = 0; + } // carico i dati nell'array: di default tutto VUOTO, con posizione attiva... for (int pos_y = 0; pos_y < numComm; pos_y++) { @@ -194,29 +202,33 @@ namespace PROJ_ETS.WebUserControls riga.Cells.Add(cell); // variabili accessorie x dip Ds_ProjEts.DipendentiRow rigaDip; - // preparo celle! - for (int pos_x = 0; pos_x < numDip; pos_x++) + // se ho dati + if (numDip > 0 && numComm > 0) { - cell = new TableCell(); - cell.CssClass = "cBia"; - if (showOre) + // preparo celle! + for (int pos_x = 0; pos_x < numDip; pos_x++) { - cell.Text = string.Format("{0:0#} h", oreTotDip[pos_x]); - cell.ToolTip = ""; - // SE sono oltre 40h coloro di rosso!!! - if (oreTotDip[pos_x] > 40) + cell = new TableCell(); + cell.CssClass = "cBia"; + if (showOre) { - cell.CssClass = "cBia lblErrore"; + cell.Text = string.Format("{0:0#} h", oreTotDip[pos_x]); + cell.ToolTip = ""; + // SE sono oltre 40h coloro di rosso!!! + if (oreTotDip[pos_x] > 40) + { + cell.CssClass = "cBia lblErrore"; + } } + else + { + rigaDip = (Ds_ProjEts.DipendentiRow)tabDip.Select(string.Format("idxDipendente={0}", tabD2ATR[pos_x].idxDipendente))[0]; + //cell.Text = rigaDip.SIGLA; + cell.Text = rigaDip.Nome.Substring(0, 1) + rigaDip.Cognome.Substring(0, 1) + rigaDip.Cognome.Substring(1, 2).ToLower(); + cell.ToolTip = string.Format("{0} {1}", rigaDip.Nome, rigaDip.Cognome); + } + riga.Cells.Add(cell); } - else - { - rigaDip = (Ds_ProjEts.DipendentiRow)tabDip.Select(string.Format("idxDipendente={0}", tabD2ATR[pos_x].idxDipendente))[0]; - //cell.Text = rigaDip.SIGLA; - cell.Text = rigaDip.Nome.Substring(0, 1) + rigaDip.Cognome.Substring(0, 1) + rigaDip.Cognome.Substring(1, 2).ToLower(); - cell.ToolTip = string.Format("{0} {1}", rigaDip.Nome, rigaDip.Cognome); - } - riga.Cells.Add(cell); } // cella vuota finale cell = new TableCell(); diff --git a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll index 9184907..f2f89dd 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ