Egalware/ETS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inseriti totali complessivi nei 3 bazaar

Browse Source
This commit is contained in:
Samuele Locatelli
2013-09-19 10:57:11 +02:00
parent 1bfad537cf
commit e4470f9018
9 changed files with 71 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ETS_Data/DataProxy_ProjEts.cs
+11 -1
View File
@@ -141,8 +141,18 @@ namespace ETS_Data
{ }
return answ;
}
/// <summary>
/// effettua export su GPW dei singoli dipendenti delle ore programmate x la settimana indicata
/// </summary>
/// <param name="anno"></param>
/// <param name="settimana"></param>
/// <returns></returns>
public bool esportaBazaarSuGPW(int anno, int settimana)
{
bool answ = false;
public bool esportaBazaarSuGPW(int anno, int
return answ;
}
#endregion
}
PROJ-ETS/PROJ-ETS/Content/Style.css
+3
View File
@@ -1100,6 +1100,9 @@ div > ul > li > a.selected.menuNav {
.lblErrore {
color: #ff0000;
}
.lblBlu {
color: #3333FF;
}
/* gestione celle tabella registro ore full */
.cTabRO {
text-align: center;
PROJ-ETS/PROJ-ETS/Content/Style.less
+4
View File
@@ -1251,6 +1251,10 @@ div > ul > li > a.selected.menuNav {
color: @rossoStart;
}
.lblBlu {
color: #3333FF;
}
/* gestione celle tabella registro ore full */
@grigioCellaRO: #777;
@altezzaCellaRO: 15px;
PROJ-ETS/PROJ-ETS/Content/Style.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.cs
+16 -2
View File
@@ -57,6 +57,7 @@ namespace PROJ_ETS.WebUserControls
protected ETS_Data.Type.BazaarRes[,] TabellaRisorse;
protected int[] oreTotDip;
protected int[] oreTotComm;
protected int oreTot;
protected string[] schemaOreDip;
protected Ds_ProjEts.DipendentiDataTable tabDip = new Ds_ProjEts.DipendentiDataTable();
protected Ds_ProjEts.Dip2ATRDataTable tabD2ATR = new Ds_ProjEts.Dip2ATRDataTable();
@@ -223,6 +224,7 @@ namespace PROJ_ETS.WebUserControls
oreTotDip = new int[numDip];
oreTotComm = new int[numComm];
schemaOreDip = new string[numDip];
oreTot = 0;
for (int ii = 0; ii < numDip; ii++)
{
schemaOreDip[ii] = "00000";
@@ -267,6 +269,7 @@ namespace PROJ_ETS.WebUserControls
oreTotDip[pos_x] += rigaBaz.OreTot;
schemaOreDip[pos_x] = oreWeek.addOre(schemaOreDip[pos_x].ToString(), rigaBaz.SchemaWeek, 8);
oreTotComm[pos_y] += rigaBaz.OreTot;
oreTot += rigaBaz.OreTot;
}
}
}
@@ -309,8 +312,19 @@ namespace PROJ_ETS.WebUserControls
riga.Cells.Add(cell);
}
// cella vuota finale
cell = new TableCell();
riga.Cells.Add(cell);
if (showOre && numDip > 0 && numComm > 0)
{
cell = new TableCell();
cell.CssClass = "cBia lblBlu";
cell.Text = string.Format("{0:0##} h", oreTot);
cell.ToolTip = "Ore TOTALI";
riga.Cells.Add(cell);
}
else
{
cell = new TableCell();
riga.Cells.Add(cell);
}
// aggiungo riga!
tblBlocco.Rows.Add(riga);
}
PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs
+17 -3
View File
@@ -17,6 +17,7 @@ namespace PROJ_ETS.WebUserControls
protected ETS_Data.Type.ImpiegoRes[,] TabellaRisorse;
protected int[] oreTotDip;
protected int[] oreTotComm;
protected int oreTot;
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();
@@ -128,6 +129,7 @@ namespace PROJ_ETS.WebUserControls
TabellaRisorse = new ETS_Data.Type.ImpiegoRes[numDip, numComm];
oreTotDip = new int[numDip];
oreTotComm = new int[numComm];
oreTot = 0;
for (int ii = 0; ii < numDip; ii++)
{
oreTotDip[ii] = 0;
@@ -186,6 +188,7 @@ namespace PROJ_ETS.WebUserControls
// aggiorno totali righe/colonne (comemsse/dip)
oreTotDip[pos_x] += rigaIR.OreTot;
oreTotComm[pos_y] += rigaIR.OreTot;
oreTot += rigaIR.OreTot;
}
}
}
@@ -231,9 +234,20 @@ namespace PROJ_ETS.WebUserControls
riga.Cells.Add(cell);
}
}
// cella vuota finale
cell = new TableCell();
riga.Cells.Add(cell);
// cella vuota finale
if (showOre && numDip > 0 && numComm > 0)
{
cell = new TableCell();
cell.CssClass = "cBia lblBlu";
cell.Text = string.Format("{0:0##} h", oreTot);
cell.ToolTip = "Ore TOTALI";
riga.Cells.Add(cell);
}
else
{
cell = new TableCell();
riga.Cells.Add(cell);
}
// aggiungo riga!
tblBlocco.Rows.Add(riga);
}
PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekVerify.ascx.cs
+19 -2
View File
@@ -17,6 +17,8 @@ namespace PROJ_ETS.WebUserControls
protected ETS_Data.Type.ImpiegoRes[,] TabellaRisorse;
protected int[] oreTotDip;
protected int[] oreTotComm;
protected int oreTot;
protected int oreTotBgt;
protected int[] oreBgtTotDip;
protected int[] oreBgtTotComm;
protected Ds_ProjEts.DipendentiDataTable tabDip = new Ds_ProjEts.DipendentiDataTable();
@@ -132,6 +134,8 @@ namespace PROJ_ETS.WebUserControls
oreTotComm = new int[numComm];
oreBgtTotDip = new int[numDip];
oreBgtTotComm = new int[numComm];
oreTot = 0;
oreTotBgt = 0;
for (int ii = 0; ii < numDip; ii++)
{
oreTotDip[ii] = 0;
@@ -245,6 +249,8 @@ namespace PROJ_ETS.WebUserControls
oreTotComm[pos_y] += oreTotIR;
oreBgtTotDip[pos_x] += oreTotBaz;
oreBgtTotComm[pos_y] += oreTotBaz;
oreTot += oreTotIR;
oreTotBgt += oreTotBaz;
}
}
}
@@ -287,8 +293,19 @@ namespace PROJ_ETS.WebUserControls
riga.Cells.Add(cell);
}
// cella vuota finale
cell = new TableCell();
riga.Cells.Add(cell);
if (showOre && numDip > 0 && numComm > 0)
{
cell = new TableCell();
cell.CssClass = "cBia lblBlu";
cell.Text = string.Format("{0:0##}/{1:0##}", oreTot, oreTotBgt);
cell.ToolTip = "Ore TOTALI EROGATE / Ore TOTALI Budget";
riga.Cells.Add(cell);
}
else
{
cell = new TableCell();
riga.Cells.Add(cell);
}
// aggiungo riga!
tblBlocco.Rows.Add(riga);
}
PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll
BIN
View File
Binary file not shown.