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

apuntato ordinamento ore tot descending

Browse Source 
aggiornato codice colore
This commit is contained in:
Samuele Locatelli
2013-09-09 18:38:31 +02:00
parent 11fe524a1a
commit f86f8d1001
6 changed files with 272 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PROJ-ETS/PROJ-ETS/Content/Style.css
+137 -46
View File
@@ -1092,80 +1092,80 @@ div > ul > li > a.selected.menuNav {
.lblErrore {
color: #ff0000;
}
/* gestione celle tabella bazaar */
.cTab {
/* gestione celle tabella registro ore full */
.cTabRO {
text-align: center;
height: 20px;
height: 15px;
border: solid 1px #777777;
}
.cEmp {
/*background-image: url('../Images/grigio_80.png');*/
background-color: #ffffff;
background-image: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cdd5c4));
background-image: -webkit-linear-gradient(#ffffff, #cdd5c4);
background-image: -moz-linear-gradient(#ffffff, #cdd5c4);
background-image: -ms-linear-gradient(#ffffff, #cdd5c4);
background-image: -o-linear-gradient(#ffffff, #cdd5c4);
background-image: linear-gradient(#ffffff, #cdd5c4);
background-color: #d5d5d5;
background-image: -webkit-gradient(linear, left top, left bottom, from(#f8fbff), to(#d5d5d5));
background-image: -webkit-linear-gradient(#f8fbff, #d5d5d5);
background-image: -moz-linear-gradient(#f8fbff, #d5d5d5);
background-image: -ms-linear-gradient(#f8fbff, #d5d5d5);
background-image: -o-linear-gradient(#f8fbff, #d5d5d5);
background-image: linear-gradient(#f8fbff, #d5d5d5);
}
.cS01 {
/*background-image: url('../Images/grigioChiaro_80.png');*/
background-color: #cdd5c4;
background-image: -webkit-gradient(linear, left top, left bottom, from(#cbff4e), to(#cdd5c4));
background-image: -webkit-linear-gradient(#cbff4e, #cdd5c4);
background-image: -moz-linear-gradient(#cbff4e, #cdd5c4);
background-image: -ms-linear-gradient(#cbff4e, #cdd5c4);
background-image: -o-linear-gradient(#cbff4e, #cdd5c4);
background-image: linear-gradient(#cbff4e, #cdd5c4);
background-color: #f8fbff;
background-image: -webkit-gradient(linear, left top, left bottom, from(#c9c900), to(#f8fbff));
background-image: -webkit-linear-gradient(#c9c900, #f8fbff);
background-image: -moz-linear-gradient(#c9c900, #f8fbff);
background-image: -ms-linear-gradient(#c9c900, #f8fbff);
background-image: -o-linear-gradient(#c9c900, #f8fbff);
background-image: linear-gradient(#c9c900, #f8fbff);
}
.cS02 {
/*background-image: url('../Images/verde_80.png');*/
background-color: #ffff73;
background-image: -webkit-gradient(linear, left top, left bottom, from(#cbff4e), to(#ffff73));
background-image: -webkit-linear-gradient(#cbff4e, #ffff73);
background-image: -moz-linear-gradient(#cbff4e, #ffff73);
background-image: -ms-linear-gradient(#cbff4e, #ffff73);
background-image: -o-linear-gradient(#cbff4e, #ffff73);
background-image: linear-gradient(#cbff4e, #ffff73);
background-color: #c9c900;
background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f000), to(#c9c900));
background-image: -webkit-linear-gradient(#f0f000, #c9c900);
background-image: -moz-linear-gradient(#f0f000, #c9c900);
background-image: -ms-linear-gradient(#f0f000, #c9c900);
background-image: -o-linear-gradient(#f0f000, #c9c900);
background-image: linear-gradient(#f0f000, #c9c900);
color: White;
}
.cS03 {
/*background-image: url('../Images/giallo_80.png');*/
background-color: #ffff73;
background-image: -webkit-gradient(linear, left top, left bottom, from(#ffd88d), to(#ffff73));
background-image: -webkit-linear-gradient(#ffd88d, #ffff73);
background-image: -moz-linear-gradient(#ffd88d, #ffff73);
background-image: -ms-linear-gradient(#ffd88d, #ffff73);
background-image: -o-linear-gradient(#ffd88d, #ffff73);
background-image: linear-gradient(#ffd88d, #ffff73);
background-color: #f0f000;
background-image: -webkit-gradient(linear, left top, left bottom, from(#fdfd00), to(#f0f000));
background-image: -webkit-linear-gradient(#fdfd00, #f0f000);
background-image: -moz-linear-gradient(#fdfd00, #f0f000);
background-image: -ms-linear-gradient(#fdfd00, #f0f000);
background-image: -o-linear-gradient(#fdfd00, #f0f000);
background-image: linear-gradient(#fdfd00, #f0f000);
color: White;
}
.cS04 {
/*background-image: url('../Images/arancio_80.png');*/
background-color: #ffd88d;
background-image: -webkit-gradient(linear, left top, left bottom, from(#ee8b8b), to(#ffd88d));
background-image: -webkit-linear-gradient(#ee8b8b, #ffd88d);
background-image: -moz-linear-gradient(#ee8b8b, #ffd88d);
background-image: -ms-linear-gradient(#ee8b8b, #ffd88d);
background-image: -o-linear-gradient(#ee8b8b, #ffd88d);
background-image: linear-gradient(#ee8b8b, #ffd88d);
background-color: #fdfd00;
background-image: -webkit-gradient(linear, left top, left bottom, from(#ffff42), to(#fdfd00));
background-image: -webkit-linear-gradient(#ffff42, #fdfd00);
background-image: -moz-linear-gradient(#ffff42, #fdfd00);
background-image: -ms-linear-gradient(#ffff42, #fdfd00);
background-image: -o-linear-gradient(#ffff42, #fdfd00);
background-image: linear-gradient(#ffff42, #fdfd00);
color: White;
}
.cOvr {
/*background-image: url('../Images/rosso_80.png');*/
background-color: #ee8b8b;
background-image: -webkit-gradient(linear, left top, left bottom, from(#d52323), to(#ee8b8b));
background-image: -webkit-linear-gradient(#d52323, #ee8b8b);
background-image: -moz-linear-gradient(#d52323, #ee8b8b);
background-image: -ms-linear-gradient(#d52323, #ee8b8b);
background-image: -o-linear-gradient(#d52323, #ee8b8b);
background-image: linear-gradient(#d52323, #ee8b8b);
background-color: #ffff42;
background-image: -webkit-gradient(linear, left top, left bottom, from(#ffff8e), to(#ffff42));
background-image: -webkit-linear-gradient(#ffff8e, #ffff42);
background-image: -moz-linear-gradient(#ffff8e, #ffff42);
background-image: -ms-linear-gradient(#ffff8e, #ffff42);
background-image: -o-linear-gradient(#ffff8e, #ffff42);
background-image: linear-gradient(#ffff8e, #ffff42);
}
.cBia {
text-align: center;
@@ -1174,7 +1174,98 @@ div > ul > li > a.selected.menuNav {
padding: 0px 2px;
}
.selCel {
border: dashed 2px black;
background-color: #cbebff;
border: dashed 2px #22AAff;
/*font-weight: bold;*/
text-align: center;
}
/* end celle bazaar*/
/* gestione celle tabella bazaar */
.cTab {
text-align: center;
height: 20px;
border: solid 1px #777777;
}
.cREmp {
/*background-image: url('../Images/grigio_80.png');*/
background-color: #c3c3c3;
background-image: -webkit-gradient(linear, left top, left bottom, from(#f8fbff), to(#c3c3c3));
background-image: -webkit-linear-gradient(#f8fbff, #c3c3c3);
background-image: -moz-linear-gradient(#f8fbff, #c3c3c3);
background-image: -ms-linear-gradient(#f8fbff, #c3c3c3);
background-image: -o-linear-gradient(#f8fbff, #c3c3c3);
background-image: linear-gradient(#f8fbff, #c3c3c3);
}
.cR01 {
/*background-image: url('../Images/grigioChiaro_80.png');*/
background-color: #f8fbff;
background-image: -webkit-gradient(linear, left top, left bottom, from(#90c4ff), to(#f8fbff));
background-image: -webkit-linear-gradient(#90c4ff, #f8fbff);
background-image: -moz-linear-gradient(#90c4ff, #f8fbff);
background-image: -ms-linear-gradient(#90c4ff, #f8fbff);
background-image: -o-linear-gradient(#90c4ff, #f8fbff);
background-image: linear-gradient(#90c4ff, #f8fbff);
}
.cR02 {
/*background-image: url('../Images/verde_80.png');*/
background-color: #90c4ff;
background-image: -webkit-gradient(linear, left top, left bottom, from(#76b8ff), to(#90c4ff));
background-image: -webkit-linear-gradient(#76b8ff, #90c4ff);
background-image: -moz-linear-gradient(#76b8ff, #90c4ff);
background-image: -ms-linear-gradient(#76b8ff, #90c4ff);
background-image: -o-linear-gradient(#76b8ff, #90c4ff);
background-image: linear-gradient(#76b8ff, #90c4ff);
color: White;
}
.cR03 {
/*background-image: url('../Images/giallo_80.png');*/
background-color: #76b8ff;
background-image: -webkit-gradient(linear, left top, left bottom, from(#5caaff), to(#76b8ff));
background-image: -webkit-linear-gradient(#5caaff, #76b8ff);
background-image: -moz-linear-gradient(#5caaff, #76b8ff);
background-image: -ms-linear-gradient(#5caaff, #76b8ff);
background-image: -o-linear-gradient(#5caaff, #76b8ff);
background-image: linear-gradient(#5caaff, #76b8ff);
color: White;
}
.cR04 {
/*background-image: url('../Images/arancio_80.png');*/
background-color: #5caaff;
background-image: -webkit-gradient(linear, left top, left bottom, from(#288eff), to(#5caaff));
background-image: -webkit-linear-gradient(#288eff, #5caaff);
background-image: -moz-linear-gradient(#288eff, #5caaff);
background-image: -ms-linear-gradient(#288eff, #5caaff);
background-image: -o-linear-gradient(#288eff, #5caaff);
background-image: linear-gradient(#288eff, #5caaff);
color: White;
}
.cROvr {
/*background-image: url('../Images/rosso_80.png');*/
background-color: #288eff;
background-image: -webkit-gradient(linear, left top, left bottom, from(#3333d9), to(#288eff));
background-image: -webkit-linear-gradient(#3333d9, #288eff);
background-image: -moz-linear-gradient(#3333d9, #288eff);
background-image: -ms-linear-gradient(#3333d9, #288eff);
background-image: -o-linear-gradient(#3333d9, #288eff);
background-image: linear-gradient(#3333d9, #288eff);
color: White;
}
.cRBia {
text-align: center;
font-weight: bold;
height: 15px;
padding: 0px 2px;
}
.selCelR {
background-color: #cbebff;
border: dashed 2px #22AAff;
/*font-weight: bold;*/
text-align: center;
PROJ-ETS/PROJ-ETS/Content/Style.less
+122 -35
View File
@@ -1242,35 +1242,33 @@ div > ul > li > a.selected.menuNav {
color: @rossoStart;
}
/* gestione celle tabella bazaar */
@grigioCella: #777;
@altezzaCella: 20px;
/* gestione celle tabella registro ore full */
@grigioCellaRO: #777;
@altezzaCellaRO: 15px;
.cTab {
.cTabRO {
text-align: center;
height: @altezzaCella;
border: solid 1px @grigioCella;
height: @altezzaCellaRO;
border: solid 1px @grigioCellaRO;
}
@S00: #FFF;
@S01: #cdd5c4;
@S02: #cbff4e;
@S03: #ffff73;
@S04: #ffd88d;
@S05: #ee8b8b;
@S06: #d52323;
@S06: #ffff8e;
@S05: #ffff42;
@S04: #fdfd00;
@S03: #f0f000;
@S02: #c9c900;
@S01: #f8fbff;
@S00: #d5d5d5;
.cEmp {
/*background-image: url('../Images/grigio_80.png');*/
background-color: @S00;
background-image: -webkit-gradient(linear,left top,left bottom,from( @S00 ),to( @S01 ));
background-image: -webkit-linear-gradient( @S00,@S01 );
background-image: -moz-linear-gradient( @S00,@S01 );
background-image: -ms-linear-gradient( @S00,@S01 );
background-image: -o-linear-gradient( @S00,@S01 );
background-image: linear-gradient( @S00,@S01 );
background-image: -webkit-gradient(linear,left top,left bottom,from( @S01 ),to( @S00 ));
background-image: -webkit-linear-gradient( @S01,@S00 );
background-image: -moz-linear-gradient( @S01,@S00 );
background-image: -ms-linear-gradient( @S01,@S00 );
background-image: -o-linear-gradient( @S01,@S00 );
background-image: linear-gradient( @S01,@S00 );
}
.cS01 {
/*background-image: url('../Images/grigioChiaro_80.png');*/
background-color: @S01;
@@ -1281,19 +1279,17 @@ div > ul > li > a.selected.menuNav {
background-image: -o-linear-gradient( @S02,@S01 );
background-image: linear-gradient( @S02,@S01 );
}
.cS02 {
/*background-image: url('../Images/verde_80.png');*/
background-color: @S03;
background-image: -webkit-gradient(linear,left top,left bottom,from( @S02 ),to( @S03 ));
background-image: -webkit-linear-gradient( @S02,@S03 );
background-image: -moz-linear-gradient( @S02,@S03 );
background-image: -ms-linear-gradient( @S02,@S03 );
background-image: -o-linear-gradient( @S02,@S03 );
background-image: linear-gradient( @S02,@S03 );
background-color: @S02;
background-image: -webkit-gradient(linear,left top,left bottom,from( @S03 ),to( @S02 ));
background-image: -webkit-linear-gradient( @S03,@S02 );
background-image: -moz-linear-gradient( @S03,@S02 );
background-image: -ms-linear-gradient( @S03,@S02 );
background-image: -o-linear-gradient( @S03,@S02 );
background-image: linear-gradient( @S03,@S02 );
color: White;
}
.cS03 {
/*background-image: url('../Images/giallo_80.png');*/
background-color: @S03;
@@ -1305,7 +1301,6 @@ div > ul > li > a.selected.menuNav {
background-image: linear-gradient( @S04,@S03 );
color: White;
}
.cS04 {
/*background-image: url('../Images/arancio_80.png');*/
background-color: @S04;
@@ -1317,7 +1312,6 @@ div > ul > li > a.selected.menuNav {
background-image: linear-gradient( @S05,@S04 );
color: White;
}
.cOvr {
/*background-image: url('../Images/rosso_80.png');*/
background-color: @S05;
@@ -1328,16 +1322,109 @@ div > ul > li > a.selected.menuNav {
background-image: -o-linear-gradient( @S06,@S05 );
background-image: linear-gradient( @S06,@S05 );
}
.cBia {
text-align: center;
font-weight: bold;
height: @altezzaCella;
padding: 0px 2px;
}
.selCel {
border: dashed 2px black; /*font-weight: bold;*/
background-color: #cbebff;
border: dashed 2px #22AAff; /*font-weight: bold;*/
text-align: center;
}
/* end celle bazaar*/
/* gestione celle tabella bazaar */
@grigioCella: #777;
@altezzaCella: 20px;
.cTab {
text-align: center;
height: @altezzaCella;
border: solid 1px @grigioCella;
}
@RO06: #3333d9;
@RO05: #288eff;
@RO04: #5caaff;
@RO03: #76b8ff;
@RO02: #90c4ff;
@RO01: #f8fbff;
@RO00: #c3c3c3;
.cREmp {
/*background-image: url('../Images/grigio_80.png');*/
background-color: @RO00;
background-image: -webkit-gradient(linear,left top,left bottom,from( @RO01 ),to( @RO00 ));
background-image: -webkit-linear-gradient( @RO01,@RO00 );
background-image: -moz-linear-gradient( @RO01,@RO00 );
background-image: -ms-linear-gradient( @RO01,@RO00 );
background-image: -o-linear-gradient( @RO01,@RO00 );
background-image: linear-gradient( @RO01,@RO00 );
}
.cR01 {
/*background-image: url('../Images/grigioChiaro_80.png');*/
background-color: @RO01;
background-image: -webkit-gradient(linear,left top,left bottom,from( @RO02 ),to( @RO01 ));
background-image: -webkit-linear-gradient( @RO02,@RO01 );
background-image: -moz-linear-gradient( @RO02,@RO01 );
background-image: -ms-linear-gradient( @RO02,@RO01 );
background-image: -o-linear-gradient( @RO02,@RO01 );
background-image: linear-gradient( @RO02,@RO01 );
}
.cR02 {
/*background-image: url('../Images/verde_80.png');*/
background-color: @RO02;
background-image: -webkit-gradient(linear,left top,left bottom,from( @RO03 ),to( @RO02 ));
background-image: -webkit-linear-gradient( @RO03,@RO02 );
background-image: -moz-linear-gradient( @RO03,@RO02 );
background-image: -ms-linear-gradient( @RO03,@RO02 );
background-image: -o-linear-gradient( @RO03,@RO02 );
background-image: linear-gradient( @RO03,@RO02 );
color: White;
}
.cR03 {
/*background-image: url('../Images/giallo_80.png');*/
background-color: @RO03;
background-image: -webkit-gradient(linear,left top,left bottom,from( @RO04 ),to( @RO03 ));
background-image: -webkit-linear-gradient( @RO04,@RO03 );
background-image: -moz-linear-gradient( @RO04,@RO03 );
background-image: -ms-linear-gradient( @RO04,@RO03 );
background-image: -o-linear-gradient( @RO04,@RO03 );
background-image: linear-gradient( @RO04,@RO03 );
color: White;
}
.cR04 {
/*background-image: url('../Images/arancio_80.png');*/
background-color: @RO04;
background-image: -webkit-gradient(linear,left top,left bottom,from( @RO05 ),to( @RO04 ));
background-image: -webkit-linear-gradient( @RO05,@RO04 );
background-image: -moz-linear-gradient( @RO05,@RO04 );
background-image: -ms-linear-gradient( @RO05,@RO04 );
background-image: -o-linear-gradient( @RO05,@RO04 );
background-image: linear-gradient( @RO05,@RO04 );
color: White;
}
.cROvr {
/*background-image: url('../Images/rosso_80.png');*/
background-color: @RO05;
background-image: -webkit-gradient(linear,left top,left bottom,from( @RO06 ),to( @RO05 ));
background-image: -webkit-linear-gradient( @RO06,@RO05 );
background-image: -moz-linear-gradient( @RO06,@RO05 );
background-image: -ms-linear-gradient( @RO06,@RO05 );
background-image: -o-linear-gradient( @RO06,@RO05 );
background-image: linear-gradient( @RO06,@RO05 );
color: White;
}
.cRBia {
text-align: center;
font-weight: bold;
height: @altezzaCellaRO;
padding: 0px 2px;
}
.selCelR {
background-color: #cbebff;
border: dashed 2px #22AAff; /*font-weight: bold;*/
text-align: center;
}
/* end celle bazaar*/
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_weekRA.ascx.cs
+12 -30
View File
@@ -139,7 +139,7 @@ namespace PROJ_ETS.WebUserControls
{
// carico TUTTE le celle del Impiego...
tabIR = DataProxy_ProjEts.DP.taIR.getFullWeek(anno, settimana);
tabComm = DataProxy_ProjEts.DP.taSelCom.GetData(); // leggo tutte commesse...
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
@@ -179,27 +179,27 @@ namespace PROJ_ETS.WebUserControls
}
if (rigaIR.OreTot == 0)
{
css = "cTab cEmp";
css = "cTabRO cREmp";
}
else if (rigaIR.OreTot < utils.obj.confReadInt("soglia1"))
{
css = "cTab cS01";
css = "cTabRO cR01";
}
else if (rigaIR.OreTot < utils.obj.confReadInt("soglia2"))
{
css = "cTab cS02";
css = "cTabRO cR02";
}
else if (rigaIR.OreTot < utils.obj.confReadInt("soglia3"))
{
css = "cTab cS03";
css = "cTabRO cR03";
}
else if (rigaIR.OreTot < utils.obj.confReadInt("soglia4"))
{
css = "cTab cS04";
css = "cTabRO cR04";
}
else
{
css = "cTab cOvr";
css = "cTabRO cROvr";
}
tooltip = string.Format("{2} / {0} {1}", rigaDip.Nome, rigaDip.Cognome, rigaComm.label.Substring(0, 9));
TabellaRisorse[pos_x, pos_y] = new ETS_Data.Type.ImpiegoRes(rigaIR.OreTot.ToString(), tooltip, css, rigaIR.idxDipendente, string.Format("{0} {1}", rigaDip.Nome, rigaDip.Cognome), rigaDip.SIGLA, rigaIR.idxFase, rigaIR.OreTot, 0);
@@ -267,19 +267,14 @@ namespace PROJ_ETS.WebUserControls
//cella!
TableCell cell;
cell = new TableCell();
cell.CssClass = "cBia";
cell.CssClass = "cRBia";
try
{
rigaComm = (DS_utilsProjEts.v_selCommesseRow)tabComm.Select(string.Format("value = {0}", tabIRSingle[pos_y].idxFase))[0];
if (showOre)
{
// aggiungo button x fare elemento cliccabile
LinkButton lnkbDel = new LinkButton();
// controllo se CUD è abilitato
lnkbDel.Text = string.Format("{0:0##} h", oreTotComm[pos_y]);
lnkbDel.ToolTip = string.Format("Commessa {0}", rigaComm.label.Substring(0, 9));
lnkbDel.Enabled = false;
cell.Controls.Add(lnkbDel);
cell.Text = string.Format("{0:0##} h", oreTotComm[pos_y]);
cell.ToolTip = string.Format("Commessa {0}", rigaComm.label.Substring(0, 9));
}
else
{
@@ -318,21 +313,8 @@ namespace PROJ_ETS.WebUserControls
{
cell = new TableCell();
cell.CssClass = TabellaRisorse[pos_x, pos_y].Css;
// aggiungo button x fare elemento cliccabile
LinkButton lnkb = new LinkButton();
lnkb.ToolTip = TabellaRisorse[pos_x, pos_y].ToolTip;
lnkb.Text = TabellaRisorse[pos_x, pos_y].Label;
#if false
lnkb.CssClass = "openDiag"; // server x far si ceh apra il dialog modale...
// controllo se CUD è abilitato
if (cudEnabled)
{
lnkb.Click += new EventHandler(lnkb_Click);
lnkb.CommandArgument = string.Format("{0}#{1}", TabellaRisorse[pos_x, pos_y].IdxDipendente, TabellaRisorse[pos_x, pos_y].IdxFase);
}
lnkb.Enabled = cudEnabled;
#endif
cell.Controls.Add(lnkb);
cell.ToolTip = TabellaRisorse[pos_x, pos_y].ToolTip;
cell.Text = TabellaRisorse[pos_x, pos_y].Label;
// carico in cella di tabella il linkButton
riga.Cells.Add(cell);
}
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.