diff --git a/ETS_Data/DataProxy_ProjEts.cs b/ETS_Data/DataProxy_ProjEts.cs index 3729180..8effbfb 100644 --- a/ETS_Data/DataProxy_ProjEts.cs +++ b/ETS_Data/DataProxy_ProjEts.cs @@ -191,50 +191,70 @@ namespace ETS_Data int inviate = 0; string oggettoEmail = utils.obj.confReadString("emailBaz_subject"); string fromEmail = utils.obj.confReadString("_fromEmail"); + string toEmail = ""; string aCapo = "
"; string corpoEmail = ""; string progSett = ""; int idxDipendente = 0; - Ds_ProjEts.DipendentiRow rigaDip; // leggo tutte commesse ed i dipendenti... tabComm = DataProxy_ProjEts.DP.taSelCom.GetData(); tabDip = DataProxy_ProjEts.DP.taDip.GetData(); + tabD2ATR = DataProxy_ProjEts.DP.taD2ATR.getBazOrd(); + Ds_ProjEts.DipendentiRow rigaDip; // ciclo su TUTTI i dipendenti inseriti come risorse in bazaar - - // test: invio forzato sett 9, dip 5 !!! - idxDipendente = 5; - settimana = 9; - - rigaDip = (Ds_ProjEts.DipendentiRow)tabDip.Select(string.Format("idxDipendente={0}", idxDipendente))[0]; - corpoEmail = "
PROJ-ETS
"; - corpoEmail += string.Format(utils.obj.confReadString("emailBaz_body_Head") + " {1:00}/{0} - {2} {3}", anno, settimana, rigaDip.Cognome, rigaDip.Nome) + aCapo + aCapo; - corpoEmail += string.Format(@"{1}", utils.obj.confReadString("baseUrl"), utils.obj.confReadString("emailBaz_body_Link")); - corpoEmail += aCapo + aCapo; - // compongo la programmazione settimanale utente... EVENTUALMENTE CON GIORNI VUOTI!!! - - progSett = getAgendDip(idxDipendente, anno, settimana); - - corpoEmail += progSett; - corpoEmail += "" + utils.obj.confReadString("emailBaz_body_Firma") + ""; - try + foreach (Ds_ProjEts.Dip2ATRRow riga in tabD2ATR) { - // invio email con link + resoconto breve impegno settimanale - utils.gestEmail.geAuth.mandaEmail(fromEmail, "samuele@steamware.net", oggettoEmail, corpoEmail); - inviate++; + idxDipendente = riga.idxDipendente; + rigaDip = (Ds_ProjEts.DipendentiRow)tabDip.Select(string.Format("idxDipendente={0}", idxDipendente))[0]; + + // se sono in testing resetto email a mia... + if (utils.obj.confReadBool("testMode")) + { + toEmail = "samuele@steamware.net"; + } + else + { + toEmail = rigaDip.email; + } + + // test: invio forzato sett 9!!! + settimana = 9; + + corpoEmail = "
PROJ-ETS
"; + corpoEmail += string.Format(utils.obj.confReadString("emailBaz_body_Head") + " {1:00}/{0} - {2} {3}", anno, settimana, rigaDip.Cognome, rigaDip.Nome) + aCapo + aCapo; + corpoEmail += string.Format(@"{1}", utils.obj.confReadString("baseUrl"), utils.obj.confReadString("emailBaz_body_Link")); + corpoEmail += aCapo + aCapo; + // compongo la programmazione settimanale utente... EVENTUALMENTE CON GIORNI VUOTI!!! + + progSett = getAgendDip(idxDipendente, anno, settimana); + + corpoEmail += progSett; + corpoEmail += "" + utils.obj.confReadString("emailBaz_body_Firma") + ""; + try + { + // invio email con link + resoconto breve impegno settimanale + utils.gestEmail.geAuth.mandaEmail(fromEmail, toEmail, oggettoEmail, corpoEmail); + inviate++; + } + catch + { } + + if (utils.obj.confReadBool("testMode") && inviate > 5) + { + answ = true; + return answ; + } } - catch - { } - - answ = inviate > 0; // controlla che ALMENO 1 email sia stata inviata... return answ; } + protected Ds_ProjEts.DipendentiDataTable tabDip = new Ds_ProjEts.DipendentiDataTable(); + protected Ds_ProjEts.Dip2ATRDataTable tabD2ATR = new Ds_ProjEts.Dip2ATRDataTable(); protected Ds_ProjEts.BazaarRisorseDataTable tabBazSingle = new Ds_ProjEts.BazaarRisorseDataTable(); protected DS_utilsProjEts.v_selCommesseDataTable tabComm = new DS_utilsProjEts.v_selCommesseDataTable(); - protected Ds_ProjEts.DipendentiDataTable tabDip = new Ds_ProjEts.DipendentiDataTable(); /// /// Formatta blocco impegni del dipendente x la settimana indicata /// @@ -247,7 +267,7 @@ namespace ETS_Data //default string answ = ""; // inizio a comporre tabella utente - answ += ""; + answ += "
"; // recupero i dati x il dipendente corrente... tabBazSingle = DataProxy_ProjEts.DP.taBaz.getByAnnoSettDip(anno, sett, idxDipendente); // compongo la settimana a partire dalla data richiesta... @@ -286,16 +306,14 @@ namespace ETS_Data { // recupero dati commessa... rigaComm = (DS_utilsProjEts.v_selCommesseRow)tabComm.Select(string.Format("value = {0}", riga.idxFase))[0]; - answ += string.Format("", utils.trimChar(rigaComm.label, 40), riga.SchemaWeek); + answ += string.Format("", utils.trimChar(rigaComm.label, utils.obj.confReadInt("maxCharNomeComm")), riga.SchemaWeek); } // aggiungo spaziatura answ += "

"; return answ; } - - - + #endregion } } diff --git a/ETS_Data/bin/Release/ETS_Data.dll b/ETS_Data/bin/Release/ETS_Data.dll index e97b85e..9f2a23b 100644 Binary files a/ETS_Data/bin/Release/ETS_Data.dll and b/ETS_Data/bin/Release/ETS_Data.dll differ diff --git a/ETS_Data/obj/Debug/TempPE/Ds_ProjEts.Designer.cs.dll b/ETS_Data/obj/Debug/TempPE/Ds_ProjEts.Designer.cs.dll index 5dad480..86d6850 100644 Binary files a/ETS_Data/obj/Debug/TempPE/Ds_ProjEts.Designer.cs.dll and b/ETS_Data/obj/Debug/TempPE/Ds_ProjEts.Designer.cs.dll differ diff --git a/PROJ-ETS/PROJ-ETS/Web.ETS.config b/PROJ-ETS/PROJ-ETS/Web.ETS.config index 89367fd..256f147 100644 --- a/PROJ-ETS/PROJ-ETS/Web.ETS.config +++ b/PROJ-ETS/PROJ-ETS/Web.ETS.config @@ -15,6 +15,7 @@ --> + diff --git a/PROJ-ETS/PROJ-ETS/Web.config b/PROJ-ETS/PROJ-ETS/Web.config index 88c2179..1176417 100644 --- a/PROJ-ETS/PROJ-ETS/Web.config +++ b/PROJ-ETS/PROJ-ETS/Web.config @@ -32,6 +32,7 @@ + @@ -64,8 +65,9 @@ - + + diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx index c86d977..f4d12f6 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" %> +
@@ -34,6 +36,12 @@
+
+ +
+ +
+
@@ -305,7 +313,7 @@
- +
diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll index e97b85e..9f2a23b 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 786043a..3532e78 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 88c2179..1176417 100644 --- a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll.config +++ b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll.config @@ -32,6 +32,7 @@ + @@ -64,8 +65,9 @@ - + +
{0} {1}
{0} {1}