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

Typo & cleanup area GPW_Data

Browse Source
This commit is contained in:
Samuele Locatelli
2022-02-03 06:58:42 +01:00
parent 888ffbff8c
commit 4a49d31083
9 changed files with 110 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW_Data/App_Readme/SteamWare_demo/example-NLog.config
+5 -7
View File
@@ -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">
<!-- optional, add some variabeles
https://github.com/nlog/NLog/wiki/Configuration-file#variables
-->
<variable name="myvar" value="myvalue"/>
<variable name="myvar" value="myvalue" />
<!--
See https://github.com/nlog/nlog/wiki/Configuration-file
<!--
See https://github.com/nlog/nlog/wiki/Configuration-file
for information on customizing logging rules and outputs.
-->
@@ -21,8 +20,7 @@
<target xsi:type="File"
name="SteamWareLib"
fileName="${basedir}/logs/${shortdate}-SteamWare.log"
layout="${longdate} ${uppercase:${level}} ${message}"
/>
layout="${longdate} ${uppercase:${level}} ${message}" />
</targets>
<rules>
GPW_Data/App_Readme/SteamWare_demo/example-app.config
+1 -1
View File
@@ -14,4 +14,4 @@
<add name="SteamWare.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16" providerName="System.Data.SqlClient" />
<add name="SteamWare.Properties.Settings.DbConfConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16" providerName="System.Data.SqlClient" />
</connectionStrings>
</configuration>
</configuration>
GPW_Data/DataProxy.cs
+10 -5
View File
@@ -11,6 +11,14 @@ namespace GPW_data
/// </summary>
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
/// <summary>
@@ -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;
GPW_Data/Enums.cs
+10 -11
View File
@@ -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
{
/// <summary>
/// elenco stato controllo
@@ -15,6 +9,7 @@ namespace GPW_data
insert,
item
}
/// <summary>
/// definisce i tipi di codice che il barcode può leggere
/// </summary>
@@ -24,21 +19,25 @@ namespace GPW_data
/// Tipo non riconosciuto
/// </summary>
ND,
/// <summary>
/// [idx] - il barcode rappresenta un codice dipendente tipo "idx" + numero
/// [idx] - il barcode rappresenta un codice dipendente tipo "idx" + numero
/// </summary>
idxDipendente,
/// <summary>
/// [matr] - il barcode rappresenta un codice dipendente tipo "matr" + matricola
/// [matr] - il barcode rappresenta un codice dipendente tipo "matr" + matricola
/// </summary>
matrDipendente,
/// <summary>
/// [CF] - il barcode rappresenta un codice dipendente tipo "cf" + cod fiscale dipendente
/// [CF] - il barcode rappresenta un codice dipendente tipo "cf" + cod fiscale dipendente
/// </summary>
cfDipendente,
/// <summary>
/// codice che indica un comando (prefisso da web.config)
/// </summary>
Comando
}
}
}
GPW_Data/Objects.cs
+10 -5
View File
@@ -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
}
}
}
GPW_Data/packages.config
+40 -40
View File
@@ -1,43 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AIM" version="1.1.0" targetFramework="net462" />
<package id="AjaxControlToolkit" version="20.1.0" targetFramework="net462" />
<package id="Crc32C.NET" version="1.0.5.0" targetFramework="net462" />
<package id="DnsClient" version="1.5.0" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net462" />
<package id="Microsoft.NETCore.Platforms" version="6.0.1" targetFramework="net462" />
<package id="MongoDB.Bson" version="2.14.1" targetFramework="net462" />
<package id="MongoDB.Driver" version="2.14.1" targetFramework="net462" />
<package id="MongoDB.Driver.Core" version="2.14.1" targetFramework="net462" />
<package id="MongoDB.Libmongocrypt" version="1.3.0" targetFramework="net462" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="net462" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net462" />
<package id="NLog" version="4.7.13" targetFramework="net462" />
<package id="PDFsharp" version="1.50.5147" targetFramework="net462" />
<package id="Pipelines.Sockets.Unofficial" version="2.2.2" targetFramework="net462" />
<package id="RestSharp" version="106.15.0" targetFramework="net462" />
<package id="SharpCompress" version="0.30.1" targetFramework="net462" />
<package id="SharpZipLib" version="1.3.3" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.2.88" targetFramework="net462" />
<package id="SteamWare" version="5.1.2109.1716" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.1.2109.1716" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="6.0.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
<package id="System.IO.Pipelines" version="6.0.1" targetFramework="net462" />
<package id="System.Memory" version="4.5.4" targetFramework="net462" />
<package id="System.Net.Http" version="4.3.4" targetFramework="net462" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net462" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net462" />
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" />
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Pkcs" version="6.0.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net462" />
<package id="System.Text.Encoding.CodePages" version="6.0.0" targetFramework="net462" />
<package id="System.Threading.Channels" version="6.0.0" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
<package id="AIM" version="1.1.0" targetFramework="net462" />
<package id="AjaxControlToolkit" version="20.1.0" targetFramework="net462" />
<package id="Crc32C.NET" version="1.0.5.0" targetFramework="net462" />
<package id="DnsClient" version="1.5.0" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net462" />
<package id="Microsoft.NETCore.Platforms" version="6.0.1" targetFramework="net462" />
<package id="MongoDB.Bson" version="2.14.1" targetFramework="net462" />
<package id="MongoDB.Driver" version="2.14.1" targetFramework="net462" />
<package id="MongoDB.Driver.Core" version="2.14.1" targetFramework="net462" />
<package id="MongoDB.Libmongocrypt" version="1.3.0" targetFramework="net462" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="net462" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net462" />
<package id="NLog" version="4.7.13" targetFramework="net462" />
<package id="PDFsharp" version="1.50.5147" targetFramework="net462" />
<package id="Pipelines.Sockets.Unofficial" version="2.2.2" targetFramework="net462" />
<package id="RestSharp" version="106.15.0" targetFramework="net462" />
<package id="SharpCompress" version="0.30.1" targetFramework="net462" />
<package id="SharpZipLib" version="1.3.3" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.2.88" targetFramework="net462" />
<package id="SteamWare" version="5.1.2109.1716" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.1.2109.1716" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="6.0.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
<package id="System.IO.Pipelines" version="6.0.1" targetFramework="net462" />
<package id="System.Memory" version="4.5.4" targetFramework="net462" />
<package id="System.Net.Http" version="4.3.4" targetFramework="net462" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net462" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net462" />
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" />
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Pkcs" version="6.0.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net462" />
<package id="System.Text.Encoding.CodePages" version="6.0.0" targetFramework="net462" />
<package id="System.Threading.Channels" version="6.0.0" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
</packages>
GPW_Data/timbratrice.cs
+30 -30
View File
@@ -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
/// </summary>
public class timbratrice
{
/// <summary>
/// registra una timbratura per il dipendente indicato
/// </summary>
/// <param name="idxDipendente"></param>
/// <param name="dataOra"></param>
/// <param name="isEntrata"></param>
/// <param name="ip"></param>
/// <param name="tipoTimbr"></param>
/// <param name="approvata"></param>
/// <returns></returns>
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
/// <summary>
/// registra una timbratura per il dipendente indicato
/// </summary>
@@ -63,13 +40,36 @@ namespace GPW_data
}
}
}
}
}
catch
{ }
return answ;
}
}
}
/// <summary>
/// registra una timbratura per il dipendente indicato
/// </summary>
/// <param name="idxDipendente"></param>
/// <param name="dataOra"></param>
/// <param name="isEntrata"></param>
/// <param name="ip"></param>
/// <param name="tipoTimbr"></param>
/// <param name="approvata"></param>
/// <returns></returns>
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
}
}
GPW_Data/utils.cs
+3 -5
View File
@@ -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
{
GPW_data/App.config
+1 -1
View File
@@ -41,4 +41,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
</configuration>