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

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele Locatelli
2013-10-03 17:37:06 +02:00
parent 00d35af5b5 9e3ef65b36
commit eb2e4f81cf
17 changed files with 89 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ETS-WS/ETS-WS/bin/ETS_Data.dll
BIN
View File
Binary file not shown.
ETS_Data/bin/ETS/ETS_Data.dll
BIN
View File
Binary file not shown.
ETS_Data/obj/ETS/ETS_Data.dll
BIN
View File
Binary file not shown.
ETS_Data/obj/ETS/TempPE/Ds_ProjEts1.Designer.cs.dll
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/Content/Style.css
+11 -4
View File
@@ -1116,6 +1116,9 @@ div > ul > li > a.selected.menuNav {
.lblErrore {
color: #ff0000;
}
.lblGreen {
color: #00a300;
}
.lblBlu {
color: #3333FF;
}
@@ -1195,11 +1198,10 @@ div > ul > li > a.selected.menuNav {
background-image: linear-gradient(#caca00, #e4e400);
}
.cBia {
text-align: center;
font-weight: bold;
height: 20px;
width: 29px;
padding: 0px 2px;
align-content: center;
}
.selCel {
background-color: #cbebff;
@@ -1209,10 +1211,10 @@ div > ul > li > a.selected.menuNav {
text-align: center;
}
.cTab {
text-align: center;
height: 20px;
width: 29px;
align-content: center;
text-align: center;
border: solid 1px #777777;
}
.cREmp {
@@ -1286,11 +1288,16 @@ div > ul > li > a.selected.menuNav {
color: White;
}
.cRBia {
text-align: center;
white-space: nowrap;
margin: auto;
vertical-align: middle;
font-weight: bold;
height: 16px;
padding: 0px 2px;
}
.cCent {
text-align: center;
}
.selCelR {
background-color: #cbebff;
border: dashed 2px #22AAff;
PROJ-ETS/PROJ-ETS/Content/Style.less
+10 -5
View File
@@ -1267,7 +1267,9 @@ div > ul > li > a.selected.menuNav {
.lblErrore {
color: @rossoStart;
}
.lblGreen {
color: #00a300;
}
.lblBlu {
color: #3333FF;
}
@@ -1357,11 +1359,10 @@ div > ul > li > a.selected.menuNav {
background-image: linear-gradient( @S06,@S05 );
}
.cBia {
text-align: center;
font-weight: bold;
height: @altezzaCella;
width: @larghCella;
padding: 0px 2px;
align-content: center;
}
.selCel {
background-color: #cbebff;
@@ -1374,7 +1375,6 @@ div > ul > li > a.selected.menuNav {
height: @altezzaCella;
width: @larghCella;
align-content: center;
text-align: center;
border: solid 1px @grigioCella;
}
@@ -1450,11 +1450,16 @@ div > ul > li > a.selected.menuNav {
color: White;
}
.cRBia {
text-align: center;
white-space: nowrap;
margin: auto;
vertical-align: middle;
font-weight: bold;
height: @altezzaCellaRO;
padding: 0px 2px;
}
.cCent{
text-align: center;
}
.selCelR {
background-color: #cbebff;
border: dashed 2px #22AAff; /*font-weight: bold;*/
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/Web.ETS.config
+1 -1
View File
@@ -15,7 +15,7 @@
</connectionStrings>
-->
<appSettings>
<add key="destCcProjEmail" value="gparietti@etseng.it,rravasio@etseng.it,enava@etseng.it,mmolteni@etseng.it,gpw@etseng.it" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="destCcProjEmail" value="gparietti@etseng.it,rravasio@etseng.it,enava@etseng.it,mmolteni@etseng.it,cgiupponi@etseng.it,gpw@etseng.it" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="_fromEmail" value="gpw@etseng.it" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="_smtpCli" value="83.103.24.19" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="_emailUser" value="gpw@etseng.it" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
PROJ-ETS/PROJ-ETS/Web.config
+1 -1
View File
@@ -26,7 +26,7 @@
<add key="appName" value="PROJ-ETS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.0" />
<add key="minRev" value="221" />
<add key="minRev" value="226" />
<add key="stdEmail" value="info@steamware.net" />
<add key="_safePages" value="Default.aspx#unauthorized.aspx#forceUser.aspx#login.aspx#test.aspx#Test.aspx" />
<!--area gestione auth cookie-->
PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.cs
+37 -18
View File
@@ -168,7 +168,7 @@ namespace PROJ_ETS.WebUserControls
btnReleaseWeek.ToolTip = "Rilascia il piano settimanale copiando in GPW lo schema delle ore a progetto indicate per la settimana";
}
}
/// <summary>
/// anno selezionato (wrapper)
@@ -232,15 +232,7 @@ namespace PROJ_ETS.WebUserControls
idxDip = tabBaz[0].idxDipendente;
// calcolo num celel totali
totCelle = tabBaz.Rows.Count;
// a secondo del ruolo utente (PowerUser|PowerReader oppure CC) determino quali commesse siano visibili
if (isCC && !(isPowerReader || isPowerUser))
{
tabBazSingle = DataProxy_ProjEts.DP.taBaz.getByAnnoSettCC(anno, settimana, idxDip, user_std.UtSn.currUserNomeCognome);
}
else
{
tabBazSingle = DataProxy_ProjEts.DP.taBaz.getByAnnoSettDip(anno, settimana, idxDip);
}
tabBazSingle = DataProxy_ProjEts.DP.taBaz.getByAnnoSettDip(anno, settimana, idxDip);
// calcolo numero commesse!
numComm = tabBazSingle.Rows.Count;
numDip = tabD2ATR.Rows.Count;
@@ -325,22 +317,28 @@ namespace PROJ_ETS.WebUserControls
for (int pos_x = 0; pos_x < numDip; pos_x++)
{
cell = new TableCell();
cell.CssClass = "cBia";
cell.CssClass = "cBia cCent";
if (showOre && numDip > 0 && numComm > 0)
{
cell.Text = string.Format("{0:0#} h</br>{1}", oreTotDip[pos_x], schemaOreDip[pos_x]);
cell.ToolTip = "";
// SE sono oltre 40h coloro di rosso!!!
if ((oreTotDip[pos_x] > 40) || (schemaOreDip[pos_x].IndexOf("X") > 0))
// SE sono 40h coloro di verde!!!
if (oreTotDip[pos_x] == 40)
{
cell.CssClass = "cBia lblErrore";
cell.CssClass = "cBia cCent lblGreen";
}
// SE sono oltre 40h coloro di rosso!!!
else if ((oreTotDip[pos_x] > 40) || (schemaOreDip[pos_x].IndexOf("X") > 0))
{
cell.CssClass = "cBia cCent lblErrore";
}
}
else
{
rigaDip = (Ds_ProjEts.DipendentiRow)tabDip.Select(string.Format("idxDipendente={0}", tabD2ATR[pos_x].idxDipendente))[0];
cell.Text = rigaDip.codHw;
//cell.Text = rigaDip.SIGLA;
cell.Text = rigaDip.Nome.Substring(0, 1) + rigaDip.Cognome.Substring(0, 1) + rigaDip.Cognome.Substring(1, 2).ToLower();
//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);
@@ -389,13 +387,13 @@ namespace PROJ_ETS.WebUserControls
//cella!
TableCell cell;
cell = new TableCell();
cell.CssClass = "cRBia divSx";
cell.CssClass = "cRBia";
rigaComm = (DS_utilsProjEts.v_selCommesseRow)tabComm.Select(string.Format("value = {0}", tabBazSingle[pos_y].idxFase))[0];
rigaCommShort = (DS_utilsProjEts.v_selCommesseRow)tabCommShort.Select(string.Format("value = {0}", tabBazSingle[pos_y].idxFase))[0];
if (showOre)
{
// controllo edit è abilitato
if (editEnabled)
if (editEnabled && (isPowerUser || isCurrentCC(tabBazSingle[pos_y].idxFase)))
{
// aggiungo button x fare elemento cliccabile
LinkButton lnkbDel = new LinkButton();
@@ -488,7 +486,7 @@ namespace PROJ_ETS.WebUserControls
cell = new TableCell();
cell.CssClass = TabellaRisorse[pos_x, pos_y].Css;
// controllo edit è abilitato
if (editEnabled)
if (editEnabled && (isPowerUser || isCurrentCC(TabellaRisorse[pos_x, pos_y].IdxFase)))
{
// aggiungo button x fare elemento cliccabile
LinkButton lnkb = new LinkButton();
@@ -796,6 +794,27 @@ namespace PROJ_ETS.WebUserControls
}
}
/// <summary>
/// risponde alla domanda se l'utente sia CC della commessa indicata dalla fase
/// </summary>
/// <param name="idxFase"></param>
/// <returns></returns>
public bool isCurrentCC(int idxFase)
{
bool answ = false;
string CapoCommessa = "";
try
{
CapoCommessa = DataProxy_ProjEts.DP.taDC.GetData(idxFase)[0].CapoCommessa;
}
catch
{ }
if (user_std.UtSn.currUserNomeCognome == CapoCommessa || user_std.UtSn.currUserCognomeNome == CapoCommessa)
{
answ = true;
}
return answ;
}
/// <summary>
/// indica se la settimana sia già stata rilasciata (c'è record in tab ReleasedWeek e quindi è stato esportato su GPW)
/// </summary>
public bool isReleased
PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs
+12 -6
View File
@@ -220,22 +220,28 @@ namespace PROJ_ETS.WebUserControls
for (int pos_x = 0; pos_x < numDip; pos_x++)
{
cell = new TableCell();
cell.CssClass = "cBia";
cell.CssClass = "cBia cCent";
if (showOre && numDip > 0 && numComm > 0)
{
cell.Text = string.Format("{0:0#} h", oreTotDip[pos_x]);
cell.ToolTip = "";
// SE sono oltre 40h coloro di rosso!!!
if (oreTotDip[pos_x] > 40)
// SE sono 40h coloro di verde!!!
if (oreTotDip[pos_x] == 40)
{
cell.CssClass = "cBia lblErrore";
cell.CssClass = "cBia cCent lblGreen";
}
// SE sono oltre 40h coloro di rosso!!!
else if (oreTotDip[pos_x] > 40)
{
cell.CssClass = "cBia cCent lblErrore";
}
}
else
{
rigaDip = (Ds_ProjEts.DipendentiRow)tabDip.Select(string.Format("idxDipendente={0}", tabD2ATR[pos_x].idxDipendente))[0];
cell.Text = rigaDip.codHw;
//cell.Text = rigaDip.SIGLA;
cell.Text = rigaDip.Nome.Substring(0, 1) + rigaDip.Cognome.Substring(0, 1) + rigaDip.Cognome.Substring(1, 2).ToLower();
//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);
@@ -272,7 +278,7 @@ namespace PROJ_ETS.WebUserControls
//cella!
TableCell cell;
cell = new TableCell();
cell.CssClass = "cRBia divSx";
cell.CssClass = "cRBia";
try
{
rigaComm = (DS_utilsProjEts.v_selCommesseRow)tabComm.Select(string.Format("value = {0}", tabIRPareto[pos_y].idxFase))[0];
PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekVerify.ascx
+3 -3
View File
@@ -11,13 +11,13 @@
</asp:Table>
</div>
<div class="divSx ui-corner-all shadowBox"" style="white-space: nowrap; padding: 4px; margin-left:4px">
<div class="divSx ui-corner-all shadowBox"" style="white-space: nowrap; padding: 4px; margin-left:4px; font-size: 7pt;">
<h3>Legenda</h3>
Ore Effettive / Ore programmate
<br /><br />
<%--<br /><br />
indice rendimento:
<br />
<img src="Images/FormulaCorr.png" width="161" height="38" />
<img src="Images/FormulaCorr.png" width="120" height="30" />--%>
</div>
</div>
<div class="clearDiv">
PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekVerify.ascx.cs
+12 -6
View File
@@ -288,22 +288,28 @@ namespace PROJ_ETS.WebUserControls
for (int pos_x = 0; pos_x < numDip; pos_x++)
{
cell = new TableCell();
cell.CssClass = "cBia";
cell.CssClass = "cBia cCent";
if (showOre && numDip > 0 && numComm > 0)
{
cell.Text = string.Format("{0}/{1}", oreTotDip[pos_x], oreBgtTotDip[pos_x]);
cell.ToolTip = "";
// SE sono oltre 40h coloro di rosso!!!
if (oreTotDip[pos_x] > 40)
// SE sono 40h coloro di verde!!!
if (oreTotDip[pos_x] == 40)
{
cell.CssClass = "cBia lblErrore";
cell.CssClass = "cBia cCent lblGreen";
}
// SE sono oltre 40h coloro di rosso!!!
else if (oreTotDip[pos_x] > 40)
{
cell.CssClass = "cBia cCent lblErrore";
}
}
else
{
rigaDip = (Ds_ProjEts.DipendentiRow)tabDip.Select(string.Format("idxDipendente={0}", tabD2ATR[pos_x].idxDipendente))[0];
cell.Text = rigaDip.codHw;
//cell.Text = rigaDip.SIGLA;
cell.Text = rigaDip.Nome.Substring(0, 1) + rigaDip.Cognome.Substring(0, 1) + rigaDip.Cognome.Substring(1, 2).ToLower();
//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);
@@ -339,7 +345,7 @@ namespace PROJ_ETS.WebUserControls
//cella!
TableCell cell;
cell = new TableCell();
cell.CssClass = "cRBia divSx";
cell.CssClass = "cRBia";
try
{
rigaComm = (DS_utilsProjEts.v_selCommesseRow)tabComm.Select(string.Format("value = {0}", tabIRPareto[pos_y].idxFase))[0];
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.
PROJ-ETS/PROJ-ETS/jumper.aspx.cs
+1
View File
@@ -55,6 +55,7 @@ namespace PROJ_ETS
}
catch
{ }
utils.obj.setSessionVal("idxFase_sel", idxFase);
utils.obj.setSessionVal("idxProgetto_sel", idxProj);
utils.obj.setSessionVal("idxCli_sel", idxCli);
utils.obj.setSessionVal("nomeCli_sel", nomeCli);
PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip
BIN
View File
Binary file not shown.