From 0bb07270faa6c3d46ea8b1b2d4d19755973b2232 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 10 Nov 2021 10:07:03 +0100 Subject: [PATCH] fix procedure check licenza singolo user globale --- GPW_Data/DataProxy.cs | 10 +--------- GPW_Data/licenzeGPW.cs | 28 +++++++++++++++++++++++++--- GPW_Data/utils.cs | 4 ++-- 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/GPW_Data/DataProxy.cs b/GPW_Data/DataProxy.cs index cef6ed9..9ed2c13 100644 --- a/GPW_Data/DataProxy.cs +++ b/GPW_Data/DataProxy.cs @@ -64,15 +64,7 @@ namespace GPW_data { get { - bool answ = false; - try - { - // FIXME TODO !!! FARE !!! - DS_Applicazione.DipendentiRow rigaDip = DP.taDipendenti.getByIdx(idxDipendente)[0]; - answ = rigaDip.attivo; - } - catch - { } + bool answ = licenzeGPW.userPayloadOk(idxDipendente); return answ; } } diff --git a/GPW_Data/licenzeGPW.cs b/GPW_Data/licenzeGPW.cs index 130f79a..5e16489 100644 --- a/GPW_Data/licenzeGPW.cs +++ b/GPW_Data/licenzeGPW.cs @@ -45,9 +45,7 @@ namespace GPW_data get { Random rndGen = new Random(); - int minVal = 50; - int maxVal = 70; - return rndGen.Next(minVal, maxVal) * 60; + return rndGen.Next(50, 70) * 60; } } @@ -743,6 +741,30 @@ namespace GPW_data return await Task.FromResult(answ); } + public static bool userPayloadOk(int idxDip) + { + bool answ = false; + try + { + // recupero riga dip + var userTab = DataProxy.DP.taDipendenti.getByIdx(idxDip); + if (userTab != null && userTab.Count > 0) + { + var userRow = userTab[0]; + // calcolo suo codice... + var codImpCurr = DataProxy.DP.hashCodImpiego(userRow); + // cerco dip tra elenco json + var userLocalList = ListaAttivazioni; + var foundRec = userLocalList.Where(x => x.CodImpiego == codImpCurr); + answ = foundRec.Count() > 0; + } + } + catch + { } + + return answ; + } + #endregion Public Methods } } \ No newline at end of file diff --git a/GPW_Data/utils.cs b/GPW_Data/utils.cs index 1f5a901..42b6a8d 100644 --- a/GPW_Data/utils.cs +++ b/GPW_Data/utils.cs @@ -361,11 +361,11 @@ namespace GPW_data bool answ = false; if (memLayer.ML.confReadBool("enableDailyCheck")) { - if (memLayer.ML.confReadInt("_logLevel") > 5) logger.lg.scriviLog("Richiesto Check Daily Duties", tipoLog.INFO); int firstHour2Check = memLayer.ML.confReadInt("firstHour2Check"); - // controllo sfasato di x ore come da we.config se ci sia già stato il check quotidiano anomalie (con relative email) + // controllo sfasato di x ore come da web.config se ci sia già stato il check quotidiano anomalie (con relative email) if (DataProxy.DP.taRE.getByDataEv("checkAnomalie", DateTime.Now.AddHours(-firstHour2Check).Date).Rows.Count == 0) { + logger.lg.scriviLog("Richiesto Check Daily Duties", tipoLog.INFO); // chiamo check anomalie checkAnomalie(); //registro evento