From d93f882c30145e799f24cd5f8d63a26d1e251dbf Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Oct 2021 16:12:38 +0200 Subject: [PATCH] Aggiunta registrazione EXT, gestioen timbrature ingresso --- GPW.Api/GPW.Api/GPW.Api.csproj | 5 +-- .../PublishProfiles/IIS01.pubxml.user | 2 +- .../PublishProfiles/IIS02.pubxml.user | 2 +- GPW.Api/GPW.Data/Controllers/DbController.cs | 44 +++++++++++-------- GPW.Api/GPW.Data/DBModels/CheckVc19.cs | 7 ++- GPW.Api/GPW.Data/GPWContext.cs | 14 +++++- 6 files changed, 48 insertions(+), 26 deletions(-) diff --git a/GPW.Api/GPW.Api/GPW.Api.csproj b/GPW.Api/GPW.Api/GPW.Api.csproj index e04f63a..6b6418e 100644 --- a/GPW.Api/GPW.Api/GPW.Api.csproj +++ b/GPW.Api/GPW.Api/GPW.Api.csproj @@ -1,4 +1,4 @@ - + net5.0 @@ -33,9 +33,6 @@ - - Always - Always diff --git a/GPW.Api/GPW.Api/Properties/PublishProfiles/IIS01.pubxml.user b/GPW.Api/GPW.Api/Properties/PublishProfiles/IIS01.pubxml.user index 98c64f9..5fffd14 100644 --- a/GPW.Api/GPW.Api/Properties/PublishProfiles/IIS01.pubxml.user +++ b/GPW.Api/GPW.Api/Properties/PublishProfiles/IIS01.pubxml.user @@ -7,6 +7,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAk75miMJLMkCTEelQutKpbwAAAAACAAAAAAADZgAAwAAAABAAAAD64JiQMe/ZFQyoGM4R9sGPAAAAAASAAACgAAAAEAAAAM/q6+akRak8c3V0r3Mk+WoYAAAAsnZQbXwmQ0HddyBl23zqJ7UdrMoQ01oAFAAAAChHebeDEvGpMY3I9BCRoDeEkL/A - True|2021-10-21T15:34:31.5116686Z;True|2021-10-21T17:33:36.5842465+02:00;True|2021-10-21T17:33:31.1197556+02:00;True|2021-10-21T17:32:02.6752268+02:00;True|2021-10-21T17:31:01.4481659+02:00;True|2021-10-21T17:30:54.5129982+02:00;True|2021-10-21T17:30:26.4580323+02:00;True|2021-10-21T17:29:05.5768737+02:00;True|2021-10-21T17:29:00.6469015+02:00;True|2021-10-21T17:25:28.7571399+02:00;True|2021-10-21T17:25:24.8661113+02:00;True|2021-10-18T20:21:43.5592264+02:00;True|2021-10-18T20:15:20.3159574+02:00;True|2021-10-18T20:15:15.7014379+02:00;True|2021-10-18T20:10:02.7090938+02:00;True|2021-10-18T20:09:50.1979643+02:00;True|2021-10-18T20:09:20.6062870+02:00;True|2021-10-18T20:02:51.7298688+02:00;True|2021-10-18T20:02:46.6139358+02:00;True|2021-10-18T18:32:46.3582973+02:00;True|2021-10-18T18:32:40.4187829+02:00;True|2021-10-18T18:16:06.7339286+02:00;True|2021-10-18T18:15:55.3572290+02:00;True|2021-10-18T12:45:35.3623591+02:00;True|2021-10-18T12:45:31.6185568+02:00;True|2021-10-18T12:38:20.4056350+02:00;True|2021-10-18T12:14:33.7489648+02:00;True|2021-10-18T12:10:37.6779923+02:00;False|2021-10-18T12:09:50.4457635+02:00;False|2021-10-18T12:08:24.6162366+02:00; + True|2021-10-26T14:11:45.5614027Z;True|2021-10-26T16:11:39.3438864+02:00;True|2021-10-26T16:11:33.8810094+02:00;True|2021-10-21T17:34:31.5116686+02:00;True|2021-10-21T17:33:36.5842465+02:00;True|2021-10-21T17:33:31.1197556+02:00;True|2021-10-21T17:32:02.6752268+02:00;True|2021-10-21T17:31:01.4481659+02:00;True|2021-10-21T17:30:54.5129982+02:00;True|2021-10-21T17:30:26.4580323+02:00;True|2021-10-21T17:29:05.5768737+02:00;True|2021-10-21T17:29:00.6469015+02:00;True|2021-10-21T17:25:28.7571399+02:00;True|2021-10-21T17:25:24.8661113+02:00;True|2021-10-18T20:21:43.5592264+02:00;True|2021-10-18T20:15:20.3159574+02:00;True|2021-10-18T20:15:15.7014379+02:00;True|2021-10-18T20:10:02.7090938+02:00;True|2021-10-18T20:09:50.1979643+02:00;True|2021-10-18T20:09:20.6062870+02:00;True|2021-10-18T20:02:51.7298688+02:00;True|2021-10-18T20:02:46.6139358+02:00;True|2021-10-18T18:32:46.3582973+02:00;True|2021-10-18T18:32:40.4187829+02:00;True|2021-10-18T18:16:06.7339286+02:00;True|2021-10-18T18:15:55.3572290+02:00;True|2021-10-18T12:45:35.3623591+02:00;True|2021-10-18T12:45:31.6185568+02:00;True|2021-10-18T12:38:20.4056350+02:00;True|2021-10-18T12:14:33.7489648+02:00;True|2021-10-18T12:10:37.6779923+02:00;False|2021-10-18T12:09:50.4457635+02:00;False|2021-10-18T12:08:24.6162366+02:00; \ No newline at end of file diff --git a/GPW.Api/GPW.Api/Properties/PublishProfiles/IIS02.pubxml.user b/GPW.Api/GPW.Api/Properties/PublishProfiles/IIS02.pubxml.user index f945025..add2f2f 100644 --- a/GPW.Api/GPW.Api/Properties/PublishProfiles/IIS02.pubxml.user +++ b/GPW.Api/GPW.Api/Properties/PublishProfiles/IIS02.pubxml.user @@ -7,6 +7,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAk75miMJLMkCTEelQutKpbwAAAAACAAAAAAADZgAAwAAAABAAAAB43BVhUmznhAu3pUfV1IfOAAAAAASAAACgAAAAEAAAAEV8hgbujDFfsMjS77NS2oYYAAAAUHPGFaVWgRqQPDU4wk5KGABmVHKko4/9FAAAANtaROBOcPHljx4RnmQHj5aHdtYk - True|2021-10-21T15:35:11.9761128Z;True|2021-10-18T20:22:00.9305399+02:00;True|2021-10-18T18:32:29.4558070+02:00;True|2021-10-18T18:32:22.8950294+02:00;True|2021-10-18T18:16:13.7563877+02:00;True|2021-10-18T18:15:48.5678387+02:00;True|2021-10-18T12:45:45.7228681+02:00;True|2021-10-18T12:14:22.3221605+02:00;True|2021-10-18T12:14:15.7373530+02:00;True|2021-10-18T12:10:43.8607301+02:00; + True|2021-10-26T14:12:11.7740950Z;True|2021-10-26T16:11:56.2014641+02:00;True|2021-10-26T16:11:22.2897842+02:00;False|2021-10-26T16:10:58.3733037+02:00;False|2021-10-26T16:10:29.4793991+02:00;True|2021-10-21T17:35:11.9761128+02:00;True|2021-10-18T20:22:00.9305399+02:00;True|2021-10-18T18:32:29.4558070+02:00;True|2021-10-18T18:32:22.8950294+02:00;True|2021-10-18T18:16:13.7563877+02:00;True|2021-10-18T18:15:48.5678387+02:00;True|2021-10-18T12:45:45.7228681+02:00;True|2021-10-18T12:14:22.3221605+02:00;True|2021-10-18T12:14:15.7373530+02:00;True|2021-10-18T12:10:43.8607301+02:00; \ No newline at end of file diff --git a/GPW.Api/GPW.Data/Controllers/DbController.cs b/GPW.Api/GPW.Data/Controllers/DbController.cs index 8c0ba59..e9e67ca 100644 --- a/GPW.Api/GPW.Data/Controllers/DbController.cs +++ b/GPW.Api/GPW.Data/Controllers/DbController.cs @@ -122,28 +122,37 @@ namespace GPW.Data.Controllers currUser = userList[0]; } - // fisso dipendente - idxDip = currUser.IdxDipendente; + if (currUser != null) + { + // fisso dipendente + idxDip = currUser.IdxDipendente; + } - // se trovato procedo + string rawPayload = JsonConvert.SerializeObject(updItem); + CheckVc19 newItem = new CheckVc19() + { + IdxDipendente = idxDip, + DtCheck = DateTime.Now, + Cognome = updItem.nam.fn.ToUpper(), + Nome = updItem.nam.gn.ToUpper(), + Payload = rawPayload, + DOB = updItem.dob.Date + }; + // aggiungo! + localDbCtx + .DbSetCheckVc19 + .Add(newItem); + + // ora salvo! + localDbCtx.SaveChanges(); + + // se trovato procedo ANCHE x timbratura if (idxDip > 0) { - string rawPayload = JsonConvert.SerializeObject(updItem); - CheckVc19 newItem = new CheckVc19() - { - IdxDipendente = idxDip, - DtCheck = DateTime.Now, - Payload = rawPayload - }; - // aggiungo! - localDbCtx - .DbSetCheckVc19 - .Add(newItem); - // verifico se ho timbratura ingresso var listTimbra = localDbCtx .DbSetTimbrature - .Where(x => x.IdxDipendente == idxDip) + .Where(x => x.IdxDipendente == idxDip && x.DataOra.Date == DateTime.Today && x.Entrata == true) .ToList(); // se non ci fosse aggiungo if (listTimbra == null || listTimbra.Count == 0) @@ -154,7 +163,7 @@ namespace GPW.Data.Controllers DataOra = DateTime.Now, CodTipoTimb = "Web", Ipv4 = clientIp, - Entrata = true, + Entrata = true }; // aggiungo! @@ -162,7 +171,6 @@ namespace GPW.Data.Controllers .DbSetTimbrature .Add(newIngresso); } - // ora salvo! localDbCtx.SaveChanges(); done = true; diff --git a/GPW.Api/GPW.Data/DBModels/CheckVc19.cs b/GPW.Api/GPW.Data/DBModels/CheckVc19.cs index 4f70421..edd39b0 100644 --- a/GPW.Api/GPW.Data/DBModels/CheckVc19.cs +++ b/GPW.Api/GPW.Data/DBModels/CheckVc19.cs @@ -9,8 +9,13 @@ namespace GPW.Data.DBModels { public partial class CheckVc19 { + public int IdxCheckVc19 { get; set; } public DateTime DtCheck { get; set; } - public int IdxDipendente { get; set; } + public int IdxDipendente { get; set; } = 0; + + public string Cognome { get; set; } = ""; + public string Nome { get; set; } = ""; + public DateTime DOB { get; set; } public string Payload { get; set; } } } diff --git a/GPW.Api/GPW.Data/GPWContext.cs b/GPW.Api/GPW.Data/GPWContext.cs index 6e042a7..1e14f92 100644 --- a/GPW.Api/GPW.Data/GPWContext.cs +++ b/GPW.Api/GPW.Data/GPWContext.cs @@ -1542,7 +1542,7 @@ namespace GPW.Data modelBuilder.Entity(entity => { - entity.HasKey(e => new { e.DtCheck, e.IdxDipendente }); + entity.HasKey(e => e.IdxCheckVc19); entity.ToTable("CheckVC19"); @@ -1558,6 +1558,18 @@ namespace GPW.Data .HasMaxLength(500) .HasColumnName("payload") .HasDefaultValueSql("('')"); + + entity.Property(e => e.Cognome) + .IsRequired() + .HasMaxLength(100) + .HasColumnName("cognome") + .HasDefaultValueSql("('')"); + + entity.Property(e => e.Nome) + .IsRequired() + .HasMaxLength(100) + .HasColumnName("nome") + .HasDefaultValueSql("('')"); }); modelBuilder.Entity(entity =>