@@ -154,58 +154,58 @@
--%>
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx.cs
index 85e9f84..13de2a4 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx.cs
@@ -843,6 +843,35 @@ namespace PROJ_ETS.WebUserControls
grView.DataBind();
}
+ ///
+ /// determina se possa vedere dati avanzati (economici tipicamente) dato idx fase
+ ///
+ /// idx fase interessata...
+ ///
+ public bool canSeeAdvData(object _idxFase)
+ {
+ bool answ = false;
+ int idxFase = 0;
+ try
+ {
+ idxFase = Convert.ToInt32(_idxFase);
+ }
+ catch
+ { }
+ // se è POWER* o PM PUO' vedere...
+ if(utils.obj.isPowerUser || utils.obj.isPowerReader || utils.obj.isPM)
+ {
+ answ = true;
+ }
+ else if(utils.obj.isCC && utils.obj.isCurrentCC(idxFase))
+ {
+ // controllo SE sia sua la commessa...
+ answ = true;
+ }
+
+ return answ;
+ }
+
#endregion
}
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx
index c86d977..5a29948 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx
@@ -1,6 +1,8 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_datiComm.ascx.cs" Inherits="PROJ_ETS.WebUserControls.mod_datiComm" %>
<%@ Register Src="mod_navDettComm.ascx" TagName="mod_navDettComm" TagPrefix="uc1" %>
+<%@ Register Src="~/WebUserControls/mod_labelsComm.ascx" TagPrefix="uc1" TagName="mod_labelsComm" %>
+
+
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_labelsComm.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_labelsComm.ascx
index 983d9c0..2fdc22a 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_labelsComm.ascx
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_labelsComm.ascx
@@ -1,14 +1,27 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_labelsComm.ascx.cs" Inherits="PROJ_ETS.WebUserControls.mod_labelsComm" %>
+
+
+
+
+
+
ADD
+ <%--
RES--%>
+
+
+
+
+
+ <%# Eval("CodLabel") %>
+
+
+
+
+
+
+
+
+ <%--
AAA BBB CCC--%>
+
+
-
-
- <%# Eval("CodLabel") %>
-
-
-
-
-
-
-
-
-<%--
AAA BBB CCC--%>
\ No newline at end of file
+
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_labelsComm.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_labelsComm.ascx.cs
index 57fb367..7a5752b 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_labelsComm.ascx.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_labelsComm.ascx.cs
@@ -1,4 +1,5 @@
-using System;
+using ETS_Data;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -11,9 +12,12 @@ namespace PROJ_ETS.WebUserControls
{
protected void Page_Load(object sender, EventArgs e)
{
-
+ divModLabels.Visible = delEnabled;
+ lblBtns.Visible = !delEnabled;
}
-
+ ///
+ /// idx fase di cui mostrare dettaglio etichette
+ ///
public int idxFase
{
get
@@ -32,5 +36,55 @@ namespace PROJ_ETS.WebUserControls
hfIdxFase.Value = value.ToString();
}
}
+ ///
+ /// abilitazione o meno all'eliminazione dei tags
+ ///
+ public bool delEnabled
+ {
+ get
+ {
+ bool answ = false;
+ try
+ {
+ answ = Convert.ToBoolean(hfDelEnabled.Value);
+ }
+ catch
+ { }
+ return answ;
+ }
+ set
+ {
+ hfDelEnabled.Value = value.ToString();
+ divModLabels.Visible = value;
+ }
+ }
+
+
+ protected void lbtAddLabel_Click(object sender, EventArgs e)
+ {
+ // UPSERT...
+ DataProxy_ProjEts.DP.taL2C.UpsertQuery(idxFase, ddlSelLabel.SelectedValue);
+ repLabels.DataBind();
+ }
+
+ protected void lbtResetLabels_Click(object sender, EventArgs e)
+ {
+ DataProxy_ProjEts.DP.taL2C.deleteByFase(idxFase);
+ repLabels.DataBind();
+ }
+
+ protected void lbtDel_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ // recupero argomento
+ LinkButton lb = (LinkButton)sender;
+ //lb.CommandArgument
+ DataProxy_ProjEts.DP.taL2C.Delete(idxFase, lb.CommandArgument);
+ }
+ catch
+ { }
+ repLabels.DataBind();
+ }
}
}
\ No newline at end of file
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_labelsComm.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_labelsComm.ascx.designer.cs
index 532618e..d32e9fc 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_labelsComm.ascx.designer.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_labelsComm.ascx.designer.cs
@@ -13,13 +13,49 @@ namespace PROJ_ETS.WebUserControls {
public partial class mod_labelsComm {
///
- /// hfIdxFase control.
+ /// divModLabels control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::System.Web.UI.WebControls.HiddenField hfIdxFase;
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl divModLabels;
+
+ ///
+ /// lblBtns control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblBtns;
+
+ ///
+ /// ddlSelLabel control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.DropDownList ddlSelLabel;
+
+ ///
+ /// lbtAddLabel control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton lbtAddLabel;
+
+ ///
+ /// odsLabel control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.ObjectDataSource odsLabel;
///
/// repLabels control.
@@ -38,5 +74,23 @@ namespace PROJ_ETS.WebUserControls {
/// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
+
+ ///
+ /// hfIdxFase control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.HiddenField hfIdxFase;
+
+ ///
+ /// hfDelEnabled control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.HiddenField hfDelEnabled;
}
}
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_login.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_login.ascx.cs
index f319270..bdd31a9 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_login.ascx.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_login.ascx.cs
@@ -144,7 +144,6 @@ public partial class mod_login : System.Web.UI.UserControl
else
{
lblMessage.Text = "Accesso fallito
key foce login non valida!!! tentativo registrata!!!";
- //mandaEmail(_fromEmail, _adminEmail, "Attenzione: tentativo di accesso non autorizzato!", String.Format("Tentativo di forcing user non autorizzato!
L'utente {0} ha tentato di accedere a {1} forzando l'utente ma la sua key autorizzativa e' sbagliata...", Page.User.Identity.Name, user_std.UtSn.Traduci(SteamWare.memLayer.ML.confReadString("defaultApp"))));
string _rigaLog = String.Format("User {0}\t tried to force user - wrong password - he tried to log as \t {1}\\{2}", Page.User.Identity.Name, dominio.Text, user.Text);
lg.Warn(_rigaLog);
if (Login_Error != null)
@@ -155,7 +154,6 @@ public partial class mod_login : System.Web.UI.UserControl
}
else
{
- //mandaEmail(_fromEmail, _adminEmail, "Attenzione: tentativo di accesso non autorizzato!", String.Format("Tentativo di forcing user non autorizzato!
L'utente {0} ha tentato di accedere a {1} forzando l'utente ma la funzione e' disabilitata...", Page.User.Identity.Name, user_std.UtSn.Traduci(SteamWare.memLayer.ML.confReadString("defaultApp"))));
string _rigaLog = String.Format("User {0}\t tried to force user - access disabled - he tried to log as \t {1}\\{2}", Page.User.Identity.Name, dominio.Text, user.Text);
lg.Warn(_rigaLog);
if (Login_Error != null)
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_spostaComm.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_spostaComm.ascx.cs
index 15678cb..6a1b745 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_spostaComm.ascx.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_spostaComm.ascx.cs
@@ -237,7 +237,6 @@ namespace PROJ_ETS.WebUserControls
break;
case tipoSpostamento.moveRA:
//enableBtnSposta = true;
- //testoBtn = traduci("moveRA");
//cssBtn = "btnBlu ui-corner-all shadowBox btnEditBig";
break;
default:
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx
index 08dbd1f..6b2d5fd 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx
@@ -3,14 +3,14 @@
-
-
+
-
-
+
-
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.cs
index a5ce1e6..3c2113a 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.cs
@@ -135,8 +135,8 @@ namespace PROJ_ETS.WebUserControls
// aggiunta commesse e clona seguono stessa regola di visibilità e abilitazione...
btnAddNew.Enabled = cudEnabled;
btnCloneWeek.Enabled = cudEnabled;
- btnAddNew.Visible = isWritable() && isPowerUser;
- btnCloneWeek.Visible = isWritable() && isPowerUser;
+ btnAddNew.Visible = isWritable() && (utils.obj.isPowerUser || utils.obj.isPM);
+ btnCloneWeek.Visible = isWritable() && utils.obj.isPowerUser;
fixBtnAddNewComm();
if (!cudEnabled)
{
@@ -153,7 +153,7 @@ namespace PROJ_ETS.WebUserControls
btnCloneWeek.ToolTip = "Copia le Commesse dalla settimana precedente";
}
// rilascio / congelamento ore in GPW ha sua regola (NON lo mostra direttamente se "scaduto")
- btnReleaseWeek.Visible = isWritable() && isPowerUser && cudEnabled;
+ btnReleaseWeek.Visible = isWritable() && utils.obj.isPowerUser && cudEnabled;
// a seconda che sia stata rilasciata o meno la settimana mostro sblocco o rilascio settimana...
if (isReleased)
{
@@ -217,6 +217,7 @@ namespace PROJ_ETS.WebUserControls
///
private void caricaDatiBlocco()
{
+ unlockRes();
int totCelle = 0;
int idxDip = 0;
// recupero il numero di TUTTE le celle
@@ -230,7 +231,7 @@ namespace PROJ_ETS.WebUserControls
tabCommShort = DataProxy_ProjEts.DP.taSelCom.getCommShort(); // leggo tutte commesse formato short (nickname...)
// calcolo il primo dip
idxDip = tabBaz[0].idxDipendente;
- // calcolo num celel totali
+ // calcolo num celle totali
totCelle = tabBaz.Rows.Count;
tabBazSingle = DataProxy_ProjEts.DP.taBaz.getByAnnoSettDip(anno, settimana, idxDip);
// calcolo numero commesse!
@@ -300,6 +301,18 @@ namespace PROJ_ETS.WebUserControls
}
}
}
+ ///
+ /// sblocca le risorse scadute (= lock da oltre tempo max)
+ ///
+ private void unlockRes()
+ {
+ int minBlockEditRes = utils.obj.confReadInt("minBlockEditRes");
+ if (minBlockEditRes > 0)
+ {
+ DataProxy_ProjEts.DP.taTLB.unlockExpired(minBlockEditRes);
+ }
+ }
+
///
/// disegna la riga di intestazione/chiusura x dipendenti
///
@@ -318,10 +331,19 @@ namespace PROJ_ETS.WebUserControls
{
cell = new TableCell();
cell.CssClass = "cBia cCent";
+ // se è ultima riga...
if (showOre && numDip > 0 && numComm > 0)
{
- cell.Text = string.Format("{0:0#} h{1}", oreTotDip[pos_x], schemaOreDip[pos_x]);
- cell.ToolTip = "";
+ cell.Text = string.Format("
{0:0#} h{1}", oreTotDip[pos_x], schemaOreDip[pos_x]);
+ if (userIsLocked(tabD2ATR[pos_x].idxDipendente))
+ {
+ cell.ToolTip = string.Format("LOCK: {0} in modifica", lockedBy(tabD2ATR[pos_x].idxDipendente));
+ }
+ else
+ {
+ //cell.ToolTip = "";
+ cell.ToolTip = schemaOreDip[pos_x];
+ }
// SE sono 40h coloro di verde!!!
if (oreTotDip[pos_x] == 40)
{
@@ -364,13 +386,13 @@ namespace PROJ_ETS.WebUserControls
/// controlla abilitazione edit x celle e cancellazione, ovvero
/// - cudEnabled (controllo periodo scaduto e permette sett future)
/// - isWritable (utente con permessi RW = S)
- /// - utente poweruser oppure settimana non rialasciata x utente CC
+ /// - utente PowerUser/ProjectManager oppure settimana non rilasciata (x utente CapoComm)
///
protected bool editEnabled
{
get
{
- return cudEnabled && isWritable() && (isPowerUser || !isReleased);
+ return cudEnabled && isWritable() && (utils.obj.isPowerUser || utils.obj.isPM || !isReleased);
}
}
///
@@ -393,7 +415,7 @@ namespace PROJ_ETS.WebUserControls
if (showOre)
{
// controllo edit è abilitato
- if (editEnabled && (isPowerUser || isCurrentCC(tabBazSingle[pos_y].idxFase)))
+ if (editEnabled && (utils.obj.isPowerUser || utils.obj.isPM || utils.obj.isCurrentCC(tabBazSingle[pos_y].idxFase)))
{
// aggiungo button x fare elemento cliccabile
LinkButton lnkbDel = new LinkButton();
@@ -488,6 +510,9 @@ namespace PROJ_ETS.WebUserControls
// salvo valori
IdxDipSel = Convert.ToInt32(valori[0]);
IdxFaseSel = Convert.ToInt32(valori[1]);
+ // blocco dip!
+ DataProxy_ProjEts.DP.taTLB.lockDip(IdxDipSel, user_std.UtSn.NomeCognome);
+ // continuo
rigaBaz = (Ds_ProjEts.BazaarRisorseRow)tabBaz.Select(string.Format("idxDipendente={0} AND idxFase={1}", IdxDipSel, IdxFaseSel))[0];
rigaDip = (Ds_ProjEts.DipendentiRow)tabDip.Select(string.Format("idxDipendente={0}", IdxDipSel))[0];
rigaComm = (DS_utilsProjEts.v_selCommesseRow)tabComm.Select(string.Format("value = {0}", IdxFaseSel))[0];
@@ -518,16 +543,25 @@ namespace PROJ_ETS.WebUserControls
cell = new TableCell();
cell.CssClass = TabellaRisorse[pos_x, pos_y].Css;
// controllo edit è abilitato
- if (editEnabled && (isPowerUser || isCurrentCC(TabellaRisorse[pos_x, pos_y].IdxFase)))
+ if (editEnabled && (utils.obj.isPowerUser || utils.obj.isPM || utils.obj.isCurrentCC(TabellaRisorse[pos_x, pos_y].IdxFase)))
{
// 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;
- lnkb.CssClass = "openDiag"; // server x far si che apra il dialog modale...
- 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 && isWritable();
+ // controllo che user NON sia locked...
+ if (!userIsLocked(TabellaRisorse[pos_x, pos_y].IdxDipendente) || lockedByMe(TabellaRisorse[pos_x, pos_y].IdxDipendente))
+ {
+ lnkb.CssClass = "openDiag"; // server x far si che apra il dialog modale...
+ 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 && isWritable();
+ }
+ else
+ {
+ lnkb.Enabled = lockedByMe(TabellaRisorse[pos_x, pos_y].IdxDipendente);
+ //lnkb.Enabled = false;
+ }
cell.Controls.Add(lnkb);
}
else
@@ -540,6 +574,18 @@ namespace PROJ_ETS.WebUserControls
{
cell.CssClass = "selCel";
}
+ // altrimenti controllo se la COLONNA di un dip bloccato, nel caso SEGNALO e blocco....
+ else if (userIsLocked(TabellaRisorse[pos_x, pos_y].IdxDipendente))
+ {
+ if (lockedByMe(TabellaRisorse[pos_x, pos_y].IdxDipendente))
+ {
+ cell.CssClass = "myLock";
+ }
+ else
+ {
+ cell.CssClass = "lockCol";
+ }
+ }
// carico in cella di tabella il linkButton
riga.Cells.Add(cell);
}
@@ -549,6 +595,48 @@ namespace PROJ_ETS.WebUserControls
// metto ultima riga con indicazione valori NUMERICI del totale ore x dipendente
setupRigaDip(true);
}
+ ///
+ /// verifica se utente sia locked
+ ///
+ ///
+ ///
+ protected bool userIsLocked(int IdxDipendente)
+ {
+ return DataProxy_ProjEts.DP.taTLB.getByDip(IdxDipendente).Rows.Count > 0;
+ }
+ ///
+ /// verifica se sia io a tenere in lock...
+ ///
+ ///
+ ///
+ protected bool lockedByMe(int IdxDipendente)
+ {
+ bool answ = false;
+ try
+ {
+ // controllo: SE sono io che ho bloccato allora NON vale blocco x ME...
+ answ = DataProxy_ProjEts.DP.taTLB.getByDip(IdxDipendente)[0].LockedBy == user_std.UtSn.NomeCognome;
+ }
+ catch
+ { }
+ return answ;
+ }
+ ///
+ /// restituisce nome di chi ha lock su risorsa (dipendente)...
+ ///
+ ///
+ ///
+ protected string lockedBy(int IdxDipendente)
+ {
+ string answ = "ND";
+ try
+ {
+ answ = DataProxy_ProjEts.DP.taTLB.getByDip(IdxDipendente)[0].LockedBy;
+ }
+ catch
+ { }
+ return answ;
+ }
///
/// gestione visualizzaizone pannello elenco commesse da inserire
@@ -577,7 +665,7 @@ namespace PROJ_ETS.WebUserControls
///
protected void btnReleaseWeek_Click(object sender, EventArgs e)
{
- // controllo se la settimana è rialsciata o meno e di conseguenza opero...
+ // controllo se la settimana è rilasciata o meno e di conseguenza opero...
if (isReleased)
{
// sblocco
@@ -627,7 +715,7 @@ namespace PROJ_ETS.WebUserControls
///
public string trimChar(object stringaIn, object maxChar)
{
- return utils.obj.trimChar(stringaIn, maxChar);
+ return utils.trimChar(stringaIn, maxChar);
}
///
@@ -715,6 +803,8 @@ namespace PROJ_ETS.WebUserControls
{
allocazione = Convert.ToInt32(txtAllocazione.Text.Trim());
DataProxy_ProjEts.DP.taBaz.updateQuery(anno, settimana, IdxDipSel, IdxFaseSel, allocazione);
+ // sblocco dip!
+ DataProxy_ProjEts.DP.taTLB.unlockDip(IdxDipSel);
}
catch
{ }
@@ -727,6 +817,9 @@ namespace PROJ_ETS.WebUserControls
protected void btnCancel_Click(object sender, EventArgs e)
{
+ // sblocco dip!
+ DataProxy_ProjEts.DP.taTLB.unlockDip(IdxDipSel);
+ // resetto
lblOut.Text = "";
IdxDipSel = 0;
IdxFaseSel = 0;
@@ -782,71 +875,6 @@ namespace PROJ_ETS.WebUserControls
return answ;
}
///
- /// risponde alla domanda se l'utente sia PowerUser
- ///
- ///
- public bool isPowerUser
- {
- get
- {
- return user_std.UtSn.userHasRight("PowerUser");
- }
- }
- ///
- /// risponde alla domanda se l'utente sia PowerReader
- ///
- ///
- public bool isPowerReader
- {
- get
- {
- return user_std.UtSn.userHasRight("PowerReader");
- }
- }
- ///
- /// risponde alla domanda se l'utente sia User
- ///
- ///
- public bool isUser
- {
- get
- {
- return user_std.UtSn.userHasRight("User");
- }
- }
- ///
- /// risponde alla domanda se l'utente sia CapoCommessa
- ///
- ///
- public bool isCC
- {
- get
- {
- return user_std.UtSn.userHasRight("CC");
- }
- }
- ///
- /// risponde alla domanda se l'utente sia CC della commessa indicata dalla fase
- ///
- ///
- ///
- 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;
- }
- ///
/// indica se la settimana sia già stata rilasciata (c'è record in tab ReleasedWeek e quindi è stato esportato su GPW)
///
public bool isReleased
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs
index ce2baf7..9174cb6 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs
@@ -104,7 +104,7 @@ namespace PROJ_ETS.WebUserControls
// calcolo num celle totali
totCelle = tabIR.Rows.Count;
// a secondo del ruolo utente (PowerUser|PowerReader oppure CC) determino quali commesse siano visibili
- if (isCC && !(isPowerReader || isPowerUser))
+ if (utils.obj.isCC && !(utils.obj.isPowerReader || utils.obj.isPowerUser))
{
tabIRPareto = DataProxy_ProjEts.DP.taIR.getFullWeekParetoCC(anno, settimana, user_std.UtSn.currUserNomeCognome);
}
@@ -381,6 +381,7 @@ namespace PROJ_ETS.WebUserControls
answ = user_std.UtSn.isPageWriteEnabled(_paginaCorrente);
return answ;
}
+#if false
///
/// risponde alla domanda se l'utente sia PowerUser
///
@@ -425,5 +426,17 @@ namespace PROJ_ETS.WebUserControls
return user_std.UtSn.userHasRight("CC");
}
}
+ ///
+ /// risponde alla domanda se l'utente sia ProjectManager
+ ///
+ ///
+ public bool isPM
+ {
+ get
+ {
+ return user_std.UtSn.userHasRight("PM");
+ }
+ }
+#endif
}
}
\ No newline at end of file
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekVerify.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekVerify.ascx.cs
index 83e5c8e..5c81a16 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekVerify.ascx.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekVerify.ascx.cs
@@ -112,7 +112,7 @@ namespace PROJ_ETS.WebUserControls
// calcolo num celle totali
totCelle = tabIR.Rows.Count;
// a secondo del ruolo utente (PowerUser|PowerReader oppure CC) determino quali commesse siano visibili
- if (isCC && !(isPowerReader || isPowerUser))
+ if (utils.obj.isCC && !(utils.obj.isPowerReader || utils.obj.isPowerUser))
{
tabIRPareto = DataProxy_ProjEts.DP.taIR.getBazWeekParetoCC(anno, settimana, user_std.UtSn.currUserNomeCognome);
}
@@ -481,6 +481,7 @@ namespace PROJ_ETS.WebUserControls
answ = user_std.UtSn.isPageWriteEnabled(_paginaCorrente);
return answ;
}
+#if false
///
/// risponde alla domanda se l'utente sia PowerUser
///
@@ -525,5 +526,17 @@ namespace PROJ_ETS.WebUserControls
return user_std.UtSn.userHasRight("CC");
}
}
+ ///
+ /// risponde alla domanda se l'utente sia ProjectManager
+ ///
+ ///
+ public bool isPM
+ {
+ get
+ {
+ return user_std.UtSn.userHasRight("PM");
+ }
+ }
+#endif
}
}
\ No newline at end of file
diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll
index 2567090..1e78c55 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 50ee686..140cbb6 100644
Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ
diff --git a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll.config b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll.config
index 2a10806..1176417 100644
--- a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll.config
+++ b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll.config
@@ -14,7 +14,8 @@
-
+
+
@@ -31,6 +32,7 @@
+
@@ -59,13 +61,21 @@
+
+
+
+
+
+
+
+
-
+
@@ -120,11 +130,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip b/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip
index 6c6c226..e55d997 100644
Binary files a/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip and b/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip differ
diff --git a/VersGen/CodeVersion.cs b/VersGen/CodeVersion.cs
index de92df0..d101ef3 100644
--- a/VersGen/CodeVersion.cs
+++ b/VersGen/CodeVersion.cs
@@ -5,7 +5,7 @@
using System.Reflection;
-[assembly: AssemblyVersion("2.2.1.163")]
-[assembly: AssemblyFileVersion("2.2.1.163")]
+[assembly: AssemblyVersion("2.2.3.164")]
+[assembly: AssemblyFileVersion("2.2.3.164")]
[assembly: AssemblyCopyright("Steamware © 2013-2016")]
[assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/CodeVersion.tt b/VersGen/CodeVersion.tt
index e8dfcde..786b23b 100644
--- a/VersGen/CodeVersion.tt
+++ b/VersGen/CodeVersion.tt
@@ -6,8 +6,8 @@
using System.Reflection;
-[assembly: AssemblyVersion("2.2.1.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("2.2.1.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("2.2.3.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("2.2.3.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2013-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+
diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll
index cb14e36..0c3f2d1 100644
Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ
diff --git a/VersGen/bin/Release/VersGen.dll b/VersGen/bin/Release/VersGen.dll
index 9c429e2..73b07b5 100644
Binary files a/VersGen/bin/Release/VersGen.dll and b/VersGen/bin/Release/VersGen.dll differ
diff --git a/VersGen/obj/Debug/TempPE/CodeVersion.cs.dll b/VersGen/obj/Debug/TempPE/CodeVersion.cs.dll
index 0d0e3b1..200eb9e 100644
Binary files a/VersGen/obj/Debug/TempPE/CodeVersion.cs.dll and b/VersGen/obj/Debug/TempPE/CodeVersion.cs.dll differ
diff --git a/VersGen/obj/Debug/VersGen.dll b/VersGen/obj/Debug/VersGen.dll
index cb14e36..0c3f2d1 100644
Binary files a/VersGen/obj/Debug/VersGen.dll and b/VersGen/obj/Debug/VersGen.dll differ
diff --git a/VersGen/obj/Release/TempPE/CodeVersion.cs.dll b/VersGen/obj/Release/TempPE/CodeVersion.cs.dll
index dc458e2..400d5ea 100644
Binary files a/VersGen/obj/Release/TempPE/CodeVersion.cs.dll and b/VersGen/obj/Release/TempPE/CodeVersion.cs.dll differ
diff --git a/VersGen/obj/Release/VersGen.dll b/VersGen/obj/Release/VersGen.dll
index 9c429e2..73b07b5 100644
Binary files a/VersGen/obj/Release/VersGen.dll and b/VersGen/obj/Release/VersGen.dll differ