diff --git a/GPW_Data/App_Readme/SteamWare_demo/example-NLog.config b/GPW_Data/App_Readme/SteamWare_demo/example-NLog.config index a11a39e..e1e4c83 100644 --- a/GPW_Data/App_Readme/SteamWare_demo/example-NLog.config +++ b/GPW_Data/App_Readme/SteamWare_demo/example-NLog.config @@ -4,16 +4,15 @@ xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd" autoReload="true" throwExceptions="false" - internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log" > - + internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log"> - + - @@ -21,8 +20,7 @@ + layout="${longdate} ${uppercase:${level}} ${message}" /> diff --git a/GPW_Data/App_Readme/SteamWare_demo/example-app.config b/GPW_Data/App_Readme/SteamWare_demo/example-app.config index fb42165..dbb0810 100644 --- a/GPW_Data/App_Readme/SteamWare_demo/example-app.config +++ b/GPW_Data/App_Readme/SteamWare_demo/example-app.config @@ -14,4 +14,4 @@ - + \ No newline at end of file diff --git a/GPW_Data/DataProxy.cs b/GPW_Data/DataProxy.cs index 2ac50f3..4bbdd47 100644 --- a/GPW_Data/DataProxy.cs +++ b/GPW_Data/DataProxy.cs @@ -11,6 +11,14 @@ namespace GPW_data /// public class DataProxy { + #region Private Fields + + private static int cacheTTL = 60 * 5; + + private static string rkeyDipRow = memLayer.ML.redHash($"LiMan:DipRow"); + + #endregion Private Fields + #region Public Fields /// @@ -25,8 +33,8 @@ namespace GPW_data public DS_ApplicazioneTableAdapters.AnagOrariTableAdapter taAO; public DS_ApplicazioneTableAdapters.AnagProgettiTableAdapter taAP; public DS_ApplicazioneTableAdapters.CalendFesteFerieTableAdapter taCFF; - public DS_ApplicazioneTableAdapters.Dipendenti2RuoliTableAdapter taDip2Ruoli; public DS_ApplicazioneTableAdapters.Dipendenti2GruppiTableAdapter taDip2Gruppi; + public DS_ApplicazioneTableAdapters.Dipendenti2RuoliTableAdapter taDip2Ruoli; public DS_ApplicazioneTableAdapters.stp_DipendentiAndAnomalieTableAdapter taDipAnom; public DS_ApplicazioneTableAdapters.DipendentiTableAdapter taDipendenti; public DS_exportTableAdapters.RegAtt_pivotTableAdapter taExpComm; @@ -43,8 +51,8 @@ namespace GPW_data public DS_ApplicazioneTableAdapters.TimbratureTableAdapter taTimb; public DS_ApplicazioneTableAdapters.TimbratureExplTableAdapter taTimbExpl; public DS_ApplicazioneTableAdapters.TE_RA_ExplTableAdapter taTimbRegAtt; - public DS_UtilityTableAdapters.v_selProjFasiTableAdapter taVSPF; public DS_UtilityTableAdapters.v_selDipendentiTableAdapter taVSD; + public DS_UtilityTableAdapters.v_selProjFasiTableAdapter taVSPF; public DS_UtilityTableAdapters.stp_VSProjFasi_searchTableAdapter taVSProjFasiSearch; #endregion Public Fields @@ -324,9 +332,6 @@ namespace GPW_data return fatto; } - private static int cacheTTL = 60 * 5; - private static string rkeyDipRow = memLayer.ML.redHash($"LiMan:DipRow"); - public DS_Applicazione.DipendentiRow getRowDip(int idxDip) { DS_Applicazione.DipendentiRow answ = null; diff --git a/GPW_Data/Enums.cs b/GPW_Data/Enums.cs index c0a8cce..5d18306 100644 --- a/GPW_Data/Enums.cs +++ b/GPW_Data/Enums.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace GPW_data +namespace GPW_data { /// /// elenco stato controllo @@ -15,6 +9,7 @@ namespace GPW_data insert, item } + /// /// definisce i tipi di codice che il barcode può leggere /// @@ -24,21 +19,25 @@ namespace GPW_data /// Tipo non riconosciuto /// ND, + /// - /// [idx] - il barcode rappresenta un codice dipendente tipo "idx" + numero + /// [idx] - il barcode rappresenta un codice dipendente tipo "idx" + numero /// idxDipendente, + /// - /// [matr] - il barcode rappresenta un codice dipendente tipo "matr" + matricola + /// [matr] - il barcode rappresenta un codice dipendente tipo "matr" + matricola /// matrDipendente, + /// - /// [CF] - il barcode rappresenta un codice dipendente tipo "cf" + cod fiscale dipendente + /// [CF] - il barcode rappresenta un codice dipendente tipo "cf" + cod fiscale dipendente /// cfDipendente, + /// /// codice che indica un comando (prefisso da web.config) /// Comando } -} +} \ No newline at end of file diff --git a/GPW_Data/Objects.cs b/GPW_Data/Objects.cs index 549b2e0..2fb1f0a 100644 --- a/GPW_Data/Objects.cs +++ b/GPW_Data/Objects.cs @@ -1,19 +1,24 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace GPW_data { public class chartJsTSerie { + #region Public Properties + public DateTime x { get; set; } public decimal y { get; set; } + + #endregion Public Properties } + public class chartJsXY { + #region Public Properties + public decimal x { get; set; } public decimal y { get; set; } + + #endregion Public Properties } -} +} \ No newline at end of file diff --git a/GPW_Data/packages.config b/GPW_Data/packages.config index c71c799..2bd428d 100644 --- a/GPW_Data/packages.config +++ b/GPW_Data/packages.config @@ -1,43 +1,43 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GPW_Data/timbratrice.cs b/GPW_Data/timbratrice.cs index 998907e..a59bd99 100644 --- a/GPW_Data/timbratrice.cs +++ b/GPW_Data/timbratrice.cs @@ -1,8 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using SteamWare; +using SteamWare; +using System; namespace GPW_data { @@ -11,28 +8,8 @@ namespace GPW_data /// public class timbratrice { - /// - /// registra una timbratura per il dipendente indicato - /// - /// - /// - /// - /// - /// - /// - /// - public static bool registraTimbratura(int idxDipendente, DateTime dataOra, bool isEntrata, string ip, string tipoTimbr, bool approvata) - { - bool answ = false; - try - { - DataProxy.DP.taTimb.stp_insTimbMan(idxDipendente, dataOra, isEntrata, ip, tipoTimbr, approvata); - answ = true; - } - catch - { } - return answ; - } + #region Public Methods + /// /// registra una timbratura per il dipendente indicato /// @@ -63,13 +40,36 @@ namespace GPW_data } } } - } } catch { } return answ; } - } -} + /// + /// registra una timbratura per il dipendente indicato + /// + /// + /// + /// + /// + /// + /// + /// + public static bool registraTimbratura(int idxDipendente, DateTime dataOra, bool isEntrata, string ip, string tipoTimbr, bool approvata) + { + bool answ = false; + try + { + DataProxy.DP.taTimb.stp_insTimbMan(idxDipendente, dataOra, isEntrata, ip, tipoTimbr, approvata); + answ = true; + } + 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 79f000c..f3d7172 100644 --- a/GPW_Data/utils.cs +++ b/GPW_Data/utils.cs @@ -1,9 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Newtonsoft.Json; +using Newtonsoft.Json; using SteamWare; +using System; +using System.Collections.Generic; namespace GPW_data { diff --git a/GPW_data/App.config b/GPW_data/App.config index 70f425c..70b58b0 100644 --- a/GPW_data/App.config +++ b/GPW_data/App.config @@ -41,4 +41,4 @@ - + \ No newline at end of file