diff --git a/.vs/ApiPolo/DesignTimeBuild/.dtbcache.v2 b/.vs/ApiPolo/DesignTimeBuild/.dtbcache.v2
index 0218388..f49a464 100644
Binary files a/.vs/ApiPolo/DesignTimeBuild/.dtbcache.v2 and b/.vs/ApiPolo/DesignTimeBuild/.dtbcache.v2 differ
diff --git a/.vs/ApiPolo/v17/.suo b/.vs/ApiPolo/v17/.suo
index cf32419..d848e18 100644
Binary files a/.vs/ApiPolo/v17/.suo and b/.vs/ApiPolo/v17/.suo differ
diff --git a/.vs/ProjectEvaluation/apipolo.metadata.v7.bin b/.vs/ProjectEvaluation/apipolo.metadata.v7.bin
index 4dc3c05..702bd3b 100644
Binary files a/.vs/ProjectEvaluation/apipolo.metadata.v7.bin and b/.vs/ProjectEvaluation/apipolo.metadata.v7.bin differ
diff --git a/.vs/ProjectEvaluation/apipolo.projects.v7.bin b/.vs/ProjectEvaluation/apipolo.projects.v7.bin
index 75dcf60..afe76e6 100644
Binary files a/.vs/ProjectEvaluation/apipolo.projects.v7.bin and b/.vs/ProjectEvaluation/apipolo.projects.v7.bin differ
diff --git a/ApiPolo/Controllers/PoloController.cs b/ApiPolo/Controllers/PoloController.cs
index 2c210ac..3731d15 100644
--- a/ApiPolo/Controllers/PoloController.cs
+++ b/ApiPolo/Controllers/PoloController.cs
@@ -357,6 +357,8 @@ namespace ApiPolo.Controllers
#region ChiamateSeriale
private readonly MARRO_CHIAMATA_SERIALE_DbContext _Marro_chiaser;
+ private readonly GITSR_CHIAMATA_SERIALE_DbContext _Gitoga_chiaser;
+ private readonly LIFTA_CHIAMATA_SERIALE_DbContext _Lifta_chiaser;
private readonly SIET_CHIAMATA_SERIALE_DbContext _Siet_chiaser;
private readonly SICILIA_CHIAMATA_SERIALE_DbContext _Sicilia_chiaser;
private readonly PMS_CHIAMATA_SERIALE_DbContext _PMS_chiaser;
@@ -794,6 +796,7 @@ namespace ApiPolo.Controllers
#region chiamate table
MARRO_CHIAMATE_TABLE_DbContext Marro_chiatable,
+
SIET_CHIAMATE_TABLE_DbContext Siet_chiatable,
SICILIA_CHIAMATE_TABLE_DbContext Sicilia_chiatable,
PMS_CHIAMATE_TABLE_DbContext Pms_chiatable,
@@ -804,6 +807,8 @@ namespace ApiPolo.Controllers
#region chiamate seriale
MARRO_CHIAMATA_SERIALE_DbContext Marro_chiaser,
+ GITSR_CHIAMATA_SERIALE_DbContext Gitoga_chiaser,
+ LIFTA_CHIAMATA_SERIALE_DbContext Lifta_chiaser,
SIET_CHIAMATA_SERIALE_DbContext Siet_chiaser,
SICILIA_CHIAMATA_SERIALE_DbContext Sicilia_chiaser,
PMS_CHIAMATA_SERIALE_DbContext PMS_chiaser,
@@ -1155,6 +1160,7 @@ namespace ApiPolo.Controllers
#region ChiamateTable
_Marro_chiatable = Marro_chiatable;
+
_Siet_chiatable = Siet_chiatable;
_Sicilia_chiatable = Sicilia_chiatable;
_Pms_chiatable = Pms_chiatable;
@@ -1165,6 +1171,8 @@ namespace ApiPolo.Controllers
#region ChiamateSeriale
_Marro_chiaser = Marro_chiaser;
+ _Gitoga_chiaser = Gitoga_chiaser;
+ _Lifta_chiaser = Lifta_chiaser;
_Siet_chiaser = Siet_chiaser;
_Sicilia_chiaser = Sicilia_chiaser;
_PMS_chiaser = PMS_chiaser;
@@ -2241,6 +2249,8 @@ namespace ApiPolo.Controllers
switch (tenant)
{
case Clienti.Marrocco:
+ case Clienti.Gitoga:
+ case Clienti.Lifta:
_chia = _Marro_chiatable.Chi;
break;
case Clienti.Siet:
@@ -2279,6 +2289,12 @@ namespace ApiPolo.Controllers
case Clienti.Marrocco:
_chiaser = _Marro_chiaser.Seriali;
break;
+ case Clienti.Gitoga:
+ _chiaser = _Gitoga_chiaser.Seriali;
+ break;
+ case Clienti.Lifta:
+ _chiaser = _Lifta_chiaser.Seriali;
+ break;
case Clienti.Siet:
_chiaser = _Siet_chiaser.Seriali;
break;
@@ -2303,6 +2319,7 @@ namespace ApiPolo.Controllers
switch (tenant)
{
case Clienti.Marrocco:
+ case Clienti.Gitoga:
_chiaprog = _Marro_chiaprog.Progressivi;
break;
case Clienti.Sicilia:
@@ -3667,9 +3684,8 @@ namespace ApiPolo.Controllers
}
}
-
- [HttpPost]
/// token salvataggio
+ [HttpPost]
[Route("token/sendMessage")]
public async Task> sendMessage(string tokenDevice,string _title, string _body)
{
@@ -12682,7 +12698,10 @@ namespace ApiPolo.Controllers
break;
+
case Clienti.Marrocco:
+ case Clienti.Gitoga:
+ case Clienti.Lifta:
cpwarnNumChiamata = await leggiCpwarnProg(ten, "prog\\NUMCHI\\", esercizio);
progChiamata = Convert.ToString(cpwarnNumChiamata.autonum);
tablecodeProg = cpwarnNumChiamata.tablecode;
@@ -12828,6 +12847,8 @@ namespace ApiPolo.Controllers
tOut.prog_Out = await aggiornaprogressivoDecimal(ten, progressivoLetto, tablecodeProg, warncodeProg);
break;
case Clienti.Marrocco:
+ case Clienti.Gitoga:
+ case Clienti.Lifta:
serialeUpdate = tOut.uscita.chserial;
tOut.chiaser_Out = await aggiornaSeriale(ten, serialeUpdate);
@@ -13190,6 +13211,9 @@ namespace ApiPolo.Controllers
switch (ten)
{
case Clienti.Marrocco:
+ case Clienti.Gitoga:
+ case Clienti.Lifta:
+ //GITOGA e LIFTA sono comunque dentro il db di Marrocco
t = fillChiamateTableInput(tt.FirstOrDefault(), codimp, tecnico, ten,serLetto,progLetto, codice_commessa);
using (var tranMarro = _Marro_chiatable.Database.BeginTransaction())
{
@@ -13198,6 +13222,7 @@ namespace ApiPolo.Controllers
tranMarro.Commit();
}
break;
+
case Clienti.Siet:
t = fillChiamateTableInput(tt.FirstOrDefault(), codimp, tecnico, ten, serLetto, progLetto, codice_commessa);
using (var tranSiet = _Siet_chiatable.Database.BeginTransaction())
@@ -13406,37 +13431,59 @@ namespace ApiPolo.Controllers
{
case Clienti.Marrocco:
using (var transaction = _Marro_chiaser.Database.BeginTransaction())
+ {
+ ChiamataSeriale entitasViewModel = _chiamateser.Where(p => p.piditta.Equals(tenant)).FirstOrDefault();
+ entitasViewModel.pinumero = nuovoSeriale;
+ entitasViewModel.cpccchk = cpcccchk;
+ _Marro_chiaser.Entry(entitasViewModel).State = EntityState.Modified;
+ await _Marro_chiaser.SaveChangesAsync();
+ transaction.Commit();
+ }
+ break;
+ case Clienti.Gitoga:
+ using (var transaction = _Gitoga_chiaser.Database.BeginTransaction())
{
ChiamataSeriale entitasViewModel = _chiamateser.Where(p => p.piditta.Equals(tenant)).FirstOrDefault();
entitasViewModel.pinumero = nuovoSeriale;
entitasViewModel.cpccchk = cpcccchk;
- _Marro_chiaser.Entry(entitasViewModel).State = EntityState.Modified;
- await _Marro_chiaser.SaveChangesAsync();
+ _Gitoga_chiaser.Entry(entitasViewModel).State = EntityState.Modified;
+ await _Gitoga_chiaser.SaveChangesAsync();
transaction.Commit();
}
break;
- case Clienti.Siet:
- using (var transactionSiet = _Siet_chiaser.Database.BeginTransaction())
- {
- ChiamataSeriale entitasViewModel = _chiamateser.Where(p => p.piditta.Equals(tenant)).FirstOrDefault();
- entitasViewModel.pinumero = nuovoSeriale;
- entitasViewModel.cpccchk = cpcccchk;
- _Siet_chiaser.Entry(entitasViewModel).State = EntityState.Modified;
- await _Siet_chiaser.SaveChangesAsync();
- transactionSiet.Commit();
- }
- break;
- case Clienti.Sicilia:
- using (var transactionSicilia = _Sicilia_chiaser.Database.BeginTransaction())
- {
- ChiamataSeriale entitasViewModel = _chiamateser.Where(p => p.piditta.Equals(tenant)).FirstOrDefault();
- entitasViewModel.pinumero = nuovoSeriale;
- entitasViewModel.cpccchk = cpcccchk;
- _Sicilia_chiaser.Entry(entitasViewModel).State = EntityState.Modified;
- await _Sicilia_chiaser.SaveChangesAsync();
- transactionSicilia.Commit();
- }
- break;
+ case Clienti.Lifta:
+ using (var transaction = _Lifta_chiaser.Database.BeginTransaction())
+ {
+ ChiamataSeriale entitasViewModel = _chiamateser.Where(p => p.piditta.Equals(tenant)).FirstOrDefault();
+ entitasViewModel.pinumero = nuovoSeriale;
+ entitasViewModel.cpccchk = cpcccchk;
+ _Lifta_chiaser.Entry(entitasViewModel).State = EntityState.Modified;
+ await _Lifta_chiaser.SaveChangesAsync();
+ transaction.Commit();
+ }
+ break;
+ case Clienti.Siet:
+ using (var transactionSiet = _Siet_chiaser.Database.BeginTransaction())
+ {
+ ChiamataSeriale entitasViewModel = _chiamateser.Where(p => p.piditta.Equals(tenant)).FirstOrDefault();
+ entitasViewModel.pinumero = nuovoSeriale;
+ entitasViewModel.cpccchk = cpcccchk;
+ _Siet_chiaser.Entry(entitasViewModel).State = EntityState.Modified;
+ await _Siet_chiaser.SaveChangesAsync();
+ transactionSiet.Commit();
+ }
+ break;
+ case Clienti.Sicilia:
+ using (var transactionSicilia = _Sicilia_chiaser.Database.BeginTransaction())
+ {
+ ChiamataSeriale entitasViewModel = _chiamateser.Where(p => p.piditta.Equals(tenant)).FirstOrDefault();
+ entitasViewModel.pinumero = nuovoSeriale;
+ entitasViewModel.cpccchk = cpcccchk;
+ _Sicilia_chiaser.Entry(entitasViewModel).State = EntityState.Modified;
+ await _Sicilia_chiaser.SaveChangesAsync();
+ transactionSicilia.Commit();
+ }
+ break;
default:
break;
@@ -13451,6 +13498,8 @@ namespace ApiPolo.Controllers
switch (tenant)
{
case Clienti.Marrocco:
+ case Clienti.Gitoga:
+ case Clienti.Lifta:
using (var transaction = _Marro_chiaprog.Database.BeginTransaction())
{
Prog entitasViewModel = _chiamateprogr.Where(p => p.tablecode.Equals(tablecode)&& p.warncode.Equals(warncode)).FirstOrDefault();
@@ -13591,7 +13640,6 @@ namespace ApiPolo.Controllers
}
return cso;
}
-
private async Task leggiCpwarnSeriale(string tenant, string tablecode)
{
//autorun float
diff --git a/ApiPolo/Models/Gitoga_dbcontext/GITSR_CHIAMATA_SERIALE_DbContext.cs b/ApiPolo/Models/Gitoga_dbcontext/GITSR_CHIAMATA_SERIALE_DbContext.cs
new file mode 100644
index 0000000..fcdf33f
--- /dev/null
+++ b/ApiPolo/Models/Gitoga_dbcontext/GITSR_CHIAMATA_SERIALE_DbContext.cs
@@ -0,0 +1,25 @@
+
+using Microsoft.EntityFrameworkCore;
+
+namespace ApiPolo.Models.Gitoga_dbcontext
+{
+ ///
+ public class GITSR_CHIAMATA_SERIALE_DbContext: DbContext
+ {
+ ///
+ public DbSet? Seriali { get; set; }
+
+ ///
+ public GITSR_CHIAMATA_SERIALE_DbContext(DbContextOptions options) : base(options)
+ {
+ }
+ ///
+ protected override void OnModelCreating(ModelBuilder modelBuilder)
+ {
+ modelBuilder.Entity().ToTable("GITSRPINUMCHI");
+ modelBuilder.Entity().HasKey(table => new {
+ table.piditta
+ });
+ }
+ }
+}
diff --git a/ApiPolo/Models/Lifta_dbcontext/LIFTA_CHIAMATA_SERIALE_DbContext.cs b/ApiPolo/Models/Lifta_dbcontext/LIFTA_CHIAMATA_SERIALE_DbContext.cs
new file mode 100644
index 0000000..f1ca2ea
--- /dev/null
+++ b/ApiPolo/Models/Lifta_dbcontext/LIFTA_CHIAMATA_SERIALE_DbContext.cs
@@ -0,0 +1,25 @@
+
+using Microsoft.EntityFrameworkCore;
+
+namespace ApiPolo.Models.Lifta_dbcontext
+{
+ ///
+ public class LIFTA_CHIAMATA_SERIALE_DbContext:DbContext
+ {
+ ///
+ public DbSet? Seriali { get; set; }
+
+ ///
+ public LIFTA_CHIAMATA_SERIALE_DbContext(DbContextOptions options) : base(options)
+ {
+ }
+ ///
+ protected override void OnModelCreating(ModelBuilder modelBuilder)
+ {
+ modelBuilder.Entity().ToTable("LIFTAPINUMCHI");
+ modelBuilder.Entity().HasKey(table => new {
+ table.piditta
+ });
+ }
+ }
+}
diff --git a/ApiPolo/Startup.cs b/ApiPolo/Startup.cs
index b89d2ef..58d6609 100644
--- a/ApiPolo/Startup.cs
+++ b/ApiPolo/Startup.cs
@@ -421,6 +421,9 @@ namespace ApiPolo
services.AddDbContext(options => options.UseSqlServer(Configuration.GetConnectionString("GITSR")
, options => { options.CommandTimeout(commandTimeoutInSeconds); }
));
+ services.AddDbContext(options => options.UseSqlServer(Configuration.GetConnectionString("GITSR")
+ , options => { options.CommandTimeout(commandTimeoutInSeconds); }
+ ));
#endregion
#region LIFTA
@@ -466,6 +469,9 @@ namespace ApiPolo
services.AddDbContext(options => options.UseSqlServer(Configuration.GetConnectionString("LIFTA")
, options => { options.CommandTimeout(commandTimeoutInSeconds); }
));
+ services.AddDbContext(options => options.UseSqlServer(Configuration.GetConnectionString("LIFTA")
+ , options => { options.CommandTimeout(commandTimeoutInSeconds); }
+ ));
#endregion
#region SIET
@@ -1002,7 +1008,7 @@ namespace ApiPolo
//gen.SwaggerDoc("v1", new OpenApiInfo { Title = "POLO API WS2016", Version = "v3.3" });
DateTime oggi = DateTime.Now;
string dt = oggi.ToString();
- gen.SwaggerDoc("v1", new OpenApiInfo { Title = "POLO API - v.app 1.29", Version = dt });
+ gen.SwaggerDoc("v1", new OpenApiInfo { Title = "POLO API - v.app 1.30", Version = dt });
var filePath = Path.Combine(System.AppContext.BaseDirectory, "ApiPolo.xml");
gen.IncludeXmlComments(filePath);
diff --git a/ApiPolo/bin/Release/net6.0/ApiPolo.dll b/ApiPolo/bin/Release/net6.0/ApiPolo.dll
index 3422f1a..d5471cc 100644
Binary files a/ApiPolo/bin/Release/net6.0/ApiPolo.dll and b/ApiPolo/bin/Release/net6.0/ApiPolo.dll differ
diff --git a/ApiPolo/bin/Release/net6.0/ApiPolo.pdb b/ApiPolo/bin/Release/net6.0/ApiPolo.pdb
index 766474c..6b47cc9 100644
Binary files a/ApiPolo/bin/Release/net6.0/ApiPolo.pdb and b/ApiPolo/bin/Release/net6.0/ApiPolo.pdb differ
diff --git a/ApiPolo/bin/Release/net6.0/ApiPolo.xml b/ApiPolo/bin/Release/net6.0/ApiPolo.xml
index 06012a2..ede9ba6 100644
--- a/ApiPolo/bin/Release/net6.0/ApiPolo.xml
+++ b/ApiPolo/bin/Release/net6.0/ApiPolo.xml
@@ -9,7 +9,7 @@
Controller unico
-
+
polocontroller
@@ -195,6 +195,9 @@
token salvataggio
+
+ token salvataggio
+
Magazzini per login return:ActionResult
@@ -3202,6 +3205,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3784,6 +3799,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ApiPolo/obj/Release/net6.0/ApiPolo.csproj.CoreCompileInputs.cache b/ApiPolo/obj/Release/net6.0/ApiPolo.csproj.CoreCompileInputs.cache
index a81457d..020a163 100644
--- a/ApiPolo/obj/Release/net6.0/ApiPolo.csproj.CoreCompileInputs.cache
+++ b/ApiPolo/obj/Release/net6.0/ApiPolo.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-b78fa82da7ded7be00478e6f319a1436374877b4
+6182c7269e1442e5a9aeb6a018a6bdc7b71d4bd1
diff --git a/ApiPolo/obj/Release/net6.0/ApiPolo.dll b/ApiPolo/obj/Release/net6.0/ApiPolo.dll
index 3422f1a..d5471cc 100644
Binary files a/ApiPolo/obj/Release/net6.0/ApiPolo.dll and b/ApiPolo/obj/Release/net6.0/ApiPolo.dll differ
diff --git a/ApiPolo/obj/Release/net6.0/ApiPolo.pdb b/ApiPolo/obj/Release/net6.0/ApiPolo.pdb
index 766474c..6b47cc9 100644
Binary files a/ApiPolo/obj/Release/net6.0/ApiPolo.pdb and b/ApiPolo/obj/Release/net6.0/ApiPolo.pdb differ
diff --git a/ApiPolo/obj/Release/net6.0/ApiPolo.xml b/ApiPolo/obj/Release/net6.0/ApiPolo.xml
index 06012a2..ede9ba6 100644
--- a/ApiPolo/obj/Release/net6.0/ApiPolo.xml
+++ b/ApiPolo/obj/Release/net6.0/ApiPolo.xml
@@ -9,7 +9,7 @@
Controller unico
-
+
polocontroller
@@ -195,6 +195,9 @@
token salvataggio
+
+ token salvataggio
+
Magazzini per login return:ActionResult
@@ -3202,6 +3205,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3784,6 +3799,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ApiPolo/obj/Release/net6.0/ref/ApiPolo.dll b/ApiPolo/obj/Release/net6.0/ref/ApiPolo.dll
index 87813ca..c3c812b 100644
Binary files a/ApiPolo/obj/Release/net6.0/ref/ApiPolo.dll and b/ApiPolo/obj/Release/net6.0/ref/ApiPolo.dll differ
diff --git a/ApiPolo/obj/Release/net6.0/refint/ApiPolo.dll b/ApiPolo/obj/Release/net6.0/refint/ApiPolo.dll
index 87813ca..c3c812b 100644
Binary files a/ApiPolo/obj/Release/net6.0/refint/ApiPolo.dll and b/ApiPolo/obj/Release/net6.0/refint/ApiPolo.dll differ