From 1fc8d234f7f7baa88c2d1b444ab133bb5ff03064 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Sat, 15 May 2021 16:36:53 +0200 Subject: [PATCH 001/158] Inizio inserimento classi x EFCore --- MpDataLayer/Constants.cs | 12 ++++++++++++ MpDataLayer/{Class1.cs => Enums.cs} | 4 ++-- MpDataLayer/MpDataLayer.csproj | 11 +++++++++++ MpDataLayer/StatsDbContext.cs | 12 ++++++++++++ 4 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 MpDataLayer/Constants.cs rename MpDataLayer/{Class1.cs => Enums.cs} (67%) create mode 100644 MpDataLayer/StatsDbContext.cs diff --git a/MpDataLayer/Constants.cs b/MpDataLayer/Constants.cs new file mode 100644 index 00000000..3c7f13d8 --- /dev/null +++ b/MpDataLayer/Constants.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MpDataLayer +{ + class Constants + { + } +} diff --git a/MpDataLayer/Class1.cs b/MpDataLayer/Enums.cs similarity index 67% rename from MpDataLayer/Class1.cs rename to MpDataLayer/Enums.cs index ef37b930..64437007 100644 --- a/MpDataLayer/Class1.cs +++ b/MpDataLayer/Enums.cs @@ -2,7 +2,7 @@ namespace MpDataLayer { - public class Class1 + public class Enums { } -} +} \ No newline at end of file diff --git a/MpDataLayer/MpDataLayer.csproj b/MpDataLayer/MpDataLayer.csproj index f208d303..3ec447d6 100644 --- a/MpDataLayer/MpDataLayer.csproj +++ b/MpDataLayer/MpDataLayer.csproj @@ -4,4 +4,15 @@ net5.0 + + + + + + + + + + + diff --git a/MpDataLayer/StatsDbContext.cs b/MpDataLayer/StatsDbContext.cs new file mode 100644 index 00000000..d897301c --- /dev/null +++ b/MpDataLayer/StatsDbContext.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MpDataLayer +{ + public class StatsDbContext + { + } +} \ No newline at end of file From 719aac18de85e2e34f8785b19ec174e68ecd95c0 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Sat, 15 May 2021 17:02:29 +0200 Subject: [PATCH 002/158] Modelli da scaffolding automatico (da rivedere) --- MpDataLayer/DatabaseModels/Aaul.cs | 13 + MpDataLayer/DatabaseModels/Cal.cs | 18 + MpDataLayer/DatabaseModels/Config.cs | 15 + MpDataLayer/DatabaseModels/Ddb.cs | 15 + MpDataLayer/DatabaseModels/Ddb1.cs | 24 + MpDataLayer/DatabaseModels/DdbTurni.cs | 30 + MpDataLayer/DatabaseModels/DdbTurniNew.cs | 30 + MpDataLayer/DatabaseModels/DdbTurniSummary.cs | 21 + .../DatabaseModels/DdbTurniSummaryNew.cs | 21 + MpDataLayer/DatabaseModels/Ecp.cs | 23 + MpDataLayer/DatabaseModels/Ecp1.cs | 21 + MpDataLayer/DatabaseModels/Kit.cs | 14 + .../DatabaseModels/MoonPro_STATSContext.cs | 1558 +++++++++++++++++ MpDataLayer/DatabaseModels/Odl.cs | 26 + MpDataLayer/DatabaseModels/Odl1.cs | 30 + MpDataLayer/DatabaseModels/R.cs | 23 + MpDataLayer/DatabaseModels/R1.cs | 22 + MpDataLayer/DatabaseModels/Rc.cs | 19 + MpDataLayer/DatabaseModels/Tally.cs | 12 + MpDataLayer/DatabaseModels/TcStat.cs | 16 + MpDataLayer/DatabaseModels/Tcr.cs | 19 + MpDataLayer/DatabaseModels/Tcr1.cs | 20 + MpDataLayer/DatabaseModels/TcrDay.cs | 19 + MpDataLayer/DatabaseModels/TcrDayTest.cs | 19 + MpDataLayer/DatabaseModels/TestJason.cs | 14 + MpDataLayer/DatabaseModels/Ul.cs | 21 + MpDataLayer/DatabaseModels/VDdb.cs | 24 + MpDataLayer/DatabaseModels/VDdbLight.cs | 18 + MpDataLayer/DatabaseModels/VDdbLightOld.cs | 18 + MpDataLayer/DatabaseModels/VDdbTurni.cs | 26 + MpDataLayer/DatabaseModels/VEcp.cs | 21 + MpDataLayer/DatabaseModels/VEcp1.cs | 25 + MpDataLayer/DatabaseModels/VEcpExtended.cs | 27 + MpDataLayer/DatabaseModels/VKit.cs | 14 + MpDataLayer/DatabaseModels/VOdl.cs | 30 + MpDataLayer/DatabaseModels/VOdl1.cs | 28 + MpDataLayer/DatabaseModels/VPodlNonChiusi.cs | 30 + MpDataLayer/DatabaseModels/VR.cs | 22 + MpDataLayer/DatabaseModels/VR1.cs | 23 + MpDataLayer/DatabaseModels/VRc.cs | 19 + MpDataLayer/DatabaseModels/VTcStat.cs | 18 + MpDataLayer/DatabaseModels/VTcr.cs | 20 + MpDataLayer/DatabaseModels/VTcr1.cs | 21 + MpDataLayer/DatabaseModels/VTcrDay.cs | 21 + MpDataLayer/DatabaseModels/VUl.cs | 21 + MpDataLayer/DatabaseModels/VetoTc.cs | 15 + MpDataLayer/MpDataLayer.csproj | 4 + 47 files changed, 2508 insertions(+) create mode 100644 MpDataLayer/DatabaseModels/Aaul.cs create mode 100644 MpDataLayer/DatabaseModels/Cal.cs create mode 100644 MpDataLayer/DatabaseModels/Config.cs create mode 100644 MpDataLayer/DatabaseModels/Ddb.cs create mode 100644 MpDataLayer/DatabaseModels/Ddb1.cs create mode 100644 MpDataLayer/DatabaseModels/DdbTurni.cs create mode 100644 MpDataLayer/DatabaseModels/DdbTurniNew.cs create mode 100644 MpDataLayer/DatabaseModels/DdbTurniSummary.cs create mode 100644 MpDataLayer/DatabaseModels/DdbTurniSummaryNew.cs create mode 100644 MpDataLayer/DatabaseModels/Ecp.cs create mode 100644 MpDataLayer/DatabaseModels/Ecp1.cs create mode 100644 MpDataLayer/DatabaseModels/Kit.cs create mode 100644 MpDataLayer/DatabaseModels/MoonPro_STATSContext.cs create mode 100644 MpDataLayer/DatabaseModels/Odl.cs create mode 100644 MpDataLayer/DatabaseModels/Odl1.cs create mode 100644 MpDataLayer/DatabaseModels/R.cs create mode 100644 MpDataLayer/DatabaseModels/R1.cs create mode 100644 MpDataLayer/DatabaseModels/Rc.cs create mode 100644 MpDataLayer/DatabaseModels/Tally.cs create mode 100644 MpDataLayer/DatabaseModels/TcStat.cs create mode 100644 MpDataLayer/DatabaseModels/Tcr.cs create mode 100644 MpDataLayer/DatabaseModels/Tcr1.cs create mode 100644 MpDataLayer/DatabaseModels/TcrDay.cs create mode 100644 MpDataLayer/DatabaseModels/TcrDayTest.cs create mode 100644 MpDataLayer/DatabaseModels/TestJason.cs create mode 100644 MpDataLayer/DatabaseModels/Ul.cs create mode 100644 MpDataLayer/DatabaseModels/VDdb.cs create mode 100644 MpDataLayer/DatabaseModels/VDdbLight.cs create mode 100644 MpDataLayer/DatabaseModels/VDdbLightOld.cs create mode 100644 MpDataLayer/DatabaseModels/VDdbTurni.cs create mode 100644 MpDataLayer/DatabaseModels/VEcp.cs create mode 100644 MpDataLayer/DatabaseModels/VEcp1.cs create mode 100644 MpDataLayer/DatabaseModels/VEcpExtended.cs create mode 100644 MpDataLayer/DatabaseModels/VKit.cs create mode 100644 MpDataLayer/DatabaseModels/VOdl.cs create mode 100644 MpDataLayer/DatabaseModels/VOdl1.cs create mode 100644 MpDataLayer/DatabaseModels/VPodlNonChiusi.cs create mode 100644 MpDataLayer/DatabaseModels/VR.cs create mode 100644 MpDataLayer/DatabaseModels/VR1.cs create mode 100644 MpDataLayer/DatabaseModels/VRc.cs create mode 100644 MpDataLayer/DatabaseModels/VTcStat.cs create mode 100644 MpDataLayer/DatabaseModels/VTcr.cs create mode 100644 MpDataLayer/DatabaseModels/VTcr1.cs create mode 100644 MpDataLayer/DatabaseModels/VTcrDay.cs create mode 100644 MpDataLayer/DatabaseModels/VUl.cs create mode 100644 MpDataLayer/DatabaseModels/VetoTc.cs diff --git a/MpDataLayer/DatabaseModels/Aaul.cs b/MpDataLayer/DatabaseModels/Aaul.cs new file mode 100644 index 00000000..9394d319 --- /dev/null +++ b/MpDataLayer/DatabaseModels/Aaul.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class Aaul + { + public string Azione { get; set; } + public string Descrizione { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/Cal.cs b/MpDataLayer/DatabaseModels/Cal.cs new file mode 100644 index 00000000..9db20b85 --- /dev/null +++ b/MpDataLayer/DatabaseModels/Cal.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class Cal + { + public DateTime Giorno { get; set; } + public bool? DoDdb { get; set; } + public bool? DoTcr { get; set; } + public bool? DoUl { get; set; } + public bool? DoEcp { get; set; } + public bool? DoRs { get; set; } + public bool? DoOdl { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/Config.cs b/MpDataLayer/DatabaseModels/Config.cs new file mode 100644 index 00000000..e0dad34d --- /dev/null +++ b/MpDataLayer/DatabaseModels/Config.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class Config + { + public string Chiave { get; set; } + public string Valore { get; set; } + public string ValoreStd { get; set; } + public string Note { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/Ddb.cs b/MpDataLayer/DatabaseModels/Ddb.cs new file mode 100644 index 00000000..1f213127 --- /dev/null +++ b/MpDataLayer/DatabaseModels/Ddb.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class Ddb + { + public DateTime DataOraRif { get; set; } + public string IdxMacchina { get; set; } + public int IdxStato { get; set; } + public decimal DurataMinuti { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/Ddb1.cs b/MpDataLayer/DatabaseModels/Ddb1.cs new file mode 100644 index 00000000..33efad5a --- /dev/null +++ b/MpDataLayer/DatabaseModels/Ddb1.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class Ddb1 + { + public string IdxMacchina { get; set; } + public DateTime InizioStato { get; set; } + public DateTime? FineStato { get; set; } + public int IdxStato { get; set; } + public double? DurataMinuti { get; set; } + public string Value { get; set; } + public string CodArticolo { get; set; } + public double? TempoCicloBase { get; set; } + public int? PzPalletProd { get; set; } + public int? MatrOpr { get; set; } + public string Pallet { get; set; } + public string Descrizione { get; set; } + public string ClasseTempo { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/DdbTurni.cs b/MpDataLayer/DatabaseModels/DdbTurni.cs new file mode 100644 index 00000000..c6ad5ea1 --- /dev/null +++ b/MpDataLayer/DatabaseModels/DdbTurni.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class DdbTurni + { + public DateTime DataRif { get; set; } + public string IdxMacchina { get; set; } + public string Turno { get; set; } + public int IdxStato { get; set; } + public string CodArticolo { get; set; } + public DateTime InizioStato { get; set; } + public DateTime FineStato { get; set; } + public string Pallet { get; set; } + public int? PzPalletProd { get; set; } + public decimal? TempoCicloBase { get; set; } + public string Descrizione { get; set; } + public string ClasseTempo { get; set; } + public DateTime? DataTurnoInizio { get; set; } + public DateTime? DataTurnoFine { get; set; } + public long? DurataStato { get; set; } + public DateTime InizioPeriodo { get; set; } + public DateTime? FinePeriodo { get; set; } + public long? DurataPeriodo { get; set; } + public int TotPzProd { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/DdbTurniNew.cs b/MpDataLayer/DatabaseModels/DdbTurniNew.cs new file mode 100644 index 00000000..c8699f0f --- /dev/null +++ b/MpDataLayer/DatabaseModels/DdbTurniNew.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class DdbTurniNew + { + public DateTime DataRif { get; set; } + public string IdxMacchina { get; set; } + public string Turno { get; set; } + public int IdxStato { get; set; } + public string CodArticolo { get; set; } + public DateTime InizioStato { get; set; } + public DateTime FineStato { get; set; } + public string Pallet { get; set; } + public int? PzPalletProd { get; set; } + public decimal? TempoCicloBase { get; set; } + public string Descrizione { get; set; } + public string ClasseTempo { get; set; } + public DateTime? DataTurnoInizio { get; set; } + public DateTime? DataTurnoFine { get; set; } + public long? DurataStato { get; set; } + public DateTime InizioPeriodo { get; set; } + public DateTime? FinePeriodo { get; set; } + public long? DurataPeriodo { get; set; } + public int TotPzProd { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/DdbTurniSummary.cs b/MpDataLayer/DatabaseModels/DdbTurniSummary.cs new file mode 100644 index 00000000..2760ca5a --- /dev/null +++ b/MpDataLayer/DatabaseModels/DdbTurniSummary.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class DdbTurniSummary + { + public string IdxMacchina { get; set; } + public DateTime DataRif { get; set; } + public string Turno { get; set; } + public string CodArticolo { get; set; } + public int IdxStato { get; set; } + public decimal TempoCicloBase { get; set; } + public DateTime? Inizio { get; set; } + public int PzPalletProd { get; set; } + public decimal? Durata { get; set; } + public int? PzProd { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/DdbTurniSummaryNew.cs b/MpDataLayer/DatabaseModels/DdbTurniSummaryNew.cs new file mode 100644 index 00000000..1f0bfe4f --- /dev/null +++ b/MpDataLayer/DatabaseModels/DdbTurniSummaryNew.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class DdbTurniSummaryNew + { + public string IdxMacchina { get; set; } + public DateTime DataRif { get; set; } + public string Turno { get; set; } + public string CodArticolo { get; set; } + public int IdxStato { get; set; } + public decimal TempoCicloBase { get; set; } + public DateTime? Inizio { get; set; } + public int PzPalletProd { get; set; } + public decimal? Durata { get; set; } + public int? PzProd { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/Ecp.cs b/MpDataLayer/DatabaseModels/Ecp.cs new file mode 100644 index 00000000..2e003e85 --- /dev/null +++ b/MpDataLayer/DatabaseModels/Ecp.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class Ecp + { + public int IdxEcp { get; set; } + public DateTime DataOraConf { get; set; } + public string IdxMacchina { get; set; } + public string KeyRichiesta { get; set; } + public int IdxOdl { get; set; } + public string CodArticolo { get; set; } + public int PezziConf { get; set; } + public int PezziScar { get; set; } + public int PezziDaRilav { get; set; } + public int MatrOpr { get; set; } + public string Cognome { get; set; } + public string Nome { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/Ecp1.cs b/MpDataLayer/DatabaseModels/Ecp1.cs new file mode 100644 index 00000000..a6e1b626 --- /dev/null +++ b/MpDataLayer/DatabaseModels/Ecp1.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class Ecp1 + { + public DateTime DataOraConf { get; set; } + public string IdxMacchina { get; set; } + public int MatrApp { get; set; } + public DateTime DataFrom { get; set; } + public DateTime DataTo { get; set; } + public int PezziConf { get; set; } + public int PezziScar { get; set; } + public int PezziDaRilav { get; set; } + public string CommessaEsterna { get; set; } + public int TipoConf { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/Kit.cs b/MpDataLayer/DatabaseModels/Kit.cs new file mode 100644 index 00000000..ba70fc4a --- /dev/null +++ b/MpDataLayer/DatabaseModels/Kit.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class Kit + { + public string KeyKit { get; set; } + public string KeyExtOrd { get; set; } + public string CodArtParent { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/MoonPro_STATSContext.cs b/MpDataLayer/DatabaseModels/MoonPro_STATSContext.cs new file mode 100644 index 00000000..5023d87a --- /dev/null +++ b/MpDataLayer/DatabaseModels/MoonPro_STATSContext.cs @@ -0,0 +1,1558 @@ +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Metadata; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class MoonPro_STATSContext : DbContext + { + public MoonPro_STATSContext() + { + } + + public MoonPro_STATSContext(DbContextOptions options) + : base(options) + { + } + + public virtual DbSet Aauls { get; set; } + public virtual DbSet Cals { get; set; } + public virtual DbSet Configs { get; set; } + public virtual DbSet Ddbs { get; set; } + public virtual DbSet Ddbs1 { get; set; } + public virtual DbSet DdbTurnis { get; set; } + public virtual DbSet DdbTurniNews { get; set; } + public virtual DbSet DdbTurniSummaries { get; set; } + public virtual DbSet DdbTurniSummaryNews { get; set; } + public virtual DbSet Ecps { get; set; } + public virtual DbSet Ecps1 { get; set; } + public virtual DbSet Kits { get; set; } + public virtual DbSet Odls { get; set; } + public virtual DbSet Odls1 { get; set; } + public virtual DbSet Rs { get; set; } + public virtual DbSet Rs1 { get; set; } + public virtual DbSet Rcs { get; set; } + public virtual DbSet Tallies { get; set; } + public virtual DbSet TcStats { get; set; } + public virtual DbSet Tcrs { get; set; } + public virtual DbSet Tcrs1 { get; set; } + public virtual DbSet TcrDays { get; set; } + public virtual DbSet TcrDayTests { get; set; } + public virtual DbSet TestJasons { get; set; } + public virtual DbSet
    Uls { get; set; } + public virtual DbSet VDdbs { get; set; } + public virtual DbSet VDdbLights { get; set; } + public virtual DbSet VDdbLightOlds { get; set; } + public virtual DbSet VDdbTurnis { get; set; } + public virtual DbSet VEcps { get; set; } + public virtual DbSet VEcps1 { get; set; } + public virtual DbSet VEcpExtendeds { get; set; } + public virtual DbSet VKits { get; set; } + public virtual DbSet VOdls { get; set; } + public virtual DbSet VOdls1 { get; set; } + public virtual DbSet VPodlNonChiusis { get; set; } + public virtual DbSet VRs { get; set; } + public virtual DbSet VRs1 { get; set; } + public virtual DbSet VRcs { get; set; } + public virtual DbSet VTcStats { get; set; } + public virtual DbSet VTcrs { get; set; } + public virtual DbSet VTcrs1 { get; set; } + public virtual DbSet VTcrDays { get; set; } + public virtual DbSet VUls { get; set; } + public virtual DbSet VetoTcs { get; set; } + + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + { + if (!optionsBuilder.IsConfigured) + { +#warning To protect potentially sensitive information in your connection string, you should move it out of source code. You can avoid scaffolding the connection string by using the Name= syntax to read it from configuration - see https://go.microsoft.com/fwlink/?linkid=2131148. For more guidance on storing connection strings, see http://go.microsoft.com/fwlink/?LinkId=723263. + optionsBuilder.UseSqlServer("Server=SQL2016DEV;Database=MoonPro_STATS;Trusted_Connection=True;"); + } + } + + protected override void OnModelCreating(ModelBuilder modelBuilder) + { + modelBuilder.HasAnnotation("Relational:Collation", "SQL_Latin1_General_CP1_CI_AS"); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Azione); + + entity.ToTable("AAUL"); + + entity.Property(e => e.Azione) + .HasMaxLength(50) + .HasDefaultValueSql("('ND')") + .HasComment("Azione dell'operatore"); + + entity.Property(e => e.Descrizione) + .IsRequired() + .HasMaxLength(50) + .HasDefaultValueSql("('')"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Giorno) + .HasName("PK_Calendario"); + + entity.ToTable("CAL"); + + entity.Property(e => e.Giorno) + .HasColumnType("datetime") + .HasColumnName("giorno"); + + entity.Property(e => e.DoDdb) + .IsRequired() + .HasColumnName("doDDB") + .HasDefaultValueSql("((1))") + .HasComment("Indica che è necessario ricalcolare statistiche derivate da DDB (DiarioDiBordo)"); + + entity.Property(e => e.DoEcp) + .IsRequired() + .HasColumnName("doECP") + .HasDefaultValueSql("((1))") + .HasComment("Indica che è necessario ricalcolare statistiche derivate da DPO (DatiProduzione Operatore) - conferme manuali operatore"); + + entity.Property(e => e.DoOdl) + .IsRequired() + .HasColumnName("doODL") + .HasDefaultValueSql("((1))") + .HasComment("Indica che è necessario ricalcolare statistiche ODL"); + + entity.Property(e => e.DoRs) + .IsRequired() + .HasColumnName("doRS") + .HasDefaultValueSql("((1))") + .HasComment("Indica che è necessario ricalcolare statistiche derivate da RS (Registro Scarti)"); + + entity.Property(e => e.DoTcr) + .IsRequired() + .HasColumnName("doTCR") + .HasDefaultValueSql("((1))") + .HasComment("Indica che è necessario ricalcolare statistiche derivate da rilevazione TCR (TempiCicloRilevati)"); + + entity.Property(e => e.DoUl) + .IsRequired() + .HasColumnName("doUL") + .HasDefaultValueSql("((1))") + .HasComment("Indica che è necessario ricalcolare statistiche derivate da DSO (Dichiarazioni Scarti Operatore)"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Chiave); + + entity.ToTable("Config"); + + entity.Property(e => e.Chiave) + .HasMaxLength(50) + .HasColumnName("chiave"); + + entity.Property(e => e.Note).HasColumnName("note"); + + entity.Property(e => e.Valore).HasColumnName("valore"); + + entity.Property(e => e.ValoreStd) + .HasColumnName("valoreStd") + .HasComment("Valore di default/riferimento per la variabile"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => new { e.DataOraRif, e.IdxMacchina, e.IdxStato }) + .HasName("PK_DDB_1"); + + entity.ToTable("DDB"); + + entity.Property(e => e.DataOraRif).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.DurataMinuti).HasColumnType("decimal(18, 8)"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToTable("DDB", "raw"); + + entity.HasIndex(e => e.InizioStato, "ci_DDB_Data") + .IsClustered(); + + entity.HasIndex(e => e.CodArticolo, "i_DDB_CodArt"); + + entity.HasIndex(e => e.IdxMacchina, "i_DDB_IdxMacc"); + + entity.HasIndex(e => e.IdxStato, "i_DDB_IdxStato"); + + entity.HasIndex(e => e.MatrOpr, "i_DDB_MatrOpr"); + + entity.Property(e => e.ClasseTempo).HasMaxLength(50); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.Descrizione).HasMaxLength(50); + + entity.Property(e => e.FineStato).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.InizioStato).HasColumnType("datetime"); + + entity.Property(e => e.Pallet) + .HasMaxLength(20) + .HasColumnName("pallet"); + + entity.Property(e => e.Value).HasMaxLength(50); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => new { e.DataRif, e.IdxMacchina, e.Turno, e.IdxStato, e.CodArticolo, e.InizioPeriodo }); + + entity.ToTable("DDB_Turni"); + + entity.Property(e => e.DataRif).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.Turno).HasMaxLength(5); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.InizioPeriodo).HasColumnType("datetime"); + + entity.Property(e => e.ClasseTempo).HasMaxLength(50); + + entity.Property(e => e.DataTurnoFine).HasColumnType("datetime"); + + entity.Property(e => e.DataTurnoInizio).HasColumnType("datetime"); + + entity.Property(e => e.Descrizione).HasMaxLength(50); + + entity.Property(e => e.FinePeriodo).HasColumnType("datetime"); + + entity.Property(e => e.FineStato).HasColumnType("datetime"); + + entity.Property(e => e.InizioStato).HasColumnType("datetime"); + + entity.Property(e => e.Pallet) + .HasMaxLength(20) + .HasColumnName("pallet"); + + entity.Property(e => e.TempoCicloBase).HasColumnType("decimal(18, 8)"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => new { e.DataRif, e.IdxMacchina, e.Turno, e.IdxStato, e.CodArticolo, e.InizioPeriodo }); + + entity.ToTable("DDB_TurniNew"); + + entity.Property(e => e.DataRif).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.Turno).HasMaxLength(5); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.InizioPeriodo).HasColumnType("datetime"); + + entity.Property(e => e.ClasseTempo).HasMaxLength(50); + + entity.Property(e => e.DataTurnoFine).HasColumnType("datetime"); + + entity.Property(e => e.DataTurnoInizio).HasColumnType("datetime"); + + entity.Property(e => e.Descrizione).HasMaxLength(50); + + entity.Property(e => e.FinePeriodo).HasColumnType("datetime"); + + entity.Property(e => e.FineStato).HasColumnType("datetime"); + + entity.Property(e => e.InizioStato).HasColumnType("datetime"); + + entity.Property(e => e.Pallet) + .HasMaxLength(20) + .HasColumnName("pallet"); + + entity.Property(e => e.TempoCicloBase).HasColumnType("decimal(18, 8)"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => new { e.IdxMacchina, e.DataRif, e.Turno, e.CodArticolo, e.IdxStato, e.TempoCicloBase, e.PzPalletProd }); + + entity.ToTable("DDB_TurniSummary"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.DataRif).HasColumnType("datetime"); + + entity.Property(e => e.Turno).HasMaxLength(5); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.TempoCicloBase).HasColumnType("decimal(18, 8)"); + + entity.Property(e => e.Durata).HasColumnType("numeric(27, 7)"); + + entity.Property(e => e.Inizio).HasColumnType("datetime"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => new { e.IdxMacchina, e.DataRif, e.Turno, e.CodArticolo, e.IdxStato, e.TempoCicloBase, e.PzPalletProd }); + + entity.ToTable("DDB_TurniSummaryNew"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.DataRif).HasColumnType("datetime"); + + entity.Property(e => e.Turno).HasMaxLength(5); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.TempoCicloBase).HasColumnType("decimal(18, 8)"); + + entity.Property(e => e.Durata).HasColumnType("numeric(27, 7)"); + + entity.Property(e => e.Inizio).HasColumnType("datetime"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.IdxEcp); + + entity.ToTable("ECP"); + + entity.Property(e => e.IdxEcp).HasColumnName("idxECP"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Cognome) + .IsRequired() + .HasMaxLength(50) + .HasDefaultValueSql("('')"); + + entity.Property(e => e.DataOraConf).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50) + .HasColumnName("idxMacchina"); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Nome) + .IsRequired() + .HasMaxLength(50) + .HasDefaultValueSql("('')"); + + entity.Property(e => e.PezziConf).HasColumnName("pezziConf"); + + entity.Property(e => e.PezziDaRilav).HasColumnName("pezziDaRilav"); + + entity.Property(e => e.PezziScar).HasColumnName("pezziScar"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToTable("ECP", "raw"); + + entity.HasIndex(e => e.DataOraConf, "ci_ECP_Data") + .IsClustered(); + + entity.HasIndex(e => e.IdxMacchina, "i_ECP_IdxMacc"); + + entity.HasIndex(e => e.MatrApp, "i_ECP_MatrApp"); + + entity.HasIndex(e => e.IdxMacchina, "i_ODL_IdxMacc"); + + entity.Property(e => e.CommessaEsterna) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataFrom) + .HasColumnType("datetime") + .HasColumnName("dataFrom"); + + entity.Property(e => e.DataOraConf).HasColumnType("datetime"); + + entity.Property(e => e.DataTo) + .HasColumnType("datetime") + .HasColumnName("dataTo"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50) + .HasColumnName("idxMacchina"); + + entity.Property(e => e.PezziConf).HasColumnName("pezziConf"); + + entity.Property(e => e.PezziDaRilav).HasColumnName("pezziDaRilav"); + + entity.Property(e => e.PezziScar).HasColumnName("pezziScar"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.KeyKit); + + entity.ToTable("KIT", "raw"); + + entity.Property(e => e.KeyKit).HasMaxLength(50); + + entity.Property(e => e.CodArtParent).IsRequired(); + + entity.Property(e => e.KeyExtOrd).IsRequired(); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.IdxOdl) + .HasName("PK_ODL_1"); + + entity.ToTable("ODL"); + + entity.Property(e => e.IdxOdl) + .ValueGeneratedNever() + .HasColumnName("IdxODL"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodArticoloParent) + .IsRequired() + .HasDefaultValueSql("('')"); + + entity.Property(e => e.DataFine).HasColumnType("datetime"); + + entity.Property(e => e.DataInizio).HasColumnType("datetime"); + + entity.Property(e => e.DueDate).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50) + .HasComment("Chiave: ordine esterno o KIT"); + + entity.Property(e => e.KeyRichiestaParent) + .IsRequired() + .HasDefaultValueSql("('')") + .HasComment("Chiave: ordine esterno o KIT"); + + entity.Property(e => e.PzPallet).HasDefaultValueSql("((1))"); + + entity.Property(e => e.Tcassegnato) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCAssegnato"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.IdxOdl) + .IsClustered(false); + + entity.ToTable("ODL", "raw"); + + entity.HasIndex(e => e.IdxOdl, "ci_ODL_Data") + .IsClustered(); + + entity.HasIndex(e => e.IdxMacchina, "i_ODL_IdxMacc"); + + entity.HasIndex(e => e.KeyRichiesta, "i_ODL_KeyRic"); + + entity.Property(e => e.IdxOdl) + .ValueGeneratedNever() + .HasColumnName("IdxODL"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CommessaAs400) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataAppr).HasColumnType("datetime"); + + entity.Property(e => e.DataFine).HasColumnType("datetime"); + + entity.Property(e => e.DataInizio).HasColumnType("datetime"); + + entity.Property(e => e.DueDate).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Note).HasMaxLength(2500); + + entity.Property(e => e.Provvisorio).HasColumnName("provvisorio"); + + entity.Property(e => e.Tcassegnato) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCAssegnato"); + + entity.Property(e => e.TcrichAttr) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCRichAttr"); + + entity.Property(e => e.UserAppr).HasMaxLength(50); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => new { e.DataOraRif, e.IdxMacchina, e.Causale, e.IdxOdl }); + + entity.ToTable("RS"); + + entity.Property(e => e.DataOraRif).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.Causale).HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Cognome) + .IsRequired() + .HasMaxLength(50) + .HasDefaultValueSql("('')"); + + entity.Property(e => e.Descrizione) + .IsRequired() + .HasMaxLength(250); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Nome) + .IsRequired() + .HasMaxLength(50) + .HasDefaultValueSql("('')"); + + entity.Property(e => e.Note) + .IsRequired() + .HasMaxLength(250); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToTable("RS", "raw"); + + entity.HasIndex(e => e.DataOra, "ci_RS_Data") + .IsClustered(); + + entity.HasIndex(e => e.Causale, "i_RS_Causale"); + + entity.HasIndex(e => e.CodArticolo, "i_RS_CodArt"); + + entity.HasIndex(e => e.IdxMacchina, "i_RS_IdxMacc"); + + entity.HasIndex(e => e.MatrOpr, "i_RS_MatrOpr"); + + entity.Property(e => e.Causale) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataOra).HasColumnType("datetime"); + + entity.Property(e => e.DataOraProdRec).HasColumnType("datetime"); + + entity.Property(e => e.Descrizione) + .IsRequired() + .HasMaxLength(250); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Note) + .IsRequired() + .HasMaxLength(250); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.IdxControllo) + .IsClustered(false); + + entity.ToTable("RC", "raw"); + + entity.HasIndex(e => e.DataOra, "ci_RC_Data") + .IsClustered(); + + entity.HasIndex(e => e.CodArticolo, "i_RC_CodArt"); + + entity.HasIndex(e => e.EsitoOk, "i_RC_EsitoOk"); + + entity.HasIndex(e => e.IdxMacchina, "i_RC_IdxMacc"); + + entity.HasIndex(e => e.MatrOpr, "i_RC_MatrOpr"); + + entity.Property(e => e.IdxControllo).ValueGeneratedNever(); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataOra).HasColumnType("datetime"); + + entity.Property(e => e.EsitoOk).HasColumnName("EsitoOK"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.Note) + .IsRequired() + .HasMaxLength(250); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.N) + .HasName("PK_Tally_N"); + + entity.ToTable("Tally"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => new { e.CodArticolo, e.CodGruppo, e.IdxMacchina }); + + entity.ToTable("TC_Stat"); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.CodGruppo).HasMaxLength(50); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.TcStat1) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TC_Stat"); + + entity.Property(e => e.TcType).HasColumnName("TC_Type"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => new { e.IdxMacchina, e.CodArticolo, e.DataOraRif }) + .IsClustered(false); + + entity.ToTable("TCR"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.DataOraRif).HasColumnType("datetime"); + + entity.Property(e => e.Tc50p) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TC50p") + .HasComment("Valore percentile 50"); + + entity.Property(e => e.Tcmax) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMax") + .HasComment("Valore MASSIMO"); + + entity.Property(e => e.Tcmedio) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMedio") + .HasComment("Valore di MEDIA arimetica"); + + entity.Property(e => e.Tcmin) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMin") + .HasComment("Valore minimo"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToTable("TCR", "raw"); + + entity.HasIndex(e => e.DataOraRif, "ci_TCR_Data") + .IsClustered(); + + entity.HasIndex(e => e.CodArticolo, "i_TCR_CodArt"); + + entity.HasIndex(e => e.IdxMacchina, "i_TCR_IdxMacc"); + + entity.HasIndex(e => e.KeyRichiesta, "i_TCR_KeyRich"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataOraRif).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Tcassegnato) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCAssegnato"); + + entity.Property(e => e.Tcmedio) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMedio"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => new { e.IdxMacchina, e.CodArticolo, e.DataOraRif }) + .HasName("PK_TCRDay") + .IsClustered(false); + + entity.ToTable("TCR_Day"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.DataOraRif).HasColumnType("date"); + + entity.Property(e => e.Tc50p) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TC50p") + .HasComment("Valore percentile 50"); + + entity.Property(e => e.Tcmax) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMax") + .HasComment("Valore MASSIMO"); + + entity.Property(e => e.Tcmedio) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMedio") + .HasComment("Valore di MEDIA arimetica"); + + entity.Property(e => e.Tcmin) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMin") + .HasComment("Valore minimo"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToTable("TCR_DayTest"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataOraRif).HasColumnType("date"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Tc50p) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TC50p"); + + entity.Property(e => e.Tcmax) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMax"); + + entity.Property(e => e.Tcmedio) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMedio"); + + entity.Property(e => e.Tcmin) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMin"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToTable("TestJason"); + + entity.Property(e => e.Data).HasColumnType("date"); + }); + + modelBuilder.Entity
      (entity => + { + entity.HasKey(e => e.IdxLog) + .HasName("PK_UserLog"); + + entity.ToTable("UL"); + + entity.HasIndex(e => e.DataOraRif, "i_UL_DataOra"); + + entity.Property(e => e.Azione) + .IsRequired() + .HasMaxLength(50) + .HasDefaultValueSql("('ND')") + .HasComment("Azione dell'operatore"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Cognome) + .IsRequired() + .HasMaxLength(50) + .HasDefaultValueSql("('')"); + + entity.Property(e => e.DataOraRif).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Nome) + .IsRequired() + .HasMaxLength(50) + .HasDefaultValueSql("('')"); + + entity.Property(e => e.Qta).HasColumnType("decimal(18, 8)"); + + entity.Property(e => e.Valore) + .IsRequired() + .HasMaxLength(250) + .HasDefaultValueSql("('')"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("vDDB"); + + entity.Property(e => e.ClasseTempo).HasMaxLength(50); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.Descrizione).HasMaxLength(50); + + entity.Property(e => e.FineStato).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.InizioStato).HasColumnType("datetime"); + + entity.Property(e => e.Pallet) + .HasMaxLength(20) + .HasColumnName("pallet"); + + entity.Property(e => e.Value).HasMaxLength(50); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_DDB_Light", "export"); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.CodMacchina).HasMaxLength(50); + + entity.Property(e => e.DescMacchina).HasMaxLength(50); + + entity.Property(e => e.InizioStato).HasColumnType("datetime"); + + entity.Property(e => e.Operatore) + .IsRequired() + .HasMaxLength(101); + + entity.Property(e => e.Stato).HasMaxLength(50); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("vDDB_Light_OLD"); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.CodMacchina).HasMaxLength(50); + + entity.Property(e => e.DescMacchina).HasMaxLength(50); + + entity.Property(e => e.InizioStato).HasColumnType("datetime"); + + entity.Property(e => e.Operatore) + .IsRequired() + .HasMaxLength(101); + + entity.Property(e => e.Stato).HasMaxLength(50); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_DDB_Turni", "export"); + + entity.Property(e => e.ClasseTempo).HasMaxLength(50); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodMacchina).HasMaxLength(50); + + entity.Property(e => e.DataRif).HasColumnType("datetime"); + + entity.Property(e => e.DescClasseTempo).HasMaxLength(50); + + entity.Property(e => e.DescMacchina).HasMaxLength(50); + + entity.Property(e => e.Durata).HasColumnType("numeric(38, 7)"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.SemColore) + .IsRequired() + .HasMaxLength(6) + .IsUnicode(false); + + entity.Property(e => e.Semaforo).HasMaxLength(50); + + entity.Property(e => e.TempoCicloBase).HasColumnType("decimal(18, 8)"); + + entity.Property(e => e.Turno) + .IsRequired() + .HasMaxLength(5); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("vECP"); + + entity.Property(e => e.CommessaEsterna) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataFrom) + .HasColumnType("datetime") + .HasColumnName("dataFrom"); + + entity.Property(e => e.DataOraConf).HasColumnType("datetime"); + + entity.Property(e => e.DataTo) + .HasColumnType("datetime") + .HasColumnName("dataTo"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50) + .HasColumnName("idxMacchina"); + + entity.Property(e => e.PezziConf).HasColumnName("pezziConf"); + + entity.Property(e => e.PezziDaRilav).HasColumnName("pezziDaRilav"); + + entity.Property(e => e.PezziScar).HasColumnName("pezziScar"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_ECP", "export"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodMacchina).HasMaxLength(50); + + entity.Property(e => e.Cognome) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataOraConf).HasColumnType("datetime"); + + entity.Property(e => e.DescMacchina).HasMaxLength(50); + + entity.Property(e => e.IdxEcp).HasColumnName("idxECP"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50) + .HasColumnName("idxMacchina"); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Nome) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.PezziConf).HasColumnName("pezziConf"); + + entity.Property(e => e.PezziDaRilav).HasColumnName("pezziDaRilav"); + + entity.Property(e => e.PezziScar).HasColumnName("pezziScar"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_ECP_Extended", "export"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodMacchina).HasMaxLength(50); + + entity.Property(e => e.Cognome) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataOraConf).HasColumnType("datetime"); + + entity.Property(e => e.DescMacchina).HasMaxLength(50); + + entity.Property(e => e.DueDate).HasColumnType("datetime"); + + entity.Property(e => e.IdxEcp).HasColumnName("idxECP"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50) + .HasColumnName("idxMacchina"); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Nome) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.PezziConf).HasColumnName("pezziConf"); + + entity.Property(e => e.PezziDaRilav).HasColumnName("pezziDaRilav"); + + entity.Property(e => e.PezziScar).HasColumnName("pezziScar"); + + entity.Property(e => e.Tcassegnato) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCAssegnato"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("vKIT"); + + entity.Property(e => e.KeyKit) + .IsRequired() + .HasMaxLength(50); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("vODL"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CommessaAs400) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataAppr).HasColumnType("datetime"); + + entity.Property(e => e.DataFine).HasColumnType("datetime"); + + entity.Property(e => e.DataInizio).HasColumnType("datetime"); + + entity.Property(e => e.DueDate).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Note).HasMaxLength(2500); + + entity.Property(e => e.Provvisorio).HasColumnName("provvisorio"); + + entity.Property(e => e.Tcassegnato) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCAssegnato"); + + entity.Property(e => e.TcrichAttr) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCRichAttr"); + + entity.Property(e => e.UserAppr).HasMaxLength(50); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_ODL", "export"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodArticoloParent).IsRequired(); + + entity.Property(e => e.CodMacchina).HasMaxLength(50); + + entity.Property(e => e.DataFine).HasColumnType("datetime"); + + entity.Property(e => e.DataInizio).HasColumnType("datetime"); + + entity.Property(e => e.DescMacchina).HasMaxLength(50); + + entity.Property(e => e.DueDate).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.KeyRichiestaParent).IsRequired(); + + entity.Property(e => e.Tcassegnato) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCAssegnato"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_PODL_NonChiusi", "export"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodGruppo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataInizio).HasColumnType("datetime"); + + entity.Property(e => e.DescArticolo).HasMaxLength(301); + + entity.Property(e => e.DueDate).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.IdxPromessa).HasColumnName("idxPromessa"); + + entity.Property(e => e.KeyBcode) + .IsRequired() + .HasMaxLength(50) + .HasColumnName("KeyBCode"); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Nome).HasMaxLength(50); + + entity.Property(e => e.Tcassegnato) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCAssegnato"); + + entity.Property(e => e.TotMinProg).HasColumnType("decimal(29, 8)"); + + entity.Property(e => e.TotOreProg).HasColumnType("decimal(32, 11)"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("vRS"); + + entity.Property(e => e.Causale) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataOra).HasColumnType("datetime"); + + entity.Property(e => e.DataOraProdRec).HasColumnType("datetime"); + + entity.Property(e => e.Descrizione) + .IsRequired() + .HasMaxLength(250); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Note) + .IsRequired() + .HasMaxLength(250); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_RS", "export"); + + entity.Property(e => e.Causale) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Cognome) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataOraRif).HasColumnType("datetime"); + + entity.Property(e => e.Descrizione) + .IsRequired() + .HasMaxLength(250); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Nome) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Note) + .IsRequired() + .HasMaxLength(250); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("vRC"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataOra).HasColumnType("datetime"); + + entity.Property(e => e.EsitoOk).HasColumnName("EsitoOK"); + + entity.Property(e => e.IdxControllo).ValueGeneratedOnAdd(); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.Note) + .IsRequired() + .HasMaxLength(250); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_TC_Stat", "export"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodGruppo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodMacchina).HasMaxLength(50); + + entity.Property(e => e.DescMacchina).HasMaxLength(50); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.TcStat) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TC_Stat"); + + entity.Property(e => e.TcType).HasColumnName("TC_Type"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("vTCR"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataOraRif).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Tcassegnato) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCAssegnato"); + + entity.Property(e => e.Tcmedio) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMedio"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_TCR", "export"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodMacchina).HasMaxLength(50); + + entity.Property(e => e.DataOraRif).HasColumnType("datetime"); + + entity.Property(e => e.DescMacchina).HasMaxLength(50); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Tc50p) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TC50p"); + + entity.Property(e => e.Tcmax) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMax"); + + entity.Property(e => e.Tcmedio) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMedio"); + + entity.Property(e => e.Tcmin) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMin"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_TCR_Day", "export"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodMacchina).HasMaxLength(50); + + entity.Property(e => e.DataOraRif).HasColumnType("datetime"); + + entity.Property(e => e.DescMacchina).HasMaxLength(50); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Tc50p) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TC50p"); + + entity.Property(e => e.Tcmax) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMax"); + + entity.Property(e => e.Tcmedio) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMedio"); + + entity.Property(e => e.Tcmin) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMin"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_UL", "export"); + + entity.Property(e => e.Azione) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Cognome) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataOraRif).HasColumnType("datetime"); + + entity.Property(e => e.IdxLog).ValueGeneratedOnAdd(); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Nome) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Qta).HasColumnType("decimal(18, 8)"); + + entity.Property(e => e.Valore) + .IsRequired() + .HasMaxLength(250); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => new { e.IdxMacchina, e.CodArticolo }); + + entity.ToTable("VetoTC"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.SogliaTc) + .HasColumnType("decimal(18, 8)") + .HasColumnName("SogliaTC"); + + entity.Property(e => e.VetoTc1) + .IsRequired() + .HasColumnName("VetoTC") + .HasDefaultValueSql("((1))"); + }); + + OnModelCreatingPartial(modelBuilder); + } + + partial void OnModelCreatingPartial(ModelBuilder modelBuilder); + } +} diff --git a/MpDataLayer/DatabaseModels/Odl.cs b/MpDataLayer/DatabaseModels/Odl.cs new file mode 100644 index 00000000..aa588745 --- /dev/null +++ b/MpDataLayer/DatabaseModels/Odl.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class Odl + { + public int IdxOdl { get; set; } + public string KeyRichiesta { get; set; } + public string CodArticolo { get; set; } + public decimal Tcassegnato { get; set; } + public string IdxMacchina { get; set; } + public int NumPezzi { get; set; } + public int NumPezziEv { get; set; } + public int NumPezziSca { get; set; } + public int NumPezziRil { get; set; } + public DateTime? DataInizio { get; set; } + public DateTime? DataFine { get; set; } + public string KeyRichiestaParent { get; set; } + public string CodArticoloParent { get; set; } + public DateTime? DueDate { get; set; } + public int? PzPallet { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/Odl1.cs b/MpDataLayer/DatabaseModels/Odl1.cs new file mode 100644 index 00000000..96edddb6 --- /dev/null +++ b/MpDataLayer/DatabaseModels/Odl1.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class Odl1 + { + public int IdxOdl { get; set; } + public string CodArticolo { get; set; } + public string IdxMacchina { get; set; } + public int NumPezzi { get; set; } + public decimal Tcassegnato { get; set; } + public DateTime? DataInizio { get; set; } + public DateTime? DataFine { get; set; } + public string Note { get; set; } + public bool NeedAppr { get; set; } + public string UserAppr { get; set; } + public DateTime? DataAppr { get; set; } + public decimal? TcrichAttr { get; set; } + public string KeyRichiesta { get; set; } + public int PzPallet { get; set; } + public bool Provvisorio { get; set; } + public int MatrOpr { get; set; } + public string CommessaAs400 { get; set; } + public int ToAs400 { get; set; } + public DateTime? DueDate { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/R.cs b/MpDataLayer/DatabaseModels/R.cs new file mode 100644 index 00000000..58830883 --- /dev/null +++ b/MpDataLayer/DatabaseModels/R.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class R + { + public DateTime DataOraRif { get; set; } + public string IdxMacchina { get; set; } + public string Causale { get; set; } + public string Descrizione { get; set; } + public string Note { get; set; } + public int Qta { get; set; } + public string KeyRichiesta { get; set; } + public int IdxOdl { get; set; } + public string CodArticolo { get; set; } + public int MatrOpr { get; set; } + public string Cognome { get; set; } + public string Nome { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/R1.cs b/MpDataLayer/DatabaseModels/R1.cs new file mode 100644 index 00000000..ef429455 --- /dev/null +++ b/MpDataLayer/DatabaseModels/R1.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class R1 + { + public string IdxMacchina { get; set; } + public DateTime DataOra { get; set; } + public string Causale { get; set; } + public int Qta { get; set; } + public string Note { get; set; } + public string CodArticolo { get; set; } + public int MatrOpr { get; set; } + public DateTime? DataOraProdRec { get; set; } + public string Descrizione { get; set; } + public string KeyRichiesta { get; set; } + public int IdxOdl { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/Rc.cs b/MpDataLayer/DatabaseModels/Rc.cs new file mode 100644 index 00000000..db9e5a56 --- /dev/null +++ b/MpDataLayer/DatabaseModels/Rc.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class Rc + { + public int IdxControllo { get; set; } + public DateTime DataOra { get; set; } + public string IdxMacchina { get; set; } + public int IdxOdl { get; set; } + public string CodArticolo { get; set; } + public int MatrOpr { get; set; } + public bool EsitoOk { get; set; } + public string Note { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/Tally.cs b/MpDataLayer/DatabaseModels/Tally.cs new file mode 100644 index 00000000..665c4c8f --- /dev/null +++ b/MpDataLayer/DatabaseModels/Tally.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class Tally + { + public int N { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/TcStat.cs b/MpDataLayer/DatabaseModels/TcStat.cs new file mode 100644 index 00000000..47854d10 --- /dev/null +++ b/MpDataLayer/DatabaseModels/TcStat.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class TcStat + { + public string CodArticolo { get; set; } + public string CodGruppo { get; set; } + public string IdxMacchina { get; set; } + public decimal TcStat1 { get; set; } + public int TcType { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/Tcr.cs b/MpDataLayer/DatabaseModels/Tcr.cs new file mode 100644 index 00000000..e6164342 --- /dev/null +++ b/MpDataLayer/DatabaseModels/Tcr.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class Tcr + { + public DateTime DataOraRif { get; set; } + public string IdxMacchina { get; set; } + public string CodArticolo { get; set; } + public int PzProd { get; set; } + public decimal? Tcmedio { get; set; } + public decimal? Tcmin { get; set; } + public decimal? Tcmax { get; set; } + public decimal? Tc50p { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/Tcr1.cs b/MpDataLayer/DatabaseModels/Tcr1.cs new file mode 100644 index 00000000..9cd223b2 --- /dev/null +++ b/MpDataLayer/DatabaseModels/Tcr1.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class Tcr1 + { + public string IdxMacchina { get; set; } + public string CodArticolo { get; set; } + public DateTime DataOraRif { get; set; } + public decimal Tcmedio { get; set; } + public int PzProd { get; set; } + public int IdxOdl { get; set; } + public decimal Tcassegnato { get; set; } + public string KeyRichiesta { get; set; } + public int PzPallet { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/TcrDay.cs b/MpDataLayer/DatabaseModels/TcrDay.cs new file mode 100644 index 00000000..5e3f2f19 --- /dev/null +++ b/MpDataLayer/DatabaseModels/TcrDay.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class TcrDay + { + public DateTime DataOraRif { get; set; } + public string IdxMacchina { get; set; } + public string CodArticolo { get; set; } + public int PzProd { get; set; } + public decimal? Tcmedio { get; set; } + public decimal? Tcmin { get; set; } + public decimal? Tcmax { get; set; } + public decimal? Tc50p { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/TcrDayTest.cs b/MpDataLayer/DatabaseModels/TcrDayTest.cs new file mode 100644 index 00000000..7cdd98a2 --- /dev/null +++ b/MpDataLayer/DatabaseModels/TcrDayTest.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class TcrDayTest + { + public DateTime DataOraRif { get; set; } + public string IdxMacchina { get; set; } + public string CodArticolo { get; set; } + public int PzProd { get; set; } + public decimal? Tcmedio { get; set; } + public decimal? Tcmin { get; set; } + public decimal? Tcmax { get; set; } + public decimal? Tc50p { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/TestJason.cs b/MpDataLayer/DatabaseModels/TestJason.cs new file mode 100644 index 00000000..f162836d --- /dev/null +++ b/MpDataLayer/DatabaseModels/TestJason.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class TestJason + { + public DateTime Data { get; set; } + public byte[] Json { get; set; } + public int? Rows { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/Ul.cs b/MpDataLayer/DatabaseModels/Ul.cs new file mode 100644 index 00000000..585b79dc --- /dev/null +++ b/MpDataLayer/DatabaseModels/Ul.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class Ul + { + public int IdxLog { get; set; } + public DateTime DataOraRif { get; set; } + public string IdxMacchina { get; set; } + public int MatrOpr { get; set; } + public string Cognome { get; set; } + public string Nome { get; set; } + public string CodArticolo { get; set; } + public string Azione { get; set; } + public string Valore { get; set; } + public decimal Qta { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/VDdb.cs b/MpDataLayer/DatabaseModels/VDdb.cs new file mode 100644 index 00000000..b6101765 --- /dev/null +++ b/MpDataLayer/DatabaseModels/VDdb.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class VDdb + { + public string IdxMacchina { get; set; } + public DateTime InizioStato { get; set; } + public DateTime? FineStato { get; set; } + public int IdxStato { get; set; } + public double? DurataMinuti { get; set; } + public string Value { get; set; } + public string CodArticolo { get; set; } + public double? TempoCicloBase { get; set; } + public int? PzPalletProd { get; set; } + public int? MatrOpr { get; set; } + public string Pallet { get; set; } + public string Descrizione { get; set; } + public string ClasseTempo { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/VDdbLight.cs b/MpDataLayer/DatabaseModels/VDdbLight.cs new file mode 100644 index 00000000..2340bc30 --- /dev/null +++ b/MpDataLayer/DatabaseModels/VDdbLight.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class VDdbLight + { + public string CodMacchina { get; set; } + public string DescMacchina { get; set; } + public DateTime InizioStato { get; set; } + public string Stato { get; set; } + public double? DurataMinuti { get; set; } + public string CodArticolo { get; set; } + public string Operatore { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/VDdbLightOld.cs b/MpDataLayer/DatabaseModels/VDdbLightOld.cs new file mode 100644 index 00000000..1f56626f --- /dev/null +++ b/MpDataLayer/DatabaseModels/VDdbLightOld.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class VDdbLightOld + { + public string CodMacchina { get; set; } + public string DescMacchina { get; set; } + public DateTime InizioStato { get; set; } + public string Stato { get; set; } + public double? DurataMinuti { get; set; } + public string CodArticolo { get; set; } + public string Operatore { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/VDdbTurni.cs b/MpDataLayer/DatabaseModels/VDdbTurni.cs new file mode 100644 index 00000000..39f605b1 --- /dev/null +++ b/MpDataLayer/DatabaseModels/VDdbTurni.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class VDdbTurni + { + public string IdxMacchina { get; set; } + public DateTime DataRif { get; set; } + public string Turno { get; set; } + public string CodArticolo { get; set; } + public int IdxStato { get; set; } + public decimal TempoCicloBase { get; set; } + public int PzPalletProd { get; set; } + public decimal? Durata { get; set; } + public int? PzProd { get; set; } + public string ClasseTempo { get; set; } + public string DescClasseTempo { get; set; } + public string Semaforo { get; set; } + public string SemColore { get; set; } + public string CodMacchina { get; set; } + public string DescMacchina { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/VEcp.cs b/MpDataLayer/DatabaseModels/VEcp.cs new file mode 100644 index 00000000..274a6c3b --- /dev/null +++ b/MpDataLayer/DatabaseModels/VEcp.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class VEcp + { + public DateTime DataOraConf { get; set; } + public string IdxMacchina { get; set; } + public int MatrApp { get; set; } + public DateTime DataFrom { get; set; } + public DateTime DataTo { get; set; } + public int PezziConf { get; set; } + public int PezziScar { get; set; } + public int PezziDaRilav { get; set; } + public string CommessaEsterna { get; set; } + public int TipoConf { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/VEcp1.cs b/MpDataLayer/DatabaseModels/VEcp1.cs new file mode 100644 index 00000000..e12d1a9e --- /dev/null +++ b/MpDataLayer/DatabaseModels/VEcp1.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class VEcp1 + { + public int IdxEcp { get; set; } + public DateTime DataOraConf { get; set; } + public string IdxMacchina { get; set; } + public string CodMacchina { get; set; } + public string DescMacchina { get; set; } + public string KeyRichiesta { get; set; } + public int IdxOdl { get; set; } + public string CodArticolo { get; set; } + public int PezziConf { get; set; } + public int PezziScar { get; set; } + public int PezziDaRilav { get; set; } + public int MatrOpr { get; set; } + public string Cognome { get; set; } + public string Nome { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/VEcpExtended.cs b/MpDataLayer/DatabaseModels/VEcpExtended.cs new file mode 100644 index 00000000..b6c03144 --- /dev/null +++ b/MpDataLayer/DatabaseModels/VEcpExtended.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class VEcpExtended + { + public int IdxEcp { get; set; } + public DateTime DataOraConf { get; set; } + public string IdxMacchina { get; set; } + public string CodMacchina { get; set; } + public string DescMacchina { get; set; } + public string KeyRichiesta { get; set; } + public int IdxOdl { get; set; } + public string CodArticolo { get; set; } + public int PezziConf { get; set; } + public int PezziScar { get; set; } + public int PezziDaRilav { get; set; } + public int MatrOpr { get; set; } + public string Cognome { get; set; } + public string Nome { get; set; } + public decimal Tcassegnato { get; set; } + public DateTime DueDate { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/VKit.cs b/MpDataLayer/DatabaseModels/VKit.cs new file mode 100644 index 00000000..59d8084f --- /dev/null +++ b/MpDataLayer/DatabaseModels/VKit.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class VKit + { + public string KeyKit { get; set; } + public string KeyExtOrd { get; set; } + public string CodArtParent { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/VOdl.cs b/MpDataLayer/DatabaseModels/VOdl.cs new file mode 100644 index 00000000..5cf15d5a --- /dev/null +++ b/MpDataLayer/DatabaseModels/VOdl.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class VOdl + { + public int IdxOdl { get; set; } + public string CodArticolo { get; set; } + public string IdxMacchina { get; set; } + public int NumPezzi { get; set; } + public decimal Tcassegnato { get; set; } + public DateTime? DataInizio { get; set; } + public DateTime? DataFine { get; set; } + public string Note { get; set; } + public bool NeedAppr { get; set; } + public string UserAppr { get; set; } + public DateTime? DataAppr { get; set; } + public decimal? TcrichAttr { get; set; } + public string KeyRichiesta { get; set; } + public int PzPallet { get; set; } + public bool Provvisorio { get; set; } + public int MatrOpr { get; set; } + public string CommessaAs400 { get; set; } + public int ToAs400 { get; set; } + public DateTime? DueDate { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/VOdl1.cs b/MpDataLayer/DatabaseModels/VOdl1.cs new file mode 100644 index 00000000..75a3a7f5 --- /dev/null +++ b/MpDataLayer/DatabaseModels/VOdl1.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class VOdl1 + { + public int IdxOdl { get; set; } + public string KeyRichiesta { get; set; } + public string CodArticolo { get; set; } + public decimal Tcassegnato { get; set; } + public string IdxMacchina { get; set; } + public string CodMacchina { get; set; } + public string DescMacchina { get; set; } + public int NumPezzi { get; set; } + public int NumPezziEv { get; set; } + public int NumPezziSca { get; set; } + public int NumPezziRil { get; set; } + public DateTime? DataInizio { get; set; } + public DateTime? DataFine { get; set; } + public string KeyRichiestaParent { get; set; } + public string CodArticoloParent { get; set; } + public DateTime? DueDate { get; set; } + public int? PzPallet { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/VPodlNonChiusi.cs b/MpDataLayer/DatabaseModels/VPodlNonChiusi.cs new file mode 100644 index 00000000..9c7ef255 --- /dev/null +++ b/MpDataLayer/DatabaseModels/VPodlNonChiusi.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class VPodlNonChiusi + { + public int IdxPromessa { get; set; } + public string KeyRichiesta { get; set; } + public string KeyBcode { get; set; } + public bool Attivabile { get; set; } + public int IdxOdl { get; set; } + public DateTime? DataInizio { get; set; } + public string CodArticolo { get; set; } + public string DescArticolo { get; set; } + public string CodGruppo { get; set; } + public string IdxMacchina { get; set; } + public string CodMacchina { get; set; } + public string Nome { get; set; } + public int NumPezzi { get; set; } + public decimal Tcassegnato { get; set; } + public DateTime DueDate { get; set; } + public int Priorita { get; set; } + public int PzPallet { get; set; } + public decimal? TotMinProg { get; set; } + public decimal? TotOreProg { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/VR.cs b/MpDataLayer/DatabaseModels/VR.cs new file mode 100644 index 00000000..f147a688 --- /dev/null +++ b/MpDataLayer/DatabaseModels/VR.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class VR + { + public string IdxMacchina { get; set; } + public DateTime DataOra { get; set; } + public string Causale { get; set; } + public int Qta { get; set; } + public string Note { get; set; } + public string CodArticolo { get; set; } + public int MatrOpr { get; set; } + public DateTime? DataOraProdRec { get; set; } + public string Descrizione { get; set; } + public string KeyRichiesta { get; set; } + public int IdxOdl { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/VR1.cs b/MpDataLayer/DatabaseModels/VR1.cs new file mode 100644 index 00000000..47737486 --- /dev/null +++ b/MpDataLayer/DatabaseModels/VR1.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class VR1 + { + public DateTime DataOraRif { get; set; } + public string IdxMacchina { get; set; } + public string Causale { get; set; } + public string Descrizione { get; set; } + public string Note { get; set; } + public int Qta { get; set; } + public string KeyRichiesta { get; set; } + public int IdxOdl { get; set; } + public string CodArticolo { get; set; } + public int MatrOpr { get; set; } + public string Cognome { get; set; } + public string Nome { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/VRc.cs b/MpDataLayer/DatabaseModels/VRc.cs new file mode 100644 index 00000000..ac41945e --- /dev/null +++ b/MpDataLayer/DatabaseModels/VRc.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class VRc + { + public int IdxControllo { get; set; } + public DateTime DataOra { get; set; } + public string IdxMacchina { get; set; } + public int IdxOdl { get; set; } + public string CodArticolo { get; set; } + public int MatrOpr { get; set; } + public bool EsitoOk { get; set; } + public string Note { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/VTcStat.cs b/MpDataLayer/DatabaseModels/VTcStat.cs new file mode 100644 index 00000000..8846c061 --- /dev/null +++ b/MpDataLayer/DatabaseModels/VTcStat.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class VTcStat + { + public string CodArticolo { get; set; } + public string CodGruppo { get; set; } + public string IdxMacchina { get; set; } + public string CodMacchina { get; set; } + public string DescMacchina { get; set; } + public decimal TcStat { get; set; } + public int TcType { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/VTcr.cs b/MpDataLayer/DatabaseModels/VTcr.cs new file mode 100644 index 00000000..612bc35a --- /dev/null +++ b/MpDataLayer/DatabaseModels/VTcr.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class VTcr + { + public string IdxMacchina { get; set; } + public string CodArticolo { get; set; } + public DateTime DataOraRif { get; set; } + public decimal Tcmedio { get; set; } + public int PzProd { get; set; } + public int IdxOdl { get; set; } + public decimal Tcassegnato { get; set; } + public string KeyRichiesta { get; set; } + public int PzPallet { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/VTcr1.cs b/MpDataLayer/DatabaseModels/VTcr1.cs new file mode 100644 index 00000000..15231e9d --- /dev/null +++ b/MpDataLayer/DatabaseModels/VTcr1.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class VTcr1 + { + public DateTime DataOraRif { get; set; } + public string IdxMacchina { get; set; } + public string CodMacchina { get; set; } + public string DescMacchina { get; set; } + public string CodArticolo { get; set; } + public int PzProd { get; set; } + public decimal? Tcmedio { get; set; } + public decimal? Tcmin { get; set; } + public decimal? Tcmax { get; set; } + public decimal? Tc50p { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/VTcrDay.cs b/MpDataLayer/DatabaseModels/VTcrDay.cs new file mode 100644 index 00000000..5d4c6101 --- /dev/null +++ b/MpDataLayer/DatabaseModels/VTcrDay.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class VTcrDay + { + public DateTime? DataOraRif { get; set; } + public string IdxMacchina { get; set; } + public string CodMacchina { get; set; } + public string DescMacchina { get; set; } + public string CodArticolo { get; set; } + public int PzProd { get; set; } + public decimal? Tcmedio { get; set; } + public decimal? Tcmin { get; set; } + public decimal? Tcmax { get; set; } + public decimal? Tc50p { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/VUl.cs b/MpDataLayer/DatabaseModels/VUl.cs new file mode 100644 index 00000000..3005f8cd --- /dev/null +++ b/MpDataLayer/DatabaseModels/VUl.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class VUl + { + public int IdxLog { get; set; } + public DateTime DataOraRif { get; set; } + public string IdxMacchina { get; set; } + public int MatrOpr { get; set; } + public string Cognome { get; set; } + public string Nome { get; set; } + public string CodArticolo { get; set; } + public string Azione { get; set; } + public string Valore { get; set; } + public decimal Qta { get; set; } + } +} diff --git a/MpDataLayer/DatabaseModels/VetoTc.cs b/MpDataLayer/DatabaseModels/VetoTc.cs new file mode 100644 index 00000000..d4271715 --- /dev/null +++ b/MpDataLayer/DatabaseModels/VetoTc.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MpDataLayer.DatabaseModels +{ + public partial class VetoTc + { + public string IdxMacchina { get; set; } + public string CodArticolo { get; set; } + public bool? VetoTc1 { get; set; } + public decimal SogliaTc { get; set; } + } +} diff --git a/MpDataLayer/MpDataLayer.csproj b/MpDataLayer/MpDataLayer.csproj index 3ec447d6..7ed61e7f 100644 --- a/MpDataLayer/MpDataLayer.csproj +++ b/MpDataLayer/MpDataLayer.csproj @@ -13,6 +13,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + From 44824ee57e7ed5bc66f9a30b317883e59156c2ab Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Sat, 15 May 2021 18:14:46 +0200 Subject: [PATCH 003/158] Appunti --- MpDataLayer/Resources/Readme.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 MpDataLayer/Resources/Readme.md diff --git a/MpDataLayer/Resources/Readme.md b/MpDataLayer/Resources/Readme.md new file mode 100644 index 00000000..29cc121b --- /dev/null +++ b/MpDataLayer/Resources/Readme.md @@ -0,0 +1,23 @@ +# Appunti gestione MP-STAT DB + + +Per la gestione dell'accesso al DB statistiche si opera con EFCore --> apop blazor server + +## Scaffolding DB iniziale + + Scaffold-DbContext "Server=SQL2016DEV;Database=MoonPro_STATS;Trusted_Connection=True;" Microsoft.EntityFrameworkCore.SqlServer -OutputDir DatabaseModels + +## Scaffolding SOLO di tabelle/viste selezionate (con force update) + + Scaffold-DbContext "Server=SQL2016DEV;Database=MoonPro_STATS;Trusted_Connection=True;" Microsoft.EntityFrameworkCore.SqlServer -OutputDir DatabaseModels -Tables v_RS, v_TC_Stat, v_TCR, v_TCR_Day, v_UL + + + +## Approfondimenti + +Qualche link di approfondimento: + + - https://docs.microsoft.com/en-us/ef/core/ + - https://docs.microsoft.com/en-us/ef/core/extensions/ + - https://www.entityframeworktutorial.net/efcore/create-model-for-existing-database-in-ef-core.aspx + - https://entityframework.net/ef-code-first \ No newline at end of file From e38972db54ba6fbf686584f5629bcacb8b147ceb Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Sat, 15 May 2021 18:17:23 +0200 Subject: [PATCH 004/158] Esclusione classi non impiegate --- .../MoonPro_STATSContext.cs | 76 ++++++++++++------- MpDataLayer/MpDataLayer.csproj | 28 +++++++ 2 files changed, 77 insertions(+), 27 deletions(-) rename MpDataLayer/{DatabaseModels => }/MoonPro_STATSContext.cs (98%) diff --git a/MpDataLayer/DatabaseModels/MoonPro_STATSContext.cs b/MpDataLayer/MoonPro_STATSContext.cs similarity index 98% rename from MpDataLayer/DatabaseModels/MoonPro_STATSContext.cs rename to MpDataLayer/MoonPro_STATSContext.cs index 5023d87a..9f753c68 100644 --- a/MpDataLayer/DatabaseModels/MoonPro_STATSContext.cs +++ b/MpDataLayer/MoonPro_STATSContext.cs @@ -1,13 +1,16 @@ using System; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata; +using MpDataLayer.DatabaseModels; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MpDataLayer { public partial class MoonPro_STATSContext : DbContext { + #region Public Constructors + public MoonPro_STATSContext() { } @@ -17,13 +20,16 @@ namespace MpDataLayer.DatabaseModels { } + #endregion Public Constructors + +#if false public virtual DbSet Aauls { get; set; } public virtual DbSet Cals { get; set; } public virtual DbSet Configs { get; set; } public virtual DbSet Ddbs { get; set; } public virtual DbSet Ddbs1 { get; set; } - public virtual DbSet DdbTurnis { get; set; } public virtual DbSet DdbTurniNews { get; set; } + public virtual DbSet DdbTurnis { get; set; } public virtual DbSet DdbTurniSummaries { get; set; } public virtual DbSet DdbTurniSummaryNews { get; set; } public virtual DbSet Ecps { get; set; } @@ -31,37 +37,51 @@ namespace MpDataLayer.DatabaseModels public virtual DbSet Kits { get; set; } public virtual DbSet Odls { get; set; } public virtual DbSet Odls1 { get; set; } + public virtual DbSet Rcs { get; set; } public virtual DbSet Rs { get; set; } public virtual DbSet Rs1 { get; set; } - public virtual DbSet Rcs { get; set; } public virtual DbSet Tallies { get; set; } - public virtual DbSet TcStats { get; set; } - public virtual DbSet Tcrs { get; set; } - public virtual DbSet Tcrs1 { get; set; } public virtual DbSet TcrDays { get; set; } public virtual DbSet TcrDayTests { get; set; } + public virtual DbSet Tcrs { get; set; } + public virtual DbSet Tcrs1 { get; set; } + public virtual DbSet TcStats { get; set; } public virtual DbSet TestJasons { get; set; } public virtual DbSet
        Uls { get; set; } - public virtual DbSet VDdbs { get; set; } - public virtual DbSet VDdbLights { get; set; } +#endif + + #region Public Properties + public virtual DbSet VDdbLightOlds { get; set; } + public virtual DbSet VDdbLights { get; set; } + public virtual DbSet VDdbs { get; set; } public virtual DbSet VDdbTurnis { get; set; } + public virtual DbSet VEcpExtendeds { get; set; } public virtual DbSet VEcps { get; set; } public virtual DbSet VEcps1 { get; set; } - public virtual DbSet VEcpExtendeds { get; set; } + public virtual DbSet VetoTcs { get; set; } public virtual DbSet VKits { get; set; } public virtual DbSet VOdls { get; set; } public virtual DbSet VOdls1 { get; set; } public virtual DbSet VPodlNonChiusis { get; set; } + public virtual DbSet VRcs { get; set; } public virtual DbSet VRs { get; set; } public virtual DbSet VRs1 { get; set; } - public virtual DbSet VRcs { get; set; } - public virtual DbSet VTcStats { get; set; } + public virtual DbSet VTcrDays { get; set; } public virtual DbSet VTcrs { get; set; } public virtual DbSet VTcrs1 { get; set; } - public virtual DbSet VTcrDays { get; set; } + public virtual DbSet VTcStats { get; set; } public virtual DbSet VUls { get; set; } - public virtual DbSet VetoTcs { get; set; } + + #endregion Public Properties + + #region Private Methods + + partial void OnModelCreatingPartial(ModelBuilder modelBuilder); + + #endregion Private Methods + + #region Protected Methods protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { @@ -76,22 +96,23 @@ namespace MpDataLayer.DatabaseModels { modelBuilder.HasAnnotation("Relational:Collation", "SQL_Latin1_General_CP1_CI_AS"); +#if false modelBuilder.Entity(entity => - { - entity.HasKey(e => e.Azione); + { + entity.HasKey(e => e.Azione); - entity.ToTable("AAUL"); + entity.ToTable("AAUL"); - entity.Property(e => e.Azione) - .HasMaxLength(50) - .HasDefaultValueSql("('ND')") - .HasComment("Azione dell'operatore"); + entity.Property(e => e.Azione) + .HasMaxLength(50) + .HasDefaultValueSql("('ND')") + .HasComment("Azione dell'operatore"); - entity.Property(e => e.Descrizione) - .IsRequired() - .HasMaxLength(50) - .HasDefaultValueSql("('')"); - }); + entity.Property(e => e.Descrizione) + .IsRequired() + .HasMaxLength(50) + .HasDefaultValueSql("('')"); + }); modelBuilder.Entity(entity => { @@ -871,6 +892,7 @@ namespace MpDataLayer.DatabaseModels .HasMaxLength(250) .HasDefaultValueSql("('')"); }); +#endif modelBuilder.Entity(entity => { @@ -1553,6 +1575,6 @@ namespace MpDataLayer.DatabaseModels OnModelCreatingPartial(modelBuilder); } - partial void OnModelCreatingPartial(ModelBuilder modelBuilder); + #endregion Protected Methods } -} +} \ No newline at end of file diff --git a/MpDataLayer/MpDataLayer.csproj b/MpDataLayer/MpDataLayer.csproj index 7ed61e7f..dc2e3773 100644 --- a/MpDataLayer/MpDataLayer.csproj +++ b/MpDataLayer/MpDataLayer.csproj @@ -4,6 +4,34 @@ net5.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + From ea08fb4b7818fd0ceb7a9acf7e4eb4457e0dffc9 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 13:18:15 +0200 Subject: [PATCH 005/158] Aggiunta lettura RAW dati scarti --- MP-STATS/Data/MpStatsService.cs | 72 +++++++++ MP-STATS/Pages/Controlli.razor | 14 +- MP-STATS/Pages/Index.razor | 10 +- MP-STATS/Pages/Scarti.razor | 60 ++++++- MP-STATS/Pages/Scarti.razor.cs | 146 ++++++++++++++++++ MP-STATS/Shared/NavMenu.razor | 14 +- MP-STATS/Startup.cs | 49 ++++-- MP-STATS/appsettings.json | 6 +- MpDataLayer/Controllers/MpStatsController.cs | 85 ++++++++++ .../{VRc.cs => ResControlli.cs} | 14 +- .../DatabaseModels/{VR.cs => ResScarti.cs} | 20 ++- .../{VUl.cs => UserActionLog.cs} | 18 ++- MpDataLayer/MoonPro_STATSContext.cs | 90 +++++++---- MpDataLayer/MpDataLayer.csproj | 23 ++- 14 files changed, 526 insertions(+), 95 deletions(-) create mode 100644 MP-STATS/Data/MpStatsService.cs create mode 100644 MP-STATS/Pages/Scarti.razor.cs create mode 100644 MpDataLayer/Controllers/MpStatsController.cs rename MpDataLayer/DatabaseModels/{VRc.cs => ResControlli.cs} (80%) rename MpDataLayer/DatabaseModels/{VR.cs => ResScarti.cs} (85%) rename MpDataLayer/DatabaseModels/{VUl.cs => UserActionLog.cs} (83%) diff --git a/MP-STATS/Data/MpStatsService.cs b/MP-STATS/Data/MpStatsService.cs new file mode 100644 index 00000000..df8ce951 --- /dev/null +++ b/MP-STATS/Data/MpStatsService.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using System.Configuration; +using System.Text; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Logging; +using MpDataLayer; + +namespace MP_STATS.Data +{ + public class MpStatsService + { + #region Private Fields + + private static IConfiguration _configuration; + private static ILogger _logger; + + #endregion Private Fields + + #region Protected Fields + + protected static string connStringBBM = ""; + protected static string connStringFatt = ""; + + #endregion Protected Fields + + #region Public Fields + + public static MpDataLayer.Controllers.MpStatsController dbController; + + #endregion Public Fields + + #region Public Constructors + + public MpStatsService(IConfiguration configuration, ILogger logger) + { + _logger = logger; + _configuration = configuration; + string connStr = _configuration.GetConnectionString("Mp.Stats"); + if (string.IsNullOrEmpty(connStr)) + { + _logger.LogError("ConnString empty!"); + } + else + { + dbController = new MpDataLayer.Controllers.MpStatsController(configuration); + StringBuilder sb = new StringBuilder(); + sb.AppendLine($"DbController OK"); + //sb.AppendLine($"CST: {dbController.CustomersCount()} | CNT: {dbController.CountersCount()} | BSK: {dbController.BasketsCount()} | NGT: {dbController.NegotiationsCount()} | DOC: {dbController.DocsCount()} | ITM: {dbController.ItemsCount()} | RES: {dbController.ResourcesCount()}"); + _logger.LogInformation(sb.ToString()); + } + } + + #endregion Public Constructors + + #region Public Methods + + public void rollBackEdit(object item) + { + dbController.rollBackEntity(item); + } + + public Task ScartiGetAll(int numRecord, string searchVal = "") + { + return Task.FromResult(dbController.ScartiGetAll(numRecord, searchVal).ToArray()); + } + + #endregion Public Methods + } +} \ No newline at end of file diff --git a/MP-STATS/Pages/Controlli.razor b/MP-STATS/Pages/Controlli.razor index 80019b0d..854bc248 100644 --- a/MP-STATS/Pages/Controlli.razor +++ b/MP-STATS/Pages/Controlli.razor @@ -1,5 +1,15 @@ -

        Controlli

        +@page "/controlli" + +@using MP_STATS.Components +@using MP_STATS.Data + +
        +
        Controlli
        +
        + elenco controlli +
        +
        @code { -} +} \ No newline at end of file diff --git a/MP-STATS/Pages/Index.razor b/MP-STATS/Pages/Index.razor index 2762d330..7e53c4fd 100644 --- a/MP-STATS/Pages/Index.razor +++ b/MP-STATS/Pages/Index.razor @@ -13,7 +13,7 @@
        - | | | | | | + | | |
        @@ -24,13 +24,7 @@
        @Anno
        -
        -
        - -
        -
        -
        - + @**@ diff --git a/MP-STATS/Pages/Scarti.razor b/MP-STATS/Pages/Scarti.razor index 31e1f24d..8ce0c777 100644 --- a/MP-STATS/Pages/Scarti.razor +++ b/MP-STATS/Pages/Scarti.razor @@ -1,5 +1,59 @@ -

        Scarti

        +@page "/scarti" -@code { +@using MP_STATS.Components +@using MP_STATS.Data -} +
        +
        Scarti
        +
        + @if (currRecord != null) + { + @**@ + } + @if (ListRecords == null) + { +

        Loading...

        + } + else + { + + + + @**@ + + + + + + + + + + + @foreach (var record in ListRecords) + { + + @**@ + + + + + + + + + } + +
        MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
         @record.IdxMacchina@record.DataOra@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo@record.Descrizione@record.CodArticolo@record.MatrOpr
        + } +
        +
        +
        +
        +
        +
        + +
        +
        +
        +
        \ No newline at end of file diff --git a/MP-STATS/Pages/Scarti.razor.cs b/MP-STATS/Pages/Scarti.razor.cs new file mode 100644 index 00000000..8a10dc37 --- /dev/null +++ b/MP-STATS/Pages/Scarti.razor.cs @@ -0,0 +1,146 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.JSInterop; +using MP_STATS.Data; +using System; +using System.Threading.Tasks; + +namespace MP_STATS.Pages +{ + public partial class Scarti : ComponentBase, IDisposable + { + #region Private Fields + + private MpDataLayer.DatabaseModels.ResScarti currRecord = null; + + private MpDataLayer.DatabaseModels.ResScarti[] ListRecords; + + #endregion Private Fields + + #region Private Properties + + private int numRecord { get; set; } = 10; + + #endregion Private Properties + + #region Protected Properties + + [Inject] + protected IJSRuntime JSRuntime { get; set; } + + [Inject] + protected MessageService MessageService { get; set; } + + [Inject] + protected NavigationManager NavManager { get; set; } + + [Inject] + protected MpStatsService StatService { get; set; } + + #endregion Protected Properties + + #region Protected Methods + + protected async Task ForceReload(int newNum) + { + numRecord = newNum; + ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + } + + protected override async Task OnInitializedAsync() + { + MessageService.ShowSearch = true; + MessageService.EA_SearchUpdated += OnSeachUpdated; + ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + } + + protected void ResetData() + { + StatService.rollBackEdit(currRecord); + currRecord = null; + } + + protected async Task UpdateData() + { + currRecord = null; + ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + } + + #endregion Protected Methods + + #region Public Methods + + public string checkSelect(DateTime DataOra, string IdxMacchina, string Causale) + { + string answ = ""; + if (currRecord != null) + { + try + { + answ = (currRecord.DataOra == DataOra && currRecord.IdxMacchina == IdxMacchina && currRecord.Causale == Causale) ? "table-info" : ""; + } + catch + { } + } + return answ; + } + + public void Dispose() + { + MessageService.EA_SearchUpdated -= OnSeachUpdated; + } + + public void OnSeachUpdated() + { + InvokeAsync(() => + { + UpdateData(); + StateHasChanged(); + }); + } + + #endregion Public Methods + +#if false + [Inject] + protected BBM_SelectData SelectData { get; set; } + + protected void CreateNew() + { + // recupero counter + string newCode = BBMService.CounterGetNext("EGW.B", 6); + DatabaseModels.BasketsModel newRecord = new DatabaseModels.BasketsModel() + { + CodBasket = newCode, + DataIns = DateTime.Now, + CustomerId = 1, + Descript = "New Basket" + }; + currBasket = newRecord; + } + + protected async Task Delete(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) + { + if (!await JSRuntime.InvokeAsync("confirm", $"Sicuro di voler eliminare il Basket '{currRecord.CodBasket}'?")) + return; + + BBMService.BasketsDelete(currRecord); + await UpdateData(); + } + + protected void Edit(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) + { + currBasket = currRecord; + } + + protected void ShowDocs(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) + { + // salvo + SelectData.BasketId = currRecord.BasketId; + SelectData.NegotiationId = 0; + // rimando... + NavManager.NavigateTo("docs"); + } + +#endif + } +} \ No newline at end of file diff --git a/MP-STATS/Shared/NavMenu.razor b/MP-STATS/Shared/NavMenu.razor index c7710983..68368d26 100644 --- a/MP-STATS/Shared/NavMenu.razor +++ b/MP-STATS/Shared/NavMenu.razor @@ -12,19 +12,14 @@ Home - @*
      • - - Diario Impianti - -
        • *@
      • Diario Produzione
      • - - Scarti + + User Action Log
      • @@ -32,6 +27,11 @@ Controlli
        • +
      • + + Scarti + +
        • @*
      • Counter diff --git a/MP-STATS/Startup.cs b/MP-STATS/Startup.cs index 278ea222..433ae5d0 100644 --- a/MP-STATS/Startup.cs +++ b/MP-STATS/Startup.cs @@ -18,28 +18,22 @@ namespace MP_STATS { public class Startup { + #region Public Constructors + public Startup(IConfiguration configuration) { Configuration = configuration; } + #endregion Public Constructors + + #region Public Properties + public IConfiguration Configuration { get; } - // This method gets called by the runtime. Use this method to add services to the container. - // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 - public void ConfigureServices(IServiceCollection services) - { - - - services.AddLocalization(); + #endregion Public Properties - services.AddRazorPages(); - services.AddServerSideBlazor(); - //services.AddSingleton(); - //services.AddScoped(); - services.AddScoped(); - services.AddSingleton(); - } + #region Public Methods // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. public void Configure(IApplicationBuilder app, IWebHostEnvironment env) @@ -55,7 +49,7 @@ namespace MP_STATS app.UseHsts(); } - // cultura IT... + // cultura IT... var supportedCultures = new[]{ new CultureInfo("it-IT") }; @@ -77,5 +71,28 @@ namespace MP_STATS endpoints.MapFallbackToPage("/_Host"); }); } + + // This method gets called by the runtime. Use this method to add services to the container. + // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 + public void ConfigureServices(IServiceCollection services) + { + services.AddLocalization(); + + services.AddRazorPages(); + services.AddServerSideBlazor(); + services.AddSingleton(Configuration); + +#if false + services.AddDbContext(options => + options.UseSqlServer(Configuration.GetConnectionString("BloggingDatabase"))); +#endif + + //services.AddScoped(); + services.AddSingleton(); + services.AddScoped(); + services.AddSingleton(); + } + + #endregion Public Methods } -} +} \ No newline at end of file diff --git a/MP-STATS/appsettings.json b/MP-STATS/appsettings.json index 93a81b25..5b26a9ce 100644 --- a/MP-STATS/appsettings.json +++ b/MP-STATS/appsettings.json @@ -7,6 +7,8 @@ } }, "AllowedHosts": "*", - "SherpaBBM": "Data Source=SQL2012DEV;Initial Catalog=SHERPA.BBM;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=Sherpa.BBM;", - "SherpaFatt": "Data Source=SQL2012DEV;Initial Catalog=SHERPA.Fatt;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=Sherpa.BBM;" + "ConnectionStrings": { + "DefaultConnection": "Server=SQL2016DEV;Database=MoonPro_STATS;Trusted_Connection=True;MultipleActiveResultSets=true", + "Mp.Stats": "Server=SQL2016DEV;Database=MoonPro_STATS;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.STATS;" + } } \ No newline at end of file diff --git a/MpDataLayer/Controllers/MpStatsController.cs b/MpDataLayer/Controllers/MpStatsController.cs new file mode 100644 index 00000000..0ba0f3f5 --- /dev/null +++ b/MpDataLayer/Controllers/MpStatsController.cs @@ -0,0 +1,85 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Configuration; +using NLog; +using Microsoft.Extensions.Configuration; + +namespace MpDataLayer.Controllers +{ + public class MpStatsController : IDisposable + { + #region Private Fields + + private static IConfiguration _configuration; + private static MoonPro_STATSContext dbCtx; + private static NLog.Logger Log = LogManager.GetCurrentClassLogger(); + + #endregion Private Fields + + #region Public Constructors + + public MpStatsController(IConfiguration configuration) + { + _configuration = configuration; + dbCtx = new MoonPro_STATSContext(configuration); + Log.Info("Avviata classe MpStatsController.MpStatsController"); + } + + #endregion Public Constructors + + #region Public Methods + + public void Dispose() + { + // Clear database context + dbCtx.Dispose(); + } + + /// + /// Annulla modifiche su una specifica entity (cancel update) + /// + /// + /// + public bool rollBackEntity(object item) + { + bool answ = false; + try + { + if (dbCtx.Entry(item).State == Microsoft.EntityFrameworkCore.EntityState.Deleted || dbCtx.Entry(item).State == Microsoft.EntityFrameworkCore.EntityState.Modified) + { + dbCtx.Entry(item).Reload(); + } + } + catch (Exception exc) + { + Log.Error($"Eccezione in rollBackEntity{Environment.NewLine}{exc}"); + } + return answ; + } + + /// + /// Elenco tabella scarti da filtro + /// + /// + /// + /// + public List ScartiGetAll(int numRecord, string searchVal = "") + { + List dbResult = new List(); + + dbResult = dbCtx + .DbSetScarti + .Where(x => x.KeyRichiesta.Contains(searchVal) || x.Descrizione.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) + .OrderByDescending(x => x.DataOra) + .Take(numRecord) + .ToList(); + + return dbResult; + } + + #endregion Public Methods + } +} \ No newline at end of file diff --git a/MpDataLayer/DatabaseModels/VRc.cs b/MpDataLayer/DatabaseModels/ResControlli.cs similarity index 80% rename from MpDataLayer/DatabaseModels/VRc.cs rename to MpDataLayer/DatabaseModels/ResControlli.cs index ac41945e..6a14a1d6 100644 --- a/MpDataLayer/DatabaseModels/VRc.cs +++ b/MpDataLayer/DatabaseModels/ResControlli.cs @@ -5,15 +5,19 @@ using System.Collections.Generic; namespace MpDataLayer.DatabaseModels { - public partial class VRc + public partial class ResControlli { - public int IdxControllo { get; set; } + #region Public Properties + + public string CodArticolo { get; set; } public DateTime DataOra { get; set; } + public bool EsitoOk { get; set; } + public int IdxControllo { get; set; } public string IdxMacchina { get; set; } public int IdxOdl { get; set; } - public string CodArticolo { get; set; } public int MatrOpr { get; set; } - public bool EsitoOk { get; set; } public string Note { get; set; } + + #endregion Public Properties } -} +} \ No newline at end of file diff --git a/MpDataLayer/DatabaseModels/VR.cs b/MpDataLayer/DatabaseModels/ResScarti.cs similarity index 85% rename from MpDataLayer/DatabaseModels/VR.cs rename to MpDataLayer/DatabaseModels/ResScarti.cs index f147a688..3b4b8a3b 100644 --- a/MpDataLayer/DatabaseModels/VR.cs +++ b/MpDataLayer/DatabaseModels/ResScarti.cs @@ -5,18 +5,22 @@ using System.Collections.Generic; namespace MpDataLayer.DatabaseModels { - public partial class VR + public partial class ResScarti { - public string IdxMacchina { get; set; } - public DateTime DataOra { get; set; } + #region Public Properties + public string Causale { get; set; } - public int Qta { get; set; } - public string Note { get; set; } public string CodArticolo { get; set; } - public int MatrOpr { get; set; } + public DateTime DataOra { get; set; } public DateTime? DataOraProdRec { get; set; } public string Descrizione { get; set; } - public string KeyRichiesta { get; set; } + public string IdxMacchina { get; set; } public int IdxOdl { get; set; } + public string KeyRichiesta { get; set; } + public int MatrOpr { get; set; } + public string Note { get; set; } + public int Qta { get; set; } + + #endregion Public Properties } -} +} \ No newline at end of file diff --git a/MpDataLayer/DatabaseModels/VUl.cs b/MpDataLayer/DatabaseModels/UserActionLog.cs similarity index 83% rename from MpDataLayer/DatabaseModels/VUl.cs rename to MpDataLayer/DatabaseModels/UserActionLog.cs index 3005f8cd..199809cb 100644 --- a/MpDataLayer/DatabaseModels/VUl.cs +++ b/MpDataLayer/DatabaseModels/UserActionLog.cs @@ -5,17 +5,21 @@ using System.Collections.Generic; namespace MpDataLayer.DatabaseModels { - public partial class VUl + public partial class UserActionLog { - public int IdxLog { get; set; } + #region Public Properties + + public string Azione { get; set; } + public string CodArticolo { get; set; } + public string Cognome { get; set; } public DateTime DataOraRif { get; set; } + public int IdxLog { get; set; } public string IdxMacchina { get; set; } public int MatrOpr { get; set; } - public string Cognome { get; set; } public string Nome { get; set; } - public string CodArticolo { get; set; } - public string Azione { get; set; } - public string Valore { get; set; } public decimal Qta { get; set; } + public string Valore { get; set; } + + #endregion Public Properties } -} +} \ No newline at end of file diff --git a/MpDataLayer/MoonPro_STATSContext.cs b/MpDataLayer/MoonPro_STATSContext.cs index 9f753c68..6704c094 100644 --- a/MpDataLayer/MoonPro_STATSContext.cs +++ b/MpDataLayer/MoonPro_STATSContext.cs @@ -1,7 +1,9 @@ using System; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.Extensions.Configuration; using MpDataLayer.DatabaseModels; +using NLog; #nullable disable @@ -9,10 +11,19 @@ namespace MpDataLayer { public partial class MoonPro_STATSContext : DbContext { + #region Private Fields + + private static NLog.Logger Log = LogManager.GetCurrentClassLogger(); + + private IConfiguration _configuration; + + #endregion Private Fields + #region Public Constructors - public MoonPro_STATSContext() + public MoonPro_STATSContext(IConfiguration configuration) { + _configuration = configuration; } public MoonPro_STATSContext(DbContextOptions options) @@ -50,8 +61,7 @@ namespace MpDataLayer public virtual DbSet
          Uls { get; set; } #endif - #region Public Properties - +#if false public virtual DbSet VDdbLightOlds { get; set; } public virtual DbSet VDdbLights { get; set; } public virtual DbSet VDdbs { get; set; } @@ -64,14 +74,20 @@ namespace MpDataLayer public virtual DbSet VOdls { get; set; } public virtual DbSet VOdls1 { get; set; } public virtual DbSet VPodlNonChiusis { get; set; } - public virtual DbSet VRcs { get; set; } - public virtual DbSet VRs { get; set; } - public virtual DbSet VRs1 { get; set; } +#endif + + #region Public Properties + + public virtual DbSet DbSetControlli { get; set; } + public virtual DbSet DbSetScarti { get; set; } +#if false + public virtual DbSet VRs1 { get; set; } public virtual DbSet VTcrDays { get; set; } public virtual DbSet VTcrs { get; set; } public virtual DbSet VTcrs1 { get; set; } public virtual DbSet VTcStats { get; set; } - public virtual DbSet VUls { get; set; } +#endif + public virtual DbSet DbSetUserLog { get; set; } #endregion Public Properties @@ -87,8 +103,12 @@ namespace MpDataLayer { if (!optionsBuilder.IsConfigured) { + string connString = _configuration.GetConnectionString("Mp.Stats"); + + optionsBuilder.UseSqlServer(_configuration.GetConnectionString("Mp.Stats")); + #warning To protect potentially sensitive information in your connection string, you should move it out of source code. You can avoid scaffolding the connection string by using the Name= syntax to read it from configuration - see https://go.microsoft.com/fwlink/?linkid=2131148. For more guidance on storing connection strings, see http://go.microsoft.com/fwlink/?LinkId=723263. - optionsBuilder.UseSqlServer("Server=SQL2016DEV;Database=MoonPro_STATS;Trusted_Connection=True;"); + //optionsBuilder.UseSqlServer("Server=SQL2016DEV;Database=MoonPro_STATS;Trusted_Connection=True;"); } } @@ -892,7 +912,6 @@ namespace MpDataLayer .HasMaxLength(250) .HasDefaultValueSql("('')"); }); -#endif modelBuilder.Entity(entity => { @@ -1273,8 +1292,9 @@ namespace MpDataLayer entity.Property(e => e.TotOreProg).HasColumnType("decimal(32, 11)"); }); +#endif - modelBuilder.Entity(entity => + modelBuilder.Entity(entity => { entity.HasNoKey(); @@ -1310,8 +1330,9 @@ namespace MpDataLayer .IsRequired() .HasMaxLength(250); }); +#if false - modelBuilder.Entity(entity => + modelBuilder.Entity(entity => { entity.HasNoKey(); @@ -1353,8 +1374,9 @@ namespace MpDataLayer .IsRequired() .HasMaxLength(250); }); +#endif - modelBuilder.Entity(entity => + modelBuilder.Entity(entity => { entity.HasNoKey(); @@ -1381,34 +1403,35 @@ namespace MpDataLayer .HasMaxLength(250); }); +#if false modelBuilder.Entity(entity => - { - entity.HasNoKey(); + { + entity.HasNoKey(); - entity.ToView("v_TC_Stat", "export"); + entity.ToView("v_TC_Stat", "export"); - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); - entity.Property(e => e.CodGruppo) - .IsRequired() - .HasMaxLength(50); + entity.Property(e => e.CodGruppo) + .IsRequired() + .HasMaxLength(50); - entity.Property(e => e.CodMacchina).HasMaxLength(50); + entity.Property(e => e.CodMacchina).HasMaxLength(50); - entity.Property(e => e.DescMacchina).HasMaxLength(50); + entity.Property(e => e.DescMacchina).HasMaxLength(50); - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); - entity.Property(e => e.TcStat) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TC_Stat"); + entity.Property(e => e.TcStat) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TC_Stat"); - entity.Property(e => e.TcType).HasColumnName("TC_Type"); - }); + entity.Property(e => e.TcType).HasColumnName("TC_Type"); + }); modelBuilder.Entity(entity => { @@ -1514,8 +1537,9 @@ namespace MpDataLayer .HasColumnType("decimal(18, 8)") .HasColumnName("TCMin"); }); +#endif - modelBuilder.Entity(entity => + modelBuilder.Entity(entity => { entity.HasNoKey(); @@ -1551,6 +1575,7 @@ namespace MpDataLayer .IsRequired() .HasMaxLength(250); }); +#if false modelBuilder.Entity(entity => { @@ -1571,6 +1596,7 @@ namespace MpDataLayer .HasColumnName("VetoTC") .HasDefaultValueSql("((1))"); }); +#endif OnModelCreatingPartial(modelBuilder); } diff --git a/MpDataLayer/MpDataLayer.csproj b/MpDataLayer/MpDataLayer.csproj index dc2e3773..33dc3477 100644 --- a/MpDataLayer/MpDataLayer.csproj +++ b/MpDataLayer/MpDataLayer.csproj @@ -30,11 +30,23 @@ - - - - - + + + + + + + + + + + + + + + + + @@ -45,6 +57,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + From 9aa783373f07be682a51c304213fad1025ad142b Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 13:27:11 +0200 Subject: [PATCH 006/158] Rename MpDatalayer --> MP.Data --- MpDataLayer/Constants.cs | 2 +- MpDataLayer/Controllers/MpStatsController.cs | 2 +- MpDataLayer/DatabaseModels/Aaul.cs | 2 +- MpDataLayer/DatabaseModels/Cal.cs | 2 +- MpDataLayer/DatabaseModels/Config.cs | 2 +- MpDataLayer/DatabaseModels/Ddb.cs | 2 +- MpDataLayer/DatabaseModels/Ddb1.cs | 2 +- MpDataLayer/DatabaseModels/DdbTurni.cs | 2 +- MpDataLayer/DatabaseModels/DdbTurniNew.cs | 2 +- MpDataLayer/DatabaseModels/DdbTurniSummary.cs | 2 +- MpDataLayer/DatabaseModels/DdbTurniSummaryNew.cs | 2 +- MpDataLayer/DatabaseModels/Ecp.cs | 2 +- MpDataLayer/DatabaseModels/Ecp1.cs | 2 +- MpDataLayer/DatabaseModels/Kit.cs | 2 +- MpDataLayer/DatabaseModels/Odl.cs | 2 +- MpDataLayer/DatabaseModels/Odl1.cs | 2 +- MpDataLayer/DatabaseModels/R.cs | 2 +- MpDataLayer/DatabaseModels/R1.cs | 2 +- MpDataLayer/DatabaseModels/Rc.cs | 2 +- MpDataLayer/DatabaseModels/ResControlli.cs | 2 +- MpDataLayer/DatabaseModels/ResScarti.cs | 2 +- MpDataLayer/DatabaseModels/Tally.cs | 2 +- MpDataLayer/DatabaseModels/TcStat.cs | 2 +- MpDataLayer/DatabaseModels/Tcr.cs | 2 +- MpDataLayer/DatabaseModels/Tcr1.cs | 2 +- MpDataLayer/DatabaseModels/TcrDay.cs | 2 +- MpDataLayer/DatabaseModels/TcrDayTest.cs | 2 +- MpDataLayer/DatabaseModels/TestJason.cs | 2 +- MpDataLayer/DatabaseModels/Ul.cs | 2 +- MpDataLayer/DatabaseModels/UserActionLog.cs | 2 +- MpDataLayer/DatabaseModels/VDdb.cs | 2 +- MpDataLayer/DatabaseModels/VDdbLight.cs | 2 +- MpDataLayer/DatabaseModels/VDdbLightOld.cs | 2 +- MpDataLayer/DatabaseModels/VDdbTurni.cs | 2 +- MpDataLayer/DatabaseModels/VEcp.cs | 2 +- MpDataLayer/DatabaseModels/VEcp1.cs | 2 +- MpDataLayer/DatabaseModels/VEcpExtended.cs | 2 +- MpDataLayer/DatabaseModels/VKit.cs | 2 +- MpDataLayer/DatabaseModels/VOdl.cs | 2 +- MpDataLayer/DatabaseModels/VOdl1.cs | 2 +- MpDataLayer/DatabaseModels/VPodlNonChiusi.cs | 2 +- MpDataLayer/DatabaseModels/VR1.cs | 2 +- MpDataLayer/DatabaseModels/VTcStat.cs | 2 +- MpDataLayer/DatabaseModels/VTcr.cs | 2 +- MpDataLayer/DatabaseModels/VTcr1.cs | 2 +- MpDataLayer/DatabaseModels/VTcrDay.cs | 2 +- MpDataLayer/DatabaseModels/VetoTc.cs | 2 +- MpDataLayer/Enums.cs | 2 +- MpDataLayer/{MpDataLayer.csproj => MP.Data.csproj} | 2 ++ MpDataLayer/MoonPro_STATSContext.cs | 2 +- MpDataLayer/StatsDbContext.cs | 2 +- 51 files changed, 52 insertions(+), 50 deletions(-) rename MpDataLayer/{MpDataLayer.csproj => MP.Data.csproj} (97%) diff --git a/MpDataLayer/Constants.cs b/MpDataLayer/Constants.cs index 3c7f13d8..4abf10f1 100644 --- a/MpDataLayer/Constants.cs +++ b/MpDataLayer/Constants.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace MpDataLayer +namespace MP.Data { class Constants { diff --git a/MpDataLayer/Controllers/MpStatsController.cs b/MpDataLayer/Controllers/MpStatsController.cs index 0ba0f3f5..0b1d43eb 100644 --- a/MpDataLayer/Controllers/MpStatsController.cs +++ b/MpDataLayer/Controllers/MpStatsController.cs @@ -7,7 +7,7 @@ using System.Configuration; using NLog; using Microsoft.Extensions.Configuration; -namespace MpDataLayer.Controllers +namespace MP.Data.Controllers { public class MpStatsController : IDisposable { diff --git a/MpDataLayer/DatabaseModels/Aaul.cs b/MpDataLayer/DatabaseModels/Aaul.cs index 9394d319..f639d8c7 100644 --- a/MpDataLayer/DatabaseModels/Aaul.cs +++ b/MpDataLayer/DatabaseModels/Aaul.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class Aaul { diff --git a/MpDataLayer/DatabaseModels/Cal.cs b/MpDataLayer/DatabaseModels/Cal.cs index 9db20b85..62ac75a3 100644 --- a/MpDataLayer/DatabaseModels/Cal.cs +++ b/MpDataLayer/DatabaseModels/Cal.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class Cal { diff --git a/MpDataLayer/DatabaseModels/Config.cs b/MpDataLayer/DatabaseModels/Config.cs index e0dad34d..e994d899 100644 --- a/MpDataLayer/DatabaseModels/Config.cs +++ b/MpDataLayer/DatabaseModels/Config.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class Config { diff --git a/MpDataLayer/DatabaseModels/Ddb.cs b/MpDataLayer/DatabaseModels/Ddb.cs index 1f213127..01eb95f0 100644 --- a/MpDataLayer/DatabaseModels/Ddb.cs +++ b/MpDataLayer/DatabaseModels/Ddb.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class Ddb { diff --git a/MpDataLayer/DatabaseModels/Ddb1.cs b/MpDataLayer/DatabaseModels/Ddb1.cs index 33efad5a..60291b02 100644 --- a/MpDataLayer/DatabaseModels/Ddb1.cs +++ b/MpDataLayer/DatabaseModels/Ddb1.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class Ddb1 { diff --git a/MpDataLayer/DatabaseModels/DdbTurni.cs b/MpDataLayer/DatabaseModels/DdbTurni.cs index c6ad5ea1..4fc7e14d 100644 --- a/MpDataLayer/DatabaseModels/DdbTurni.cs +++ b/MpDataLayer/DatabaseModels/DdbTurni.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class DdbTurni { diff --git a/MpDataLayer/DatabaseModels/DdbTurniNew.cs b/MpDataLayer/DatabaseModels/DdbTurniNew.cs index c8699f0f..37bf31d9 100644 --- a/MpDataLayer/DatabaseModels/DdbTurniNew.cs +++ b/MpDataLayer/DatabaseModels/DdbTurniNew.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class DdbTurniNew { diff --git a/MpDataLayer/DatabaseModels/DdbTurniSummary.cs b/MpDataLayer/DatabaseModels/DdbTurniSummary.cs index 2760ca5a..5db34143 100644 --- a/MpDataLayer/DatabaseModels/DdbTurniSummary.cs +++ b/MpDataLayer/DatabaseModels/DdbTurniSummary.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class DdbTurniSummary { diff --git a/MpDataLayer/DatabaseModels/DdbTurniSummaryNew.cs b/MpDataLayer/DatabaseModels/DdbTurniSummaryNew.cs index 1f0bfe4f..1460328b 100644 --- a/MpDataLayer/DatabaseModels/DdbTurniSummaryNew.cs +++ b/MpDataLayer/DatabaseModels/DdbTurniSummaryNew.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class DdbTurniSummaryNew { diff --git a/MpDataLayer/DatabaseModels/Ecp.cs b/MpDataLayer/DatabaseModels/Ecp.cs index 2e003e85..09fb32dc 100644 --- a/MpDataLayer/DatabaseModels/Ecp.cs +++ b/MpDataLayer/DatabaseModels/Ecp.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class Ecp { diff --git a/MpDataLayer/DatabaseModels/Ecp1.cs b/MpDataLayer/DatabaseModels/Ecp1.cs index a6e1b626..33a3a973 100644 --- a/MpDataLayer/DatabaseModels/Ecp1.cs +++ b/MpDataLayer/DatabaseModels/Ecp1.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class Ecp1 { diff --git a/MpDataLayer/DatabaseModels/Kit.cs b/MpDataLayer/DatabaseModels/Kit.cs index ba70fc4a..cb25c5c0 100644 --- a/MpDataLayer/DatabaseModels/Kit.cs +++ b/MpDataLayer/DatabaseModels/Kit.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class Kit { diff --git a/MpDataLayer/DatabaseModels/Odl.cs b/MpDataLayer/DatabaseModels/Odl.cs index aa588745..fa8f8bfa 100644 --- a/MpDataLayer/DatabaseModels/Odl.cs +++ b/MpDataLayer/DatabaseModels/Odl.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class Odl { diff --git a/MpDataLayer/DatabaseModels/Odl1.cs b/MpDataLayer/DatabaseModels/Odl1.cs index 96edddb6..50436e07 100644 --- a/MpDataLayer/DatabaseModels/Odl1.cs +++ b/MpDataLayer/DatabaseModels/Odl1.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class Odl1 { diff --git a/MpDataLayer/DatabaseModels/R.cs b/MpDataLayer/DatabaseModels/R.cs index 58830883..8e58bf74 100644 --- a/MpDataLayer/DatabaseModels/R.cs +++ b/MpDataLayer/DatabaseModels/R.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class R { diff --git a/MpDataLayer/DatabaseModels/R1.cs b/MpDataLayer/DatabaseModels/R1.cs index ef429455..e4abb10d 100644 --- a/MpDataLayer/DatabaseModels/R1.cs +++ b/MpDataLayer/DatabaseModels/R1.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class R1 { diff --git a/MpDataLayer/DatabaseModels/Rc.cs b/MpDataLayer/DatabaseModels/Rc.cs index db9e5a56..8578e1a4 100644 --- a/MpDataLayer/DatabaseModels/Rc.cs +++ b/MpDataLayer/DatabaseModels/Rc.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class Rc { diff --git a/MpDataLayer/DatabaseModels/ResControlli.cs b/MpDataLayer/DatabaseModels/ResControlli.cs index 6a14a1d6..77f46ee9 100644 --- a/MpDataLayer/DatabaseModels/ResControlli.cs +++ b/MpDataLayer/DatabaseModels/ResControlli.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class ResControlli { diff --git a/MpDataLayer/DatabaseModels/ResScarti.cs b/MpDataLayer/DatabaseModels/ResScarti.cs index 3b4b8a3b..4d66d124 100644 --- a/MpDataLayer/DatabaseModels/ResScarti.cs +++ b/MpDataLayer/DatabaseModels/ResScarti.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class ResScarti { diff --git a/MpDataLayer/DatabaseModels/Tally.cs b/MpDataLayer/DatabaseModels/Tally.cs index 665c4c8f..e64cf735 100644 --- a/MpDataLayer/DatabaseModels/Tally.cs +++ b/MpDataLayer/DatabaseModels/Tally.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class Tally { diff --git a/MpDataLayer/DatabaseModels/TcStat.cs b/MpDataLayer/DatabaseModels/TcStat.cs index 47854d10..eef51348 100644 --- a/MpDataLayer/DatabaseModels/TcStat.cs +++ b/MpDataLayer/DatabaseModels/TcStat.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class TcStat { diff --git a/MpDataLayer/DatabaseModels/Tcr.cs b/MpDataLayer/DatabaseModels/Tcr.cs index e6164342..d0ba1c26 100644 --- a/MpDataLayer/DatabaseModels/Tcr.cs +++ b/MpDataLayer/DatabaseModels/Tcr.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class Tcr { diff --git a/MpDataLayer/DatabaseModels/Tcr1.cs b/MpDataLayer/DatabaseModels/Tcr1.cs index 9cd223b2..444d2669 100644 --- a/MpDataLayer/DatabaseModels/Tcr1.cs +++ b/MpDataLayer/DatabaseModels/Tcr1.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class Tcr1 { diff --git a/MpDataLayer/DatabaseModels/TcrDay.cs b/MpDataLayer/DatabaseModels/TcrDay.cs index 5e3f2f19..20c3fbdf 100644 --- a/MpDataLayer/DatabaseModels/TcrDay.cs +++ b/MpDataLayer/DatabaseModels/TcrDay.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class TcrDay { diff --git a/MpDataLayer/DatabaseModels/TcrDayTest.cs b/MpDataLayer/DatabaseModels/TcrDayTest.cs index 7cdd98a2..904d7c7f 100644 --- a/MpDataLayer/DatabaseModels/TcrDayTest.cs +++ b/MpDataLayer/DatabaseModels/TcrDayTest.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class TcrDayTest { diff --git a/MpDataLayer/DatabaseModels/TestJason.cs b/MpDataLayer/DatabaseModels/TestJason.cs index f162836d..8f921d40 100644 --- a/MpDataLayer/DatabaseModels/TestJason.cs +++ b/MpDataLayer/DatabaseModels/TestJason.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class TestJason { diff --git a/MpDataLayer/DatabaseModels/Ul.cs b/MpDataLayer/DatabaseModels/Ul.cs index 585b79dc..54b11f82 100644 --- a/MpDataLayer/DatabaseModels/Ul.cs +++ b/MpDataLayer/DatabaseModels/Ul.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class Ul { diff --git a/MpDataLayer/DatabaseModels/UserActionLog.cs b/MpDataLayer/DatabaseModels/UserActionLog.cs index 199809cb..15426401 100644 --- a/MpDataLayer/DatabaseModels/UserActionLog.cs +++ b/MpDataLayer/DatabaseModels/UserActionLog.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class UserActionLog { diff --git a/MpDataLayer/DatabaseModels/VDdb.cs b/MpDataLayer/DatabaseModels/VDdb.cs index b6101765..4aeccff6 100644 --- a/MpDataLayer/DatabaseModels/VDdb.cs +++ b/MpDataLayer/DatabaseModels/VDdb.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class VDdb { diff --git a/MpDataLayer/DatabaseModels/VDdbLight.cs b/MpDataLayer/DatabaseModels/VDdbLight.cs index 2340bc30..f1bafcbc 100644 --- a/MpDataLayer/DatabaseModels/VDdbLight.cs +++ b/MpDataLayer/DatabaseModels/VDdbLight.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class VDdbLight { diff --git a/MpDataLayer/DatabaseModels/VDdbLightOld.cs b/MpDataLayer/DatabaseModels/VDdbLightOld.cs index 1f56626f..d636177a 100644 --- a/MpDataLayer/DatabaseModels/VDdbLightOld.cs +++ b/MpDataLayer/DatabaseModels/VDdbLightOld.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class VDdbLightOld { diff --git a/MpDataLayer/DatabaseModels/VDdbTurni.cs b/MpDataLayer/DatabaseModels/VDdbTurni.cs index 39f605b1..fbdc6046 100644 --- a/MpDataLayer/DatabaseModels/VDdbTurni.cs +++ b/MpDataLayer/DatabaseModels/VDdbTurni.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class VDdbTurni { diff --git a/MpDataLayer/DatabaseModels/VEcp.cs b/MpDataLayer/DatabaseModels/VEcp.cs index 274a6c3b..c90a45b6 100644 --- a/MpDataLayer/DatabaseModels/VEcp.cs +++ b/MpDataLayer/DatabaseModels/VEcp.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class VEcp { diff --git a/MpDataLayer/DatabaseModels/VEcp1.cs b/MpDataLayer/DatabaseModels/VEcp1.cs index e12d1a9e..3c63b654 100644 --- a/MpDataLayer/DatabaseModels/VEcp1.cs +++ b/MpDataLayer/DatabaseModels/VEcp1.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class VEcp1 { diff --git a/MpDataLayer/DatabaseModels/VEcpExtended.cs b/MpDataLayer/DatabaseModels/VEcpExtended.cs index b6c03144..c2d75bc9 100644 --- a/MpDataLayer/DatabaseModels/VEcpExtended.cs +++ b/MpDataLayer/DatabaseModels/VEcpExtended.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class VEcpExtended { diff --git a/MpDataLayer/DatabaseModels/VKit.cs b/MpDataLayer/DatabaseModels/VKit.cs index 59d8084f..f84ce903 100644 --- a/MpDataLayer/DatabaseModels/VKit.cs +++ b/MpDataLayer/DatabaseModels/VKit.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class VKit { diff --git a/MpDataLayer/DatabaseModels/VOdl.cs b/MpDataLayer/DatabaseModels/VOdl.cs index 5cf15d5a..8600135a 100644 --- a/MpDataLayer/DatabaseModels/VOdl.cs +++ b/MpDataLayer/DatabaseModels/VOdl.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class VOdl { diff --git a/MpDataLayer/DatabaseModels/VOdl1.cs b/MpDataLayer/DatabaseModels/VOdl1.cs index 75a3a7f5..97fda075 100644 --- a/MpDataLayer/DatabaseModels/VOdl1.cs +++ b/MpDataLayer/DatabaseModels/VOdl1.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class VOdl1 { diff --git a/MpDataLayer/DatabaseModels/VPodlNonChiusi.cs b/MpDataLayer/DatabaseModels/VPodlNonChiusi.cs index 9c7ef255..fa806e0d 100644 --- a/MpDataLayer/DatabaseModels/VPodlNonChiusi.cs +++ b/MpDataLayer/DatabaseModels/VPodlNonChiusi.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class VPodlNonChiusi { diff --git a/MpDataLayer/DatabaseModels/VR1.cs b/MpDataLayer/DatabaseModels/VR1.cs index 47737486..956f8786 100644 --- a/MpDataLayer/DatabaseModels/VR1.cs +++ b/MpDataLayer/DatabaseModels/VR1.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class VR1 { diff --git a/MpDataLayer/DatabaseModels/VTcStat.cs b/MpDataLayer/DatabaseModels/VTcStat.cs index 8846c061..2c048219 100644 --- a/MpDataLayer/DatabaseModels/VTcStat.cs +++ b/MpDataLayer/DatabaseModels/VTcStat.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class VTcStat { diff --git a/MpDataLayer/DatabaseModels/VTcr.cs b/MpDataLayer/DatabaseModels/VTcr.cs index 612bc35a..a3adb842 100644 --- a/MpDataLayer/DatabaseModels/VTcr.cs +++ b/MpDataLayer/DatabaseModels/VTcr.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class VTcr { diff --git a/MpDataLayer/DatabaseModels/VTcr1.cs b/MpDataLayer/DatabaseModels/VTcr1.cs index 15231e9d..55061b57 100644 --- a/MpDataLayer/DatabaseModels/VTcr1.cs +++ b/MpDataLayer/DatabaseModels/VTcr1.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class VTcr1 { diff --git a/MpDataLayer/DatabaseModels/VTcrDay.cs b/MpDataLayer/DatabaseModels/VTcrDay.cs index 5d4c6101..5d591407 100644 --- a/MpDataLayer/DatabaseModels/VTcrDay.cs +++ b/MpDataLayer/DatabaseModels/VTcrDay.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class VTcrDay { diff --git a/MpDataLayer/DatabaseModels/VetoTc.cs b/MpDataLayer/DatabaseModels/VetoTc.cs index d4271715..b48ad96b 100644 --- a/MpDataLayer/DatabaseModels/VetoTc.cs +++ b/MpDataLayer/DatabaseModels/VetoTc.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; #nullable disable -namespace MpDataLayer.DatabaseModels +namespace MP.Data.DatabaseModels { public partial class VetoTc { diff --git a/MpDataLayer/Enums.cs b/MpDataLayer/Enums.cs index 64437007..421dd601 100644 --- a/MpDataLayer/Enums.cs +++ b/MpDataLayer/Enums.cs @@ -1,6 +1,6 @@ using System; -namespace MpDataLayer +namespace MP.Data { public class Enums { diff --git a/MpDataLayer/MpDataLayer.csproj b/MpDataLayer/MP.Data.csproj similarity index 97% rename from MpDataLayer/MpDataLayer.csproj rename to MpDataLayer/MP.Data.csproj index 33dc3477..a8360e39 100644 --- a/MpDataLayer/MpDataLayer.csproj +++ b/MpDataLayer/MP.Data.csproj @@ -2,6 +2,8 @@ net5.0 + MP.Data + MP.Data diff --git a/MpDataLayer/MoonPro_STATSContext.cs b/MpDataLayer/MoonPro_STATSContext.cs index 6704c094..2c0ed3fa 100644 --- a/MpDataLayer/MoonPro_STATSContext.cs +++ b/MpDataLayer/MoonPro_STATSContext.cs @@ -7,7 +7,7 @@ using NLog; #nullable disable -namespace MpDataLayer +namespace MP.Data { public partial class MoonPro_STATSContext : DbContext { diff --git a/MpDataLayer/StatsDbContext.cs b/MpDataLayer/StatsDbContext.cs index d897301c..e52f398f 100644 --- a/MpDataLayer/StatsDbContext.cs +++ b/MpDataLayer/StatsDbContext.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace MpDataLayer +namespace MP.Data { public class StatsDbContext { From a90a62cd7a8fd8bcfb76c972176331d80a463f45 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 13:33:13 +0200 Subject: [PATCH 007/158] COmpleto rename MP.Data --- MP.Data/Constants.cs | 12 + MP.Data/Controllers/MpStatsController.cs | 85 + MP.Data/DatabaseModels/Aaul.cs | 13 + MP.Data/DatabaseModels/Cal.cs | 18 + MP.Data/DatabaseModels/Config.cs | 15 + MP.Data/DatabaseModels/Ddb.cs | 15 + MP.Data/DatabaseModels/Ddb1.cs | 24 + MP.Data/DatabaseModels/DdbTurni.cs | 30 + MP.Data/DatabaseModels/DdbTurniNew.cs | 30 + MP.Data/DatabaseModels/DdbTurniSummary.cs | 21 + MP.Data/DatabaseModels/DdbTurniSummaryNew.cs | 21 + MP.Data/DatabaseModels/Ecp.cs | 23 + MP.Data/DatabaseModels/Ecp1.cs | 21 + MP.Data/DatabaseModels/Kit.cs | 14 + MP.Data/DatabaseModels/Odl.cs | 26 + MP.Data/DatabaseModels/Odl1.cs | 30 + MP.Data/DatabaseModels/R.cs | 23 + MP.Data/DatabaseModels/R1.cs | 22 + MP.Data/DatabaseModels/Rc.cs | 19 + MP.Data/DatabaseModels/ResControlli.cs | 23 + MP.Data/DatabaseModels/ResScarti.cs | 26 + MP.Data/DatabaseModels/Tally.cs | 12 + MP.Data/DatabaseModels/TcStat.cs | 16 + MP.Data/DatabaseModels/Tcr.cs | 19 + MP.Data/DatabaseModels/Tcr1.cs | 20 + MP.Data/DatabaseModels/TcrDay.cs | 19 + MP.Data/DatabaseModels/TcrDayTest.cs | 19 + MP.Data/DatabaseModels/TestJason.cs | 14 + MP.Data/DatabaseModels/Ul.cs | 21 + MP.Data/DatabaseModels/UserActionLog.cs | 25 + MP.Data/DatabaseModels/VDdb.cs | 24 + MP.Data/DatabaseModels/VDdbLight.cs | 18 + MP.Data/DatabaseModels/VDdbLightOld.cs | 18 + MP.Data/DatabaseModels/VDdbTurni.cs | 26 + MP.Data/DatabaseModels/VEcp.cs | 21 + MP.Data/DatabaseModels/VEcp1.cs | 25 + MP.Data/DatabaseModels/VEcpExtended.cs | 27 + MP.Data/DatabaseModels/VKit.cs | 14 + MP.Data/DatabaseModels/VOdl.cs | 30 + MP.Data/DatabaseModels/VOdl1.cs | 28 + MP.Data/DatabaseModels/VPodlNonChiusi.cs | 30 + MP.Data/DatabaseModels/VR1.cs | 23 + MP.Data/DatabaseModels/VTcStat.cs | 18 + MP.Data/DatabaseModels/VTcr.cs | 20 + MP.Data/DatabaseModels/VTcr1.cs | 21 + MP.Data/DatabaseModels/VTcrDay.cs | 21 + MP.Data/DatabaseModels/VetoTc.cs | 15 + MP.Data/Enums.cs | 8 + MP.Data/MP.Data.csproj | 65 + MP.Data/MoonPro_STATSContext.cs | 1606 ++++++++++++++++++ MP.Data/Resources/Readme.md | 23 + MP.Data/StatsDbContext.cs | 12 + 52 files changed, 2769 insertions(+) create mode 100644 MP.Data/Constants.cs create mode 100644 MP.Data/Controllers/MpStatsController.cs create mode 100644 MP.Data/DatabaseModels/Aaul.cs create mode 100644 MP.Data/DatabaseModels/Cal.cs create mode 100644 MP.Data/DatabaseModels/Config.cs create mode 100644 MP.Data/DatabaseModels/Ddb.cs create mode 100644 MP.Data/DatabaseModels/Ddb1.cs create mode 100644 MP.Data/DatabaseModels/DdbTurni.cs create mode 100644 MP.Data/DatabaseModels/DdbTurniNew.cs create mode 100644 MP.Data/DatabaseModels/DdbTurniSummary.cs create mode 100644 MP.Data/DatabaseModels/DdbTurniSummaryNew.cs create mode 100644 MP.Data/DatabaseModels/Ecp.cs create mode 100644 MP.Data/DatabaseModels/Ecp1.cs create mode 100644 MP.Data/DatabaseModels/Kit.cs create mode 100644 MP.Data/DatabaseModels/Odl.cs create mode 100644 MP.Data/DatabaseModels/Odl1.cs create mode 100644 MP.Data/DatabaseModels/R.cs create mode 100644 MP.Data/DatabaseModels/R1.cs create mode 100644 MP.Data/DatabaseModels/Rc.cs create mode 100644 MP.Data/DatabaseModels/ResControlli.cs create mode 100644 MP.Data/DatabaseModels/ResScarti.cs create mode 100644 MP.Data/DatabaseModels/Tally.cs create mode 100644 MP.Data/DatabaseModels/TcStat.cs create mode 100644 MP.Data/DatabaseModels/Tcr.cs create mode 100644 MP.Data/DatabaseModels/Tcr1.cs create mode 100644 MP.Data/DatabaseModels/TcrDay.cs create mode 100644 MP.Data/DatabaseModels/TcrDayTest.cs create mode 100644 MP.Data/DatabaseModels/TestJason.cs create mode 100644 MP.Data/DatabaseModels/Ul.cs create mode 100644 MP.Data/DatabaseModels/UserActionLog.cs create mode 100644 MP.Data/DatabaseModels/VDdb.cs create mode 100644 MP.Data/DatabaseModels/VDdbLight.cs create mode 100644 MP.Data/DatabaseModels/VDdbLightOld.cs create mode 100644 MP.Data/DatabaseModels/VDdbTurni.cs create mode 100644 MP.Data/DatabaseModels/VEcp.cs create mode 100644 MP.Data/DatabaseModels/VEcp1.cs create mode 100644 MP.Data/DatabaseModels/VEcpExtended.cs create mode 100644 MP.Data/DatabaseModels/VKit.cs create mode 100644 MP.Data/DatabaseModels/VOdl.cs create mode 100644 MP.Data/DatabaseModels/VOdl1.cs create mode 100644 MP.Data/DatabaseModels/VPodlNonChiusi.cs create mode 100644 MP.Data/DatabaseModels/VR1.cs create mode 100644 MP.Data/DatabaseModels/VTcStat.cs create mode 100644 MP.Data/DatabaseModels/VTcr.cs create mode 100644 MP.Data/DatabaseModels/VTcr1.cs create mode 100644 MP.Data/DatabaseModels/VTcrDay.cs create mode 100644 MP.Data/DatabaseModels/VetoTc.cs create mode 100644 MP.Data/Enums.cs create mode 100644 MP.Data/MP.Data.csproj create mode 100644 MP.Data/MoonPro_STATSContext.cs create mode 100644 MP.Data/Resources/Readme.md create mode 100644 MP.Data/StatsDbContext.cs diff --git a/MP.Data/Constants.cs b/MP.Data/Constants.cs new file mode 100644 index 00000000..4abf10f1 --- /dev/null +++ b/MP.Data/Constants.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MP.Data +{ + class Constants + { + } +} diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs new file mode 100644 index 00000000..0b1d43eb --- /dev/null +++ b/MP.Data/Controllers/MpStatsController.cs @@ -0,0 +1,85 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Configuration; +using NLog; +using Microsoft.Extensions.Configuration; + +namespace MP.Data.Controllers +{ + public class MpStatsController : IDisposable + { + #region Private Fields + + private static IConfiguration _configuration; + private static MoonPro_STATSContext dbCtx; + private static NLog.Logger Log = LogManager.GetCurrentClassLogger(); + + #endregion Private Fields + + #region Public Constructors + + public MpStatsController(IConfiguration configuration) + { + _configuration = configuration; + dbCtx = new MoonPro_STATSContext(configuration); + Log.Info("Avviata classe MpStatsController.MpStatsController"); + } + + #endregion Public Constructors + + #region Public Methods + + public void Dispose() + { + // Clear database context + dbCtx.Dispose(); + } + + /// + /// Annulla modifiche su una specifica entity (cancel update) + /// + /// + /// + public bool rollBackEntity(object item) + { + bool answ = false; + try + { + if (dbCtx.Entry(item).State == Microsoft.EntityFrameworkCore.EntityState.Deleted || dbCtx.Entry(item).State == Microsoft.EntityFrameworkCore.EntityState.Modified) + { + dbCtx.Entry(item).Reload(); + } + } + catch (Exception exc) + { + Log.Error($"Eccezione in rollBackEntity{Environment.NewLine}{exc}"); + } + return answ; + } + + /// + /// Elenco tabella scarti da filtro + /// + /// + /// + /// + public List ScartiGetAll(int numRecord, string searchVal = "") + { + List dbResult = new List(); + + dbResult = dbCtx + .DbSetScarti + .Where(x => x.KeyRichiesta.Contains(searchVal) || x.Descrizione.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) + .OrderByDescending(x => x.DataOra) + .Take(numRecord) + .ToList(); + + return dbResult; + } + + #endregion Public Methods + } +} \ No newline at end of file diff --git a/MP.Data/DatabaseModels/Aaul.cs b/MP.Data/DatabaseModels/Aaul.cs new file mode 100644 index 00000000..f639d8c7 --- /dev/null +++ b/MP.Data/DatabaseModels/Aaul.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class Aaul + { + public string Azione { get; set; } + public string Descrizione { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/Cal.cs b/MP.Data/DatabaseModels/Cal.cs new file mode 100644 index 00000000..62ac75a3 --- /dev/null +++ b/MP.Data/DatabaseModels/Cal.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class Cal + { + public DateTime Giorno { get; set; } + public bool? DoDdb { get; set; } + public bool? DoTcr { get; set; } + public bool? DoUl { get; set; } + public bool? DoEcp { get; set; } + public bool? DoRs { get; set; } + public bool? DoOdl { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/Config.cs b/MP.Data/DatabaseModels/Config.cs new file mode 100644 index 00000000..e994d899 --- /dev/null +++ b/MP.Data/DatabaseModels/Config.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class Config + { + public string Chiave { get; set; } + public string Valore { get; set; } + public string ValoreStd { get; set; } + public string Note { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/Ddb.cs b/MP.Data/DatabaseModels/Ddb.cs new file mode 100644 index 00000000..01eb95f0 --- /dev/null +++ b/MP.Data/DatabaseModels/Ddb.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class Ddb + { + public DateTime DataOraRif { get; set; } + public string IdxMacchina { get; set; } + public int IdxStato { get; set; } + public decimal DurataMinuti { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/Ddb1.cs b/MP.Data/DatabaseModels/Ddb1.cs new file mode 100644 index 00000000..60291b02 --- /dev/null +++ b/MP.Data/DatabaseModels/Ddb1.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class Ddb1 + { + public string IdxMacchina { get; set; } + public DateTime InizioStato { get; set; } + public DateTime? FineStato { get; set; } + public int IdxStato { get; set; } + public double? DurataMinuti { get; set; } + public string Value { get; set; } + public string CodArticolo { get; set; } + public double? TempoCicloBase { get; set; } + public int? PzPalletProd { get; set; } + public int? MatrOpr { get; set; } + public string Pallet { get; set; } + public string Descrizione { get; set; } + public string ClasseTempo { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/DdbTurni.cs b/MP.Data/DatabaseModels/DdbTurni.cs new file mode 100644 index 00000000..4fc7e14d --- /dev/null +++ b/MP.Data/DatabaseModels/DdbTurni.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class DdbTurni + { + public DateTime DataRif { get; set; } + public string IdxMacchina { get; set; } + public string Turno { get; set; } + public int IdxStato { get; set; } + public string CodArticolo { get; set; } + public DateTime InizioStato { get; set; } + public DateTime FineStato { get; set; } + public string Pallet { get; set; } + public int? PzPalletProd { get; set; } + public decimal? TempoCicloBase { get; set; } + public string Descrizione { get; set; } + public string ClasseTempo { get; set; } + public DateTime? DataTurnoInizio { get; set; } + public DateTime? DataTurnoFine { get; set; } + public long? DurataStato { get; set; } + public DateTime InizioPeriodo { get; set; } + public DateTime? FinePeriodo { get; set; } + public long? DurataPeriodo { get; set; } + public int TotPzProd { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/DdbTurniNew.cs b/MP.Data/DatabaseModels/DdbTurniNew.cs new file mode 100644 index 00000000..37bf31d9 --- /dev/null +++ b/MP.Data/DatabaseModels/DdbTurniNew.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class DdbTurniNew + { + public DateTime DataRif { get; set; } + public string IdxMacchina { get; set; } + public string Turno { get; set; } + public int IdxStato { get; set; } + public string CodArticolo { get; set; } + public DateTime InizioStato { get; set; } + public DateTime FineStato { get; set; } + public string Pallet { get; set; } + public int? PzPalletProd { get; set; } + public decimal? TempoCicloBase { get; set; } + public string Descrizione { get; set; } + public string ClasseTempo { get; set; } + public DateTime? DataTurnoInizio { get; set; } + public DateTime? DataTurnoFine { get; set; } + public long? DurataStato { get; set; } + public DateTime InizioPeriodo { get; set; } + public DateTime? FinePeriodo { get; set; } + public long? DurataPeriodo { get; set; } + public int TotPzProd { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/DdbTurniSummary.cs b/MP.Data/DatabaseModels/DdbTurniSummary.cs new file mode 100644 index 00000000..5db34143 --- /dev/null +++ b/MP.Data/DatabaseModels/DdbTurniSummary.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class DdbTurniSummary + { + public string IdxMacchina { get; set; } + public DateTime DataRif { get; set; } + public string Turno { get; set; } + public string CodArticolo { get; set; } + public int IdxStato { get; set; } + public decimal TempoCicloBase { get; set; } + public DateTime? Inizio { get; set; } + public int PzPalletProd { get; set; } + public decimal? Durata { get; set; } + public int? PzProd { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/DdbTurniSummaryNew.cs b/MP.Data/DatabaseModels/DdbTurniSummaryNew.cs new file mode 100644 index 00000000..1460328b --- /dev/null +++ b/MP.Data/DatabaseModels/DdbTurniSummaryNew.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class DdbTurniSummaryNew + { + public string IdxMacchina { get; set; } + public DateTime DataRif { get; set; } + public string Turno { get; set; } + public string CodArticolo { get; set; } + public int IdxStato { get; set; } + public decimal TempoCicloBase { get; set; } + public DateTime? Inizio { get; set; } + public int PzPalletProd { get; set; } + public decimal? Durata { get; set; } + public int? PzProd { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/Ecp.cs b/MP.Data/DatabaseModels/Ecp.cs new file mode 100644 index 00000000..09fb32dc --- /dev/null +++ b/MP.Data/DatabaseModels/Ecp.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class Ecp + { + public int IdxEcp { get; set; } + public DateTime DataOraConf { get; set; } + public string IdxMacchina { get; set; } + public string KeyRichiesta { get; set; } + public int IdxOdl { get; set; } + public string CodArticolo { get; set; } + public int PezziConf { get; set; } + public int PezziScar { get; set; } + public int PezziDaRilav { get; set; } + public int MatrOpr { get; set; } + public string Cognome { get; set; } + public string Nome { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/Ecp1.cs b/MP.Data/DatabaseModels/Ecp1.cs new file mode 100644 index 00000000..33a3a973 --- /dev/null +++ b/MP.Data/DatabaseModels/Ecp1.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class Ecp1 + { + public DateTime DataOraConf { get; set; } + public string IdxMacchina { get; set; } + public int MatrApp { get; set; } + public DateTime DataFrom { get; set; } + public DateTime DataTo { get; set; } + public int PezziConf { get; set; } + public int PezziScar { get; set; } + public int PezziDaRilav { get; set; } + public string CommessaEsterna { get; set; } + public int TipoConf { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/Kit.cs b/MP.Data/DatabaseModels/Kit.cs new file mode 100644 index 00000000..cb25c5c0 --- /dev/null +++ b/MP.Data/DatabaseModels/Kit.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class Kit + { + public string KeyKit { get; set; } + public string KeyExtOrd { get; set; } + public string CodArtParent { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/Odl.cs b/MP.Data/DatabaseModels/Odl.cs new file mode 100644 index 00000000..fa8f8bfa --- /dev/null +++ b/MP.Data/DatabaseModels/Odl.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class Odl + { + public int IdxOdl { get; set; } + public string KeyRichiesta { get; set; } + public string CodArticolo { get; set; } + public decimal Tcassegnato { get; set; } + public string IdxMacchina { get; set; } + public int NumPezzi { get; set; } + public int NumPezziEv { get; set; } + public int NumPezziSca { get; set; } + public int NumPezziRil { get; set; } + public DateTime? DataInizio { get; set; } + public DateTime? DataFine { get; set; } + public string KeyRichiestaParent { get; set; } + public string CodArticoloParent { get; set; } + public DateTime? DueDate { get; set; } + public int? PzPallet { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/Odl1.cs b/MP.Data/DatabaseModels/Odl1.cs new file mode 100644 index 00000000..50436e07 --- /dev/null +++ b/MP.Data/DatabaseModels/Odl1.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class Odl1 + { + public int IdxOdl { get; set; } + public string CodArticolo { get; set; } + public string IdxMacchina { get; set; } + public int NumPezzi { get; set; } + public decimal Tcassegnato { get; set; } + public DateTime? DataInizio { get; set; } + public DateTime? DataFine { get; set; } + public string Note { get; set; } + public bool NeedAppr { get; set; } + public string UserAppr { get; set; } + public DateTime? DataAppr { get; set; } + public decimal? TcrichAttr { get; set; } + public string KeyRichiesta { get; set; } + public int PzPallet { get; set; } + public bool Provvisorio { get; set; } + public int MatrOpr { get; set; } + public string CommessaAs400 { get; set; } + public int ToAs400 { get; set; } + public DateTime? DueDate { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/R.cs b/MP.Data/DatabaseModels/R.cs new file mode 100644 index 00000000..8e58bf74 --- /dev/null +++ b/MP.Data/DatabaseModels/R.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class R + { + public DateTime DataOraRif { get; set; } + public string IdxMacchina { get; set; } + public string Causale { get; set; } + public string Descrizione { get; set; } + public string Note { get; set; } + public int Qta { get; set; } + public string KeyRichiesta { get; set; } + public int IdxOdl { get; set; } + public string CodArticolo { get; set; } + public int MatrOpr { get; set; } + public string Cognome { get; set; } + public string Nome { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/R1.cs b/MP.Data/DatabaseModels/R1.cs new file mode 100644 index 00000000..e4abb10d --- /dev/null +++ b/MP.Data/DatabaseModels/R1.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class R1 + { + public string IdxMacchina { get; set; } + public DateTime DataOra { get; set; } + public string Causale { get; set; } + public int Qta { get; set; } + public string Note { get; set; } + public string CodArticolo { get; set; } + public int MatrOpr { get; set; } + public DateTime? DataOraProdRec { get; set; } + public string Descrizione { get; set; } + public string KeyRichiesta { get; set; } + public int IdxOdl { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/Rc.cs b/MP.Data/DatabaseModels/Rc.cs new file mode 100644 index 00000000..8578e1a4 --- /dev/null +++ b/MP.Data/DatabaseModels/Rc.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class Rc + { + public int IdxControllo { get; set; } + public DateTime DataOra { get; set; } + public string IdxMacchina { get; set; } + public int IdxOdl { get; set; } + public string CodArticolo { get; set; } + public int MatrOpr { get; set; } + public bool EsitoOk { get; set; } + public string Note { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/ResControlli.cs b/MP.Data/DatabaseModels/ResControlli.cs new file mode 100644 index 00000000..77f46ee9 --- /dev/null +++ b/MP.Data/DatabaseModels/ResControlli.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class ResControlli + { + #region Public Properties + + public string CodArticolo { get; set; } + public DateTime DataOra { get; set; } + public bool EsitoOk { get; set; } + public int IdxControllo { get; set; } + public string IdxMacchina { get; set; } + public int IdxOdl { get; set; } + public int MatrOpr { get; set; } + public string Note { get; set; } + + #endregion Public Properties + } +} \ No newline at end of file diff --git a/MP.Data/DatabaseModels/ResScarti.cs b/MP.Data/DatabaseModels/ResScarti.cs new file mode 100644 index 00000000..4d66d124 --- /dev/null +++ b/MP.Data/DatabaseModels/ResScarti.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class ResScarti + { + #region Public Properties + + public string Causale { get; set; } + public string CodArticolo { get; set; } + public DateTime DataOra { get; set; } + public DateTime? DataOraProdRec { get; set; } + public string Descrizione { get; set; } + public string IdxMacchina { get; set; } + public int IdxOdl { get; set; } + public string KeyRichiesta { get; set; } + public int MatrOpr { get; set; } + public string Note { get; set; } + public int Qta { get; set; } + + #endregion Public Properties + } +} \ No newline at end of file diff --git a/MP.Data/DatabaseModels/Tally.cs b/MP.Data/DatabaseModels/Tally.cs new file mode 100644 index 00000000..e64cf735 --- /dev/null +++ b/MP.Data/DatabaseModels/Tally.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class Tally + { + public int N { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/TcStat.cs b/MP.Data/DatabaseModels/TcStat.cs new file mode 100644 index 00000000..eef51348 --- /dev/null +++ b/MP.Data/DatabaseModels/TcStat.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class TcStat + { + public string CodArticolo { get; set; } + public string CodGruppo { get; set; } + public string IdxMacchina { get; set; } + public decimal TcStat1 { get; set; } + public int TcType { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/Tcr.cs b/MP.Data/DatabaseModels/Tcr.cs new file mode 100644 index 00000000..d0ba1c26 --- /dev/null +++ b/MP.Data/DatabaseModels/Tcr.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class Tcr + { + public DateTime DataOraRif { get; set; } + public string IdxMacchina { get; set; } + public string CodArticolo { get; set; } + public int PzProd { get; set; } + public decimal? Tcmedio { get; set; } + public decimal? Tcmin { get; set; } + public decimal? Tcmax { get; set; } + public decimal? Tc50p { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/Tcr1.cs b/MP.Data/DatabaseModels/Tcr1.cs new file mode 100644 index 00000000..444d2669 --- /dev/null +++ b/MP.Data/DatabaseModels/Tcr1.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class Tcr1 + { + public string IdxMacchina { get; set; } + public string CodArticolo { get; set; } + public DateTime DataOraRif { get; set; } + public decimal Tcmedio { get; set; } + public int PzProd { get; set; } + public int IdxOdl { get; set; } + public decimal Tcassegnato { get; set; } + public string KeyRichiesta { get; set; } + public int PzPallet { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/TcrDay.cs b/MP.Data/DatabaseModels/TcrDay.cs new file mode 100644 index 00000000..20c3fbdf --- /dev/null +++ b/MP.Data/DatabaseModels/TcrDay.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class TcrDay + { + public DateTime DataOraRif { get; set; } + public string IdxMacchina { get; set; } + public string CodArticolo { get; set; } + public int PzProd { get; set; } + public decimal? Tcmedio { get; set; } + public decimal? Tcmin { get; set; } + public decimal? Tcmax { get; set; } + public decimal? Tc50p { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/TcrDayTest.cs b/MP.Data/DatabaseModels/TcrDayTest.cs new file mode 100644 index 00000000..904d7c7f --- /dev/null +++ b/MP.Data/DatabaseModels/TcrDayTest.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class TcrDayTest + { + public DateTime DataOraRif { get; set; } + public string IdxMacchina { get; set; } + public string CodArticolo { get; set; } + public int PzProd { get; set; } + public decimal? Tcmedio { get; set; } + public decimal? Tcmin { get; set; } + public decimal? Tcmax { get; set; } + public decimal? Tc50p { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/TestJason.cs b/MP.Data/DatabaseModels/TestJason.cs new file mode 100644 index 00000000..8f921d40 --- /dev/null +++ b/MP.Data/DatabaseModels/TestJason.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class TestJason + { + public DateTime Data { get; set; } + public byte[] Json { get; set; } + public int? Rows { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/Ul.cs b/MP.Data/DatabaseModels/Ul.cs new file mode 100644 index 00000000..54b11f82 --- /dev/null +++ b/MP.Data/DatabaseModels/Ul.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class Ul + { + public int IdxLog { get; set; } + public DateTime DataOraRif { get; set; } + public string IdxMacchina { get; set; } + public int MatrOpr { get; set; } + public string Cognome { get; set; } + public string Nome { get; set; } + public string CodArticolo { get; set; } + public string Azione { get; set; } + public string Valore { get; set; } + public decimal Qta { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/UserActionLog.cs b/MP.Data/DatabaseModels/UserActionLog.cs new file mode 100644 index 00000000..15426401 --- /dev/null +++ b/MP.Data/DatabaseModels/UserActionLog.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class UserActionLog + { + #region Public Properties + + public string Azione { get; set; } + public string CodArticolo { get; set; } + public string Cognome { get; set; } + public DateTime DataOraRif { get; set; } + public int IdxLog { get; set; } + public string IdxMacchina { get; set; } + public int MatrOpr { get; set; } + public string Nome { get; set; } + public decimal Qta { get; set; } + public string Valore { get; set; } + + #endregion Public Properties + } +} \ No newline at end of file diff --git a/MP.Data/DatabaseModels/VDdb.cs b/MP.Data/DatabaseModels/VDdb.cs new file mode 100644 index 00000000..4aeccff6 --- /dev/null +++ b/MP.Data/DatabaseModels/VDdb.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class VDdb + { + public string IdxMacchina { get; set; } + public DateTime InizioStato { get; set; } + public DateTime? FineStato { get; set; } + public int IdxStato { get; set; } + public double? DurataMinuti { get; set; } + public string Value { get; set; } + public string CodArticolo { get; set; } + public double? TempoCicloBase { get; set; } + public int? PzPalletProd { get; set; } + public int? MatrOpr { get; set; } + public string Pallet { get; set; } + public string Descrizione { get; set; } + public string ClasseTempo { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/VDdbLight.cs b/MP.Data/DatabaseModels/VDdbLight.cs new file mode 100644 index 00000000..f1bafcbc --- /dev/null +++ b/MP.Data/DatabaseModels/VDdbLight.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class VDdbLight + { + public string CodMacchina { get; set; } + public string DescMacchina { get; set; } + public DateTime InizioStato { get; set; } + public string Stato { get; set; } + public double? DurataMinuti { get; set; } + public string CodArticolo { get; set; } + public string Operatore { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/VDdbLightOld.cs b/MP.Data/DatabaseModels/VDdbLightOld.cs new file mode 100644 index 00000000..d636177a --- /dev/null +++ b/MP.Data/DatabaseModels/VDdbLightOld.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class VDdbLightOld + { + public string CodMacchina { get; set; } + public string DescMacchina { get; set; } + public DateTime InizioStato { get; set; } + public string Stato { get; set; } + public double? DurataMinuti { get; set; } + public string CodArticolo { get; set; } + public string Operatore { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/VDdbTurni.cs b/MP.Data/DatabaseModels/VDdbTurni.cs new file mode 100644 index 00000000..fbdc6046 --- /dev/null +++ b/MP.Data/DatabaseModels/VDdbTurni.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class VDdbTurni + { + public string IdxMacchina { get; set; } + public DateTime DataRif { get; set; } + public string Turno { get; set; } + public string CodArticolo { get; set; } + public int IdxStato { get; set; } + public decimal TempoCicloBase { get; set; } + public int PzPalletProd { get; set; } + public decimal? Durata { get; set; } + public int? PzProd { get; set; } + public string ClasseTempo { get; set; } + public string DescClasseTempo { get; set; } + public string Semaforo { get; set; } + public string SemColore { get; set; } + public string CodMacchina { get; set; } + public string DescMacchina { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/VEcp.cs b/MP.Data/DatabaseModels/VEcp.cs new file mode 100644 index 00000000..c90a45b6 --- /dev/null +++ b/MP.Data/DatabaseModels/VEcp.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class VEcp + { + public DateTime DataOraConf { get; set; } + public string IdxMacchina { get; set; } + public int MatrApp { get; set; } + public DateTime DataFrom { get; set; } + public DateTime DataTo { get; set; } + public int PezziConf { get; set; } + public int PezziScar { get; set; } + public int PezziDaRilav { get; set; } + public string CommessaEsterna { get; set; } + public int TipoConf { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/VEcp1.cs b/MP.Data/DatabaseModels/VEcp1.cs new file mode 100644 index 00000000..3c63b654 --- /dev/null +++ b/MP.Data/DatabaseModels/VEcp1.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class VEcp1 + { + public int IdxEcp { get; set; } + public DateTime DataOraConf { get; set; } + public string IdxMacchina { get; set; } + public string CodMacchina { get; set; } + public string DescMacchina { get; set; } + public string KeyRichiesta { get; set; } + public int IdxOdl { get; set; } + public string CodArticolo { get; set; } + public int PezziConf { get; set; } + public int PezziScar { get; set; } + public int PezziDaRilav { get; set; } + public int MatrOpr { get; set; } + public string Cognome { get; set; } + public string Nome { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/VEcpExtended.cs b/MP.Data/DatabaseModels/VEcpExtended.cs new file mode 100644 index 00000000..c2d75bc9 --- /dev/null +++ b/MP.Data/DatabaseModels/VEcpExtended.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class VEcpExtended + { + public int IdxEcp { get; set; } + public DateTime DataOraConf { get; set; } + public string IdxMacchina { get; set; } + public string CodMacchina { get; set; } + public string DescMacchina { get; set; } + public string KeyRichiesta { get; set; } + public int IdxOdl { get; set; } + public string CodArticolo { get; set; } + public int PezziConf { get; set; } + public int PezziScar { get; set; } + public int PezziDaRilav { get; set; } + public int MatrOpr { get; set; } + public string Cognome { get; set; } + public string Nome { get; set; } + public decimal Tcassegnato { get; set; } + public DateTime DueDate { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/VKit.cs b/MP.Data/DatabaseModels/VKit.cs new file mode 100644 index 00000000..f84ce903 --- /dev/null +++ b/MP.Data/DatabaseModels/VKit.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class VKit + { + public string KeyKit { get; set; } + public string KeyExtOrd { get; set; } + public string CodArtParent { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/VOdl.cs b/MP.Data/DatabaseModels/VOdl.cs new file mode 100644 index 00000000..8600135a --- /dev/null +++ b/MP.Data/DatabaseModels/VOdl.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class VOdl + { + public int IdxOdl { get; set; } + public string CodArticolo { get; set; } + public string IdxMacchina { get; set; } + public int NumPezzi { get; set; } + public decimal Tcassegnato { get; set; } + public DateTime? DataInizio { get; set; } + public DateTime? DataFine { get; set; } + public string Note { get; set; } + public bool NeedAppr { get; set; } + public string UserAppr { get; set; } + public DateTime? DataAppr { get; set; } + public decimal? TcrichAttr { get; set; } + public string KeyRichiesta { get; set; } + public int PzPallet { get; set; } + public bool Provvisorio { get; set; } + public int MatrOpr { get; set; } + public string CommessaAs400 { get; set; } + public int ToAs400 { get; set; } + public DateTime? DueDate { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/VOdl1.cs b/MP.Data/DatabaseModels/VOdl1.cs new file mode 100644 index 00000000..97fda075 --- /dev/null +++ b/MP.Data/DatabaseModels/VOdl1.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class VOdl1 + { + public int IdxOdl { get; set; } + public string KeyRichiesta { get; set; } + public string CodArticolo { get; set; } + public decimal Tcassegnato { get; set; } + public string IdxMacchina { get; set; } + public string CodMacchina { get; set; } + public string DescMacchina { get; set; } + public int NumPezzi { get; set; } + public int NumPezziEv { get; set; } + public int NumPezziSca { get; set; } + public int NumPezziRil { get; set; } + public DateTime? DataInizio { get; set; } + public DateTime? DataFine { get; set; } + public string KeyRichiestaParent { get; set; } + public string CodArticoloParent { get; set; } + public DateTime? DueDate { get; set; } + public int? PzPallet { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/VPodlNonChiusi.cs b/MP.Data/DatabaseModels/VPodlNonChiusi.cs new file mode 100644 index 00000000..fa806e0d --- /dev/null +++ b/MP.Data/DatabaseModels/VPodlNonChiusi.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class VPodlNonChiusi + { + public int IdxPromessa { get; set; } + public string KeyRichiesta { get; set; } + public string KeyBcode { get; set; } + public bool Attivabile { get; set; } + public int IdxOdl { get; set; } + public DateTime? DataInizio { get; set; } + public string CodArticolo { get; set; } + public string DescArticolo { get; set; } + public string CodGruppo { get; set; } + public string IdxMacchina { get; set; } + public string CodMacchina { get; set; } + public string Nome { get; set; } + public int NumPezzi { get; set; } + public decimal Tcassegnato { get; set; } + public DateTime DueDate { get; set; } + public int Priorita { get; set; } + public int PzPallet { get; set; } + public decimal? TotMinProg { get; set; } + public decimal? TotOreProg { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/VR1.cs b/MP.Data/DatabaseModels/VR1.cs new file mode 100644 index 00000000..956f8786 --- /dev/null +++ b/MP.Data/DatabaseModels/VR1.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class VR1 + { + public DateTime DataOraRif { get; set; } + public string IdxMacchina { get; set; } + public string Causale { get; set; } + public string Descrizione { get; set; } + public string Note { get; set; } + public int Qta { get; set; } + public string KeyRichiesta { get; set; } + public int IdxOdl { get; set; } + public string CodArticolo { get; set; } + public int MatrOpr { get; set; } + public string Cognome { get; set; } + public string Nome { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/VTcStat.cs b/MP.Data/DatabaseModels/VTcStat.cs new file mode 100644 index 00000000..2c048219 --- /dev/null +++ b/MP.Data/DatabaseModels/VTcStat.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class VTcStat + { + public string CodArticolo { get; set; } + public string CodGruppo { get; set; } + public string IdxMacchina { get; set; } + public string CodMacchina { get; set; } + public string DescMacchina { get; set; } + public decimal TcStat { get; set; } + public int TcType { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/VTcr.cs b/MP.Data/DatabaseModels/VTcr.cs new file mode 100644 index 00000000..a3adb842 --- /dev/null +++ b/MP.Data/DatabaseModels/VTcr.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class VTcr + { + public string IdxMacchina { get; set; } + public string CodArticolo { get; set; } + public DateTime DataOraRif { get; set; } + public decimal Tcmedio { get; set; } + public int PzProd { get; set; } + public int IdxOdl { get; set; } + public decimal Tcassegnato { get; set; } + public string KeyRichiesta { get; set; } + public int PzPallet { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/VTcr1.cs b/MP.Data/DatabaseModels/VTcr1.cs new file mode 100644 index 00000000..55061b57 --- /dev/null +++ b/MP.Data/DatabaseModels/VTcr1.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class VTcr1 + { + public DateTime DataOraRif { get; set; } + public string IdxMacchina { get; set; } + public string CodMacchina { get; set; } + public string DescMacchina { get; set; } + public string CodArticolo { get; set; } + public int PzProd { get; set; } + public decimal? Tcmedio { get; set; } + public decimal? Tcmin { get; set; } + public decimal? Tcmax { get; set; } + public decimal? Tc50p { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/VTcrDay.cs b/MP.Data/DatabaseModels/VTcrDay.cs new file mode 100644 index 00000000..5d591407 --- /dev/null +++ b/MP.Data/DatabaseModels/VTcrDay.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class VTcrDay + { + public DateTime? DataOraRif { get; set; } + public string IdxMacchina { get; set; } + public string CodMacchina { get; set; } + public string DescMacchina { get; set; } + public string CodArticolo { get; set; } + public int PzProd { get; set; } + public decimal? Tcmedio { get; set; } + public decimal? Tcmin { get; set; } + public decimal? Tcmax { get; set; } + public decimal? Tc50p { get; set; } + } +} diff --git a/MP.Data/DatabaseModels/VetoTc.cs b/MP.Data/DatabaseModels/VetoTc.cs new file mode 100644 index 00000000..b48ad96b --- /dev/null +++ b/MP.Data/DatabaseModels/VetoTc.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class VetoTc + { + public string IdxMacchina { get; set; } + public string CodArticolo { get; set; } + public bool? VetoTc1 { get; set; } + public decimal SogliaTc { get; set; } + } +} diff --git a/MP.Data/Enums.cs b/MP.Data/Enums.cs new file mode 100644 index 00000000..421dd601 --- /dev/null +++ b/MP.Data/Enums.cs @@ -0,0 +1,8 @@ +using System; + +namespace MP.Data +{ + public class Enums + { + } +} \ No newline at end of file diff --git a/MP.Data/MP.Data.csproj b/MP.Data/MP.Data.csproj new file mode 100644 index 00000000..a8360e39 --- /dev/null +++ b/MP.Data/MP.Data.csproj @@ -0,0 +1,65 @@ + + + + net5.0 + MP.Data + MP.Data + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + diff --git a/MP.Data/MoonPro_STATSContext.cs b/MP.Data/MoonPro_STATSContext.cs new file mode 100644 index 00000000..ee404307 --- /dev/null +++ b/MP.Data/MoonPro_STATSContext.cs @@ -0,0 +1,1606 @@ +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.Extensions.Configuration; +using MP.Data.DatabaseModels; +using NLog; + +#nullable disable + +namespace MP.Data +{ + public partial class MoonPro_STATSContext : DbContext + { + #region Private Fields + + private static NLog.Logger Log = LogManager.GetCurrentClassLogger(); + + private IConfiguration _configuration; + + #endregion Private Fields + + #region Public Constructors + + public MoonPro_STATSContext(IConfiguration configuration) + { + _configuration = configuration; + } + + public MoonPro_STATSContext(DbContextOptions options) + : base(options) + { + } + + #endregion Public Constructors + +#if false + public virtual DbSet Aauls { get; set; } + public virtual DbSet Cals { get; set; } + public virtual DbSet Configs { get; set; } + public virtual DbSet Ddbs { get; set; } + public virtual DbSet Ddbs1 { get; set; } + public virtual DbSet DdbTurniNews { get; set; } + public virtual DbSet DdbTurnis { get; set; } + public virtual DbSet DdbTurniSummaries { get; set; } + public virtual DbSet DdbTurniSummaryNews { get; set; } + public virtual DbSet Ecps { get; set; } + public virtual DbSet Ecps1 { get; set; } + public virtual DbSet Kits { get; set; } + public virtual DbSet Odls { get; set; } + public virtual DbSet Odls1 { get; set; } + public virtual DbSet Rcs { get; set; } + public virtual DbSet Rs { get; set; } + public virtual DbSet Rs1 { get; set; } + public virtual DbSet Tallies { get; set; } + public virtual DbSet TcrDays { get; set; } + public virtual DbSet TcrDayTests { get; set; } + public virtual DbSet Tcrs { get; set; } + public virtual DbSet Tcrs1 { get; set; } + public virtual DbSet TcStats { get; set; } + public virtual DbSet TestJasons { get; set; } + public virtual DbSet
            Uls { get; set; } +#endif + +#if false + public virtual DbSet VDdbLightOlds { get; set; } + public virtual DbSet VDdbLights { get; set; } + public virtual DbSet VDdbs { get; set; } + public virtual DbSet VDdbTurnis { get; set; } + public virtual DbSet VEcpExtendeds { get; set; } + public virtual DbSet VEcps { get; set; } + public virtual DbSet VEcps1 { get; set; } + public virtual DbSet VetoTcs { get; set; } + public virtual DbSet VKits { get; set; } + public virtual DbSet VOdls { get; set; } + public virtual DbSet VOdls1 { get; set; } + public virtual DbSet VPodlNonChiusis { get; set; } +#endif + + #region Public Properties + + public virtual DbSet DbSetControlli { get; set; } + public virtual DbSet DbSetScarti { get; set; } +#if false + public virtual DbSet VRs1 { get; set; } + public virtual DbSet VTcrDays { get; set; } + public virtual DbSet VTcrs { get; set; } + public virtual DbSet VTcrs1 { get; set; } + public virtual DbSet VTcStats { get; set; } +#endif + public virtual DbSet DbSetUserLog { get; set; } + + #endregion Public Properties + + #region Private Methods + + partial void OnModelCreatingPartial(ModelBuilder modelBuilder); + + #endregion Private Methods + + #region Protected Methods + + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + { + if (!optionsBuilder.IsConfigured) + { + string connString = _configuration.GetConnectionString("Mp.Stats"); + + optionsBuilder.UseSqlServer(_configuration.GetConnectionString("Mp.Stats")); + +#warning To protect potentially sensitive information in your connection string, you should move it out of source code. You can avoid scaffolding the connection string by using the Name= syntax to read it from configuration - see https://go.microsoft.com/fwlink/?linkid=2131148. For more guidance on storing connection strings, see http://go.microsoft.com/fwlink/?LinkId=723263. + //optionsBuilder.UseSqlServer("Server=SQL2016DEV;Database=MoonPro_STATS;Trusted_Connection=True;"); + } + } + + protected override void OnModelCreating(ModelBuilder modelBuilder) + { + modelBuilder.HasAnnotation("Relational:Collation", "SQL_Latin1_General_CP1_CI_AS"); + +#if false + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Azione); + + entity.ToTable("AAUL"); + + entity.Property(e => e.Azione) + .HasMaxLength(50) + .HasDefaultValueSql("('ND')") + .HasComment("Azione dell'operatore"); + + entity.Property(e => e.Descrizione) + .IsRequired() + .HasMaxLength(50) + .HasDefaultValueSql("('')"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Giorno) + .HasName("PK_Calendario"); + + entity.ToTable("CAL"); + + entity.Property(e => e.Giorno) + .HasColumnType("datetime") + .HasColumnName("giorno"); + + entity.Property(e => e.DoDdb) + .IsRequired() + .HasColumnName("doDDB") + .HasDefaultValueSql("((1))") + .HasComment("Indica che è necessario ricalcolare statistiche derivate da DDB (DiarioDiBordo)"); + + entity.Property(e => e.DoEcp) + .IsRequired() + .HasColumnName("doECP") + .HasDefaultValueSql("((1))") + .HasComment("Indica che è necessario ricalcolare statistiche derivate da DPO (DatiProduzione Operatore) - conferme manuali operatore"); + + entity.Property(e => e.DoOdl) + .IsRequired() + .HasColumnName("doODL") + .HasDefaultValueSql("((1))") + .HasComment("Indica che è necessario ricalcolare statistiche ODL"); + + entity.Property(e => e.DoRs) + .IsRequired() + .HasColumnName("doRS") + .HasDefaultValueSql("((1))") + .HasComment("Indica che è necessario ricalcolare statistiche derivate da RS (Registro Scarti)"); + + entity.Property(e => e.DoTcr) + .IsRequired() + .HasColumnName("doTCR") + .HasDefaultValueSql("((1))") + .HasComment("Indica che è necessario ricalcolare statistiche derivate da rilevazione TCR (TempiCicloRilevati)"); + + entity.Property(e => e.DoUl) + .IsRequired() + .HasColumnName("doUL") + .HasDefaultValueSql("((1))") + .HasComment("Indica che è necessario ricalcolare statistiche derivate da DSO (Dichiarazioni Scarti Operatore)"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Chiave); + + entity.ToTable("Config"); + + entity.Property(e => e.Chiave) + .HasMaxLength(50) + .HasColumnName("chiave"); + + entity.Property(e => e.Note).HasColumnName("note"); + + entity.Property(e => e.Valore).HasColumnName("valore"); + + entity.Property(e => e.ValoreStd) + .HasColumnName("valoreStd") + .HasComment("Valore di default/riferimento per la variabile"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => new { e.DataOraRif, e.IdxMacchina, e.IdxStato }) + .HasName("PK_DDB_1"); + + entity.ToTable("DDB"); + + entity.Property(e => e.DataOraRif).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.DurataMinuti).HasColumnType("decimal(18, 8)"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToTable("DDB", "raw"); + + entity.HasIndex(e => e.InizioStato, "ci_DDB_Data") + .IsClustered(); + + entity.HasIndex(e => e.CodArticolo, "i_DDB_CodArt"); + + entity.HasIndex(e => e.IdxMacchina, "i_DDB_IdxMacc"); + + entity.HasIndex(e => e.IdxStato, "i_DDB_IdxStato"); + + entity.HasIndex(e => e.MatrOpr, "i_DDB_MatrOpr"); + + entity.Property(e => e.ClasseTempo).HasMaxLength(50); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.Descrizione).HasMaxLength(50); + + entity.Property(e => e.FineStato).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.InizioStato).HasColumnType("datetime"); + + entity.Property(e => e.Pallet) + .HasMaxLength(20) + .HasColumnName("pallet"); + + entity.Property(e => e.Value).HasMaxLength(50); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => new { e.DataRif, e.IdxMacchina, e.Turno, e.IdxStato, e.CodArticolo, e.InizioPeriodo }); + + entity.ToTable("DDB_Turni"); + + entity.Property(e => e.DataRif).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.Turno).HasMaxLength(5); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.InizioPeriodo).HasColumnType("datetime"); + + entity.Property(e => e.ClasseTempo).HasMaxLength(50); + + entity.Property(e => e.DataTurnoFine).HasColumnType("datetime"); + + entity.Property(e => e.DataTurnoInizio).HasColumnType("datetime"); + + entity.Property(e => e.Descrizione).HasMaxLength(50); + + entity.Property(e => e.FinePeriodo).HasColumnType("datetime"); + + entity.Property(e => e.FineStato).HasColumnType("datetime"); + + entity.Property(e => e.InizioStato).HasColumnType("datetime"); + + entity.Property(e => e.Pallet) + .HasMaxLength(20) + .HasColumnName("pallet"); + + entity.Property(e => e.TempoCicloBase).HasColumnType("decimal(18, 8)"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => new { e.DataRif, e.IdxMacchina, e.Turno, e.IdxStato, e.CodArticolo, e.InizioPeriodo }); + + entity.ToTable("DDB_TurniNew"); + + entity.Property(e => e.DataRif).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.Turno).HasMaxLength(5); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.InizioPeriodo).HasColumnType("datetime"); + + entity.Property(e => e.ClasseTempo).HasMaxLength(50); + + entity.Property(e => e.DataTurnoFine).HasColumnType("datetime"); + + entity.Property(e => e.DataTurnoInizio).HasColumnType("datetime"); + + entity.Property(e => e.Descrizione).HasMaxLength(50); + + entity.Property(e => e.FinePeriodo).HasColumnType("datetime"); + + entity.Property(e => e.FineStato).HasColumnType("datetime"); + + entity.Property(e => e.InizioStato).HasColumnType("datetime"); + + entity.Property(e => e.Pallet) + .HasMaxLength(20) + .HasColumnName("pallet"); + + entity.Property(e => e.TempoCicloBase).HasColumnType("decimal(18, 8)"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => new { e.IdxMacchina, e.DataRif, e.Turno, e.CodArticolo, e.IdxStato, e.TempoCicloBase, e.PzPalletProd }); + + entity.ToTable("DDB_TurniSummary"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.DataRif).HasColumnType("datetime"); + + entity.Property(e => e.Turno).HasMaxLength(5); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.TempoCicloBase).HasColumnType("decimal(18, 8)"); + + entity.Property(e => e.Durata).HasColumnType("numeric(27, 7)"); + + entity.Property(e => e.Inizio).HasColumnType("datetime"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => new { e.IdxMacchina, e.DataRif, e.Turno, e.CodArticolo, e.IdxStato, e.TempoCicloBase, e.PzPalletProd }); + + entity.ToTable("DDB_TurniSummaryNew"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.DataRif).HasColumnType("datetime"); + + entity.Property(e => e.Turno).HasMaxLength(5); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.TempoCicloBase).HasColumnType("decimal(18, 8)"); + + entity.Property(e => e.Durata).HasColumnType("numeric(27, 7)"); + + entity.Property(e => e.Inizio).HasColumnType("datetime"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.IdxEcp); + + entity.ToTable("ECP"); + + entity.Property(e => e.IdxEcp).HasColumnName("idxECP"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Cognome) + .IsRequired() + .HasMaxLength(50) + .HasDefaultValueSql("('')"); + + entity.Property(e => e.DataOraConf).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50) + .HasColumnName("idxMacchina"); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Nome) + .IsRequired() + .HasMaxLength(50) + .HasDefaultValueSql("('')"); + + entity.Property(e => e.PezziConf).HasColumnName("pezziConf"); + + entity.Property(e => e.PezziDaRilav).HasColumnName("pezziDaRilav"); + + entity.Property(e => e.PezziScar).HasColumnName("pezziScar"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToTable("ECP", "raw"); + + entity.HasIndex(e => e.DataOraConf, "ci_ECP_Data") + .IsClustered(); + + entity.HasIndex(e => e.IdxMacchina, "i_ECP_IdxMacc"); + + entity.HasIndex(e => e.MatrApp, "i_ECP_MatrApp"); + + entity.HasIndex(e => e.IdxMacchina, "i_ODL_IdxMacc"); + + entity.Property(e => e.CommessaEsterna) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataFrom) + .HasColumnType("datetime") + .HasColumnName("dataFrom"); + + entity.Property(e => e.DataOraConf).HasColumnType("datetime"); + + entity.Property(e => e.DataTo) + .HasColumnType("datetime") + .HasColumnName("dataTo"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50) + .HasColumnName("idxMacchina"); + + entity.Property(e => e.PezziConf).HasColumnName("pezziConf"); + + entity.Property(e => e.PezziDaRilav).HasColumnName("pezziDaRilav"); + + entity.Property(e => e.PezziScar).HasColumnName("pezziScar"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.KeyKit); + + entity.ToTable("KIT", "raw"); + + entity.Property(e => e.KeyKit).HasMaxLength(50); + + entity.Property(e => e.CodArtParent).IsRequired(); + + entity.Property(e => e.KeyExtOrd).IsRequired(); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.IdxOdl) + .HasName("PK_ODL_1"); + + entity.ToTable("ODL"); + + entity.Property(e => e.IdxOdl) + .ValueGeneratedNever() + .HasColumnName("IdxODL"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodArticoloParent) + .IsRequired() + .HasDefaultValueSql("('')"); + + entity.Property(e => e.DataFine).HasColumnType("datetime"); + + entity.Property(e => e.DataInizio).HasColumnType("datetime"); + + entity.Property(e => e.DueDate).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50) + .HasComment("Chiave: ordine esterno o KIT"); + + entity.Property(e => e.KeyRichiestaParent) + .IsRequired() + .HasDefaultValueSql("('')") + .HasComment("Chiave: ordine esterno o KIT"); + + entity.Property(e => e.PzPallet).HasDefaultValueSql("((1))"); + + entity.Property(e => e.Tcassegnato) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCAssegnato"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.IdxOdl) + .IsClustered(false); + + entity.ToTable("ODL", "raw"); + + entity.HasIndex(e => e.IdxOdl, "ci_ODL_Data") + .IsClustered(); + + entity.HasIndex(e => e.IdxMacchina, "i_ODL_IdxMacc"); + + entity.HasIndex(e => e.KeyRichiesta, "i_ODL_KeyRic"); + + entity.Property(e => e.IdxOdl) + .ValueGeneratedNever() + .HasColumnName("IdxODL"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CommessaAs400) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataAppr).HasColumnType("datetime"); + + entity.Property(e => e.DataFine).HasColumnType("datetime"); + + entity.Property(e => e.DataInizio).HasColumnType("datetime"); + + entity.Property(e => e.DueDate).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Note).HasMaxLength(2500); + + entity.Property(e => e.Provvisorio).HasColumnName("provvisorio"); + + entity.Property(e => e.Tcassegnato) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCAssegnato"); + + entity.Property(e => e.TcrichAttr) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCRichAttr"); + + entity.Property(e => e.UserAppr).HasMaxLength(50); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => new { e.DataOraRif, e.IdxMacchina, e.Causale, e.IdxOdl }); + + entity.ToTable("RS"); + + entity.Property(e => e.DataOraRif).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.Causale).HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Cognome) + .IsRequired() + .HasMaxLength(50) + .HasDefaultValueSql("('')"); + + entity.Property(e => e.Descrizione) + .IsRequired() + .HasMaxLength(250); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Nome) + .IsRequired() + .HasMaxLength(50) + .HasDefaultValueSql("('')"); + + entity.Property(e => e.Note) + .IsRequired() + .HasMaxLength(250); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToTable("RS", "raw"); + + entity.HasIndex(e => e.DataOra, "ci_RS_Data") + .IsClustered(); + + entity.HasIndex(e => e.Causale, "i_RS_Causale"); + + entity.HasIndex(e => e.CodArticolo, "i_RS_CodArt"); + + entity.HasIndex(e => e.IdxMacchina, "i_RS_IdxMacc"); + + entity.HasIndex(e => e.MatrOpr, "i_RS_MatrOpr"); + + entity.Property(e => e.Causale) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataOra).HasColumnType("datetime"); + + entity.Property(e => e.DataOraProdRec).HasColumnType("datetime"); + + entity.Property(e => e.Descrizione) + .IsRequired() + .HasMaxLength(250); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Note) + .IsRequired() + .HasMaxLength(250); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.IdxControllo) + .IsClustered(false); + + entity.ToTable("RC", "raw"); + + entity.HasIndex(e => e.DataOra, "ci_RC_Data") + .IsClustered(); + + entity.HasIndex(e => e.CodArticolo, "i_RC_CodArt"); + + entity.HasIndex(e => e.EsitoOk, "i_RC_EsitoOk"); + + entity.HasIndex(e => e.IdxMacchina, "i_RC_IdxMacc"); + + entity.HasIndex(e => e.MatrOpr, "i_RC_MatrOpr"); + + entity.Property(e => e.IdxControllo).ValueGeneratedNever(); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataOra).HasColumnType("datetime"); + + entity.Property(e => e.EsitoOk).HasColumnName("EsitoOK"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.Note) + .IsRequired() + .HasMaxLength(250); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.N) + .HasName("PK_Tally_N"); + + entity.ToTable("Tally"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => new { e.CodArticolo, e.CodGruppo, e.IdxMacchina }); + + entity.ToTable("TC_Stat"); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.CodGruppo).HasMaxLength(50); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.TcStat1) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TC_Stat"); + + entity.Property(e => e.TcType).HasColumnName("TC_Type"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => new { e.IdxMacchina, e.CodArticolo, e.DataOraRif }) + .IsClustered(false); + + entity.ToTable("TCR"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.DataOraRif).HasColumnType("datetime"); + + entity.Property(e => e.Tc50p) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TC50p") + .HasComment("Valore percentile 50"); + + entity.Property(e => e.Tcmax) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMax") + .HasComment("Valore MASSIMO"); + + entity.Property(e => e.Tcmedio) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMedio") + .HasComment("Valore di MEDIA arimetica"); + + entity.Property(e => e.Tcmin) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMin") + .HasComment("Valore minimo"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToTable("TCR", "raw"); + + entity.HasIndex(e => e.DataOraRif, "ci_TCR_Data") + .IsClustered(); + + entity.HasIndex(e => e.CodArticolo, "i_TCR_CodArt"); + + entity.HasIndex(e => e.IdxMacchina, "i_TCR_IdxMacc"); + + entity.HasIndex(e => e.KeyRichiesta, "i_TCR_KeyRich"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataOraRif).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Tcassegnato) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCAssegnato"); + + entity.Property(e => e.Tcmedio) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMedio"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => new { e.IdxMacchina, e.CodArticolo, e.DataOraRif }) + .HasName("PK_TCRDay") + .IsClustered(false); + + entity.ToTable("TCR_Day"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.DataOraRif).HasColumnType("date"); + + entity.Property(e => e.Tc50p) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TC50p") + .HasComment("Valore percentile 50"); + + entity.Property(e => e.Tcmax) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMax") + .HasComment("Valore MASSIMO"); + + entity.Property(e => e.Tcmedio) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMedio") + .HasComment("Valore di MEDIA arimetica"); + + entity.Property(e => e.Tcmin) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMin") + .HasComment("Valore minimo"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToTable("TCR_DayTest"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataOraRif).HasColumnType("date"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Tc50p) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TC50p"); + + entity.Property(e => e.Tcmax) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMax"); + + entity.Property(e => e.Tcmedio) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMedio"); + + entity.Property(e => e.Tcmin) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMin"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToTable("TestJason"); + + entity.Property(e => e.Data).HasColumnType("date"); + }); + + modelBuilder.Entity
              (entity => + { + entity.HasKey(e => e.IdxLog) + .HasName("PK_UserLog"); + + entity.ToTable("UL"); + + entity.HasIndex(e => e.DataOraRif, "i_UL_DataOra"); + + entity.Property(e => e.Azione) + .IsRequired() + .HasMaxLength(50) + .HasDefaultValueSql("('ND')") + .HasComment("Azione dell'operatore"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Cognome) + .IsRequired() + .HasMaxLength(50) + .HasDefaultValueSql("('')"); + + entity.Property(e => e.DataOraRif).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Nome) + .IsRequired() + .HasMaxLength(50) + .HasDefaultValueSql("('')"); + + entity.Property(e => e.Qta).HasColumnType("decimal(18, 8)"); + + entity.Property(e => e.Valore) + .IsRequired() + .HasMaxLength(250) + .HasDefaultValueSql("('')"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("vDDB"); + + entity.Property(e => e.ClasseTempo).HasMaxLength(50); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.Descrizione).HasMaxLength(50); + + entity.Property(e => e.FineStato).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.InizioStato).HasColumnType("datetime"); + + entity.Property(e => e.Pallet) + .HasMaxLength(20) + .HasColumnName("pallet"); + + entity.Property(e => e.Value).HasMaxLength(50); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_DDB_Light", "export"); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.CodMacchina).HasMaxLength(50); + + entity.Property(e => e.DescMacchina).HasMaxLength(50); + + entity.Property(e => e.InizioStato).HasColumnType("datetime"); + + entity.Property(e => e.Operatore) + .IsRequired() + .HasMaxLength(101); + + entity.Property(e => e.Stato).HasMaxLength(50); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("vDDB_Light_OLD"); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.CodMacchina).HasMaxLength(50); + + entity.Property(e => e.DescMacchina).HasMaxLength(50); + + entity.Property(e => e.InizioStato).HasColumnType("datetime"); + + entity.Property(e => e.Operatore) + .IsRequired() + .HasMaxLength(101); + + entity.Property(e => e.Stato).HasMaxLength(50); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_DDB_Turni", "export"); + + entity.Property(e => e.ClasseTempo).HasMaxLength(50); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodMacchina).HasMaxLength(50); + + entity.Property(e => e.DataRif).HasColumnType("datetime"); + + entity.Property(e => e.DescClasseTempo).HasMaxLength(50); + + entity.Property(e => e.DescMacchina).HasMaxLength(50); + + entity.Property(e => e.Durata).HasColumnType("numeric(38, 7)"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.SemColore) + .IsRequired() + .HasMaxLength(6) + .IsUnicode(false); + + entity.Property(e => e.Semaforo).HasMaxLength(50); + + entity.Property(e => e.TempoCicloBase).HasColumnType("decimal(18, 8)"); + + entity.Property(e => e.Turno) + .IsRequired() + .HasMaxLength(5); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("vECP"); + + entity.Property(e => e.CommessaEsterna) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataFrom) + .HasColumnType("datetime") + .HasColumnName("dataFrom"); + + entity.Property(e => e.DataOraConf).HasColumnType("datetime"); + + entity.Property(e => e.DataTo) + .HasColumnType("datetime") + .HasColumnName("dataTo"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50) + .HasColumnName("idxMacchina"); + + entity.Property(e => e.PezziConf).HasColumnName("pezziConf"); + + entity.Property(e => e.PezziDaRilav).HasColumnName("pezziDaRilav"); + + entity.Property(e => e.PezziScar).HasColumnName("pezziScar"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_ECP", "export"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodMacchina).HasMaxLength(50); + + entity.Property(e => e.Cognome) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataOraConf).HasColumnType("datetime"); + + entity.Property(e => e.DescMacchina).HasMaxLength(50); + + entity.Property(e => e.IdxEcp).HasColumnName("idxECP"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50) + .HasColumnName("idxMacchina"); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Nome) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.PezziConf).HasColumnName("pezziConf"); + + entity.Property(e => e.PezziDaRilav).HasColumnName("pezziDaRilav"); + + entity.Property(e => e.PezziScar).HasColumnName("pezziScar"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_ECP_Extended", "export"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodMacchina).HasMaxLength(50); + + entity.Property(e => e.Cognome) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataOraConf).HasColumnType("datetime"); + + entity.Property(e => e.DescMacchina).HasMaxLength(50); + + entity.Property(e => e.DueDate).HasColumnType("datetime"); + + entity.Property(e => e.IdxEcp).HasColumnName("idxECP"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50) + .HasColumnName("idxMacchina"); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Nome) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.PezziConf).HasColumnName("pezziConf"); + + entity.Property(e => e.PezziDaRilav).HasColumnName("pezziDaRilav"); + + entity.Property(e => e.PezziScar).HasColumnName("pezziScar"); + + entity.Property(e => e.Tcassegnato) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCAssegnato"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("vKIT"); + + entity.Property(e => e.KeyKit) + .IsRequired() + .HasMaxLength(50); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("vODL"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CommessaAs400) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataAppr).HasColumnType("datetime"); + + entity.Property(e => e.DataFine).HasColumnType("datetime"); + + entity.Property(e => e.DataInizio).HasColumnType("datetime"); + + entity.Property(e => e.DueDate).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Note).HasMaxLength(2500); + + entity.Property(e => e.Provvisorio).HasColumnName("provvisorio"); + + entity.Property(e => e.Tcassegnato) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCAssegnato"); + + entity.Property(e => e.TcrichAttr) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCRichAttr"); + + entity.Property(e => e.UserAppr).HasMaxLength(50); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_ODL", "export"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodArticoloParent).IsRequired(); + + entity.Property(e => e.CodMacchina).HasMaxLength(50); + + entity.Property(e => e.DataFine).HasColumnType("datetime"); + + entity.Property(e => e.DataInizio).HasColumnType("datetime"); + + entity.Property(e => e.DescMacchina).HasMaxLength(50); + + entity.Property(e => e.DueDate).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.KeyRichiestaParent).IsRequired(); + + entity.Property(e => e.Tcassegnato) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCAssegnato"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_PODL_NonChiusi", "export"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodGruppo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataInizio).HasColumnType("datetime"); + + entity.Property(e => e.DescArticolo).HasMaxLength(301); + + entity.Property(e => e.DueDate).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.IdxPromessa).HasColumnName("idxPromessa"); + + entity.Property(e => e.KeyBcode) + .IsRequired() + .HasMaxLength(50) + .HasColumnName("KeyBCode"); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Nome).HasMaxLength(50); + + entity.Property(e => e.Tcassegnato) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCAssegnato"); + + entity.Property(e => e.TotMinProg).HasColumnType("decimal(29, 8)"); + + entity.Property(e => e.TotOreProg).HasColumnType("decimal(32, 11)"); + }); +#endif + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("vRS"); + + entity.Property(e => e.Causale) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataOra).HasColumnType("datetime"); + + entity.Property(e => e.DataOraProdRec).HasColumnType("datetime"); + + entity.Property(e => e.Descrizione) + .IsRequired() + .HasMaxLength(250); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Note) + .IsRequired() + .HasMaxLength(250); + }); +#if false + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_RS", "export"); + + entity.Property(e => e.Causale) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Cognome) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataOraRif).HasColumnType("datetime"); + + entity.Property(e => e.Descrizione) + .IsRequired() + .HasMaxLength(250); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Nome) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Note) + .IsRequired() + .HasMaxLength(250); + }); +#endif + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("vRC"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataOra).HasColumnType("datetime"); + + entity.Property(e => e.EsitoOk).HasColumnName("EsitoOK"); + + entity.Property(e => e.IdxControllo).ValueGeneratedOnAdd(); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.Note) + .IsRequired() + .HasMaxLength(250); + }); + +#if false + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_TC_Stat", "export"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodGruppo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodMacchina).HasMaxLength(50); + + entity.Property(e => e.DescMacchina).HasMaxLength(50); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.TcStat) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TC_Stat"); + + entity.Property(e => e.TcType).HasColumnName("TC_Type"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("vTCR"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataOraRif).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Tcassegnato) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCAssegnato"); + + entity.Property(e => e.Tcmedio) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMedio"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_TCR", "export"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodMacchina).HasMaxLength(50); + + entity.Property(e => e.DataOraRif).HasColumnType("datetime"); + + entity.Property(e => e.DescMacchina).HasMaxLength(50); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Tc50p) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TC50p"); + + entity.Property(e => e.Tcmax) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMax"); + + entity.Property(e => e.Tcmedio) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMedio"); + + entity.Property(e => e.Tcmin) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMin"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_TCR_Day", "export"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodMacchina).HasMaxLength(50); + + entity.Property(e => e.DataOraRif).HasColumnType("datetime"); + + entity.Property(e => e.DescMacchina).HasMaxLength(50); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Tc50p) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TC50p"); + + entity.Property(e => e.Tcmax) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMax"); + + entity.Property(e => e.Tcmedio) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMedio"); + + entity.Property(e => e.Tcmin) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCMin"); + }); +#endif + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_UL", "export"); + + entity.Property(e => e.Azione) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Cognome) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DataOraRif).HasColumnType("datetime"); + + entity.Property(e => e.IdxLog).ValueGeneratedOnAdd(); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Nome) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Qta).HasColumnType("decimal(18, 8)"); + + entity.Property(e => e.Valore) + .IsRequired() + .HasMaxLength(250); + }); +#if false + + modelBuilder.Entity(entity => + { + entity.HasKey(e => new { e.IdxMacchina, e.CodArticolo }); + + entity.ToTable("VetoTC"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.CodArticolo).HasMaxLength(50); + + entity.Property(e => e.SogliaTc) + .HasColumnType("decimal(18, 8)") + .HasColumnName("SogliaTC"); + + entity.Property(e => e.VetoTc1) + .IsRequired() + .HasColumnName("VetoTC") + .HasDefaultValueSql("((1))"); + }); +#endif + + OnModelCreatingPartial(modelBuilder); + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/MP.Data/Resources/Readme.md b/MP.Data/Resources/Readme.md new file mode 100644 index 00000000..29cc121b --- /dev/null +++ b/MP.Data/Resources/Readme.md @@ -0,0 +1,23 @@ +# Appunti gestione MP-STAT DB + + +Per la gestione dell'accesso al DB statistiche si opera con EFCore --> apop blazor server + +## Scaffolding DB iniziale + + Scaffold-DbContext "Server=SQL2016DEV;Database=MoonPro_STATS;Trusted_Connection=True;" Microsoft.EntityFrameworkCore.SqlServer -OutputDir DatabaseModels + +## Scaffolding SOLO di tabelle/viste selezionate (con force update) + + Scaffold-DbContext "Server=SQL2016DEV;Database=MoonPro_STATS;Trusted_Connection=True;" Microsoft.EntityFrameworkCore.SqlServer -OutputDir DatabaseModels -Tables v_RS, v_TC_Stat, v_TCR, v_TCR_Day, v_UL + + + +## Approfondimenti + +Qualche link di approfondimento: + + - https://docs.microsoft.com/en-us/ef/core/ + - https://docs.microsoft.com/en-us/ef/core/extensions/ + - https://www.entityframeworktutorial.net/efcore/create-model-for-existing-database-in-ef-core.aspx + - https://entityframework.net/ef-code-first \ No newline at end of file diff --git a/MP.Data/StatsDbContext.cs b/MP.Data/StatsDbContext.cs new file mode 100644 index 00000000..e52f398f --- /dev/null +++ b/MP.Data/StatsDbContext.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MP.Data +{ + public class StatsDbContext + { + } +} \ No newline at end of file From 48d5671e536392a4b23ec215b43e2a344347f022 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 13:33:28 +0200 Subject: [PATCH 008/158] RImozione old DataLayer --- MpDataLayer/Constants.cs | 12 - MpDataLayer/Controllers/MpStatsController.cs | 85 - MpDataLayer/DatabaseModels/Aaul.cs | 13 - MpDataLayer/DatabaseModels/Cal.cs | 18 - MpDataLayer/DatabaseModels/Config.cs | 15 - MpDataLayer/DatabaseModels/Ddb.cs | 15 - MpDataLayer/DatabaseModels/Ddb1.cs | 24 - MpDataLayer/DatabaseModels/DdbTurni.cs | 30 - MpDataLayer/DatabaseModels/DdbTurniNew.cs | 30 - MpDataLayer/DatabaseModels/DdbTurniSummary.cs | 21 - .../DatabaseModels/DdbTurniSummaryNew.cs | 21 - MpDataLayer/DatabaseModels/Ecp.cs | 23 - MpDataLayer/DatabaseModels/Ecp1.cs | 21 - MpDataLayer/DatabaseModels/Kit.cs | 14 - MpDataLayer/DatabaseModels/Odl.cs | 26 - MpDataLayer/DatabaseModels/Odl1.cs | 30 - MpDataLayer/DatabaseModels/R.cs | 23 - MpDataLayer/DatabaseModels/R1.cs | 22 - MpDataLayer/DatabaseModels/Rc.cs | 19 - MpDataLayer/DatabaseModels/ResControlli.cs | 23 - MpDataLayer/DatabaseModels/ResScarti.cs | 26 - MpDataLayer/DatabaseModels/Tally.cs | 12 - MpDataLayer/DatabaseModels/TcStat.cs | 16 - MpDataLayer/DatabaseModels/Tcr.cs | 19 - MpDataLayer/DatabaseModels/Tcr1.cs | 20 - MpDataLayer/DatabaseModels/TcrDay.cs | 19 - MpDataLayer/DatabaseModels/TcrDayTest.cs | 19 - MpDataLayer/DatabaseModels/TestJason.cs | 14 - MpDataLayer/DatabaseModels/Ul.cs | 21 - MpDataLayer/DatabaseModels/UserActionLog.cs | 25 - MpDataLayer/DatabaseModels/VDdb.cs | 24 - MpDataLayer/DatabaseModels/VDdbLight.cs | 18 - MpDataLayer/DatabaseModels/VDdbLightOld.cs | 18 - MpDataLayer/DatabaseModels/VDdbTurni.cs | 26 - MpDataLayer/DatabaseModels/VEcp.cs | 21 - MpDataLayer/DatabaseModels/VEcp1.cs | 25 - MpDataLayer/DatabaseModels/VEcpExtended.cs | 27 - MpDataLayer/DatabaseModels/VKit.cs | 14 - MpDataLayer/DatabaseModels/VOdl.cs | 30 - MpDataLayer/DatabaseModels/VOdl1.cs | 28 - MpDataLayer/DatabaseModels/VPodlNonChiusi.cs | 30 - MpDataLayer/DatabaseModels/VR1.cs | 23 - MpDataLayer/DatabaseModels/VTcStat.cs | 18 - MpDataLayer/DatabaseModels/VTcr.cs | 20 - MpDataLayer/DatabaseModels/VTcr1.cs | 21 - MpDataLayer/DatabaseModels/VTcrDay.cs | 21 - MpDataLayer/DatabaseModels/VetoTc.cs | 15 - MpDataLayer/Enums.cs | 8 - MpDataLayer/MP.Data.csproj | 65 - MpDataLayer/MoonPro_STATSContext.cs | 1606 ----------------- MpDataLayer/Resources/Readme.md | 23 - MpDataLayer/StatsDbContext.cs | 12 - 52 files changed, 2769 deletions(-) delete mode 100644 MpDataLayer/Constants.cs delete mode 100644 MpDataLayer/Controllers/MpStatsController.cs delete mode 100644 MpDataLayer/DatabaseModels/Aaul.cs delete mode 100644 MpDataLayer/DatabaseModels/Cal.cs delete mode 100644 MpDataLayer/DatabaseModels/Config.cs delete mode 100644 MpDataLayer/DatabaseModels/Ddb.cs delete mode 100644 MpDataLayer/DatabaseModels/Ddb1.cs delete mode 100644 MpDataLayer/DatabaseModels/DdbTurni.cs delete mode 100644 MpDataLayer/DatabaseModels/DdbTurniNew.cs delete mode 100644 MpDataLayer/DatabaseModels/DdbTurniSummary.cs delete mode 100644 MpDataLayer/DatabaseModels/DdbTurniSummaryNew.cs delete mode 100644 MpDataLayer/DatabaseModels/Ecp.cs delete mode 100644 MpDataLayer/DatabaseModels/Ecp1.cs delete mode 100644 MpDataLayer/DatabaseModels/Kit.cs delete mode 100644 MpDataLayer/DatabaseModels/Odl.cs delete mode 100644 MpDataLayer/DatabaseModels/Odl1.cs delete mode 100644 MpDataLayer/DatabaseModels/R.cs delete mode 100644 MpDataLayer/DatabaseModels/R1.cs delete mode 100644 MpDataLayer/DatabaseModels/Rc.cs delete mode 100644 MpDataLayer/DatabaseModels/ResControlli.cs delete mode 100644 MpDataLayer/DatabaseModels/ResScarti.cs delete mode 100644 MpDataLayer/DatabaseModels/Tally.cs delete mode 100644 MpDataLayer/DatabaseModels/TcStat.cs delete mode 100644 MpDataLayer/DatabaseModels/Tcr.cs delete mode 100644 MpDataLayer/DatabaseModels/Tcr1.cs delete mode 100644 MpDataLayer/DatabaseModels/TcrDay.cs delete mode 100644 MpDataLayer/DatabaseModels/TcrDayTest.cs delete mode 100644 MpDataLayer/DatabaseModels/TestJason.cs delete mode 100644 MpDataLayer/DatabaseModels/Ul.cs delete mode 100644 MpDataLayer/DatabaseModels/UserActionLog.cs delete mode 100644 MpDataLayer/DatabaseModels/VDdb.cs delete mode 100644 MpDataLayer/DatabaseModels/VDdbLight.cs delete mode 100644 MpDataLayer/DatabaseModels/VDdbLightOld.cs delete mode 100644 MpDataLayer/DatabaseModels/VDdbTurni.cs delete mode 100644 MpDataLayer/DatabaseModels/VEcp.cs delete mode 100644 MpDataLayer/DatabaseModels/VEcp1.cs delete mode 100644 MpDataLayer/DatabaseModels/VEcpExtended.cs delete mode 100644 MpDataLayer/DatabaseModels/VKit.cs delete mode 100644 MpDataLayer/DatabaseModels/VOdl.cs delete mode 100644 MpDataLayer/DatabaseModels/VOdl1.cs delete mode 100644 MpDataLayer/DatabaseModels/VPodlNonChiusi.cs delete mode 100644 MpDataLayer/DatabaseModels/VR1.cs delete mode 100644 MpDataLayer/DatabaseModels/VTcStat.cs delete mode 100644 MpDataLayer/DatabaseModels/VTcr.cs delete mode 100644 MpDataLayer/DatabaseModels/VTcr1.cs delete mode 100644 MpDataLayer/DatabaseModels/VTcrDay.cs delete mode 100644 MpDataLayer/DatabaseModels/VetoTc.cs delete mode 100644 MpDataLayer/Enums.cs delete mode 100644 MpDataLayer/MP.Data.csproj delete mode 100644 MpDataLayer/MoonPro_STATSContext.cs delete mode 100644 MpDataLayer/Resources/Readme.md delete mode 100644 MpDataLayer/StatsDbContext.cs diff --git a/MpDataLayer/Constants.cs b/MpDataLayer/Constants.cs deleted file mode 100644 index 4abf10f1..00000000 --- a/MpDataLayer/Constants.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MP.Data -{ - class Constants - { - } -} diff --git a/MpDataLayer/Controllers/MpStatsController.cs b/MpDataLayer/Controllers/MpStatsController.cs deleted file mode 100644 index 0b1d43eb..00000000 --- a/MpDataLayer/Controllers/MpStatsController.cs +++ /dev/null @@ -1,85 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Configuration; -using NLog; -using Microsoft.Extensions.Configuration; - -namespace MP.Data.Controllers -{ - public class MpStatsController : IDisposable - { - #region Private Fields - - private static IConfiguration _configuration; - private static MoonPro_STATSContext dbCtx; - private static NLog.Logger Log = LogManager.GetCurrentClassLogger(); - - #endregion Private Fields - - #region Public Constructors - - public MpStatsController(IConfiguration configuration) - { - _configuration = configuration; - dbCtx = new MoonPro_STATSContext(configuration); - Log.Info("Avviata classe MpStatsController.MpStatsController"); - } - - #endregion Public Constructors - - #region Public Methods - - public void Dispose() - { - // Clear database context - dbCtx.Dispose(); - } - - /// - /// Annulla modifiche su una specifica entity (cancel update) - /// - /// - /// - public bool rollBackEntity(object item) - { - bool answ = false; - try - { - if (dbCtx.Entry(item).State == Microsoft.EntityFrameworkCore.EntityState.Deleted || dbCtx.Entry(item).State == Microsoft.EntityFrameworkCore.EntityState.Modified) - { - dbCtx.Entry(item).Reload(); - } - } - catch (Exception exc) - { - Log.Error($"Eccezione in rollBackEntity{Environment.NewLine}{exc}"); - } - return answ; - } - - /// - /// Elenco tabella scarti da filtro - /// - /// - /// - /// - public List ScartiGetAll(int numRecord, string searchVal = "") - { - List dbResult = new List(); - - dbResult = dbCtx - .DbSetScarti - .Where(x => x.KeyRichiesta.Contains(searchVal) || x.Descrizione.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) - .OrderByDescending(x => x.DataOra) - .Take(numRecord) - .ToList(); - - return dbResult; - } - - #endregion Public Methods - } -} \ No newline at end of file diff --git a/MpDataLayer/DatabaseModels/Aaul.cs b/MpDataLayer/DatabaseModels/Aaul.cs deleted file mode 100644 index f639d8c7..00000000 --- a/MpDataLayer/DatabaseModels/Aaul.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Aaul - { - public string Azione { get; set; } - public string Descrizione { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/Cal.cs b/MpDataLayer/DatabaseModels/Cal.cs deleted file mode 100644 index 62ac75a3..00000000 --- a/MpDataLayer/DatabaseModels/Cal.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Cal - { - public DateTime Giorno { get; set; } - public bool? DoDdb { get; set; } - public bool? DoTcr { get; set; } - public bool? DoUl { get; set; } - public bool? DoEcp { get; set; } - public bool? DoRs { get; set; } - public bool? DoOdl { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/Config.cs b/MpDataLayer/DatabaseModels/Config.cs deleted file mode 100644 index e994d899..00000000 --- a/MpDataLayer/DatabaseModels/Config.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Config - { - public string Chiave { get; set; } - public string Valore { get; set; } - public string ValoreStd { get; set; } - public string Note { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/Ddb.cs b/MpDataLayer/DatabaseModels/Ddb.cs deleted file mode 100644 index 01eb95f0..00000000 --- a/MpDataLayer/DatabaseModels/Ddb.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Ddb - { - public DateTime DataOraRif { get; set; } - public string IdxMacchina { get; set; } - public int IdxStato { get; set; } - public decimal DurataMinuti { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/Ddb1.cs b/MpDataLayer/DatabaseModels/Ddb1.cs deleted file mode 100644 index 60291b02..00000000 --- a/MpDataLayer/DatabaseModels/Ddb1.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Ddb1 - { - public string IdxMacchina { get; set; } - public DateTime InizioStato { get; set; } - public DateTime? FineStato { get; set; } - public int IdxStato { get; set; } - public double? DurataMinuti { get; set; } - public string Value { get; set; } - public string CodArticolo { get; set; } - public double? TempoCicloBase { get; set; } - public int? PzPalletProd { get; set; } - public int? MatrOpr { get; set; } - public string Pallet { get; set; } - public string Descrizione { get; set; } - public string ClasseTempo { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/DdbTurni.cs b/MpDataLayer/DatabaseModels/DdbTurni.cs deleted file mode 100644 index 4fc7e14d..00000000 --- a/MpDataLayer/DatabaseModels/DdbTurni.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class DdbTurni - { - public DateTime DataRif { get; set; } - public string IdxMacchina { get; set; } - public string Turno { get; set; } - public int IdxStato { get; set; } - public string CodArticolo { get; set; } - public DateTime InizioStato { get; set; } - public DateTime FineStato { get; set; } - public string Pallet { get; set; } - public int? PzPalletProd { get; set; } - public decimal? TempoCicloBase { get; set; } - public string Descrizione { get; set; } - public string ClasseTempo { get; set; } - public DateTime? DataTurnoInizio { get; set; } - public DateTime? DataTurnoFine { get; set; } - public long? DurataStato { get; set; } - public DateTime InizioPeriodo { get; set; } - public DateTime? FinePeriodo { get; set; } - public long? DurataPeriodo { get; set; } - public int TotPzProd { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/DdbTurniNew.cs b/MpDataLayer/DatabaseModels/DdbTurniNew.cs deleted file mode 100644 index 37bf31d9..00000000 --- a/MpDataLayer/DatabaseModels/DdbTurniNew.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class DdbTurniNew - { - public DateTime DataRif { get; set; } - public string IdxMacchina { get; set; } - public string Turno { get; set; } - public int IdxStato { get; set; } - public string CodArticolo { get; set; } - public DateTime InizioStato { get; set; } - public DateTime FineStato { get; set; } - public string Pallet { get; set; } - public int? PzPalletProd { get; set; } - public decimal? TempoCicloBase { get; set; } - public string Descrizione { get; set; } - public string ClasseTempo { get; set; } - public DateTime? DataTurnoInizio { get; set; } - public DateTime? DataTurnoFine { get; set; } - public long? DurataStato { get; set; } - public DateTime InizioPeriodo { get; set; } - public DateTime? FinePeriodo { get; set; } - public long? DurataPeriodo { get; set; } - public int TotPzProd { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/DdbTurniSummary.cs b/MpDataLayer/DatabaseModels/DdbTurniSummary.cs deleted file mode 100644 index 5db34143..00000000 --- a/MpDataLayer/DatabaseModels/DdbTurniSummary.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class DdbTurniSummary - { - public string IdxMacchina { get; set; } - public DateTime DataRif { get; set; } - public string Turno { get; set; } - public string CodArticolo { get; set; } - public int IdxStato { get; set; } - public decimal TempoCicloBase { get; set; } - public DateTime? Inizio { get; set; } - public int PzPalletProd { get; set; } - public decimal? Durata { get; set; } - public int? PzProd { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/DdbTurniSummaryNew.cs b/MpDataLayer/DatabaseModels/DdbTurniSummaryNew.cs deleted file mode 100644 index 1460328b..00000000 --- a/MpDataLayer/DatabaseModels/DdbTurniSummaryNew.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class DdbTurniSummaryNew - { - public string IdxMacchina { get; set; } - public DateTime DataRif { get; set; } - public string Turno { get; set; } - public string CodArticolo { get; set; } - public int IdxStato { get; set; } - public decimal TempoCicloBase { get; set; } - public DateTime? Inizio { get; set; } - public int PzPalletProd { get; set; } - public decimal? Durata { get; set; } - public int? PzProd { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/Ecp.cs b/MpDataLayer/DatabaseModels/Ecp.cs deleted file mode 100644 index 09fb32dc..00000000 --- a/MpDataLayer/DatabaseModels/Ecp.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Ecp - { - public int IdxEcp { get; set; } - public DateTime DataOraConf { get; set; } - public string IdxMacchina { get; set; } - public string KeyRichiesta { get; set; } - public int IdxOdl { get; set; } - public string CodArticolo { get; set; } - public int PezziConf { get; set; } - public int PezziScar { get; set; } - public int PezziDaRilav { get; set; } - public int MatrOpr { get; set; } - public string Cognome { get; set; } - public string Nome { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/Ecp1.cs b/MpDataLayer/DatabaseModels/Ecp1.cs deleted file mode 100644 index 33a3a973..00000000 --- a/MpDataLayer/DatabaseModels/Ecp1.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Ecp1 - { - public DateTime DataOraConf { get; set; } - public string IdxMacchina { get; set; } - public int MatrApp { get; set; } - public DateTime DataFrom { get; set; } - public DateTime DataTo { get; set; } - public int PezziConf { get; set; } - public int PezziScar { get; set; } - public int PezziDaRilav { get; set; } - public string CommessaEsterna { get; set; } - public int TipoConf { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/Kit.cs b/MpDataLayer/DatabaseModels/Kit.cs deleted file mode 100644 index cb25c5c0..00000000 --- a/MpDataLayer/DatabaseModels/Kit.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Kit - { - public string KeyKit { get; set; } - public string KeyExtOrd { get; set; } - public string CodArtParent { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/Odl.cs b/MpDataLayer/DatabaseModels/Odl.cs deleted file mode 100644 index fa8f8bfa..00000000 --- a/MpDataLayer/DatabaseModels/Odl.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Odl - { - public int IdxOdl { get; set; } - public string KeyRichiesta { get; set; } - public string CodArticolo { get; set; } - public decimal Tcassegnato { get; set; } - public string IdxMacchina { get; set; } - public int NumPezzi { get; set; } - public int NumPezziEv { get; set; } - public int NumPezziSca { get; set; } - public int NumPezziRil { get; set; } - public DateTime? DataInizio { get; set; } - public DateTime? DataFine { get; set; } - public string KeyRichiestaParent { get; set; } - public string CodArticoloParent { get; set; } - public DateTime? DueDate { get; set; } - public int? PzPallet { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/Odl1.cs b/MpDataLayer/DatabaseModels/Odl1.cs deleted file mode 100644 index 50436e07..00000000 --- a/MpDataLayer/DatabaseModels/Odl1.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Odl1 - { - public int IdxOdl { get; set; } - public string CodArticolo { get; set; } - public string IdxMacchina { get; set; } - public int NumPezzi { get; set; } - public decimal Tcassegnato { get; set; } - public DateTime? DataInizio { get; set; } - public DateTime? DataFine { get; set; } - public string Note { get; set; } - public bool NeedAppr { get; set; } - public string UserAppr { get; set; } - public DateTime? DataAppr { get; set; } - public decimal? TcrichAttr { get; set; } - public string KeyRichiesta { get; set; } - public int PzPallet { get; set; } - public bool Provvisorio { get; set; } - public int MatrOpr { get; set; } - public string CommessaAs400 { get; set; } - public int ToAs400 { get; set; } - public DateTime? DueDate { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/R.cs b/MpDataLayer/DatabaseModels/R.cs deleted file mode 100644 index 8e58bf74..00000000 --- a/MpDataLayer/DatabaseModels/R.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class R - { - public DateTime DataOraRif { get; set; } - public string IdxMacchina { get; set; } - public string Causale { get; set; } - public string Descrizione { get; set; } - public string Note { get; set; } - public int Qta { get; set; } - public string KeyRichiesta { get; set; } - public int IdxOdl { get; set; } - public string CodArticolo { get; set; } - public int MatrOpr { get; set; } - public string Cognome { get; set; } - public string Nome { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/R1.cs b/MpDataLayer/DatabaseModels/R1.cs deleted file mode 100644 index e4abb10d..00000000 --- a/MpDataLayer/DatabaseModels/R1.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class R1 - { - public string IdxMacchina { get; set; } - public DateTime DataOra { get; set; } - public string Causale { get; set; } - public int Qta { get; set; } - public string Note { get; set; } - public string CodArticolo { get; set; } - public int MatrOpr { get; set; } - public DateTime? DataOraProdRec { get; set; } - public string Descrizione { get; set; } - public string KeyRichiesta { get; set; } - public int IdxOdl { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/Rc.cs b/MpDataLayer/DatabaseModels/Rc.cs deleted file mode 100644 index 8578e1a4..00000000 --- a/MpDataLayer/DatabaseModels/Rc.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Rc - { - public int IdxControllo { get; set; } - public DateTime DataOra { get; set; } - public string IdxMacchina { get; set; } - public int IdxOdl { get; set; } - public string CodArticolo { get; set; } - public int MatrOpr { get; set; } - public bool EsitoOk { get; set; } - public string Note { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/ResControlli.cs b/MpDataLayer/DatabaseModels/ResControlli.cs deleted file mode 100644 index 77f46ee9..00000000 --- a/MpDataLayer/DatabaseModels/ResControlli.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class ResControlli - { - #region Public Properties - - public string CodArticolo { get; set; } - public DateTime DataOra { get; set; } - public bool EsitoOk { get; set; } - public int IdxControllo { get; set; } - public string IdxMacchina { get; set; } - public int IdxOdl { get; set; } - public int MatrOpr { get; set; } - public string Note { get; set; } - - #endregion Public Properties - } -} \ No newline at end of file diff --git a/MpDataLayer/DatabaseModels/ResScarti.cs b/MpDataLayer/DatabaseModels/ResScarti.cs deleted file mode 100644 index 4d66d124..00000000 --- a/MpDataLayer/DatabaseModels/ResScarti.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class ResScarti - { - #region Public Properties - - public string Causale { get; set; } - public string CodArticolo { get; set; } - public DateTime DataOra { get; set; } - public DateTime? DataOraProdRec { get; set; } - public string Descrizione { get; set; } - public string IdxMacchina { get; set; } - public int IdxOdl { get; set; } - public string KeyRichiesta { get; set; } - public int MatrOpr { get; set; } - public string Note { get; set; } - public int Qta { get; set; } - - #endregion Public Properties - } -} \ No newline at end of file diff --git a/MpDataLayer/DatabaseModels/Tally.cs b/MpDataLayer/DatabaseModels/Tally.cs deleted file mode 100644 index e64cf735..00000000 --- a/MpDataLayer/DatabaseModels/Tally.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Tally - { - public int N { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/TcStat.cs b/MpDataLayer/DatabaseModels/TcStat.cs deleted file mode 100644 index eef51348..00000000 --- a/MpDataLayer/DatabaseModels/TcStat.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class TcStat - { - public string CodArticolo { get; set; } - public string CodGruppo { get; set; } - public string IdxMacchina { get; set; } - public decimal TcStat1 { get; set; } - public int TcType { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/Tcr.cs b/MpDataLayer/DatabaseModels/Tcr.cs deleted file mode 100644 index d0ba1c26..00000000 --- a/MpDataLayer/DatabaseModels/Tcr.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Tcr - { - public DateTime DataOraRif { get; set; } - public string IdxMacchina { get; set; } - public string CodArticolo { get; set; } - public int PzProd { get; set; } - public decimal? Tcmedio { get; set; } - public decimal? Tcmin { get; set; } - public decimal? Tcmax { get; set; } - public decimal? Tc50p { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/Tcr1.cs b/MpDataLayer/DatabaseModels/Tcr1.cs deleted file mode 100644 index 444d2669..00000000 --- a/MpDataLayer/DatabaseModels/Tcr1.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Tcr1 - { - public string IdxMacchina { get; set; } - public string CodArticolo { get; set; } - public DateTime DataOraRif { get; set; } - public decimal Tcmedio { get; set; } - public int PzProd { get; set; } - public int IdxOdl { get; set; } - public decimal Tcassegnato { get; set; } - public string KeyRichiesta { get; set; } - public int PzPallet { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/TcrDay.cs b/MpDataLayer/DatabaseModels/TcrDay.cs deleted file mode 100644 index 20c3fbdf..00000000 --- a/MpDataLayer/DatabaseModels/TcrDay.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class TcrDay - { - public DateTime DataOraRif { get; set; } - public string IdxMacchina { get; set; } - public string CodArticolo { get; set; } - public int PzProd { get; set; } - public decimal? Tcmedio { get; set; } - public decimal? Tcmin { get; set; } - public decimal? Tcmax { get; set; } - public decimal? Tc50p { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/TcrDayTest.cs b/MpDataLayer/DatabaseModels/TcrDayTest.cs deleted file mode 100644 index 904d7c7f..00000000 --- a/MpDataLayer/DatabaseModels/TcrDayTest.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class TcrDayTest - { - public DateTime DataOraRif { get; set; } - public string IdxMacchina { get; set; } - public string CodArticolo { get; set; } - public int PzProd { get; set; } - public decimal? Tcmedio { get; set; } - public decimal? Tcmin { get; set; } - public decimal? Tcmax { get; set; } - public decimal? Tc50p { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/TestJason.cs b/MpDataLayer/DatabaseModels/TestJason.cs deleted file mode 100644 index 8f921d40..00000000 --- a/MpDataLayer/DatabaseModels/TestJason.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class TestJason - { - public DateTime Data { get; set; } - public byte[] Json { get; set; } - public int? Rows { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/Ul.cs b/MpDataLayer/DatabaseModels/Ul.cs deleted file mode 100644 index 54b11f82..00000000 --- a/MpDataLayer/DatabaseModels/Ul.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Ul - { - public int IdxLog { get; set; } - public DateTime DataOraRif { get; set; } - public string IdxMacchina { get; set; } - public int MatrOpr { get; set; } - public string Cognome { get; set; } - public string Nome { get; set; } - public string CodArticolo { get; set; } - public string Azione { get; set; } - public string Valore { get; set; } - public decimal Qta { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/UserActionLog.cs b/MpDataLayer/DatabaseModels/UserActionLog.cs deleted file mode 100644 index 15426401..00000000 --- a/MpDataLayer/DatabaseModels/UserActionLog.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class UserActionLog - { - #region Public Properties - - public string Azione { get; set; } - public string CodArticolo { get; set; } - public string Cognome { get; set; } - public DateTime DataOraRif { get; set; } - public int IdxLog { get; set; } - public string IdxMacchina { get; set; } - public int MatrOpr { get; set; } - public string Nome { get; set; } - public decimal Qta { get; set; } - public string Valore { get; set; } - - #endregion Public Properties - } -} \ No newline at end of file diff --git a/MpDataLayer/DatabaseModels/VDdb.cs b/MpDataLayer/DatabaseModels/VDdb.cs deleted file mode 100644 index 4aeccff6..00000000 --- a/MpDataLayer/DatabaseModels/VDdb.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VDdb - { - public string IdxMacchina { get; set; } - public DateTime InizioStato { get; set; } - public DateTime? FineStato { get; set; } - public int IdxStato { get; set; } - public double? DurataMinuti { get; set; } - public string Value { get; set; } - public string CodArticolo { get; set; } - public double? TempoCicloBase { get; set; } - public int? PzPalletProd { get; set; } - public int? MatrOpr { get; set; } - public string Pallet { get; set; } - public string Descrizione { get; set; } - public string ClasseTempo { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/VDdbLight.cs b/MpDataLayer/DatabaseModels/VDdbLight.cs deleted file mode 100644 index f1bafcbc..00000000 --- a/MpDataLayer/DatabaseModels/VDdbLight.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VDdbLight - { - public string CodMacchina { get; set; } - public string DescMacchina { get; set; } - public DateTime InizioStato { get; set; } - public string Stato { get; set; } - public double? DurataMinuti { get; set; } - public string CodArticolo { get; set; } - public string Operatore { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/VDdbLightOld.cs b/MpDataLayer/DatabaseModels/VDdbLightOld.cs deleted file mode 100644 index d636177a..00000000 --- a/MpDataLayer/DatabaseModels/VDdbLightOld.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VDdbLightOld - { - public string CodMacchina { get; set; } - public string DescMacchina { get; set; } - public DateTime InizioStato { get; set; } - public string Stato { get; set; } - public double? DurataMinuti { get; set; } - public string CodArticolo { get; set; } - public string Operatore { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/VDdbTurni.cs b/MpDataLayer/DatabaseModels/VDdbTurni.cs deleted file mode 100644 index fbdc6046..00000000 --- a/MpDataLayer/DatabaseModels/VDdbTurni.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VDdbTurni - { - public string IdxMacchina { get; set; } - public DateTime DataRif { get; set; } - public string Turno { get; set; } - public string CodArticolo { get; set; } - public int IdxStato { get; set; } - public decimal TempoCicloBase { get; set; } - public int PzPalletProd { get; set; } - public decimal? Durata { get; set; } - public int? PzProd { get; set; } - public string ClasseTempo { get; set; } - public string DescClasseTempo { get; set; } - public string Semaforo { get; set; } - public string SemColore { get; set; } - public string CodMacchina { get; set; } - public string DescMacchina { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/VEcp.cs b/MpDataLayer/DatabaseModels/VEcp.cs deleted file mode 100644 index c90a45b6..00000000 --- a/MpDataLayer/DatabaseModels/VEcp.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VEcp - { - public DateTime DataOraConf { get; set; } - public string IdxMacchina { get; set; } - public int MatrApp { get; set; } - public DateTime DataFrom { get; set; } - public DateTime DataTo { get; set; } - public int PezziConf { get; set; } - public int PezziScar { get; set; } - public int PezziDaRilav { get; set; } - public string CommessaEsterna { get; set; } - public int TipoConf { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/VEcp1.cs b/MpDataLayer/DatabaseModels/VEcp1.cs deleted file mode 100644 index 3c63b654..00000000 --- a/MpDataLayer/DatabaseModels/VEcp1.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VEcp1 - { - public int IdxEcp { get; set; } - public DateTime DataOraConf { get; set; } - public string IdxMacchina { get; set; } - public string CodMacchina { get; set; } - public string DescMacchina { get; set; } - public string KeyRichiesta { get; set; } - public int IdxOdl { get; set; } - public string CodArticolo { get; set; } - public int PezziConf { get; set; } - public int PezziScar { get; set; } - public int PezziDaRilav { get; set; } - public int MatrOpr { get; set; } - public string Cognome { get; set; } - public string Nome { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/VEcpExtended.cs b/MpDataLayer/DatabaseModels/VEcpExtended.cs deleted file mode 100644 index c2d75bc9..00000000 --- a/MpDataLayer/DatabaseModels/VEcpExtended.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VEcpExtended - { - public int IdxEcp { get; set; } - public DateTime DataOraConf { get; set; } - public string IdxMacchina { get; set; } - public string CodMacchina { get; set; } - public string DescMacchina { get; set; } - public string KeyRichiesta { get; set; } - public int IdxOdl { get; set; } - public string CodArticolo { get; set; } - public int PezziConf { get; set; } - public int PezziScar { get; set; } - public int PezziDaRilav { get; set; } - public int MatrOpr { get; set; } - public string Cognome { get; set; } - public string Nome { get; set; } - public decimal Tcassegnato { get; set; } - public DateTime DueDate { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/VKit.cs b/MpDataLayer/DatabaseModels/VKit.cs deleted file mode 100644 index f84ce903..00000000 --- a/MpDataLayer/DatabaseModels/VKit.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VKit - { - public string KeyKit { get; set; } - public string KeyExtOrd { get; set; } - public string CodArtParent { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/VOdl.cs b/MpDataLayer/DatabaseModels/VOdl.cs deleted file mode 100644 index 8600135a..00000000 --- a/MpDataLayer/DatabaseModels/VOdl.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VOdl - { - public int IdxOdl { get; set; } - public string CodArticolo { get; set; } - public string IdxMacchina { get; set; } - public int NumPezzi { get; set; } - public decimal Tcassegnato { get; set; } - public DateTime? DataInizio { get; set; } - public DateTime? DataFine { get; set; } - public string Note { get; set; } - public bool NeedAppr { get; set; } - public string UserAppr { get; set; } - public DateTime? DataAppr { get; set; } - public decimal? TcrichAttr { get; set; } - public string KeyRichiesta { get; set; } - public int PzPallet { get; set; } - public bool Provvisorio { get; set; } - public int MatrOpr { get; set; } - public string CommessaAs400 { get; set; } - public int ToAs400 { get; set; } - public DateTime? DueDate { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/VOdl1.cs b/MpDataLayer/DatabaseModels/VOdl1.cs deleted file mode 100644 index 97fda075..00000000 --- a/MpDataLayer/DatabaseModels/VOdl1.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VOdl1 - { - public int IdxOdl { get; set; } - public string KeyRichiesta { get; set; } - public string CodArticolo { get; set; } - public decimal Tcassegnato { get; set; } - public string IdxMacchina { get; set; } - public string CodMacchina { get; set; } - public string DescMacchina { get; set; } - public int NumPezzi { get; set; } - public int NumPezziEv { get; set; } - public int NumPezziSca { get; set; } - public int NumPezziRil { get; set; } - public DateTime? DataInizio { get; set; } - public DateTime? DataFine { get; set; } - public string KeyRichiestaParent { get; set; } - public string CodArticoloParent { get; set; } - public DateTime? DueDate { get; set; } - public int? PzPallet { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/VPodlNonChiusi.cs b/MpDataLayer/DatabaseModels/VPodlNonChiusi.cs deleted file mode 100644 index fa806e0d..00000000 --- a/MpDataLayer/DatabaseModels/VPodlNonChiusi.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VPodlNonChiusi - { - public int IdxPromessa { get; set; } - public string KeyRichiesta { get; set; } - public string KeyBcode { get; set; } - public bool Attivabile { get; set; } - public int IdxOdl { get; set; } - public DateTime? DataInizio { get; set; } - public string CodArticolo { get; set; } - public string DescArticolo { get; set; } - public string CodGruppo { get; set; } - public string IdxMacchina { get; set; } - public string CodMacchina { get; set; } - public string Nome { get; set; } - public int NumPezzi { get; set; } - public decimal Tcassegnato { get; set; } - public DateTime DueDate { get; set; } - public int Priorita { get; set; } - public int PzPallet { get; set; } - public decimal? TotMinProg { get; set; } - public decimal? TotOreProg { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/VR1.cs b/MpDataLayer/DatabaseModels/VR1.cs deleted file mode 100644 index 956f8786..00000000 --- a/MpDataLayer/DatabaseModels/VR1.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VR1 - { - public DateTime DataOraRif { get; set; } - public string IdxMacchina { get; set; } - public string Causale { get; set; } - public string Descrizione { get; set; } - public string Note { get; set; } - public int Qta { get; set; } - public string KeyRichiesta { get; set; } - public int IdxOdl { get; set; } - public string CodArticolo { get; set; } - public int MatrOpr { get; set; } - public string Cognome { get; set; } - public string Nome { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/VTcStat.cs b/MpDataLayer/DatabaseModels/VTcStat.cs deleted file mode 100644 index 2c048219..00000000 --- a/MpDataLayer/DatabaseModels/VTcStat.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VTcStat - { - public string CodArticolo { get; set; } - public string CodGruppo { get; set; } - public string IdxMacchina { get; set; } - public string CodMacchina { get; set; } - public string DescMacchina { get; set; } - public decimal TcStat { get; set; } - public int TcType { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/VTcr.cs b/MpDataLayer/DatabaseModels/VTcr.cs deleted file mode 100644 index a3adb842..00000000 --- a/MpDataLayer/DatabaseModels/VTcr.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VTcr - { - public string IdxMacchina { get; set; } - public string CodArticolo { get; set; } - public DateTime DataOraRif { get; set; } - public decimal Tcmedio { get; set; } - public int PzProd { get; set; } - public int IdxOdl { get; set; } - public decimal Tcassegnato { get; set; } - public string KeyRichiesta { get; set; } - public int PzPallet { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/VTcr1.cs b/MpDataLayer/DatabaseModels/VTcr1.cs deleted file mode 100644 index 55061b57..00000000 --- a/MpDataLayer/DatabaseModels/VTcr1.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VTcr1 - { - public DateTime DataOraRif { get; set; } - public string IdxMacchina { get; set; } - public string CodMacchina { get; set; } - public string DescMacchina { get; set; } - public string CodArticolo { get; set; } - public int PzProd { get; set; } - public decimal? Tcmedio { get; set; } - public decimal? Tcmin { get; set; } - public decimal? Tcmax { get; set; } - public decimal? Tc50p { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/VTcrDay.cs b/MpDataLayer/DatabaseModels/VTcrDay.cs deleted file mode 100644 index 5d591407..00000000 --- a/MpDataLayer/DatabaseModels/VTcrDay.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VTcrDay - { - public DateTime? DataOraRif { get; set; } - public string IdxMacchina { get; set; } - public string CodMacchina { get; set; } - public string DescMacchina { get; set; } - public string CodArticolo { get; set; } - public int PzProd { get; set; } - public decimal? Tcmedio { get; set; } - public decimal? Tcmin { get; set; } - public decimal? Tcmax { get; set; } - public decimal? Tc50p { get; set; } - } -} diff --git a/MpDataLayer/DatabaseModels/VetoTc.cs b/MpDataLayer/DatabaseModels/VetoTc.cs deleted file mode 100644 index b48ad96b..00000000 --- a/MpDataLayer/DatabaseModels/VetoTc.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VetoTc - { - public string IdxMacchina { get; set; } - public string CodArticolo { get; set; } - public bool? VetoTc1 { get; set; } - public decimal SogliaTc { get; set; } - } -} diff --git a/MpDataLayer/Enums.cs b/MpDataLayer/Enums.cs deleted file mode 100644 index 421dd601..00000000 --- a/MpDataLayer/Enums.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace MP.Data -{ - public class Enums - { - } -} \ No newline at end of file diff --git a/MpDataLayer/MP.Data.csproj b/MpDataLayer/MP.Data.csproj deleted file mode 100644 index a8360e39..00000000 --- a/MpDataLayer/MP.Data.csproj +++ /dev/null @@ -1,65 +0,0 @@ - - - - net5.0 - MP.Data - MP.Data - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - diff --git a/MpDataLayer/MoonPro_STATSContext.cs b/MpDataLayer/MoonPro_STATSContext.cs deleted file mode 100644 index 2c0ed3fa..00000000 --- a/MpDataLayer/MoonPro_STATSContext.cs +++ /dev/null @@ -1,1606 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.Extensions.Configuration; -using MpDataLayer.DatabaseModels; -using NLog; - -#nullable disable - -namespace MP.Data -{ - public partial class MoonPro_STATSContext : DbContext - { - #region Private Fields - - private static NLog.Logger Log = LogManager.GetCurrentClassLogger(); - - private IConfiguration _configuration; - - #endregion Private Fields - - #region Public Constructors - - public MoonPro_STATSContext(IConfiguration configuration) - { - _configuration = configuration; - } - - public MoonPro_STATSContext(DbContextOptions options) - : base(options) - { - } - - #endregion Public Constructors - -#if false - public virtual DbSet Aauls { get; set; } - public virtual DbSet Cals { get; set; } - public virtual DbSet Configs { get; set; } - public virtual DbSet Ddbs { get; set; } - public virtual DbSet Ddbs1 { get; set; } - public virtual DbSet DdbTurniNews { get; set; } - public virtual DbSet DdbTurnis { get; set; } - public virtual DbSet DdbTurniSummaries { get; set; } - public virtual DbSet DdbTurniSummaryNews { get; set; } - public virtual DbSet Ecps { get; set; } - public virtual DbSet Ecps1 { get; set; } - public virtual DbSet Kits { get; set; } - public virtual DbSet Odls { get; set; } - public virtual DbSet Odls1 { get; set; } - public virtual DbSet Rcs { get; set; } - public virtual DbSet Rs { get; set; } - public virtual DbSet Rs1 { get; set; } - public virtual DbSet Tallies { get; set; } - public virtual DbSet TcrDays { get; set; } - public virtual DbSet TcrDayTests { get; set; } - public virtual DbSet Tcrs { get; set; } - public virtual DbSet Tcrs1 { get; set; } - public virtual DbSet TcStats { get; set; } - public virtual DbSet TestJasons { get; set; } - public virtual DbSet
                Uls { get; set; } -#endif - -#if false - public virtual DbSet VDdbLightOlds { get; set; } - public virtual DbSet VDdbLights { get; set; } - public virtual DbSet VDdbs { get; set; } - public virtual DbSet VDdbTurnis { get; set; } - public virtual DbSet VEcpExtendeds { get; set; } - public virtual DbSet VEcps { get; set; } - public virtual DbSet VEcps1 { get; set; } - public virtual DbSet VetoTcs { get; set; } - public virtual DbSet VKits { get; set; } - public virtual DbSet VOdls { get; set; } - public virtual DbSet VOdls1 { get; set; } - public virtual DbSet VPodlNonChiusis { get; set; } -#endif - - #region Public Properties - - public virtual DbSet DbSetControlli { get; set; } - public virtual DbSet DbSetScarti { get; set; } -#if false - public virtual DbSet VRs1 { get; set; } - public virtual DbSet VTcrDays { get; set; } - public virtual DbSet VTcrs { get; set; } - public virtual DbSet VTcrs1 { get; set; } - public virtual DbSet VTcStats { get; set; } -#endif - public virtual DbSet DbSetUserLog { get; set; } - - #endregion Public Properties - - #region Private Methods - - partial void OnModelCreatingPartial(ModelBuilder modelBuilder); - - #endregion Private Methods - - #region Protected Methods - - protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) - { - if (!optionsBuilder.IsConfigured) - { - string connString = _configuration.GetConnectionString("Mp.Stats"); - - optionsBuilder.UseSqlServer(_configuration.GetConnectionString("Mp.Stats")); - -#warning To protect potentially sensitive information in your connection string, you should move it out of source code. You can avoid scaffolding the connection string by using the Name= syntax to read it from configuration - see https://go.microsoft.com/fwlink/?linkid=2131148. For more guidance on storing connection strings, see http://go.microsoft.com/fwlink/?LinkId=723263. - //optionsBuilder.UseSqlServer("Server=SQL2016DEV;Database=MoonPro_STATS;Trusted_Connection=True;"); - } - } - - protected override void OnModelCreating(ModelBuilder modelBuilder) - { - modelBuilder.HasAnnotation("Relational:Collation", "SQL_Latin1_General_CP1_CI_AS"); - -#if false - modelBuilder.Entity(entity => - { - entity.HasKey(e => e.Azione); - - entity.ToTable("AAUL"); - - entity.Property(e => e.Azione) - .HasMaxLength(50) - .HasDefaultValueSql("('ND')") - .HasComment("Azione dell'operatore"); - - entity.Property(e => e.Descrizione) - .IsRequired() - .HasMaxLength(50) - .HasDefaultValueSql("('')"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => e.Giorno) - .HasName("PK_Calendario"); - - entity.ToTable("CAL"); - - entity.Property(e => e.Giorno) - .HasColumnType("datetime") - .HasColumnName("giorno"); - - entity.Property(e => e.DoDdb) - .IsRequired() - .HasColumnName("doDDB") - .HasDefaultValueSql("((1))") - .HasComment("Indica che è necessario ricalcolare statistiche derivate da DDB (DiarioDiBordo)"); - - entity.Property(e => e.DoEcp) - .IsRequired() - .HasColumnName("doECP") - .HasDefaultValueSql("((1))") - .HasComment("Indica che è necessario ricalcolare statistiche derivate da DPO (DatiProduzione Operatore) - conferme manuali operatore"); - - entity.Property(e => e.DoOdl) - .IsRequired() - .HasColumnName("doODL") - .HasDefaultValueSql("((1))") - .HasComment("Indica che è necessario ricalcolare statistiche ODL"); - - entity.Property(e => e.DoRs) - .IsRequired() - .HasColumnName("doRS") - .HasDefaultValueSql("((1))") - .HasComment("Indica che è necessario ricalcolare statistiche derivate da RS (Registro Scarti)"); - - entity.Property(e => e.DoTcr) - .IsRequired() - .HasColumnName("doTCR") - .HasDefaultValueSql("((1))") - .HasComment("Indica che è necessario ricalcolare statistiche derivate da rilevazione TCR (TempiCicloRilevati)"); - - entity.Property(e => e.DoUl) - .IsRequired() - .HasColumnName("doUL") - .HasDefaultValueSql("((1))") - .HasComment("Indica che è necessario ricalcolare statistiche derivate da DSO (Dichiarazioni Scarti Operatore)"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => e.Chiave); - - entity.ToTable("Config"); - - entity.Property(e => e.Chiave) - .HasMaxLength(50) - .HasColumnName("chiave"); - - entity.Property(e => e.Note).HasColumnName("note"); - - entity.Property(e => e.Valore).HasColumnName("valore"); - - entity.Property(e => e.ValoreStd) - .HasColumnName("valoreStd") - .HasComment("Valore di default/riferimento per la variabile"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.DataOraRif, e.IdxMacchina, e.IdxStato }) - .HasName("PK_DDB_1"); - - entity.ToTable("DDB"); - - entity.Property(e => e.DataOraRif).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.DurataMinuti).HasColumnType("decimal(18, 8)"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToTable("DDB", "raw"); - - entity.HasIndex(e => e.InizioStato, "ci_DDB_Data") - .IsClustered(); - - entity.HasIndex(e => e.CodArticolo, "i_DDB_CodArt"); - - entity.HasIndex(e => e.IdxMacchina, "i_DDB_IdxMacc"); - - entity.HasIndex(e => e.IdxStato, "i_DDB_IdxStato"); - - entity.HasIndex(e => e.MatrOpr, "i_DDB_MatrOpr"); - - entity.Property(e => e.ClasseTempo).HasMaxLength(50); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.Descrizione).HasMaxLength(50); - - entity.Property(e => e.FineStato).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.InizioStato).HasColumnType("datetime"); - - entity.Property(e => e.Pallet) - .HasMaxLength(20) - .HasColumnName("pallet"); - - entity.Property(e => e.Value).HasMaxLength(50); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.DataRif, e.IdxMacchina, e.Turno, e.IdxStato, e.CodArticolo, e.InizioPeriodo }); - - entity.ToTable("DDB_Turni"); - - entity.Property(e => e.DataRif).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.Turno).HasMaxLength(5); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.InizioPeriodo).HasColumnType("datetime"); - - entity.Property(e => e.ClasseTempo).HasMaxLength(50); - - entity.Property(e => e.DataTurnoFine).HasColumnType("datetime"); - - entity.Property(e => e.DataTurnoInizio).HasColumnType("datetime"); - - entity.Property(e => e.Descrizione).HasMaxLength(50); - - entity.Property(e => e.FinePeriodo).HasColumnType("datetime"); - - entity.Property(e => e.FineStato).HasColumnType("datetime"); - - entity.Property(e => e.InizioStato).HasColumnType("datetime"); - - entity.Property(e => e.Pallet) - .HasMaxLength(20) - .HasColumnName("pallet"); - - entity.Property(e => e.TempoCicloBase).HasColumnType("decimal(18, 8)"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.DataRif, e.IdxMacchina, e.Turno, e.IdxStato, e.CodArticolo, e.InizioPeriodo }); - - entity.ToTable("DDB_TurniNew"); - - entity.Property(e => e.DataRif).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.Turno).HasMaxLength(5); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.InizioPeriodo).HasColumnType("datetime"); - - entity.Property(e => e.ClasseTempo).HasMaxLength(50); - - entity.Property(e => e.DataTurnoFine).HasColumnType("datetime"); - - entity.Property(e => e.DataTurnoInizio).HasColumnType("datetime"); - - entity.Property(e => e.Descrizione).HasMaxLength(50); - - entity.Property(e => e.FinePeriodo).HasColumnType("datetime"); - - entity.Property(e => e.FineStato).HasColumnType("datetime"); - - entity.Property(e => e.InizioStato).HasColumnType("datetime"); - - entity.Property(e => e.Pallet) - .HasMaxLength(20) - .HasColumnName("pallet"); - - entity.Property(e => e.TempoCicloBase).HasColumnType("decimal(18, 8)"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.IdxMacchina, e.DataRif, e.Turno, e.CodArticolo, e.IdxStato, e.TempoCicloBase, e.PzPalletProd }); - - entity.ToTable("DDB_TurniSummary"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.DataRif).HasColumnType("datetime"); - - entity.Property(e => e.Turno).HasMaxLength(5); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.TempoCicloBase).HasColumnType("decimal(18, 8)"); - - entity.Property(e => e.Durata).HasColumnType("numeric(27, 7)"); - - entity.Property(e => e.Inizio).HasColumnType("datetime"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.IdxMacchina, e.DataRif, e.Turno, e.CodArticolo, e.IdxStato, e.TempoCicloBase, e.PzPalletProd }); - - entity.ToTable("DDB_TurniSummaryNew"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.DataRif).HasColumnType("datetime"); - - entity.Property(e => e.Turno).HasMaxLength(5); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.TempoCicloBase).HasColumnType("decimal(18, 8)"); - - entity.Property(e => e.Durata).HasColumnType("numeric(27, 7)"); - - entity.Property(e => e.Inizio).HasColumnType("datetime"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => e.IdxEcp); - - entity.ToTable("ECP"); - - entity.Property(e => e.IdxEcp).HasColumnName("idxECP"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Cognome) - .IsRequired() - .HasMaxLength(50) - .HasDefaultValueSql("('')"); - - entity.Property(e => e.DataOraConf).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50) - .HasColumnName("idxMacchina"); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Nome) - .IsRequired() - .HasMaxLength(50) - .HasDefaultValueSql("('')"); - - entity.Property(e => e.PezziConf).HasColumnName("pezziConf"); - - entity.Property(e => e.PezziDaRilav).HasColumnName("pezziDaRilav"); - - entity.Property(e => e.PezziScar).HasColumnName("pezziScar"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToTable("ECP", "raw"); - - entity.HasIndex(e => e.DataOraConf, "ci_ECP_Data") - .IsClustered(); - - entity.HasIndex(e => e.IdxMacchina, "i_ECP_IdxMacc"); - - entity.HasIndex(e => e.MatrApp, "i_ECP_MatrApp"); - - entity.HasIndex(e => e.IdxMacchina, "i_ODL_IdxMacc"); - - entity.Property(e => e.CommessaEsterna) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataFrom) - .HasColumnType("datetime") - .HasColumnName("dataFrom"); - - entity.Property(e => e.DataOraConf).HasColumnType("datetime"); - - entity.Property(e => e.DataTo) - .HasColumnType("datetime") - .HasColumnName("dataTo"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50) - .HasColumnName("idxMacchina"); - - entity.Property(e => e.PezziConf).HasColumnName("pezziConf"); - - entity.Property(e => e.PezziDaRilav).HasColumnName("pezziDaRilav"); - - entity.Property(e => e.PezziScar).HasColumnName("pezziScar"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => e.KeyKit); - - entity.ToTable("KIT", "raw"); - - entity.Property(e => e.KeyKit).HasMaxLength(50); - - entity.Property(e => e.CodArtParent).IsRequired(); - - entity.Property(e => e.KeyExtOrd).IsRequired(); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => e.IdxOdl) - .HasName("PK_ODL_1"); - - entity.ToTable("ODL"); - - entity.Property(e => e.IdxOdl) - .ValueGeneratedNever() - .HasColumnName("IdxODL"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodArticoloParent) - .IsRequired() - .HasDefaultValueSql("('')"); - - entity.Property(e => e.DataFine).HasColumnType("datetime"); - - entity.Property(e => e.DataInizio).HasColumnType("datetime"); - - entity.Property(e => e.DueDate).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50) - .HasComment("Chiave: ordine esterno o KIT"); - - entity.Property(e => e.KeyRichiestaParent) - .IsRequired() - .HasDefaultValueSql("('')") - .HasComment("Chiave: ordine esterno o KIT"); - - entity.Property(e => e.PzPallet).HasDefaultValueSql("((1))"); - - entity.Property(e => e.Tcassegnato) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCAssegnato"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => e.IdxOdl) - .IsClustered(false); - - entity.ToTable("ODL", "raw"); - - entity.HasIndex(e => e.IdxOdl, "ci_ODL_Data") - .IsClustered(); - - entity.HasIndex(e => e.IdxMacchina, "i_ODL_IdxMacc"); - - entity.HasIndex(e => e.KeyRichiesta, "i_ODL_KeyRic"); - - entity.Property(e => e.IdxOdl) - .ValueGeneratedNever() - .HasColumnName("IdxODL"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CommessaAs400) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataAppr).HasColumnType("datetime"); - - entity.Property(e => e.DataFine).HasColumnType("datetime"); - - entity.Property(e => e.DataInizio).HasColumnType("datetime"); - - entity.Property(e => e.DueDate).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Note).HasMaxLength(2500); - - entity.Property(e => e.Provvisorio).HasColumnName("provvisorio"); - - entity.Property(e => e.Tcassegnato) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCAssegnato"); - - entity.Property(e => e.TcrichAttr) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCRichAttr"); - - entity.Property(e => e.UserAppr).HasMaxLength(50); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.DataOraRif, e.IdxMacchina, e.Causale, e.IdxOdl }); - - entity.ToTable("RS"); - - entity.Property(e => e.DataOraRif).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.Causale).HasMaxLength(50); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Cognome) - .IsRequired() - .HasMaxLength(50) - .HasDefaultValueSql("('')"); - - entity.Property(e => e.Descrizione) - .IsRequired() - .HasMaxLength(250); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Nome) - .IsRequired() - .HasMaxLength(50) - .HasDefaultValueSql("('')"); - - entity.Property(e => e.Note) - .IsRequired() - .HasMaxLength(250); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToTable("RS", "raw"); - - entity.HasIndex(e => e.DataOra, "ci_RS_Data") - .IsClustered(); - - entity.HasIndex(e => e.Causale, "i_RS_Causale"); - - entity.HasIndex(e => e.CodArticolo, "i_RS_CodArt"); - - entity.HasIndex(e => e.IdxMacchina, "i_RS_IdxMacc"); - - entity.HasIndex(e => e.MatrOpr, "i_RS_MatrOpr"); - - entity.Property(e => e.Causale) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataOra).HasColumnType("datetime"); - - entity.Property(e => e.DataOraProdRec).HasColumnType("datetime"); - - entity.Property(e => e.Descrizione) - .IsRequired() - .HasMaxLength(250); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Note) - .IsRequired() - .HasMaxLength(250); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => e.IdxControllo) - .IsClustered(false); - - entity.ToTable("RC", "raw"); - - entity.HasIndex(e => e.DataOra, "ci_RC_Data") - .IsClustered(); - - entity.HasIndex(e => e.CodArticolo, "i_RC_CodArt"); - - entity.HasIndex(e => e.EsitoOk, "i_RC_EsitoOk"); - - entity.HasIndex(e => e.IdxMacchina, "i_RC_IdxMacc"); - - entity.HasIndex(e => e.MatrOpr, "i_RC_MatrOpr"); - - entity.Property(e => e.IdxControllo).ValueGeneratedNever(); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataOra).HasColumnType("datetime"); - - entity.Property(e => e.EsitoOk).HasColumnName("EsitoOK"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.Note) - .IsRequired() - .HasMaxLength(250); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => e.N) - .HasName("PK_Tally_N"); - - entity.ToTable("Tally"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.CodArticolo, e.CodGruppo, e.IdxMacchina }); - - entity.ToTable("TC_Stat"); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.CodGruppo).HasMaxLength(50); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.TcStat1) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TC_Stat"); - - entity.Property(e => e.TcType).HasColumnName("TC_Type"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.IdxMacchina, e.CodArticolo, e.DataOraRif }) - .IsClustered(false); - - entity.ToTable("TCR"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.DataOraRif).HasColumnType("datetime"); - - entity.Property(e => e.Tc50p) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TC50p") - .HasComment("Valore percentile 50"); - - entity.Property(e => e.Tcmax) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMax") - .HasComment("Valore MASSIMO"); - - entity.Property(e => e.Tcmedio) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMedio") - .HasComment("Valore di MEDIA arimetica"); - - entity.Property(e => e.Tcmin) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMin") - .HasComment("Valore minimo"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToTable("TCR", "raw"); - - entity.HasIndex(e => e.DataOraRif, "ci_TCR_Data") - .IsClustered(); - - entity.HasIndex(e => e.CodArticolo, "i_TCR_CodArt"); - - entity.HasIndex(e => e.IdxMacchina, "i_TCR_IdxMacc"); - - entity.HasIndex(e => e.KeyRichiesta, "i_TCR_KeyRich"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataOraRif).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Tcassegnato) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCAssegnato"); - - entity.Property(e => e.Tcmedio) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMedio"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.IdxMacchina, e.CodArticolo, e.DataOraRif }) - .HasName("PK_TCRDay") - .IsClustered(false); - - entity.ToTable("TCR_Day"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.DataOraRif).HasColumnType("date"); - - entity.Property(e => e.Tc50p) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TC50p") - .HasComment("Valore percentile 50"); - - entity.Property(e => e.Tcmax) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMax") - .HasComment("Valore MASSIMO"); - - entity.Property(e => e.Tcmedio) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMedio") - .HasComment("Valore di MEDIA arimetica"); - - entity.Property(e => e.Tcmin) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMin") - .HasComment("Valore minimo"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToTable("TCR_DayTest"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataOraRif).HasColumnType("date"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Tc50p) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TC50p"); - - entity.Property(e => e.Tcmax) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMax"); - - entity.Property(e => e.Tcmedio) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMedio"); - - entity.Property(e => e.Tcmin) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMin"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToTable("TestJason"); - - entity.Property(e => e.Data).HasColumnType("date"); - }); - - modelBuilder.Entity
                  (entity => - { - entity.HasKey(e => e.IdxLog) - .HasName("PK_UserLog"); - - entity.ToTable("UL"); - - entity.HasIndex(e => e.DataOraRif, "i_UL_DataOra"); - - entity.Property(e => e.Azione) - .IsRequired() - .HasMaxLength(50) - .HasDefaultValueSql("('ND')") - .HasComment("Azione dell'operatore"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Cognome) - .IsRequired() - .HasMaxLength(50) - .HasDefaultValueSql("('')"); - - entity.Property(e => e.DataOraRif).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Nome) - .IsRequired() - .HasMaxLength(50) - .HasDefaultValueSql("('')"); - - entity.Property(e => e.Qta).HasColumnType("decimal(18, 8)"); - - entity.Property(e => e.Valore) - .IsRequired() - .HasMaxLength(250) - .HasDefaultValueSql("('')"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("vDDB"); - - entity.Property(e => e.ClasseTempo).HasMaxLength(50); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.Descrizione).HasMaxLength(50); - - entity.Property(e => e.FineStato).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.InizioStato).HasColumnType("datetime"); - - entity.Property(e => e.Pallet) - .HasMaxLength(20) - .HasColumnName("pallet"); - - entity.Property(e => e.Value).HasMaxLength(50); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_DDB_Light", "export"); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.CodMacchina).HasMaxLength(50); - - entity.Property(e => e.DescMacchina).HasMaxLength(50); - - entity.Property(e => e.InizioStato).HasColumnType("datetime"); - - entity.Property(e => e.Operatore) - .IsRequired() - .HasMaxLength(101); - - entity.Property(e => e.Stato).HasMaxLength(50); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("vDDB_Light_OLD"); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.CodMacchina).HasMaxLength(50); - - entity.Property(e => e.DescMacchina).HasMaxLength(50); - - entity.Property(e => e.InizioStato).HasColumnType("datetime"); - - entity.Property(e => e.Operatore) - .IsRequired() - .HasMaxLength(101); - - entity.Property(e => e.Stato).HasMaxLength(50); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_DDB_Turni", "export"); - - entity.Property(e => e.ClasseTempo).HasMaxLength(50); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodMacchina).HasMaxLength(50); - - entity.Property(e => e.DataRif).HasColumnType("datetime"); - - entity.Property(e => e.DescClasseTempo).HasMaxLength(50); - - entity.Property(e => e.DescMacchina).HasMaxLength(50); - - entity.Property(e => e.Durata).HasColumnType("numeric(38, 7)"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.SemColore) - .IsRequired() - .HasMaxLength(6) - .IsUnicode(false); - - entity.Property(e => e.Semaforo).HasMaxLength(50); - - entity.Property(e => e.TempoCicloBase).HasColumnType("decimal(18, 8)"); - - entity.Property(e => e.Turno) - .IsRequired() - .HasMaxLength(5); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("vECP"); - - entity.Property(e => e.CommessaEsterna) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataFrom) - .HasColumnType("datetime") - .HasColumnName("dataFrom"); - - entity.Property(e => e.DataOraConf).HasColumnType("datetime"); - - entity.Property(e => e.DataTo) - .HasColumnType("datetime") - .HasColumnName("dataTo"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50) - .HasColumnName("idxMacchina"); - - entity.Property(e => e.PezziConf).HasColumnName("pezziConf"); - - entity.Property(e => e.PezziDaRilav).HasColumnName("pezziDaRilav"); - - entity.Property(e => e.PezziScar).HasColumnName("pezziScar"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_ECP", "export"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodMacchina).HasMaxLength(50); - - entity.Property(e => e.Cognome) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataOraConf).HasColumnType("datetime"); - - entity.Property(e => e.DescMacchina).HasMaxLength(50); - - entity.Property(e => e.IdxEcp).HasColumnName("idxECP"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50) - .HasColumnName("idxMacchina"); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Nome) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.PezziConf).HasColumnName("pezziConf"); - - entity.Property(e => e.PezziDaRilav).HasColumnName("pezziDaRilav"); - - entity.Property(e => e.PezziScar).HasColumnName("pezziScar"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_ECP_Extended", "export"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodMacchina).HasMaxLength(50); - - entity.Property(e => e.Cognome) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataOraConf).HasColumnType("datetime"); - - entity.Property(e => e.DescMacchina).HasMaxLength(50); - - entity.Property(e => e.DueDate).HasColumnType("datetime"); - - entity.Property(e => e.IdxEcp).HasColumnName("idxECP"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50) - .HasColumnName("idxMacchina"); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Nome) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.PezziConf).HasColumnName("pezziConf"); - - entity.Property(e => e.PezziDaRilav).HasColumnName("pezziDaRilav"); - - entity.Property(e => e.PezziScar).HasColumnName("pezziScar"); - - entity.Property(e => e.Tcassegnato) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCAssegnato"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("vKIT"); - - entity.Property(e => e.KeyKit) - .IsRequired() - .HasMaxLength(50); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("vODL"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CommessaAs400) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataAppr).HasColumnType("datetime"); - - entity.Property(e => e.DataFine).HasColumnType("datetime"); - - entity.Property(e => e.DataInizio).HasColumnType("datetime"); - - entity.Property(e => e.DueDate).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Note).HasMaxLength(2500); - - entity.Property(e => e.Provvisorio).HasColumnName("provvisorio"); - - entity.Property(e => e.Tcassegnato) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCAssegnato"); - - entity.Property(e => e.TcrichAttr) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCRichAttr"); - - entity.Property(e => e.UserAppr).HasMaxLength(50); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_ODL", "export"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodArticoloParent).IsRequired(); - - entity.Property(e => e.CodMacchina).HasMaxLength(50); - - entity.Property(e => e.DataFine).HasColumnType("datetime"); - - entity.Property(e => e.DataInizio).HasColumnType("datetime"); - - entity.Property(e => e.DescMacchina).HasMaxLength(50); - - entity.Property(e => e.DueDate).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.KeyRichiestaParent).IsRequired(); - - entity.Property(e => e.Tcassegnato) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCAssegnato"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_PODL_NonChiusi", "export"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodGruppo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataInizio).HasColumnType("datetime"); - - entity.Property(e => e.DescArticolo).HasMaxLength(301); - - entity.Property(e => e.DueDate).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.IdxPromessa).HasColumnName("idxPromessa"); - - entity.Property(e => e.KeyBcode) - .IsRequired() - .HasMaxLength(50) - .HasColumnName("KeyBCode"); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Nome).HasMaxLength(50); - - entity.Property(e => e.Tcassegnato) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCAssegnato"); - - entity.Property(e => e.TotMinProg).HasColumnType("decimal(29, 8)"); - - entity.Property(e => e.TotOreProg).HasColumnType("decimal(32, 11)"); - }); -#endif - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("vRS"); - - entity.Property(e => e.Causale) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataOra).HasColumnType("datetime"); - - entity.Property(e => e.DataOraProdRec).HasColumnType("datetime"); - - entity.Property(e => e.Descrizione) - .IsRequired() - .HasMaxLength(250); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Note) - .IsRequired() - .HasMaxLength(250); - }); -#if false - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_RS", "export"); - - entity.Property(e => e.Causale) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Cognome) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataOraRif).HasColumnType("datetime"); - - entity.Property(e => e.Descrizione) - .IsRequired() - .HasMaxLength(250); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Nome) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Note) - .IsRequired() - .HasMaxLength(250); - }); -#endif - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("vRC"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataOra).HasColumnType("datetime"); - - entity.Property(e => e.EsitoOk).HasColumnName("EsitoOK"); - - entity.Property(e => e.IdxControllo).ValueGeneratedOnAdd(); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.Note) - .IsRequired() - .HasMaxLength(250); - }); - -#if false - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_TC_Stat", "export"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodGruppo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodMacchina).HasMaxLength(50); - - entity.Property(e => e.DescMacchina).HasMaxLength(50); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.TcStat) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TC_Stat"); - - entity.Property(e => e.TcType).HasColumnName("TC_Type"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("vTCR"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataOraRif).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Tcassegnato) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCAssegnato"); - - entity.Property(e => e.Tcmedio) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMedio"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_TCR", "export"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodMacchina).HasMaxLength(50); - - entity.Property(e => e.DataOraRif).HasColumnType("datetime"); - - entity.Property(e => e.DescMacchina).HasMaxLength(50); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Tc50p) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TC50p"); - - entity.Property(e => e.Tcmax) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMax"); - - entity.Property(e => e.Tcmedio) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMedio"); - - entity.Property(e => e.Tcmin) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMin"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_TCR_Day", "export"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodMacchina).HasMaxLength(50); - - entity.Property(e => e.DataOraRif).HasColumnType("datetime"); - - entity.Property(e => e.DescMacchina).HasMaxLength(50); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Tc50p) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TC50p"); - - entity.Property(e => e.Tcmax) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMax"); - - entity.Property(e => e.Tcmedio) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMedio"); - - entity.Property(e => e.Tcmin) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMin"); - }); -#endif - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_UL", "export"); - - entity.Property(e => e.Azione) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Cognome) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataOraRif).HasColumnType("datetime"); - - entity.Property(e => e.IdxLog).ValueGeneratedOnAdd(); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Nome) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Qta).HasColumnType("decimal(18, 8)"); - - entity.Property(e => e.Valore) - .IsRequired() - .HasMaxLength(250); - }); -#if false - - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.IdxMacchina, e.CodArticolo }); - - entity.ToTable("VetoTC"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.SogliaTc) - .HasColumnType("decimal(18, 8)") - .HasColumnName("SogliaTC"); - - entity.Property(e => e.VetoTc1) - .IsRequired() - .HasColumnName("VetoTC") - .HasDefaultValueSql("((1))"); - }); -#endif - - OnModelCreatingPartial(modelBuilder); - } - - #endregion Protected Methods - } -} \ No newline at end of file diff --git a/MpDataLayer/Resources/Readme.md b/MpDataLayer/Resources/Readme.md deleted file mode 100644 index 29cc121b..00000000 --- a/MpDataLayer/Resources/Readme.md +++ /dev/null @@ -1,23 +0,0 @@ -# Appunti gestione MP-STAT DB - - -Per la gestione dell'accesso al DB statistiche si opera con EFCore --> apop blazor server - -## Scaffolding DB iniziale - - Scaffold-DbContext "Server=SQL2016DEV;Database=MoonPro_STATS;Trusted_Connection=True;" Microsoft.EntityFrameworkCore.SqlServer -OutputDir DatabaseModels - -## Scaffolding SOLO di tabelle/viste selezionate (con force update) - - Scaffold-DbContext "Server=SQL2016DEV;Database=MoonPro_STATS;Trusted_Connection=True;" Microsoft.EntityFrameworkCore.SqlServer -OutputDir DatabaseModels -Tables v_RS, v_TC_Stat, v_TCR, v_TCR_Day, v_UL - - - -## Approfondimenti - -Qualche link di approfondimento: - - - https://docs.microsoft.com/en-us/ef/core/ - - https://docs.microsoft.com/en-us/ef/core/extensions/ - - https://www.entityframeworktutorial.net/efcore/create-model-for-existing-database-in-ef-core.aspx - - https://entityframework.net/ef-code-first \ No newline at end of file diff --git a/MpDataLayer/StatsDbContext.cs b/MpDataLayer/StatsDbContext.cs deleted file mode 100644 index e52f398f..00000000 --- a/MpDataLayer/StatsDbContext.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MP.Data -{ - public class StatsDbContext - { - } -} \ No newline at end of file From a8a3bfdc0a44db8b566ed2fda305629e6c12af3a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 13:35:20 +0200 Subject: [PATCH 009/158] Migrazione classe Mp.Stats --- MP-STATS.sln | 4 ++-- {MP-STATS => MP.Stats}/App.razor | 0 {MP-STATS => MP.Stats}/Components/CmpFooter.razor | 0 {MP-STATS => MP.Stats}/Components/CmpTop.razor | 2 +- {MP-STATS => MP.Stats}/Components/DataPager.razor | 0 {MP-STATS => MP.Stats}/Components/HomeButton.razor | 0 {MP-STATS => MP.Stats}/Components/SearchMod.razor | 4 ++-- {MP-STATS => MP.Stats}/Data/MessageService.cs | 2 +- {MP-STATS => MP.Stats}/Data/MpStatsService.cs | 10 +++++----- {MP-STATS => MP.Stats}/Data/WeatherForecast.cs | 2 +- .../Data/WeatherForecastService.cs | 2 +- .../MP-STATS.csproj => MP.Stats/MP.Stats.csproj | 4 ++-- {MP-STATS => MP.Stats}/Pages/Controlli.razor | 4 ++-- {MP-STATS => MP.Stats}/Pages/Counter.razor | 0 {MP-STATS => MP.Stats}/Pages/Error.cshtml | 2 +- {MP-STATS => MP.Stats}/Pages/Error.cshtml.cs | 2 +- {MP-STATS => MP.Stats}/Pages/FetchData.razor | 2 +- {MP-STATS => MP.Stats}/Pages/Index.razor | 4 ++-- {MP-STATS => MP.Stats}/Pages/Scarti.razor | 4 ++-- {MP-STATS => MP.Stats}/Pages/Scarti.razor.cs | 8 ++++---- {MP-STATS => MP.Stats}/Pages/_Host.cshtml | 2 +- {MP-STATS => MP.Stats}/Pages/_Host.cshtml.bak | 2 +- {MP-STATS => MP.Stats}/Program.cs | 2 +- .../Properties/launchSettings.json | 0 {MP-STATS => MP.Stats}/Shared/MainLayout.razor | 4 ++-- {MP-STATS => MP.Stats}/Shared/MainLayout.razor.css | 0 {MP-STATS => MP.Stats}/Shared/NavMenu.razor | 0 {MP-STATS => MP.Stats}/Shared/NavMenu.razor.css | 0 {MP-STATS => MP.Stats}/Startup.cs | 4 ++-- {MP-STATS => MP.Stats}/Startup.cs.bak | 4 ++-- {MP-STATS => MP.Stats}/_Imports.razor | 4 ++-- {MP-STATS => MP.Stats}/appsettings.Development.json | 0 {MP-STATS => MP.Stats}/appsettings.Production.json | 0 {MP-STATS => MP.Stats}/appsettings.Staging.json | 0 {MP-STATS => MP.Stats}/appsettings.json | 0 {MP-STATS => MP.Stats}/appsettings.json.bak | 0 {MP-STATS => MP.Stats}/logs/.placeholder | 0 {MP-STATS => MP.Stats}/post-build.ps1 | 0 .../wwwroot/css/bootstrap/bootstrap.min.css | 0 .../wwwroot/css/bootstrap/bootstrap.min.css.map | 0 {MP-STATS => MP.Stats}/wwwroot/css/fonts.css | 0 {MP-STATS => MP.Stats}/wwwroot/css/fonts.less | 0 .../wwwroot/css/open-iconic/FONT-LICENSE | 0 .../wwwroot/css/open-iconic/ICON-LICENSE | 0 .../wwwroot/css/open-iconic/README.md | 0 .../font/css/open-iconic-bootstrap.min.css | 0 .../css/open-iconic/font/fonts/open-iconic.eot | Bin .../css/open-iconic/font/fonts/open-iconic.otf | Bin .../css/open-iconic/font/fonts/open-iconic.svg | 0 .../css/open-iconic/font/fonts/open-iconic.ttf | Bin .../css/open-iconic/font/fonts/open-iconic.woff | Bin {MP-STATS => MP.Stats}/wwwroot/css/site.css | 0 {MP-STATS => MP.Stats}/wwwroot/css/site.less | 0 {MP-STATS => MP.Stats}/wwwroot/favicon.ico | Bin .../wwwroot/fonts/lato-v17-latin-regular.eot | Bin .../wwwroot/fonts/lato-v17-latin-regular.svg | 0 .../wwwroot/fonts/lato-v17-latin-regular.ttf | Bin .../wwwroot/fonts/lato-v17-latin-regular.woff | Bin .../wwwroot/fonts/lato-v17-latin-regular.woff2 | Bin .../wwwroot/fonts/roboto-v27-latin-regular.eot | Bin .../wwwroot/fonts/roboto-v27-latin-regular.svg | 0 .../wwwroot/fonts/roboto-v27-latin-regular.ttf | Bin .../wwwroot/fonts/roboto-v27-latin-regular.woff | Bin .../wwwroot/fonts/roboto-v27-latin-regular.woff2 | Bin {MP-STATS => MP.Stats}/wwwroot/img/LogoBlu.svg | 0 {MP-STATS => MP.Stats}/wwwroot/js/debounce.js | 0 {MP-STATS => MP.Stats}/wwwroot/js/external.js | 0 67 files changed, 39 insertions(+), 39 deletions(-) rename {MP-STATS => MP.Stats}/App.razor (100%) rename {MP-STATS => MP.Stats}/Components/CmpFooter.razor (100%) rename {MP-STATS => MP.Stats}/Components/CmpTop.razor (97%) rename {MP-STATS => MP.Stats}/Components/DataPager.razor (100%) rename {MP-STATS => MP.Stats}/Components/HomeButton.razor (100%) rename {MP-STATS => MP.Stats}/Components/SearchMod.razor (94%) rename {MP-STATS => MP.Stats}/Data/MessageService.cs (98%) rename {MP-STATS => MP.Stats}/Data/MpStatsService.cs (85%) rename {MP-STATS => MP.Stats}/Data/WeatherForecast.cs (91%) rename {MP-STATS => MP.Stats}/Data/WeatherForecastService.cs (96%) rename MP-STATS/MP-STATS.csproj => MP.Stats/MP.Stats.csproj (77%) rename {MP-STATS => MP.Stats}/Pages/Controlli.razor (79%) rename {MP-STATS => MP.Stats}/Pages/Counter.razor (100%) rename {MP-STATS => MP.Stats}/Pages/Error.cshtml (97%) rename {MP-STATS => MP.Stats}/Pages/Error.cshtml.cs (97%) rename {MP-STATS => MP.Stats}/Pages/FetchData.razor (98%) rename {MP-STATS => MP.Stats}/Pages/Index.razor (97%) rename {MP-STATS => MP.Stats}/Pages/Scarti.razor (97%) rename {MP-STATS => MP.Stats}/Pages/Scarti.razor.cs (95%) rename {MP-STATS => MP.Stats}/Pages/_Host.cshtml (97%) rename {MP-STATS => MP.Stats}/Pages/_Host.cshtml.bak (97%) rename {MP-STATS => MP.Stats}/Program.cs (97%) rename {MP-STATS => MP.Stats}/Properties/launchSettings.json (100%) rename {MP-STATS => MP.Stats}/Shared/MainLayout.razor (96%) rename {MP-STATS => MP.Stats}/Shared/MainLayout.razor.css (100%) rename {MP-STATS => MP.Stats}/Shared/NavMenu.razor (100%) rename {MP-STATS => MP.Stats}/Shared/NavMenu.razor.css (100%) rename {MP-STATS => MP.Stats}/Startup.cs (98%) rename {MP-STATS => MP.Stats}/Startup.cs.bak (98%) rename {MP-STATS => MP.Stats}/_Imports.razor (89%) rename {MP-STATS => MP.Stats}/appsettings.Development.json (100%) rename {MP-STATS => MP.Stats}/appsettings.Production.json (100%) rename {MP-STATS => MP.Stats}/appsettings.Staging.json (100%) rename {MP-STATS => MP.Stats}/appsettings.json (100%) rename {MP-STATS => MP.Stats}/appsettings.json.bak (100%) rename {MP-STATS => MP.Stats}/logs/.placeholder (100%) rename {MP-STATS => MP.Stats}/post-build.ps1 (100%) rename {MP-STATS => MP.Stats}/wwwroot/css/bootstrap/bootstrap.min.css (100%) rename {MP-STATS => MP.Stats}/wwwroot/css/bootstrap/bootstrap.min.css.map (100%) rename {MP-STATS => MP.Stats}/wwwroot/css/fonts.css (100%) rename {MP-STATS => MP.Stats}/wwwroot/css/fonts.less (100%) rename {MP-STATS => MP.Stats}/wwwroot/css/open-iconic/FONT-LICENSE (100%) rename {MP-STATS => MP.Stats}/wwwroot/css/open-iconic/ICON-LICENSE (100%) rename {MP-STATS => MP.Stats}/wwwroot/css/open-iconic/README.md (100%) rename {MP-STATS => MP.Stats}/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css (100%) rename {MP-STATS => MP.Stats}/wwwroot/css/open-iconic/font/fonts/open-iconic.eot (100%) rename {MP-STATS => MP.Stats}/wwwroot/css/open-iconic/font/fonts/open-iconic.otf (100%) rename {MP-STATS => MP.Stats}/wwwroot/css/open-iconic/font/fonts/open-iconic.svg (100%) rename {MP-STATS => MP.Stats}/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf (100%) rename {MP-STATS => MP.Stats}/wwwroot/css/open-iconic/font/fonts/open-iconic.woff (100%) rename {MP-STATS => MP.Stats}/wwwroot/css/site.css (100%) rename {MP-STATS => MP.Stats}/wwwroot/css/site.less (100%) rename {MP-STATS => MP.Stats}/wwwroot/favicon.ico (100%) rename {MP-STATS => MP.Stats}/wwwroot/fonts/lato-v17-latin-regular.eot (100%) rename {MP-STATS => MP.Stats}/wwwroot/fonts/lato-v17-latin-regular.svg (100%) rename {MP-STATS => MP.Stats}/wwwroot/fonts/lato-v17-latin-regular.ttf (100%) rename {MP-STATS => MP.Stats}/wwwroot/fonts/lato-v17-latin-regular.woff (100%) rename {MP-STATS => MP.Stats}/wwwroot/fonts/lato-v17-latin-regular.woff2 (100%) rename {MP-STATS => MP.Stats}/wwwroot/fonts/roboto-v27-latin-regular.eot (100%) rename {MP-STATS => MP.Stats}/wwwroot/fonts/roboto-v27-latin-regular.svg (100%) rename {MP-STATS => MP.Stats}/wwwroot/fonts/roboto-v27-latin-regular.ttf (100%) rename {MP-STATS => MP.Stats}/wwwroot/fonts/roboto-v27-latin-regular.woff (100%) rename {MP-STATS => MP.Stats}/wwwroot/fonts/roboto-v27-latin-regular.woff2 (100%) rename {MP-STATS => MP.Stats}/wwwroot/img/LogoBlu.svg (100%) rename {MP-STATS => MP.Stats}/wwwroot/js/debounce.js (100%) rename {MP-STATS => MP.Stats}/wwwroot/js/external.js (100%) diff --git a/MP-STATS.sln b/MP-STATS.sln index 266dbaf1..c8630043 100644 --- a/MP-STATS.sln +++ b/MP-STATS.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31229.75 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP-STATS", "MP-STATS\MP-STATS.csproj", "{D9901B50-E61C-400C-B62C-FA060CF72C29}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP-STATS", "MP.Stats\MP.Stats.csproj", "{D9901B50-E61C-400C-B62C-FA060CF72C29}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MpDataLayer", "MpDataLayer\MpDataLayer.csproj", "{10BA8450-301D-49C7-8E1E-21B7469C225C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Data", "MP.Data\MP.Data.csproj", "{10BA8450-301D-49C7-8E1E-21B7469C225C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/MP-STATS/App.razor b/MP.Stats/App.razor similarity index 100% rename from MP-STATS/App.razor rename to MP.Stats/App.razor diff --git a/MP-STATS/Components/CmpFooter.razor b/MP.Stats/Components/CmpFooter.razor similarity index 100% rename from MP-STATS/Components/CmpFooter.razor rename to MP.Stats/Components/CmpFooter.razor diff --git a/MP-STATS/Components/CmpTop.razor b/MP.Stats/Components/CmpTop.razor similarity index 97% rename from MP-STATS/Components/CmpTop.razor rename to MP.Stats/Components/CmpTop.razor index 4128b284..187e684f 100644 --- a/MP-STATS/Components/CmpTop.razor +++ b/MP.Stats/Components/CmpTop.razor @@ -1,4 +1,4 @@ -@using MP_STATS.Components +@using MP.Stats.Components @using System.Security.Claims @using Microsoft.AspNetCore.Components.Authorization diff --git a/MP-STATS/Components/DataPager.razor b/MP.Stats/Components/DataPager.razor similarity index 100% rename from MP-STATS/Components/DataPager.razor rename to MP.Stats/Components/DataPager.razor diff --git a/MP-STATS/Components/HomeButton.razor b/MP.Stats/Components/HomeButton.razor similarity index 100% rename from MP-STATS/Components/HomeButton.razor rename to MP.Stats/Components/HomeButton.razor diff --git a/MP-STATS/Components/SearchMod.razor b/MP.Stats/Components/SearchMod.razor similarity index 94% rename from MP-STATS/Components/SearchMod.razor rename to MP.Stats/Components/SearchMod.razor index 85d0eb95..0aab3cec 100644 --- a/MP-STATS/Components/SearchMod.razor +++ b/MP.Stats/Components/SearchMod.razor @@ -1,5 +1,5 @@ -@using MP_STATS.Components -@using MP_STATS.Data +@using MP.Stats.Components +@using MP.Stats.Data @inject MessageService MessageService
                  diff --git a/MP-STATS/Data/MessageService.cs b/MP.Stats/Data/MessageService.cs similarity index 98% rename from MP-STATS/Data/MessageService.cs rename to MP.Stats/Data/MessageService.cs index 0ea09851..c01e734c 100644 --- a/MP-STATS/Data/MessageService.cs +++ b/MP.Stats/Data/MessageService.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace MP_STATS.Data +namespace MP.Stats.Data { public class MessageService { diff --git a/MP-STATS/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs similarity index 85% rename from MP-STATS/Data/MpStatsService.cs rename to MP.Stats/Data/MpStatsService.cs index df8ce951..5c0c2570 100644 --- a/MP-STATS/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -6,9 +6,9 @@ using System.Configuration; using System.Text; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -using MpDataLayer; +using MP.Data; -namespace MP_STATS.Data +namespace MP.Stats.Data { public class MpStatsService { @@ -28,7 +28,7 @@ namespace MP_STATS.Data #region Public Fields - public static MpDataLayer.Controllers.MpStatsController dbController; + public static MP.Data.Controllers.MpStatsController dbController; #endregion Public Fields @@ -45,7 +45,7 @@ namespace MP_STATS.Data } else { - dbController = new MpDataLayer.Controllers.MpStatsController(configuration); + dbController = new MP.Data.Controllers.MpStatsController(configuration); StringBuilder sb = new StringBuilder(); sb.AppendLine($"DbController OK"); //sb.AppendLine($"CST: {dbController.CustomersCount()} | CNT: {dbController.CountersCount()} | BSK: {dbController.BasketsCount()} | NGT: {dbController.NegotiationsCount()} | DOC: {dbController.DocsCount()} | ITM: {dbController.ItemsCount()} | RES: {dbController.ResourcesCount()}"); @@ -62,7 +62,7 @@ namespace MP_STATS.Data dbController.rollBackEntity(item); } - public Task ScartiGetAll(int numRecord, string searchVal = "") + public Task ScartiGetAll(int numRecord, string searchVal = "") { return Task.FromResult(dbController.ScartiGetAll(numRecord, searchVal).ToArray()); } diff --git a/MP-STATS/Data/WeatherForecast.cs b/MP.Stats/Data/WeatherForecast.cs similarity index 91% rename from MP-STATS/Data/WeatherForecast.cs rename to MP.Stats/Data/WeatherForecast.cs index c06bbd67..b5ff87aa 100644 --- a/MP-STATS/Data/WeatherForecast.cs +++ b/MP.Stats/Data/WeatherForecast.cs @@ -1,6 +1,6 @@ using System; -namespace MP_STATS.Data +namespace MP.Stats.Data { public class WeatherForecast { diff --git a/MP-STATS/Data/WeatherForecastService.cs b/MP.Stats/Data/WeatherForecastService.cs similarity index 96% rename from MP-STATS/Data/WeatherForecastService.cs rename to MP.Stats/Data/WeatherForecastService.cs index 069417db..02f62be9 100644 --- a/MP-STATS/Data/WeatherForecastService.cs +++ b/MP.Stats/Data/WeatherForecastService.cs @@ -2,7 +2,7 @@ using System; using System.Linq; using System.Threading.Tasks; -namespace MP_STATS.Data +namespace MP.Stats.Data { public class WeatherForecastService { diff --git a/MP-STATS/MP-STATS.csproj b/MP.Stats/MP.Stats.csproj similarity index 77% rename from MP-STATS/MP-STATS.csproj rename to MP.Stats/MP.Stats.csproj index f16d772f..4ccf0775 100644 --- a/MP-STATS/MP-STATS.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -2,11 +2,11 @@ net5.0 - MP_STATS + MP.Stats - + diff --git a/MP-STATS/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor similarity index 79% rename from MP-STATS/Pages/Controlli.razor rename to MP.Stats/Pages/Controlli.razor index 854bc248..0c0fb7b2 100644 --- a/MP-STATS/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -1,7 +1,7 @@ @page "/controlli" -@using MP_STATS.Components -@using MP_STATS.Data +@using MP.Stats.Components +@using MP.Stats.Data
                  Controlli
                  diff --git a/MP-STATS/Pages/Counter.razor b/MP.Stats/Pages/Counter.razor similarity index 100% rename from MP-STATS/Pages/Counter.razor rename to MP.Stats/Pages/Counter.razor diff --git a/MP-STATS/Pages/Error.cshtml b/MP.Stats/Pages/Error.cshtml similarity index 97% rename from MP-STATS/Pages/Error.cshtml rename to MP.Stats/Pages/Error.cshtml index b8bc6bd8..b49efeb6 100644 --- a/MP-STATS/Pages/Error.cshtml +++ b/MP.Stats/Pages/Error.cshtml @@ -1,5 +1,5 @@ @page -@model MP_STATS.Pages.ErrorModel +@model MP.Stats.Pages.ErrorModel diff --git a/MP-STATS/Pages/Error.cshtml.cs b/MP.Stats/Pages/Error.cshtml.cs similarity index 97% rename from MP-STATS/Pages/Error.cshtml.cs rename to MP.Stats/Pages/Error.cshtml.cs index 87fbb7c5..28c1142f 100644 --- a/MP-STATS/Pages/Error.cshtml.cs +++ b/MP.Stats/Pages/Error.cshtml.cs @@ -7,7 +7,7 @@ using System.Diagnostics; using System.Linq; using System.Threading.Tasks; -namespace MP_STATS.Pages +namespace MP.Stats.Pages { [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] [IgnoreAntiforgeryToken] diff --git a/MP-STATS/Pages/FetchData.razor b/MP.Stats/Pages/FetchData.razor similarity index 98% rename from MP-STATS/Pages/FetchData.razor rename to MP.Stats/Pages/FetchData.razor index 69a40f87..de4d781b 100644 --- a/MP-STATS/Pages/FetchData.razor +++ b/MP.Stats/Pages/FetchData.razor @@ -1,6 +1,6 @@ @page "/fetchdata" -@using MP_STATS.Data +@using MP.Stats.Data @inject WeatherForecastService ForecastService

                  Weather forecast

                  diff --git a/MP-STATS/Pages/Index.razor b/MP.Stats/Pages/Index.razor similarity index 97% rename from MP-STATS/Pages/Index.razor rename to MP.Stats/Pages/Index.razor index 7e53c4fd..4cf3b8ee 100644 --- a/MP-STATS/Pages/Index.razor +++ b/MP.Stats/Pages/Index.razor @@ -1,7 +1,7 @@ @page "/" -@using MP_STATS.Components -@using MP_STATS.Data +@using MP.Stats.Components +@using MP.Stats.Data
                  diff --git a/MP-STATS/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor similarity index 97% rename from MP-STATS/Pages/Scarti.razor rename to MP.Stats/Pages/Scarti.razor index 8ce0c777..e5b7ed07 100644 --- a/MP-STATS/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -1,7 +1,7 @@ @page "/scarti" -@using MP_STATS.Components -@using MP_STATS.Data +@using MP.Stats.Components +@using MP.Stats.Data
                  Scarti
                  diff --git a/MP-STATS/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs similarity index 95% rename from MP-STATS/Pages/Scarti.razor.cs rename to MP.Stats/Pages/Scarti.razor.cs index 8a10dc37..75b83121 100644 --- a/MP-STATS/Pages/Scarti.razor.cs +++ b/MP.Stats/Pages/Scarti.razor.cs @@ -1,18 +1,18 @@ using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; -using MP_STATS.Data; +using MP.Stats.Data; using System; using System.Threading.Tasks; -namespace MP_STATS.Pages +namespace MP.Stats.Pages { public partial class Scarti : ComponentBase, IDisposable { #region Private Fields - private MpDataLayer.DatabaseModels.ResScarti currRecord = null; + private MP.Data.DatabaseModels.ResScarti currRecord = null; - private MpDataLayer.DatabaseModels.ResScarti[] ListRecords; + private MP.Data.DatabaseModels.ResScarti[] ListRecords; #endregion Private Fields diff --git a/MP-STATS/Pages/_Host.cshtml b/MP.Stats/Pages/_Host.cshtml similarity index 97% rename from MP-STATS/Pages/_Host.cshtml rename to MP.Stats/Pages/_Host.cshtml index 499c43d3..9d3af208 100644 --- a/MP-STATS/Pages/_Host.cshtml +++ b/MP.Stats/Pages/_Host.cshtml @@ -1,7 +1,7 @@ @page "/" @using System.Globalization @using Microsoft.AspNetCore.Localization -@namespace MP_STATS.Pages +@namespace MP.Stats.Pages @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @{ Layout = null; diff --git a/MP-STATS/Pages/_Host.cshtml.bak b/MP.Stats/Pages/_Host.cshtml.bak similarity index 97% rename from MP-STATS/Pages/_Host.cshtml.bak rename to MP.Stats/Pages/_Host.cshtml.bak index 0b5cdcf0..8c6accba 100644 --- a/MP-STATS/Pages/_Host.cshtml.bak +++ b/MP.Stats/Pages/_Host.cshtml.bak @@ -1,5 +1,5 @@ @page "/" -@namespace MP_STATS.Pages +@namespace MP.Stats.Pages @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @{ Layout = null; diff --git a/MP-STATS/Program.cs b/MP.Stats/Program.cs similarity index 97% rename from MP-STATS/Program.cs rename to MP.Stats/Program.cs index 72c1800a..f159f7fc 100644 --- a/MP-STATS/Program.cs +++ b/MP.Stats/Program.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace MP_STATS +namespace MP.Stats { public class Program { diff --git a/MP-STATS/Properties/launchSettings.json b/MP.Stats/Properties/launchSettings.json similarity index 100% rename from MP-STATS/Properties/launchSettings.json rename to MP.Stats/Properties/launchSettings.json diff --git a/MP-STATS/Shared/MainLayout.razor b/MP.Stats/Shared/MainLayout.razor similarity index 96% rename from MP-STATS/Shared/MainLayout.razor rename to MP.Stats/Shared/MainLayout.razor index 0604e969..96964e0e 100644 --- a/MP-STATS/Shared/MainLayout.razor +++ b/MP.Stats/Shared/MainLayout.razor @@ -1,7 +1,7 @@ @inherits LayoutComponentBase -@using MP_STATS.Data -@using MP_STATS.Components +@using MP.Stats.Data +@using MP.Stats.Components @inject MessageService MessageService @implements IDisposable diff --git a/MP-STATS/Shared/MainLayout.razor.css b/MP.Stats/Shared/MainLayout.razor.css similarity index 100% rename from MP-STATS/Shared/MainLayout.razor.css rename to MP.Stats/Shared/MainLayout.razor.css diff --git a/MP-STATS/Shared/NavMenu.razor b/MP.Stats/Shared/NavMenu.razor similarity index 100% rename from MP-STATS/Shared/NavMenu.razor rename to MP.Stats/Shared/NavMenu.razor diff --git a/MP-STATS/Shared/NavMenu.razor.css b/MP.Stats/Shared/NavMenu.razor.css similarity index 100% rename from MP-STATS/Shared/NavMenu.razor.css rename to MP.Stats/Shared/NavMenu.razor.css diff --git a/MP-STATS/Startup.cs b/MP.Stats/Startup.cs similarity index 98% rename from MP-STATS/Startup.cs rename to MP.Stats/Startup.cs index 433ae5d0..ce078b63 100644 --- a/MP-STATS/Startup.cs +++ b/MP.Stats/Startup.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.HttpsPolicy; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using MP_STATS.Data; +using MP.Stats.Data; using System; using System.Collections.Generic; using System.Linq; @@ -14,7 +14,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Localization; using System.Globalization; -namespace MP_STATS +namespace MP.Stats { public class Startup { diff --git a/MP-STATS/Startup.cs.bak b/MP.Stats/Startup.cs.bak similarity index 98% rename from MP-STATS/Startup.cs.bak rename to MP.Stats/Startup.cs.bak index 137eb51f..bb9ae887 100644 --- a/MP-STATS/Startup.cs.bak +++ b/MP.Stats/Startup.cs.bak @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.HttpsPolicy; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using MP_STATS.Data; +using MP.Stats.Data; using System; using System.Collections.Generic; using System.Linq; @@ -14,7 +14,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Localization; using System.Globalization; -namespace MP_STATS +namespace MP.Stats { public class Startup { diff --git a/MP-STATS/_Imports.razor b/MP.Stats/_Imports.razor similarity index 89% rename from MP-STATS/_Imports.razor rename to MP.Stats/_Imports.razor index a33d6b96..b335524c 100644 --- a/MP-STATS/_Imports.razor +++ b/MP.Stats/_Imports.razor @@ -6,5 +6,5 @@ @using Microsoft.AspNetCore.Components.Web @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop -@using MP_STATS -@using MP_STATS.Shared +@using MP.Stats +@using MP.Stats.Shared diff --git a/MP-STATS/appsettings.Development.json b/MP.Stats/appsettings.Development.json similarity index 100% rename from MP-STATS/appsettings.Development.json rename to MP.Stats/appsettings.Development.json diff --git a/MP-STATS/appsettings.Production.json b/MP.Stats/appsettings.Production.json similarity index 100% rename from MP-STATS/appsettings.Production.json rename to MP.Stats/appsettings.Production.json diff --git a/MP-STATS/appsettings.Staging.json b/MP.Stats/appsettings.Staging.json similarity index 100% rename from MP-STATS/appsettings.Staging.json rename to MP.Stats/appsettings.Staging.json diff --git a/MP-STATS/appsettings.json b/MP.Stats/appsettings.json similarity index 100% rename from MP-STATS/appsettings.json rename to MP.Stats/appsettings.json diff --git a/MP-STATS/appsettings.json.bak b/MP.Stats/appsettings.json.bak similarity index 100% rename from MP-STATS/appsettings.json.bak rename to MP.Stats/appsettings.json.bak diff --git a/MP-STATS/logs/.placeholder b/MP.Stats/logs/.placeholder similarity index 100% rename from MP-STATS/logs/.placeholder rename to MP.Stats/logs/.placeholder diff --git a/MP-STATS/post-build.ps1 b/MP.Stats/post-build.ps1 similarity index 100% rename from MP-STATS/post-build.ps1 rename to MP.Stats/post-build.ps1 diff --git a/MP-STATS/wwwroot/css/bootstrap/bootstrap.min.css b/MP.Stats/wwwroot/css/bootstrap/bootstrap.min.css similarity index 100% rename from MP-STATS/wwwroot/css/bootstrap/bootstrap.min.css rename to MP.Stats/wwwroot/css/bootstrap/bootstrap.min.css diff --git a/MP-STATS/wwwroot/css/bootstrap/bootstrap.min.css.map b/MP.Stats/wwwroot/css/bootstrap/bootstrap.min.css.map similarity index 100% rename from MP-STATS/wwwroot/css/bootstrap/bootstrap.min.css.map rename to MP.Stats/wwwroot/css/bootstrap/bootstrap.min.css.map diff --git a/MP-STATS/wwwroot/css/fonts.css b/MP.Stats/wwwroot/css/fonts.css similarity index 100% rename from MP-STATS/wwwroot/css/fonts.css rename to MP.Stats/wwwroot/css/fonts.css diff --git a/MP-STATS/wwwroot/css/fonts.less b/MP.Stats/wwwroot/css/fonts.less similarity index 100% rename from MP-STATS/wwwroot/css/fonts.less rename to MP.Stats/wwwroot/css/fonts.less diff --git a/MP-STATS/wwwroot/css/open-iconic/FONT-LICENSE b/MP.Stats/wwwroot/css/open-iconic/FONT-LICENSE similarity index 100% rename from MP-STATS/wwwroot/css/open-iconic/FONT-LICENSE rename to MP.Stats/wwwroot/css/open-iconic/FONT-LICENSE diff --git a/MP-STATS/wwwroot/css/open-iconic/ICON-LICENSE b/MP.Stats/wwwroot/css/open-iconic/ICON-LICENSE similarity index 100% rename from MP-STATS/wwwroot/css/open-iconic/ICON-LICENSE rename to MP.Stats/wwwroot/css/open-iconic/ICON-LICENSE diff --git a/MP-STATS/wwwroot/css/open-iconic/README.md b/MP.Stats/wwwroot/css/open-iconic/README.md similarity index 100% rename from MP-STATS/wwwroot/css/open-iconic/README.md rename to MP.Stats/wwwroot/css/open-iconic/README.md diff --git a/MP-STATS/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css b/MP.Stats/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css similarity index 100% rename from MP-STATS/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css rename to MP.Stats/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css diff --git a/MP-STATS/wwwroot/css/open-iconic/font/fonts/open-iconic.eot b/MP.Stats/wwwroot/css/open-iconic/font/fonts/open-iconic.eot similarity index 100% rename from MP-STATS/wwwroot/css/open-iconic/font/fonts/open-iconic.eot rename to MP.Stats/wwwroot/css/open-iconic/font/fonts/open-iconic.eot diff --git a/MP-STATS/wwwroot/css/open-iconic/font/fonts/open-iconic.otf b/MP.Stats/wwwroot/css/open-iconic/font/fonts/open-iconic.otf similarity index 100% rename from MP-STATS/wwwroot/css/open-iconic/font/fonts/open-iconic.otf rename to MP.Stats/wwwroot/css/open-iconic/font/fonts/open-iconic.otf diff --git a/MP-STATS/wwwroot/css/open-iconic/font/fonts/open-iconic.svg b/MP.Stats/wwwroot/css/open-iconic/font/fonts/open-iconic.svg similarity index 100% rename from MP-STATS/wwwroot/css/open-iconic/font/fonts/open-iconic.svg rename to MP.Stats/wwwroot/css/open-iconic/font/fonts/open-iconic.svg diff --git a/MP-STATS/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf b/MP.Stats/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf similarity index 100% rename from MP-STATS/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf rename to MP.Stats/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf diff --git a/MP-STATS/wwwroot/css/open-iconic/font/fonts/open-iconic.woff b/MP.Stats/wwwroot/css/open-iconic/font/fonts/open-iconic.woff similarity index 100% rename from MP-STATS/wwwroot/css/open-iconic/font/fonts/open-iconic.woff rename to MP.Stats/wwwroot/css/open-iconic/font/fonts/open-iconic.woff diff --git a/MP-STATS/wwwroot/css/site.css b/MP.Stats/wwwroot/css/site.css similarity index 100% rename from MP-STATS/wwwroot/css/site.css rename to MP.Stats/wwwroot/css/site.css diff --git a/MP-STATS/wwwroot/css/site.less b/MP.Stats/wwwroot/css/site.less similarity index 100% rename from MP-STATS/wwwroot/css/site.less rename to MP.Stats/wwwroot/css/site.less diff --git a/MP-STATS/wwwroot/favicon.ico b/MP.Stats/wwwroot/favicon.ico similarity index 100% rename from MP-STATS/wwwroot/favicon.ico rename to MP.Stats/wwwroot/favicon.ico diff --git a/MP-STATS/wwwroot/fonts/lato-v17-latin-regular.eot b/MP.Stats/wwwroot/fonts/lato-v17-latin-regular.eot similarity index 100% rename from MP-STATS/wwwroot/fonts/lato-v17-latin-regular.eot rename to MP.Stats/wwwroot/fonts/lato-v17-latin-regular.eot diff --git a/MP-STATS/wwwroot/fonts/lato-v17-latin-regular.svg b/MP.Stats/wwwroot/fonts/lato-v17-latin-regular.svg similarity index 100% rename from MP-STATS/wwwroot/fonts/lato-v17-latin-regular.svg rename to MP.Stats/wwwroot/fonts/lato-v17-latin-regular.svg diff --git a/MP-STATS/wwwroot/fonts/lato-v17-latin-regular.ttf b/MP.Stats/wwwroot/fonts/lato-v17-latin-regular.ttf similarity index 100% rename from MP-STATS/wwwroot/fonts/lato-v17-latin-regular.ttf rename to MP.Stats/wwwroot/fonts/lato-v17-latin-regular.ttf diff --git a/MP-STATS/wwwroot/fonts/lato-v17-latin-regular.woff b/MP.Stats/wwwroot/fonts/lato-v17-latin-regular.woff similarity index 100% rename from MP-STATS/wwwroot/fonts/lato-v17-latin-regular.woff rename to MP.Stats/wwwroot/fonts/lato-v17-latin-regular.woff diff --git a/MP-STATS/wwwroot/fonts/lato-v17-latin-regular.woff2 b/MP.Stats/wwwroot/fonts/lato-v17-latin-regular.woff2 similarity index 100% rename from MP-STATS/wwwroot/fonts/lato-v17-latin-regular.woff2 rename to MP.Stats/wwwroot/fonts/lato-v17-latin-regular.woff2 diff --git a/MP-STATS/wwwroot/fonts/roboto-v27-latin-regular.eot b/MP.Stats/wwwroot/fonts/roboto-v27-latin-regular.eot similarity index 100% rename from MP-STATS/wwwroot/fonts/roboto-v27-latin-regular.eot rename to MP.Stats/wwwroot/fonts/roboto-v27-latin-regular.eot diff --git a/MP-STATS/wwwroot/fonts/roboto-v27-latin-regular.svg b/MP.Stats/wwwroot/fonts/roboto-v27-latin-regular.svg similarity index 100% rename from MP-STATS/wwwroot/fonts/roboto-v27-latin-regular.svg rename to MP.Stats/wwwroot/fonts/roboto-v27-latin-regular.svg diff --git a/MP-STATS/wwwroot/fonts/roboto-v27-latin-regular.ttf b/MP.Stats/wwwroot/fonts/roboto-v27-latin-regular.ttf similarity index 100% rename from MP-STATS/wwwroot/fonts/roboto-v27-latin-regular.ttf rename to MP.Stats/wwwroot/fonts/roboto-v27-latin-regular.ttf diff --git a/MP-STATS/wwwroot/fonts/roboto-v27-latin-regular.woff b/MP.Stats/wwwroot/fonts/roboto-v27-latin-regular.woff similarity index 100% rename from MP-STATS/wwwroot/fonts/roboto-v27-latin-regular.woff rename to MP.Stats/wwwroot/fonts/roboto-v27-latin-regular.woff diff --git a/MP-STATS/wwwroot/fonts/roboto-v27-latin-regular.woff2 b/MP.Stats/wwwroot/fonts/roboto-v27-latin-regular.woff2 similarity index 100% rename from MP-STATS/wwwroot/fonts/roboto-v27-latin-regular.woff2 rename to MP.Stats/wwwroot/fonts/roboto-v27-latin-regular.woff2 diff --git a/MP-STATS/wwwroot/img/LogoBlu.svg b/MP.Stats/wwwroot/img/LogoBlu.svg similarity index 100% rename from MP-STATS/wwwroot/img/LogoBlu.svg rename to MP.Stats/wwwroot/img/LogoBlu.svg diff --git a/MP-STATS/wwwroot/js/debounce.js b/MP.Stats/wwwroot/js/debounce.js similarity index 100% rename from MP-STATS/wwwroot/js/debounce.js rename to MP.Stats/wwwroot/js/debounce.js diff --git a/MP-STATS/wwwroot/js/external.js b/MP.Stats/wwwroot/js/external.js similarity index 100% rename from MP-STATS/wwwroot/js/external.js rename to MP.Stats/wwwroot/js/external.js From a5d3eaa761eeb69d77ff9154fa9d0cd194da22e4 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 14:36:30 +0200 Subject: [PATCH 010/158] fix pager con selettore tendina --- MP.Stats/Components/DataPager.razor | 37 ++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/MP.Stats/Components/DataPager.razor b/MP.Stats/Components/DataPager.razor index 8516e5d9..527b8e78 100644 --- a/MP.Stats/Components/DataPager.razor +++ b/MP.Stats/Components/DataPager.razor @@ -1,21 +1,42 @@ 
                  - -
                  - - @*# record*@ -
                  + row/pag:  +
                  @code { + protected int _numRecord { get; set; } = 10; + [Parameter] - public int numRecord { get; set; } = 10; + public int numRecord + { + get + { + return _numRecord; + } + set + { + bool doReport = !_numRecord.Equals(value); + _numRecord = value; + if (doReport) + { + reportChange(); + } + } + } [Parameter] public EventCallback numRecordChanged { get; set; } - private async Task reportChange() + private void reportChange() { - await numRecordChanged.InvokeAsync(numRecord); + numRecordChanged.InvokeAsync(numRecord); } + } \ No newline at end of file From 5bd3ddbe4f17e6129edc62426e340cd467c01e29 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 14:36:46 +0200 Subject: [PATCH 011/158] fixcss --- MP.Stats/Components/SearchMod.razor | 2 +- MP.Stats/MP.Stats.csproj | 13 ++++++ MP.Stats/Pages/Index.razor | 19 +++++--- MP.Stats/Pages/Scarti.razor | 58 ++++++++++++------------ MP.Stats/Pages/Scarti.razor.cs | 1 + MP.Stats/Pages/_Host.cshtml | 6 +-- MP.Stats/Shared/NavMenu.razor | 2 +- MP.Stats/compilerconfig.json | 10 +++++ MP.Stats/compilerconfig.json.defaults | 63 +++++++++++++++++++++++++++ MP.Stats/wwwroot/css/fonts.min.css | 1 + MP.Stats/wwwroot/css/site.min.css | 1 + 11 files changed, 135 insertions(+), 41 deletions(-) create mode 100644 MP.Stats/compilerconfig.json create mode 100644 MP.Stats/compilerconfig.json.defaults create mode 100644 MP.Stats/wwwroot/css/fonts.min.css create mode 100644 MP.Stats/wwwroot/css/site.min.css diff --git a/MP.Stats/Components/SearchMod.razor b/MP.Stats/Components/SearchMod.razor index 0aab3cec..efebcbba 100644 --- a/MP.Stats/Components/SearchMod.razor +++ b/MP.Stats/Components/SearchMod.razor @@ -3,7 +3,7 @@ @inject MessageService MessageService
                  - +
                  diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index 4ccf0775..52359c8b 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -5,6 +5,15 @@ MP.Stats + + + + + + <_ContentIncludedByDefault Remove="compilerconfig.json" /> + <_ContentIncludedByDefault Remove="wwwroot\css\fonts.min.css" /> + + @@ -13,6 +22,10 @@ + + + + PreserveNewest diff --git a/MP.Stats/Pages/Index.razor b/MP.Stats/Pages/Index.razor index 4cf3b8ee..91a38f96 100644 --- a/MP.Stats/Pages/Index.razor +++ b/MP.Stats/Pages/Index.razor @@ -3,6 +3,8 @@ @using MP.Stats.Components @using MP.Stats.Data +@inject MessageService MessageService +
                  @@ -22,14 +24,14 @@
                  -
                  @Anno
                  +
                  Main Topics
                  - - + + + @**@ - - + @**@
                  @@ -37,6 +39,9 @@
                  @code { - - private int Anno { get; set; } = DateTime.Today.Year; + protected override Task OnInitializedAsync() + { + MessageService.ShowSearch = false; + return base.OnInitializedAsync(); + } } \ No newline at end of file diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index e5b7ed07..c6503e13 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -8,43 +8,43 @@
                  @if (currRecord != null) { - @**@ + @**@ } @if (ListRecords == null) { -

                  Loading...

                  +

                  Loading...

                  } else { - - - - @**@ - - - - - - - - - - - @foreach (var record in ListRecords) +
                  MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
                  + + + @**@ + + + + + + + + + + + @foreach (var record in ListRecords) { - - @**@ - - - - - - - - + + @**@ + + + + + + + + } - -
                  MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
                   @record.IdxMacchina@record.DataOra@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo@record.Descrizione@record.CodArticolo@record.MatrOpr
                   @record.IdxMacchina@record.DataOra@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo@record.Descrizione@record.CodArticolo@record.MatrOpr
                  + + }
                  diff --git a/MP.Stats/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs index 75b83121..2a8a3d36 100644 --- a/MP.Stats/Pages/Scarti.razor.cs +++ b/MP.Stats/Pages/Scarti.razor.cs @@ -48,6 +48,7 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { + numRecord = 10; MessageService.ShowSearch = true; MessageService.EA_SearchUpdated += OnSeachUpdated; ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); diff --git a/MP.Stats/Pages/_Host.cshtml b/MP.Stats/Pages/_Host.cshtml index 9d3af208..65bfed2c 100644 --- a/MP.Stats/Pages/_Host.cshtml +++ b/MP.Stats/Pages/_Host.cshtml @@ -12,11 +12,11 @@ - MP-STATS + MP.STATS - + @@ -34,4 +34,4 @@ - + \ No newline at end of file diff --git a/MP.Stats/Shared/NavMenu.razor b/MP.Stats/Shared/NavMenu.razor index 68368d26..a2d36f59 100644 --- a/MP.Stats/Shared/NavMenu.razor +++ b/MP.Stats/Shared/NavMenu.razor @@ -19,7 +19,7 @@
                • - User Action Log + User ActionLog
                • diff --git a/MP.Stats/compilerconfig.json b/MP.Stats/compilerconfig.json new file mode 100644 index 00000000..e33c7792 --- /dev/null +++ b/MP.Stats/compilerconfig.json @@ -0,0 +1,10 @@ +[ + { + "outputFile": "wwwroot/css/fonts.css", + "inputFile": "wwwroot/css/fonts.less" + }, + { + "outputFile": "wwwroot/css/site.css", + "inputFile": "wwwroot/css/site.less" + } +] \ No newline at end of file diff --git a/MP.Stats/compilerconfig.json.defaults b/MP.Stats/compilerconfig.json.defaults new file mode 100644 index 00000000..b3519312 --- /dev/null +++ b/MP.Stats/compilerconfig.json.defaults @@ -0,0 +1,63 @@ +{ + "compilers": { + "less": { + "autoPrefix": "", + "cssComb": "none", + "ieCompat": true, + "strictMath": false, + "strictUnits": false, + "relativeUrls": true, + "rootPath": "", + "sourceMapRoot": "", + "sourceMapBasePath": "", + "sourceMap": false + }, + "sass": { + "autoPrefix": "", + "includePath": "", + "indentType": "space", + "indentWidth": 2, + "outputStyle": "nested", + "Precision": 5, + "relativeUrls": true, + "sourceMapRoot": "", + "lineFeed": "", + "sourceMap": false + }, + "stylus": { + "sourceMap": false + }, + "babel": { + "sourceMap": false + }, + "coffeescript": { + "bare": false, + "runtimeMode": "node", + "sourceMap": false + }, + "handlebars": { + "root": "", + "noBOM": false, + "name": "", + "namespace": "", + "knownHelpersOnly": false, + "forcePartial": false, + "knownHelpers": [], + "commonjs": "", + "amd": false, + "sourceMap": false + } + }, + "minifiers": { + "css": { + "enabled": true, + "termSemicolons": true, + "gzip": false + }, + "javascript": { + "enabled": true, + "termSemicolons": true, + "gzip": false + } + } +} \ No newline at end of file diff --git a/MP.Stats/wwwroot/css/fonts.min.css b/MP.Stats/wwwroot/css/fonts.min.css new file mode 100644 index 00000000..38cafa99 --- /dev/null +++ b/MP.Stats/wwwroot/css/fonts.min.css @@ -0,0 +1 @@ +@font-face{font-family:'Lato';font-style:normal;font-weight:400;src:url('../fonts/lato-v17-latin-regular.eot?');src:local(''),url('../fonts/lato-v17-latin-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/lato-v17-latin-regular.woff2') format('woff2'),url('../fonts/lato-v17-latin-regular.woff') format('woff'),url('../fonts/lato-v17-latin-regular.ttf') format('truetype'),url('../fonts/lato-v17-latin-regular.svg#Lato') format('svg');}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;src:url('../fonts/roboto-v27-latin-regular.eot?');src:local(''),url('../fonts/roboto-v27-latin-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/roboto-v27-latin-regular.woff2') format('woff2'),url('../fonts/roboto-v27-latin-regular.woff') format('woff'),url('../fonts/roboto-v27-latin-regular.ttf') format('truetype'),url('../fonts/roboto-v27-latin-regular.svg#Roboto') format('svg');} \ No newline at end of file diff --git a/MP.Stats/wwwroot/css/site.min.css b/MP.Stats/wwwroot/css/site.min.css new file mode 100644 index 00000000..fbf5f09d --- /dev/null +++ b/MP.Stats/wwwroot/css/site.min.css @@ -0,0 +1 @@ +@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');@import url('fonts.min.css');h1,h2,h3,h4,h5,h6,b{font-family:'Roboto',sans-serif;}html,body{font-family:'Lato',sans-serif;}a,.btn-link{color:#0366d6;}.btn-primary{color:#fff;background-color:#1b6ec2;border-color:#1861ac;}.content{padding-top:1.1rem;}.valid.modified:not([type=checkbox]){outline:1px solid #26b050;}.invalid{outline:1px solid #f00;}.validation-message{color:#f00;}#blazor-error-ui{background:#ffffe0;bottom:0;box-shadow:0 -1px 2px rgba(0,0,0,.2);display:none;left:0;padding:.6rem 1.25rem .7rem 1.25rem;position:fixed;width:100%;z-index:1000;}#blazor-error-ui .dismiss{cursor:pointer;position:absolute;right:.75rem;top:.5rem;}.shortcuts{text-align:center;}.shortcuts .shortcut-icon{font-size:2rem;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:.66666667rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:.25rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}@media(max-width:992px){.shortcuts .shortcut{min-width:8rem;min-height:4rem;}} \ No newline at end of file From 21303b50a5ba1c81bd189af0d66caeb903ddb5b2 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 14:44:00 +0200 Subject: [PATCH 012/158] abbozzata aggiunta pagine statistiche --- MP-STATS.sln | 2 +- MP.Stats/Pages/Controlli.razor | 58 ++++++++++-- MP.Stats/Pages/Controlli.razor.cs | 147 ++++++++++++++++++++++++++++++ MP.Stats/Pages/UserLog.razor | 59 ++++++++++++ MP.Stats/Pages/UserLog.razor.cs | 147 ++++++++++++++++++++++++++++++ 5 files changed, 405 insertions(+), 8 deletions(-) create mode 100644 MP.Stats/Pages/Controlli.razor.cs create mode 100644 MP.Stats/Pages/UserLog.razor create mode 100644 MP.Stats/Pages/UserLog.razor.cs diff --git a/MP-STATS.sln b/MP-STATS.sln index c8630043..3b5b6475 100644 --- a/MP-STATS.sln +++ b/MP-STATS.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31229.75 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP-STATS", "MP.Stats\MP.Stats.csproj", "{D9901B50-E61C-400C-B62C-FA060CF72C29}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Stats", "MP.Stats\MP.Stats.csproj", "{D9901B50-E61C-400C-B62C-FA060CF72C29}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Data", "MP.Data\MP.Data.csproj", "{10BA8450-301D-49C7-8E1E-21B7469C225C}" EndProject diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor index 0c0fb7b2..d05728d7 100644 --- a/MP.Stats/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -4,12 +4,56 @@ @using MP.Stats.Data
                  -
                  Controlli
                  +
                  Scarti
                  - elenco controlli + @if (currRecord != null) + { + @**@ + } + @if (ListRecords == null) + { +

                  Loading...

                  + } + else + { + + + + @**@ + + + + + + + + + + + @foreach (var record in ListRecords) + { + + @**@ + + + + + + + + + } + +
                  MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
                   @record.IdxMacchina@record.DataOra@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo@record.Descrizione@record.CodArticolo@record.MatrOpr
                  + }
                  -
                  - -@code { - -} \ No newline at end of file +
                  +
                  +
                  +
                  +
                  + +
                  +
                  +
                  +
                  • \ No newline at end of file diff --git a/MP.Stats/Pages/Controlli.razor.cs b/MP.Stats/Pages/Controlli.razor.cs new file mode 100644 index 00000000..951382ea --- /dev/null +++ b/MP.Stats/Pages/Controlli.razor.cs @@ -0,0 +1,147 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.JSInterop; +using MP.Stats.Data; +using System; +using System.Threading.Tasks; + +namespace MP.Stats.Pages +{ + public partial class Controlli : ComponentBase, IDisposable + { + #region Private Fields + + private MP.Data.DatabaseModels.ResScarti currRecord = null; + + private MP.Data.DatabaseModels.ResScarti[] ListRecords; + + #endregion Private Fields + + #region Private Properties + + private int numRecord { get; set; } = 10; + + #endregion Private Properties + + #region Protected Properties + + [Inject] + protected IJSRuntime JSRuntime { get; set; } + + [Inject] + protected MessageService MessageService { get; set; } + + [Inject] + protected NavigationManager NavManager { get; set; } + + [Inject] + protected MpStatsService StatService { get; set; } + + #endregion Protected Properties + + #region Protected Methods + + protected async Task ForceReload(int newNum) + { + numRecord = newNum; + ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + } + + protected override async Task OnInitializedAsync() + { + numRecord = 10; + MessageService.ShowSearch = true; + MessageService.EA_SearchUpdated += OnSeachUpdated; + ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + } + + protected void ResetData() + { + StatService.rollBackEdit(currRecord); + currRecord = null; + } + + protected async Task UpdateData() + { + currRecord = null; + ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + } + + #endregion Protected Methods + + #region Public Methods + + public string checkSelect(DateTime DataOra, string IdxMacchina, string Causale) + { + string answ = ""; + if (currRecord != null) + { + try + { + answ = (currRecord.DataOra == DataOra && currRecord.IdxMacchina == IdxMacchina && currRecord.Causale == Causale) ? "table-info" : ""; + } + catch + { } + } + return answ; + } + + public void Dispose() + { + MessageService.EA_SearchUpdated -= OnSeachUpdated; + } + + public void OnSeachUpdated() + { + InvokeAsync(() => + { + UpdateData(); + StateHasChanged(); + }); + } + + #endregion Public Methods + +#if false + [Inject] + protected BBM_SelectData SelectData { get; set; } + + protected void CreateNew() + { + // recupero counter + string newCode = BBMService.CounterGetNext("EGW.B", 6); + DatabaseModels.BasketsModel newRecord = new DatabaseModels.BasketsModel() + { + CodBasket = newCode, + DataIns = DateTime.Now, + CustomerId = 1, + Descript = "New Basket" + }; + currBasket = newRecord; + } + + protected async Task Delete(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) + { + if (!await JSRuntime.InvokeAsync("confirm", $"Sicuro di voler eliminare il Basket '{currRecord.CodBasket}'?")) + return; + + BBMService.BasketsDelete(currRecord); + await UpdateData(); + } + + protected void Edit(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) + { + currBasket = currRecord; + } + + protected void ShowDocs(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) + { + // salvo + SelectData.BasketId = currRecord.BasketId; + SelectData.NegotiationId = 0; + // rimando... + NavManager.NavigateTo("docs"); + } + +#endif + } +} \ No newline at end of file diff --git a/MP.Stats/Pages/UserLog.razor b/MP.Stats/Pages/UserLog.razor new file mode 100644 index 00000000..31097de1 --- /dev/null +++ b/MP.Stats/Pages/UserLog.razor @@ -0,0 +1,59 @@ +@page "/userlog" + +@using MP.Stats.Components +@using MP.Stats.Data + +
                  +
                  Scarti
                  +
                  + @if (currRecord != null) + { + @**@ + } + @if (ListRecords == null) + { +

                  Loading...

                  + } + else + { + + + + @**@ + + + + + + + + + + + @foreach (var record in ListRecords) + { + + @**@ + + + + + + + + + } + +
                  MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
                   @record.IdxMacchina@record.DataOra@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo@record.Descrizione@record.CodArticolo@record.MatrOpr
                  + } +
                  +
                  +
                  +
                  +
                  +
                  + +
                  +
                  +
                  +
                  \ No newline at end of file diff --git a/MP.Stats/Pages/UserLog.razor.cs b/MP.Stats/Pages/UserLog.razor.cs new file mode 100644 index 00000000..963b85a7 --- /dev/null +++ b/MP.Stats/Pages/UserLog.razor.cs @@ -0,0 +1,147 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.JSInterop; +using MP.Stats.Data; +using System; +using System.Threading.Tasks; + +namespace MP.Stats.Pages +{ + public partial class UserLog : ComponentBase, IDisposable + { + #region Private Fields + + private MP.Data.DatabaseModels.ResScarti currRecord = null; + + private MP.Data.DatabaseModels.ResScarti[] ListRecords; + + #endregion Private Fields + + #region Private Properties + + private int numRecord { get; set; } = 10; + + #endregion Private Properties + + #region Protected Properties + + [Inject] + protected IJSRuntime JSRuntime { get; set; } + + [Inject] + protected MessageService MessageService { get; set; } + + [Inject] + protected NavigationManager NavManager { get; set; } + + [Inject] + protected MpStatsService StatService { get; set; } + + #endregion Protected Properties + + #region Protected Methods + + protected async Task ForceReload(int newNum) + { + numRecord = newNum; + ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + } + + protected override async Task OnInitializedAsync() + { + numRecord = 10; + MessageService.ShowSearch = true; + MessageService.EA_SearchUpdated += OnSeachUpdated; + ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + } + + protected void ResetData() + { + StatService.rollBackEdit(currRecord); + currRecord = null; + } + + protected async Task UpdateData() + { + currRecord = null; + ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + } + + #endregion Protected Methods + + #region Public Methods + + public string checkSelect(DateTime DataOra, string IdxMacchina, string Causale) + { + string answ = ""; + if (currRecord != null) + { + try + { + answ = (currRecord.DataOra == DataOra && currRecord.IdxMacchina == IdxMacchina && currRecord.Causale == Causale) ? "table-info" : ""; + } + catch + { } + } + return answ; + } + + public void Dispose() + { + MessageService.EA_SearchUpdated -= OnSeachUpdated; + } + + public void OnSeachUpdated() + { + InvokeAsync(() => + { + UpdateData(); + StateHasChanged(); + }); + } + + #endregion Public Methods + +#if false + [Inject] + protected BBM_SelectData SelectData { get; set; } + + protected void CreateNew() + { + // recupero counter + string newCode = BBMService.CounterGetNext("EGW.B", 6); + DatabaseModels.BasketsModel newRecord = new DatabaseModels.BasketsModel() + { + CodBasket = newCode, + DataIns = DateTime.Now, + CustomerId = 1, + Descript = "New Basket" + }; + currBasket = newRecord; + } + + protected async Task Delete(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) + { + if (!await JSRuntime.InvokeAsync("confirm", $"Sicuro di voler eliminare il Basket '{currRecord.CodBasket}'?")) + return; + + BBMService.BasketsDelete(currRecord); + await UpdateData(); + } + + protected void Edit(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) + { + currBasket = currRecord; + } + + protected void ShowDocs(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) + { + // salvo + SelectData.BasketId = currRecord.BasketId; + SelectData.NegotiationId = 0; + // rimando... + NavManager.NavigateTo("docs"); + } + +#endif + } +} \ No newline at end of file From d3b5811cdccc3add63dcf4254401a5b6277fbcda Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 15:05:40 +0200 Subject: [PATCH 013/158] Bozza pagine completata --- MP.Data/Controllers/MpStatsController.cs | 44 +++++++++++++++++- MP.Stats/Data/MpStatsService.cs | 16 +++++-- MP.Stats/Pages/Controlli.razor | 14 +++--- MP.Stats/Pages/Controlli.razor.cs | 57 +++--------------------- MP.Stats/Pages/Index.razor | 2 +- MP.Stats/Pages/Scarti.razor.cs | 49 ++------------------ MP.Stats/Pages/UserLog.razor | 16 +++---- MP.Stats/Pages/UserLog.razor.cs | 57 +++--------------------- MP.Stats/Shared/NavMenu.razor | 2 +- 9 files changed, 89 insertions(+), 168 deletions(-) diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index 0b1d43eb..b8f59321 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -43,7 +43,7 @@ namespace MP.Data.Controllers /// /// /// - public bool rollBackEntity(object item) + public bool RollBackEntity(object item) { bool answ = false; try @@ -60,13 +60,33 @@ namespace MP.Data.Controllers return answ; } + /// + /// Elenco tabella controlli da filtro + /// + /// + /// + /// + public List StatControlliGetAll(int numRecord, string searchVal = "") + { + List dbResult = new List(); + + dbResult = dbCtx + .DbSetControlli + .Where(x => x.Note.Contains(searchVal) || x.IdxMacchina.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) + .OrderByDescending(x => x.DataOra) + .Take(numRecord) + .ToList(); + + return dbResult; + } + /// /// Elenco tabella scarti da filtro /// /// /// /// - public List ScartiGetAll(int numRecord, string searchVal = "") + public List StatScartiGetAll(int numRecord, string searchVal = "") { List dbResult = new List(); @@ -80,6 +100,26 @@ namespace MP.Data.Controllers return dbResult; } + /// + /// Elenco tabella UserLog da filtro + /// + /// + /// + /// + public List StatUserLogGetAll(int numRecord, string searchVal = "") + { + List dbResult = new List(); + + dbResult = dbCtx + .DbSetUserLog + .Where(x => x.Valore.Contains(searchVal) || x.Cognome.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) + .OrderByDescending(x => x.DataOraRif) + .Take(numRecord) + .ToList(); + + return dbResult; + } + #endregion Public Methods } } \ No newline at end of file diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 5c0c2570..34b74b1a 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -59,12 +59,22 @@ namespace MP.Stats.Data public void rollBackEdit(object item) { - dbController.rollBackEntity(item); + dbController.RollBackEntity(item); } - public Task ScartiGetAll(int numRecord, string searchVal = "") + public Task StatControlliGetAll(int numRecord, string searchVal = "") { - return Task.FromResult(dbController.ScartiGetAll(numRecord, searchVal).ToArray()); + return Task.FromResult(dbController.StatControlliGetAll(numRecord, searchVal).ToArray()); + } + + public Task StatScartiGetAll(int numRecord, string searchVal = "") + { + return Task.FromResult(dbController.StatScartiGetAll(numRecord, searchVal).ToArray()); + } + + public Task StatUserLogGetAll(int numRecord, string searchVal = "") + { + return Task.FromResult(dbController.StatUserLogGetAll(numRecord, searchVal).ToArray()); } #endregion Public Methods diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor index d05728d7..72afd5a9 100644 --- a/MP.Stats/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -4,7 +4,7 @@ @using MP.Stats.Data
                  -
                  Scarti
                  +
                  Controlli
                  @if (currRecord != null) { @@ -24,22 +24,22 @@ Data ODL/Commessa Articolo - Descrizione - Qta + Esito + Note Operatore @foreach (var record in ListRecords) { - + @* *@ @record.IdxMacchina @record.DataOra - @record.IdxOdl | @record.KeyRichiesta - @record.CodArticolo - @record.Descrizione + @record.IdxOdl @record.CodArticolo + @record.EsitoOk + @record.Note @record.MatrOpr } diff --git a/MP.Stats/Pages/Controlli.razor.cs b/MP.Stats/Pages/Controlli.razor.cs index 951382ea..53842097 100644 --- a/MP.Stats/Pages/Controlli.razor.cs +++ b/MP.Stats/Pages/Controlli.razor.cs @@ -10,9 +10,9 @@ namespace MP.Stats.Pages { #region Private Fields - private MP.Data.DatabaseModels.ResScarti currRecord = null; + private MP.Data.DatabaseModels.ResControlli currRecord = null; - private MP.Data.DatabaseModels.ResScarti[] ListRecords; + private MP.Data.DatabaseModels.ResControlli[] ListRecords; #endregion Private Fields @@ -43,7 +43,7 @@ namespace MP.Stats.Pages protected async Task ForceReload(int newNum) { numRecord = newNum; - ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatControlliGetAll(numRecord, MessageService.SearchVal); } protected override async Task OnInitializedAsync() @@ -51,7 +51,7 @@ namespace MP.Stats.Pages numRecord = 10; MessageService.ShowSearch = true; MessageService.EA_SearchUpdated += OnSeachUpdated; - ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatControlliGetAll(numRecord, MessageService.SearchVal); } protected void ResetData() @@ -63,21 +63,21 @@ namespace MP.Stats.Pages protected async Task UpdateData() { currRecord = null; - ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatControlliGetAll(numRecord, MessageService.SearchVal); } #endregion Protected Methods #region Public Methods - public string checkSelect(DateTime DataOra, string IdxMacchina, string Causale) + public string checkSelect(int IdxControllo) { string answ = ""; if (currRecord != null) { try { - answ = (currRecord.DataOra == DataOra && currRecord.IdxMacchina == IdxMacchina && currRecord.Causale == Causale) ? "table-info" : ""; + answ = (currRecord.IdxControllo == IdxControllo) ? "table-info" : ""; } catch { } @@ -100,48 +100,5 @@ namespace MP.Stats.Pages } #endregion Public Methods - -#if false - [Inject] - protected BBM_SelectData SelectData { get; set; } - - protected void CreateNew() - { - // recupero counter - string newCode = BBMService.CounterGetNext("EGW.B", 6); - DatabaseModels.BasketsModel newRecord = new DatabaseModels.BasketsModel() - { - CodBasket = newCode, - DataIns = DateTime.Now, - CustomerId = 1, - Descript = "New Basket" - }; - currBasket = newRecord; - } - - protected async Task Delete(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) - { - if (!await JSRuntime.InvokeAsync("confirm", $"Sicuro di voler eliminare il Basket '{currRecord.CodBasket}'?")) - return; - - BBMService.BasketsDelete(currRecord); - await UpdateData(); - } - - protected void Edit(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) - { - currBasket = currRecord; - } - - protected void ShowDocs(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) - { - // salvo - SelectData.BasketId = currRecord.BasketId; - SelectData.NegotiationId = 0; - // rimando... - NavManager.NavigateTo("docs"); - } - -#endif } } \ No newline at end of file diff --git a/MP.Stats/Pages/Index.razor b/MP.Stats/Pages/Index.razor index 91a38f96..14365445 100644 --- a/MP.Stats/Pages/Index.razor +++ b/MP.Stats/Pages/Index.razor @@ -27,7 +27,7 @@
                  Main Topics
                  - + @**@ diff --git a/MP.Stats/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs index 2a8a3d36..2f95202e 100644 --- a/MP.Stats/Pages/Scarti.razor.cs +++ b/MP.Stats/Pages/Scarti.razor.cs @@ -43,7 +43,7 @@ namespace MP.Stats.Pages protected async Task ForceReload(int newNum) { numRecord = newNum; - ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatScartiGetAll(numRecord, MessageService.SearchVal); } protected override async Task OnInitializedAsync() @@ -51,7 +51,7 @@ namespace MP.Stats.Pages numRecord = 10; MessageService.ShowSearch = true; MessageService.EA_SearchUpdated += OnSeachUpdated; - ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatScartiGetAll(numRecord, MessageService.SearchVal); } protected void ResetData() @@ -63,7 +63,7 @@ namespace MP.Stats.Pages protected async Task UpdateData() { currRecord = null; - ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatScartiGetAll(numRecord, MessageService.SearchVal); } #endregion Protected Methods @@ -100,48 +100,5 @@ namespace MP.Stats.Pages } #endregion Public Methods - -#if false - [Inject] - protected BBM_SelectData SelectData { get; set; } - - protected void CreateNew() - { - // recupero counter - string newCode = BBMService.CounterGetNext("EGW.B", 6); - DatabaseModels.BasketsModel newRecord = new DatabaseModels.BasketsModel() - { - CodBasket = newCode, - DataIns = DateTime.Now, - CustomerId = 1, - Descript = "New Basket" - }; - currBasket = newRecord; - } - - protected async Task Delete(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) - { - if (!await JSRuntime.InvokeAsync("confirm", $"Sicuro di voler eliminare il Basket '{currRecord.CodBasket}'?")) - return; - - BBMService.BasketsDelete(currRecord); - await UpdateData(); - } - - protected void Edit(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) - { - currBasket = currRecord; - } - - protected void ShowDocs(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) - { - // salvo - SelectData.BasketId = currRecord.BasketId; - SelectData.NegotiationId = 0; - // rimando... - NavManager.NavigateTo("docs"); - } - -#endif } } \ No newline at end of file diff --git a/MP.Stats/Pages/UserLog.razor b/MP.Stats/Pages/UserLog.razor index 31097de1..193069f7 100644 --- a/MP.Stats/Pages/UserLog.razor +++ b/MP.Stats/Pages/UserLog.razor @@ -4,7 +4,7 @@ @using MP.Stats.Data
                  -
                  Scarti
                  +
                  User Log
                  @if (currRecord != null) { @@ -24,23 +24,23 @@ Data ODL/Commessa Articolo + Azione Descrizione - Qta Operatore @foreach (var record in ListRecords) { - + @* *@ @record.IdxMacchina - @record.DataOra - @record.IdxOdl | @record.KeyRichiesta + @record.DataOraRif + - @record.CodArticolo - @record.Descrizione - @record.CodArticolo - @record.MatrOpr + @record.Azione + @record.Valore + @record.Cognome @record.Nome } diff --git a/MP.Stats/Pages/UserLog.razor.cs b/MP.Stats/Pages/UserLog.razor.cs index 963b85a7..a343b2dd 100644 --- a/MP.Stats/Pages/UserLog.razor.cs +++ b/MP.Stats/Pages/UserLog.razor.cs @@ -10,9 +10,9 @@ namespace MP.Stats.Pages { #region Private Fields - private MP.Data.DatabaseModels.ResScarti currRecord = null; + private MP.Data.DatabaseModels.UserActionLog currRecord = null; - private MP.Data.DatabaseModels.ResScarti[] ListRecords; + private MP.Data.DatabaseModels.UserActionLog[] ListRecords; #endregion Private Fields @@ -43,7 +43,7 @@ namespace MP.Stats.Pages protected async Task ForceReload(int newNum) { numRecord = newNum; - ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatUserLogGetAll(numRecord, MessageService.SearchVal); } protected override async Task OnInitializedAsync() @@ -51,7 +51,7 @@ namespace MP.Stats.Pages numRecord = 10; MessageService.ShowSearch = true; MessageService.EA_SearchUpdated += OnSeachUpdated; - ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatUserLogGetAll(numRecord, MessageService.SearchVal); } protected void ResetData() @@ -63,21 +63,21 @@ namespace MP.Stats.Pages protected async Task UpdateData() { currRecord = null; - ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatUserLogGetAll(numRecord, MessageService.SearchVal); } #endregion Protected Methods #region Public Methods - public string checkSelect(DateTime DataOra, string IdxMacchina, string Causale) + public string checkSelect(int IdxLog) { string answ = ""; if (currRecord != null) { try { - answ = (currRecord.DataOra == DataOra && currRecord.IdxMacchina == IdxMacchina && currRecord.Causale == Causale) ? "table-info" : ""; + answ = (currRecord.IdxLog == IdxLog) ? "table-info" : ""; } catch { } @@ -100,48 +100,5 @@ namespace MP.Stats.Pages } #endregion Public Methods - -#if false - [Inject] - protected BBM_SelectData SelectData { get; set; } - - protected void CreateNew() - { - // recupero counter - string newCode = BBMService.CounterGetNext("EGW.B", 6); - DatabaseModels.BasketsModel newRecord = new DatabaseModels.BasketsModel() - { - CodBasket = newCode, - DataIns = DateTime.Now, - CustomerId = 1, - Descript = "New Basket" - }; - currBasket = newRecord; - } - - protected async Task Delete(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) - { - if (!await JSRuntime.InvokeAsync("confirm", $"Sicuro di voler eliminare il Basket '{currRecord.CodBasket}'?")) - return; - - BBMService.BasketsDelete(currRecord); - await UpdateData(); - } - - protected void Edit(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) - { - currBasket = currRecord; - } - - protected void ShowDocs(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) - { - // salvo - SelectData.BasketId = currRecord.BasketId; - SelectData.NegotiationId = 0; - // rimando... - NavManager.NavigateTo("docs"); - } - -#endif } } \ No newline at end of file diff --git a/MP.Stats/Shared/NavMenu.razor b/MP.Stats/Shared/NavMenu.razor index a2d36f59..78ef73f4 100644 --- a/MP.Stats/Shared/NavMenu.razor +++ b/MP.Stats/Shared/NavMenu.razor @@ -18,7 +18,7 @@
                • - + User ActionLog
                  • From ea6911080e46e31f7615e37fd81468c3de2727b6 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 15:26:07 +0200 Subject: [PATCH 014/158] review page loader progressbar --- MP.Stats/Pages/Controlli.razor | 2 +- MP.Stats/Pages/Scarti.razor | 2 +- MP.Stats/Pages/UserLog.razor | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor index 72afd5a9..0aea2bac 100644 --- a/MP.Stats/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -12,7 +12,7 @@ } @if (ListRecords == null) { -

                  Loading...

                  +
                  } else { diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index c6503e13..513ece02 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -12,7 +12,7 @@ } @if (ListRecords == null) { -

                  Loading...

                  +
                  } else { diff --git a/MP.Stats/Pages/UserLog.razor b/MP.Stats/Pages/UserLog.razor index 193069f7..cd9a068c 100644 --- a/MP.Stats/Pages/UserLog.razor +++ b/MP.Stats/Pages/UserLog.razor @@ -12,7 +12,7 @@ } @if (ListRecords == null) { -

                  Loading...

                  +
                  } else { From 2444dd49c8e934aae11d31f13b3edd3e22e62358 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 15:41:59 +0200 Subject: [PATCH 015/158] =?UTF-8?q?Pulizia=20classi=20NON=20pi=C3=B9=20imp?= =?UTF-8?q?iegate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MP.Data/DatabaseModels/Aaul.cs | 13 --------- MP.Data/DatabaseModels/Cal.cs | 18 ------------ MP.Data/DatabaseModels/Config.cs | 15 ---------- MP.Data/DatabaseModels/Ddb.cs | 15 ---------- MP.Data/DatabaseModels/Ddb1.cs | 24 ---------------- MP.Data/DatabaseModels/DdbTurni.cs | 30 -------------------- MP.Data/DatabaseModels/DdbTurniNew.cs | 30 -------------------- MP.Data/DatabaseModels/DdbTurniSummary.cs | 21 -------------- MP.Data/DatabaseModels/DdbTurniSummaryNew.cs | 21 -------------- MP.Data/DatabaseModels/Ecp.cs | 23 --------------- MP.Data/DatabaseModels/Ecp1.cs | 21 -------------- MP.Data/DatabaseModels/Kit.cs | 14 --------- MP.Data/DatabaseModels/Odl.cs | 26 ----------------- MP.Data/DatabaseModels/Odl1.cs | 30 -------------------- MP.Data/DatabaseModels/R.cs | 23 --------------- MP.Data/DatabaseModels/R1.cs | 22 -------------- MP.Data/DatabaseModels/Rc.cs | 19 ------------- MP.Data/DatabaseModels/Tally.cs | 12 -------- MP.Data/DatabaseModels/TcStat.cs | 16 ----------- MP.Data/DatabaseModels/Tcr.cs | 19 ------------- MP.Data/DatabaseModels/Tcr1.cs | 20 ------------- MP.Data/DatabaseModels/TcrDay.cs | 19 ------------- MP.Data/DatabaseModels/TcrDayTest.cs | 19 ------------- MP.Data/DatabaseModels/TestJason.cs | 14 --------- MP.Data/DatabaseModels/Ul.cs | 21 -------------- MP.Data/DatabaseModels/VDdb.cs | 24 ---------------- MP.Data/DatabaseModels/VDdbLight.cs | 18 ------------ MP.Data/DatabaseModels/VDdbLightOld.cs | 18 ------------ MP.Data/DatabaseModels/VDdbTurni.cs | 26 ----------------- MP.Data/DatabaseModels/VEcp.cs | 21 -------------- MP.Data/DatabaseModels/VEcp1.cs | 25 ---------------- MP.Data/DatabaseModels/VEcpExtended.cs | 27 ------------------ MP.Data/DatabaseModels/VKit.cs | 14 --------- MP.Data/DatabaseModels/VOdl.cs | 30 -------------------- MP.Data/DatabaseModels/VOdl1.cs | 28 ------------------ MP.Data/DatabaseModels/VPodlNonChiusi.cs | 30 -------------------- MP.Data/DatabaseModels/VR1.cs | 23 --------------- MP.Data/DatabaseModels/VTcStat.cs | 18 ------------ MP.Data/DatabaseModels/VTcr.cs | 20 ------------- MP.Data/DatabaseModels/VTcr1.cs | 21 -------------- MP.Data/DatabaseModels/VTcrDay.cs | 21 -------------- MP.Data/DatabaseModels/VetoTc.cs | 15 ---------- 42 files changed, 884 deletions(-) delete mode 100644 MP.Data/DatabaseModels/Aaul.cs delete mode 100644 MP.Data/DatabaseModels/Cal.cs delete mode 100644 MP.Data/DatabaseModels/Config.cs delete mode 100644 MP.Data/DatabaseModels/Ddb.cs delete mode 100644 MP.Data/DatabaseModels/Ddb1.cs delete mode 100644 MP.Data/DatabaseModels/DdbTurni.cs delete mode 100644 MP.Data/DatabaseModels/DdbTurniNew.cs delete mode 100644 MP.Data/DatabaseModels/DdbTurniSummary.cs delete mode 100644 MP.Data/DatabaseModels/DdbTurniSummaryNew.cs delete mode 100644 MP.Data/DatabaseModels/Ecp.cs delete mode 100644 MP.Data/DatabaseModels/Ecp1.cs delete mode 100644 MP.Data/DatabaseModels/Kit.cs delete mode 100644 MP.Data/DatabaseModels/Odl.cs delete mode 100644 MP.Data/DatabaseModels/Odl1.cs delete mode 100644 MP.Data/DatabaseModels/R.cs delete mode 100644 MP.Data/DatabaseModels/R1.cs delete mode 100644 MP.Data/DatabaseModels/Rc.cs delete mode 100644 MP.Data/DatabaseModels/Tally.cs delete mode 100644 MP.Data/DatabaseModels/TcStat.cs delete mode 100644 MP.Data/DatabaseModels/Tcr.cs delete mode 100644 MP.Data/DatabaseModels/Tcr1.cs delete mode 100644 MP.Data/DatabaseModels/TcrDay.cs delete mode 100644 MP.Data/DatabaseModels/TcrDayTest.cs delete mode 100644 MP.Data/DatabaseModels/TestJason.cs delete mode 100644 MP.Data/DatabaseModels/Ul.cs delete mode 100644 MP.Data/DatabaseModels/VDdb.cs delete mode 100644 MP.Data/DatabaseModels/VDdbLight.cs delete mode 100644 MP.Data/DatabaseModels/VDdbLightOld.cs delete mode 100644 MP.Data/DatabaseModels/VDdbTurni.cs delete mode 100644 MP.Data/DatabaseModels/VEcp.cs delete mode 100644 MP.Data/DatabaseModels/VEcp1.cs delete mode 100644 MP.Data/DatabaseModels/VEcpExtended.cs delete mode 100644 MP.Data/DatabaseModels/VKit.cs delete mode 100644 MP.Data/DatabaseModels/VOdl.cs delete mode 100644 MP.Data/DatabaseModels/VOdl1.cs delete mode 100644 MP.Data/DatabaseModels/VPodlNonChiusi.cs delete mode 100644 MP.Data/DatabaseModels/VR1.cs delete mode 100644 MP.Data/DatabaseModels/VTcStat.cs delete mode 100644 MP.Data/DatabaseModels/VTcr.cs delete mode 100644 MP.Data/DatabaseModels/VTcr1.cs delete mode 100644 MP.Data/DatabaseModels/VTcrDay.cs delete mode 100644 MP.Data/DatabaseModels/VetoTc.cs diff --git a/MP.Data/DatabaseModels/Aaul.cs b/MP.Data/DatabaseModels/Aaul.cs deleted file mode 100644 index f639d8c7..00000000 --- a/MP.Data/DatabaseModels/Aaul.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Aaul - { - public string Azione { get; set; } - public string Descrizione { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/Cal.cs b/MP.Data/DatabaseModels/Cal.cs deleted file mode 100644 index 62ac75a3..00000000 --- a/MP.Data/DatabaseModels/Cal.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Cal - { - public DateTime Giorno { get; set; } - public bool? DoDdb { get; set; } - public bool? DoTcr { get; set; } - public bool? DoUl { get; set; } - public bool? DoEcp { get; set; } - public bool? DoRs { get; set; } - public bool? DoOdl { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/Config.cs b/MP.Data/DatabaseModels/Config.cs deleted file mode 100644 index e994d899..00000000 --- a/MP.Data/DatabaseModels/Config.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Config - { - public string Chiave { get; set; } - public string Valore { get; set; } - public string ValoreStd { get; set; } - public string Note { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/Ddb.cs b/MP.Data/DatabaseModels/Ddb.cs deleted file mode 100644 index 01eb95f0..00000000 --- a/MP.Data/DatabaseModels/Ddb.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Ddb - { - public DateTime DataOraRif { get; set; } - public string IdxMacchina { get; set; } - public int IdxStato { get; set; } - public decimal DurataMinuti { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/Ddb1.cs b/MP.Data/DatabaseModels/Ddb1.cs deleted file mode 100644 index 60291b02..00000000 --- a/MP.Data/DatabaseModels/Ddb1.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Ddb1 - { - public string IdxMacchina { get; set; } - public DateTime InizioStato { get; set; } - public DateTime? FineStato { get; set; } - public int IdxStato { get; set; } - public double? DurataMinuti { get; set; } - public string Value { get; set; } - public string CodArticolo { get; set; } - public double? TempoCicloBase { get; set; } - public int? PzPalletProd { get; set; } - public int? MatrOpr { get; set; } - public string Pallet { get; set; } - public string Descrizione { get; set; } - public string ClasseTempo { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/DdbTurni.cs b/MP.Data/DatabaseModels/DdbTurni.cs deleted file mode 100644 index 4fc7e14d..00000000 --- a/MP.Data/DatabaseModels/DdbTurni.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class DdbTurni - { - public DateTime DataRif { get; set; } - public string IdxMacchina { get; set; } - public string Turno { get; set; } - public int IdxStato { get; set; } - public string CodArticolo { get; set; } - public DateTime InizioStato { get; set; } - public DateTime FineStato { get; set; } - public string Pallet { get; set; } - public int? PzPalletProd { get; set; } - public decimal? TempoCicloBase { get; set; } - public string Descrizione { get; set; } - public string ClasseTempo { get; set; } - public DateTime? DataTurnoInizio { get; set; } - public DateTime? DataTurnoFine { get; set; } - public long? DurataStato { get; set; } - public DateTime InizioPeriodo { get; set; } - public DateTime? FinePeriodo { get; set; } - public long? DurataPeriodo { get; set; } - public int TotPzProd { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/DdbTurniNew.cs b/MP.Data/DatabaseModels/DdbTurniNew.cs deleted file mode 100644 index 37bf31d9..00000000 --- a/MP.Data/DatabaseModels/DdbTurniNew.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class DdbTurniNew - { - public DateTime DataRif { get; set; } - public string IdxMacchina { get; set; } - public string Turno { get; set; } - public int IdxStato { get; set; } - public string CodArticolo { get; set; } - public DateTime InizioStato { get; set; } - public DateTime FineStato { get; set; } - public string Pallet { get; set; } - public int? PzPalletProd { get; set; } - public decimal? TempoCicloBase { get; set; } - public string Descrizione { get; set; } - public string ClasseTempo { get; set; } - public DateTime? DataTurnoInizio { get; set; } - public DateTime? DataTurnoFine { get; set; } - public long? DurataStato { get; set; } - public DateTime InizioPeriodo { get; set; } - public DateTime? FinePeriodo { get; set; } - public long? DurataPeriodo { get; set; } - public int TotPzProd { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/DdbTurniSummary.cs b/MP.Data/DatabaseModels/DdbTurniSummary.cs deleted file mode 100644 index 5db34143..00000000 --- a/MP.Data/DatabaseModels/DdbTurniSummary.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class DdbTurniSummary - { - public string IdxMacchina { get; set; } - public DateTime DataRif { get; set; } - public string Turno { get; set; } - public string CodArticolo { get; set; } - public int IdxStato { get; set; } - public decimal TempoCicloBase { get; set; } - public DateTime? Inizio { get; set; } - public int PzPalletProd { get; set; } - public decimal? Durata { get; set; } - public int? PzProd { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/DdbTurniSummaryNew.cs b/MP.Data/DatabaseModels/DdbTurniSummaryNew.cs deleted file mode 100644 index 1460328b..00000000 --- a/MP.Data/DatabaseModels/DdbTurniSummaryNew.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class DdbTurniSummaryNew - { - public string IdxMacchina { get; set; } - public DateTime DataRif { get; set; } - public string Turno { get; set; } - public string CodArticolo { get; set; } - public int IdxStato { get; set; } - public decimal TempoCicloBase { get; set; } - public DateTime? Inizio { get; set; } - public int PzPalletProd { get; set; } - public decimal? Durata { get; set; } - public int? PzProd { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/Ecp.cs b/MP.Data/DatabaseModels/Ecp.cs deleted file mode 100644 index 09fb32dc..00000000 --- a/MP.Data/DatabaseModels/Ecp.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Ecp - { - public int IdxEcp { get; set; } - public DateTime DataOraConf { get; set; } - public string IdxMacchina { get; set; } - public string KeyRichiesta { get; set; } - public int IdxOdl { get; set; } - public string CodArticolo { get; set; } - public int PezziConf { get; set; } - public int PezziScar { get; set; } - public int PezziDaRilav { get; set; } - public int MatrOpr { get; set; } - public string Cognome { get; set; } - public string Nome { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/Ecp1.cs b/MP.Data/DatabaseModels/Ecp1.cs deleted file mode 100644 index 33a3a973..00000000 --- a/MP.Data/DatabaseModels/Ecp1.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Ecp1 - { - public DateTime DataOraConf { get; set; } - public string IdxMacchina { get; set; } - public int MatrApp { get; set; } - public DateTime DataFrom { get; set; } - public DateTime DataTo { get; set; } - public int PezziConf { get; set; } - public int PezziScar { get; set; } - public int PezziDaRilav { get; set; } - public string CommessaEsterna { get; set; } - public int TipoConf { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/Kit.cs b/MP.Data/DatabaseModels/Kit.cs deleted file mode 100644 index cb25c5c0..00000000 --- a/MP.Data/DatabaseModels/Kit.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Kit - { - public string KeyKit { get; set; } - public string KeyExtOrd { get; set; } - public string CodArtParent { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/Odl.cs b/MP.Data/DatabaseModels/Odl.cs deleted file mode 100644 index fa8f8bfa..00000000 --- a/MP.Data/DatabaseModels/Odl.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Odl - { - public int IdxOdl { get; set; } - public string KeyRichiesta { get; set; } - public string CodArticolo { get; set; } - public decimal Tcassegnato { get; set; } - public string IdxMacchina { get; set; } - public int NumPezzi { get; set; } - public int NumPezziEv { get; set; } - public int NumPezziSca { get; set; } - public int NumPezziRil { get; set; } - public DateTime? DataInizio { get; set; } - public DateTime? DataFine { get; set; } - public string KeyRichiestaParent { get; set; } - public string CodArticoloParent { get; set; } - public DateTime? DueDate { get; set; } - public int? PzPallet { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/Odl1.cs b/MP.Data/DatabaseModels/Odl1.cs deleted file mode 100644 index 50436e07..00000000 --- a/MP.Data/DatabaseModels/Odl1.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Odl1 - { - public int IdxOdl { get; set; } - public string CodArticolo { get; set; } - public string IdxMacchina { get; set; } - public int NumPezzi { get; set; } - public decimal Tcassegnato { get; set; } - public DateTime? DataInizio { get; set; } - public DateTime? DataFine { get; set; } - public string Note { get; set; } - public bool NeedAppr { get; set; } - public string UserAppr { get; set; } - public DateTime? DataAppr { get; set; } - public decimal? TcrichAttr { get; set; } - public string KeyRichiesta { get; set; } - public int PzPallet { get; set; } - public bool Provvisorio { get; set; } - public int MatrOpr { get; set; } - public string CommessaAs400 { get; set; } - public int ToAs400 { get; set; } - public DateTime? DueDate { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/R.cs b/MP.Data/DatabaseModels/R.cs deleted file mode 100644 index 8e58bf74..00000000 --- a/MP.Data/DatabaseModels/R.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class R - { - public DateTime DataOraRif { get; set; } - public string IdxMacchina { get; set; } - public string Causale { get; set; } - public string Descrizione { get; set; } - public string Note { get; set; } - public int Qta { get; set; } - public string KeyRichiesta { get; set; } - public int IdxOdl { get; set; } - public string CodArticolo { get; set; } - public int MatrOpr { get; set; } - public string Cognome { get; set; } - public string Nome { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/R1.cs b/MP.Data/DatabaseModels/R1.cs deleted file mode 100644 index e4abb10d..00000000 --- a/MP.Data/DatabaseModels/R1.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class R1 - { - public string IdxMacchina { get; set; } - public DateTime DataOra { get; set; } - public string Causale { get; set; } - public int Qta { get; set; } - public string Note { get; set; } - public string CodArticolo { get; set; } - public int MatrOpr { get; set; } - public DateTime? DataOraProdRec { get; set; } - public string Descrizione { get; set; } - public string KeyRichiesta { get; set; } - public int IdxOdl { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/Rc.cs b/MP.Data/DatabaseModels/Rc.cs deleted file mode 100644 index 8578e1a4..00000000 --- a/MP.Data/DatabaseModels/Rc.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Rc - { - public int IdxControllo { get; set; } - public DateTime DataOra { get; set; } - public string IdxMacchina { get; set; } - public int IdxOdl { get; set; } - public string CodArticolo { get; set; } - public int MatrOpr { get; set; } - public bool EsitoOk { get; set; } - public string Note { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/Tally.cs b/MP.Data/DatabaseModels/Tally.cs deleted file mode 100644 index e64cf735..00000000 --- a/MP.Data/DatabaseModels/Tally.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Tally - { - public int N { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/TcStat.cs b/MP.Data/DatabaseModels/TcStat.cs deleted file mode 100644 index eef51348..00000000 --- a/MP.Data/DatabaseModels/TcStat.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class TcStat - { - public string CodArticolo { get; set; } - public string CodGruppo { get; set; } - public string IdxMacchina { get; set; } - public decimal TcStat1 { get; set; } - public int TcType { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/Tcr.cs b/MP.Data/DatabaseModels/Tcr.cs deleted file mode 100644 index d0ba1c26..00000000 --- a/MP.Data/DatabaseModels/Tcr.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Tcr - { - public DateTime DataOraRif { get; set; } - public string IdxMacchina { get; set; } - public string CodArticolo { get; set; } - public int PzProd { get; set; } - public decimal? Tcmedio { get; set; } - public decimal? Tcmin { get; set; } - public decimal? Tcmax { get; set; } - public decimal? Tc50p { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/Tcr1.cs b/MP.Data/DatabaseModels/Tcr1.cs deleted file mode 100644 index 444d2669..00000000 --- a/MP.Data/DatabaseModels/Tcr1.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Tcr1 - { - public string IdxMacchina { get; set; } - public string CodArticolo { get; set; } - public DateTime DataOraRif { get; set; } - public decimal Tcmedio { get; set; } - public int PzProd { get; set; } - public int IdxOdl { get; set; } - public decimal Tcassegnato { get; set; } - public string KeyRichiesta { get; set; } - public int PzPallet { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/TcrDay.cs b/MP.Data/DatabaseModels/TcrDay.cs deleted file mode 100644 index 20c3fbdf..00000000 --- a/MP.Data/DatabaseModels/TcrDay.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class TcrDay - { - public DateTime DataOraRif { get; set; } - public string IdxMacchina { get; set; } - public string CodArticolo { get; set; } - public int PzProd { get; set; } - public decimal? Tcmedio { get; set; } - public decimal? Tcmin { get; set; } - public decimal? Tcmax { get; set; } - public decimal? Tc50p { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/TcrDayTest.cs b/MP.Data/DatabaseModels/TcrDayTest.cs deleted file mode 100644 index 904d7c7f..00000000 --- a/MP.Data/DatabaseModels/TcrDayTest.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class TcrDayTest - { - public DateTime DataOraRif { get; set; } - public string IdxMacchina { get; set; } - public string CodArticolo { get; set; } - public int PzProd { get; set; } - public decimal? Tcmedio { get; set; } - public decimal? Tcmin { get; set; } - public decimal? Tcmax { get; set; } - public decimal? Tc50p { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/TestJason.cs b/MP.Data/DatabaseModels/TestJason.cs deleted file mode 100644 index 8f921d40..00000000 --- a/MP.Data/DatabaseModels/TestJason.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class TestJason - { - public DateTime Data { get; set; } - public byte[] Json { get; set; } - public int? Rows { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/Ul.cs b/MP.Data/DatabaseModels/Ul.cs deleted file mode 100644 index 54b11f82..00000000 --- a/MP.Data/DatabaseModels/Ul.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class Ul - { - public int IdxLog { get; set; } - public DateTime DataOraRif { get; set; } - public string IdxMacchina { get; set; } - public int MatrOpr { get; set; } - public string Cognome { get; set; } - public string Nome { get; set; } - public string CodArticolo { get; set; } - public string Azione { get; set; } - public string Valore { get; set; } - public decimal Qta { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/VDdb.cs b/MP.Data/DatabaseModels/VDdb.cs deleted file mode 100644 index 4aeccff6..00000000 --- a/MP.Data/DatabaseModels/VDdb.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VDdb - { - public string IdxMacchina { get; set; } - public DateTime InizioStato { get; set; } - public DateTime? FineStato { get; set; } - public int IdxStato { get; set; } - public double? DurataMinuti { get; set; } - public string Value { get; set; } - public string CodArticolo { get; set; } - public double? TempoCicloBase { get; set; } - public int? PzPalletProd { get; set; } - public int? MatrOpr { get; set; } - public string Pallet { get; set; } - public string Descrizione { get; set; } - public string ClasseTempo { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/VDdbLight.cs b/MP.Data/DatabaseModels/VDdbLight.cs deleted file mode 100644 index f1bafcbc..00000000 --- a/MP.Data/DatabaseModels/VDdbLight.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VDdbLight - { - public string CodMacchina { get; set; } - public string DescMacchina { get; set; } - public DateTime InizioStato { get; set; } - public string Stato { get; set; } - public double? DurataMinuti { get; set; } - public string CodArticolo { get; set; } - public string Operatore { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/VDdbLightOld.cs b/MP.Data/DatabaseModels/VDdbLightOld.cs deleted file mode 100644 index d636177a..00000000 --- a/MP.Data/DatabaseModels/VDdbLightOld.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VDdbLightOld - { - public string CodMacchina { get; set; } - public string DescMacchina { get; set; } - public DateTime InizioStato { get; set; } - public string Stato { get; set; } - public double? DurataMinuti { get; set; } - public string CodArticolo { get; set; } - public string Operatore { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/VDdbTurni.cs b/MP.Data/DatabaseModels/VDdbTurni.cs deleted file mode 100644 index fbdc6046..00000000 --- a/MP.Data/DatabaseModels/VDdbTurni.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VDdbTurni - { - public string IdxMacchina { get; set; } - public DateTime DataRif { get; set; } - public string Turno { get; set; } - public string CodArticolo { get; set; } - public int IdxStato { get; set; } - public decimal TempoCicloBase { get; set; } - public int PzPalletProd { get; set; } - public decimal? Durata { get; set; } - public int? PzProd { get; set; } - public string ClasseTempo { get; set; } - public string DescClasseTempo { get; set; } - public string Semaforo { get; set; } - public string SemColore { get; set; } - public string CodMacchina { get; set; } - public string DescMacchina { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/VEcp.cs b/MP.Data/DatabaseModels/VEcp.cs deleted file mode 100644 index c90a45b6..00000000 --- a/MP.Data/DatabaseModels/VEcp.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VEcp - { - public DateTime DataOraConf { get; set; } - public string IdxMacchina { get; set; } - public int MatrApp { get; set; } - public DateTime DataFrom { get; set; } - public DateTime DataTo { get; set; } - public int PezziConf { get; set; } - public int PezziScar { get; set; } - public int PezziDaRilav { get; set; } - public string CommessaEsterna { get; set; } - public int TipoConf { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/VEcp1.cs b/MP.Data/DatabaseModels/VEcp1.cs deleted file mode 100644 index 3c63b654..00000000 --- a/MP.Data/DatabaseModels/VEcp1.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VEcp1 - { - public int IdxEcp { get; set; } - public DateTime DataOraConf { get; set; } - public string IdxMacchina { get; set; } - public string CodMacchina { get; set; } - public string DescMacchina { get; set; } - public string KeyRichiesta { get; set; } - public int IdxOdl { get; set; } - public string CodArticolo { get; set; } - public int PezziConf { get; set; } - public int PezziScar { get; set; } - public int PezziDaRilav { get; set; } - public int MatrOpr { get; set; } - public string Cognome { get; set; } - public string Nome { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/VEcpExtended.cs b/MP.Data/DatabaseModels/VEcpExtended.cs deleted file mode 100644 index c2d75bc9..00000000 --- a/MP.Data/DatabaseModels/VEcpExtended.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VEcpExtended - { - public int IdxEcp { get; set; } - public DateTime DataOraConf { get; set; } - public string IdxMacchina { get; set; } - public string CodMacchina { get; set; } - public string DescMacchina { get; set; } - public string KeyRichiesta { get; set; } - public int IdxOdl { get; set; } - public string CodArticolo { get; set; } - public int PezziConf { get; set; } - public int PezziScar { get; set; } - public int PezziDaRilav { get; set; } - public int MatrOpr { get; set; } - public string Cognome { get; set; } - public string Nome { get; set; } - public decimal Tcassegnato { get; set; } - public DateTime DueDate { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/VKit.cs b/MP.Data/DatabaseModels/VKit.cs deleted file mode 100644 index f84ce903..00000000 --- a/MP.Data/DatabaseModels/VKit.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VKit - { - public string KeyKit { get; set; } - public string KeyExtOrd { get; set; } - public string CodArtParent { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/VOdl.cs b/MP.Data/DatabaseModels/VOdl.cs deleted file mode 100644 index 8600135a..00000000 --- a/MP.Data/DatabaseModels/VOdl.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VOdl - { - public int IdxOdl { get; set; } - public string CodArticolo { get; set; } - public string IdxMacchina { get; set; } - public int NumPezzi { get; set; } - public decimal Tcassegnato { get; set; } - public DateTime? DataInizio { get; set; } - public DateTime? DataFine { get; set; } - public string Note { get; set; } - public bool NeedAppr { get; set; } - public string UserAppr { get; set; } - public DateTime? DataAppr { get; set; } - public decimal? TcrichAttr { get; set; } - public string KeyRichiesta { get; set; } - public int PzPallet { get; set; } - public bool Provvisorio { get; set; } - public int MatrOpr { get; set; } - public string CommessaAs400 { get; set; } - public int ToAs400 { get; set; } - public DateTime? DueDate { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/VOdl1.cs b/MP.Data/DatabaseModels/VOdl1.cs deleted file mode 100644 index 97fda075..00000000 --- a/MP.Data/DatabaseModels/VOdl1.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VOdl1 - { - public int IdxOdl { get; set; } - public string KeyRichiesta { get; set; } - public string CodArticolo { get; set; } - public decimal Tcassegnato { get; set; } - public string IdxMacchina { get; set; } - public string CodMacchina { get; set; } - public string DescMacchina { get; set; } - public int NumPezzi { get; set; } - public int NumPezziEv { get; set; } - public int NumPezziSca { get; set; } - public int NumPezziRil { get; set; } - public DateTime? DataInizio { get; set; } - public DateTime? DataFine { get; set; } - public string KeyRichiestaParent { get; set; } - public string CodArticoloParent { get; set; } - public DateTime? DueDate { get; set; } - public int? PzPallet { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/VPodlNonChiusi.cs b/MP.Data/DatabaseModels/VPodlNonChiusi.cs deleted file mode 100644 index fa806e0d..00000000 --- a/MP.Data/DatabaseModels/VPodlNonChiusi.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VPodlNonChiusi - { - public int IdxPromessa { get; set; } - public string KeyRichiesta { get; set; } - public string KeyBcode { get; set; } - public bool Attivabile { get; set; } - public int IdxOdl { get; set; } - public DateTime? DataInizio { get; set; } - public string CodArticolo { get; set; } - public string DescArticolo { get; set; } - public string CodGruppo { get; set; } - public string IdxMacchina { get; set; } - public string CodMacchina { get; set; } - public string Nome { get; set; } - public int NumPezzi { get; set; } - public decimal Tcassegnato { get; set; } - public DateTime DueDate { get; set; } - public int Priorita { get; set; } - public int PzPallet { get; set; } - public decimal? TotMinProg { get; set; } - public decimal? TotOreProg { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/VR1.cs b/MP.Data/DatabaseModels/VR1.cs deleted file mode 100644 index 956f8786..00000000 --- a/MP.Data/DatabaseModels/VR1.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VR1 - { - public DateTime DataOraRif { get; set; } - public string IdxMacchina { get; set; } - public string Causale { get; set; } - public string Descrizione { get; set; } - public string Note { get; set; } - public int Qta { get; set; } - public string KeyRichiesta { get; set; } - public int IdxOdl { get; set; } - public string CodArticolo { get; set; } - public int MatrOpr { get; set; } - public string Cognome { get; set; } - public string Nome { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/VTcStat.cs b/MP.Data/DatabaseModels/VTcStat.cs deleted file mode 100644 index 2c048219..00000000 --- a/MP.Data/DatabaseModels/VTcStat.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VTcStat - { - public string CodArticolo { get; set; } - public string CodGruppo { get; set; } - public string IdxMacchina { get; set; } - public string CodMacchina { get; set; } - public string DescMacchina { get; set; } - public decimal TcStat { get; set; } - public int TcType { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/VTcr.cs b/MP.Data/DatabaseModels/VTcr.cs deleted file mode 100644 index a3adb842..00000000 --- a/MP.Data/DatabaseModels/VTcr.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VTcr - { - public string IdxMacchina { get; set; } - public string CodArticolo { get; set; } - public DateTime DataOraRif { get; set; } - public decimal Tcmedio { get; set; } - public int PzProd { get; set; } - public int IdxOdl { get; set; } - public decimal Tcassegnato { get; set; } - public string KeyRichiesta { get; set; } - public int PzPallet { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/VTcr1.cs b/MP.Data/DatabaseModels/VTcr1.cs deleted file mode 100644 index 55061b57..00000000 --- a/MP.Data/DatabaseModels/VTcr1.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VTcr1 - { - public DateTime DataOraRif { get; set; } - public string IdxMacchina { get; set; } - public string CodMacchina { get; set; } - public string DescMacchina { get; set; } - public string CodArticolo { get; set; } - public int PzProd { get; set; } - public decimal? Tcmedio { get; set; } - public decimal? Tcmin { get; set; } - public decimal? Tcmax { get; set; } - public decimal? Tc50p { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/VTcrDay.cs b/MP.Data/DatabaseModels/VTcrDay.cs deleted file mode 100644 index 5d591407..00000000 --- a/MP.Data/DatabaseModels/VTcrDay.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VTcrDay - { - public DateTime? DataOraRif { get; set; } - public string IdxMacchina { get; set; } - public string CodMacchina { get; set; } - public string DescMacchina { get; set; } - public string CodArticolo { get; set; } - public int PzProd { get; set; } - public decimal? Tcmedio { get; set; } - public decimal? Tcmin { get; set; } - public decimal? Tcmax { get; set; } - public decimal? Tc50p { get; set; } - } -} diff --git a/MP.Data/DatabaseModels/VetoTc.cs b/MP.Data/DatabaseModels/VetoTc.cs deleted file mode 100644 index b48ad96b..00000000 --- a/MP.Data/DatabaseModels/VetoTc.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class VetoTc - { - public string IdxMacchina { get; set; } - public string CodArticolo { get; set; } - public bool? VetoTc1 { get; set; } - public decimal SogliaTc { get; set; } - } -} From 8f905c496c809b90f464ad21bf05f2cb8fc1233a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 15:42:25 +0200 Subject: [PATCH 016/158] Completato review iniziale Scarti --- MP.Data/Controllers/MpStatsController.cs | 2 +- MP.Data/DatabaseModels/ResScarti.cs | 6 +- MP.Data/MoonPro_STATSContext.cs | 1427 +--------------------- MP.Stats/Pages/Scarti.razor | 27 +- MP.Stats/Pages/Scarti.razor.cs | 4 +- 5 files changed, 27 insertions(+), 1439 deletions(-) diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index 0b1d43eb..272707b6 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -73,7 +73,7 @@ namespace MP.Data.Controllers dbResult = dbCtx .DbSetScarti .Where(x => x.KeyRichiesta.Contains(searchVal) || x.Descrizione.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) - .OrderByDescending(x => x.DataOra) + .OrderByDescending(x => x.DataOraRif) .Take(numRecord) .ToList(); diff --git a/MP.Data/DatabaseModels/ResScarti.cs b/MP.Data/DatabaseModels/ResScarti.cs index 4d66d124..0bb3b617 100644 --- a/MP.Data/DatabaseModels/ResScarti.cs +++ b/MP.Data/DatabaseModels/ResScarti.cs @@ -11,13 +11,15 @@ namespace MP.Data.DatabaseModels public string Causale { get; set; } public string CodArticolo { get; set; } - public DateTime DataOra { get; set; } - public DateTime? DataOraProdRec { get; set; } + public string CodMacchina { get; set; } + public string Cognome { get; set; } + public DateTime DataOraRif { get; set; } public string Descrizione { get; set; } public string IdxMacchina { get; set; } public int IdxOdl { get; set; } public string KeyRichiesta { get; set; } public int MatrOpr { get; set; } + public string Nome { get; set; } public string Note { get; set; } public int Qta { get; set; } diff --git a/MP.Data/MoonPro_STATSContext.cs b/MP.Data/MoonPro_STATSContext.cs index ee404307..3a539ffb 100644 --- a/MP.Data/MoonPro_STATSContext.cs +++ b/MP.Data/MoonPro_STATSContext.cs @@ -33,60 +33,10 @@ namespace MP.Data #endregion Public Constructors -#if false - public virtual DbSet Aauls { get; set; } - public virtual DbSet Cals { get; set; } - public virtual DbSet Configs { get; set; } - public virtual DbSet Ddbs { get; set; } - public virtual DbSet Ddbs1 { get; set; } - public virtual DbSet DdbTurniNews { get; set; } - public virtual DbSet DdbTurnis { get; set; } - public virtual DbSet DdbTurniSummaries { get; set; } - public virtual DbSet DdbTurniSummaryNews { get; set; } - public virtual DbSet Ecps { get; set; } - public virtual DbSet Ecps1 { get; set; } - public virtual DbSet Kits { get; set; } - public virtual DbSet Odls { get; set; } - public virtual DbSet Odls1 { get; set; } - public virtual DbSet Rcs { get; set; } - public virtual DbSet Rs { get; set; } - public virtual DbSet Rs1 { get; set; } - public virtual DbSet Tallies { get; set; } - public virtual DbSet TcrDays { get; set; } - public virtual DbSet TcrDayTests { get; set; } - public virtual DbSet Tcrs { get; set; } - public virtual DbSet Tcrs1 { get; set; } - public virtual DbSet TcStats { get; set; } - public virtual DbSet TestJasons { get; set; } - public virtual DbSet
                    Uls { get; set; } -#endif - -#if false - public virtual DbSet VDdbLightOlds { get; set; } - public virtual DbSet VDdbLights { get; set; } - public virtual DbSet VDdbs { get; set; } - public virtual DbSet VDdbTurnis { get; set; } - public virtual DbSet VEcpExtendeds { get; set; } - public virtual DbSet VEcps { get; set; } - public virtual DbSet VEcps1 { get; set; } - public virtual DbSet VetoTcs { get; set; } - public virtual DbSet VKits { get; set; } - public virtual DbSet VOdls { get; set; } - public virtual DbSet VOdls1 { get; set; } - public virtual DbSet VPodlNonChiusis { get; set; } -#endif - #region Public Properties public virtual DbSet DbSetControlli { get; set; } public virtual DbSet DbSetScarti { get; set; } -#if false - public virtual DbSet VRs1 { get; set; } - public virtual DbSet VTcrDays { get; set; } - public virtual DbSet VTcrs { get; set; } - public virtual DbSet VTcrs1 { get; set; } - public virtual DbSet VTcStats { get; set; } -#endif public virtual DbSet DbSetUserLog { get; set; } #endregion Public Properties @@ -116,1189 +66,11 @@ namespace MP.Data { modelBuilder.HasAnnotation("Relational:Collation", "SQL_Latin1_General_CP1_CI_AS"); -#if false - modelBuilder.Entity(entity => - { - entity.HasKey(e => e.Azione); - - entity.ToTable("AAUL"); - - entity.Property(e => e.Azione) - .HasMaxLength(50) - .HasDefaultValueSql("('ND')") - .HasComment("Azione dell'operatore"); - - entity.Property(e => e.Descrizione) - .IsRequired() - .HasMaxLength(50) - .HasDefaultValueSql("('')"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => e.Giorno) - .HasName("PK_Calendario"); - - entity.ToTable("CAL"); - - entity.Property(e => e.Giorno) - .HasColumnType("datetime") - .HasColumnName("giorno"); - - entity.Property(e => e.DoDdb) - .IsRequired() - .HasColumnName("doDDB") - .HasDefaultValueSql("((1))") - .HasComment("Indica che è necessario ricalcolare statistiche derivate da DDB (DiarioDiBordo)"); - - entity.Property(e => e.DoEcp) - .IsRequired() - .HasColumnName("doECP") - .HasDefaultValueSql("((1))") - .HasComment("Indica che è necessario ricalcolare statistiche derivate da DPO (DatiProduzione Operatore) - conferme manuali operatore"); - - entity.Property(e => e.DoOdl) - .IsRequired() - .HasColumnName("doODL") - .HasDefaultValueSql("((1))") - .HasComment("Indica che è necessario ricalcolare statistiche ODL"); - - entity.Property(e => e.DoRs) - .IsRequired() - .HasColumnName("doRS") - .HasDefaultValueSql("((1))") - .HasComment("Indica che è necessario ricalcolare statistiche derivate da RS (Registro Scarti)"); - - entity.Property(e => e.DoTcr) - .IsRequired() - .HasColumnName("doTCR") - .HasDefaultValueSql("((1))") - .HasComment("Indica che è necessario ricalcolare statistiche derivate da rilevazione TCR (TempiCicloRilevati)"); - - entity.Property(e => e.DoUl) - .IsRequired() - .HasColumnName("doUL") - .HasDefaultValueSql("((1))") - .HasComment("Indica che è necessario ricalcolare statistiche derivate da DSO (Dichiarazioni Scarti Operatore)"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => e.Chiave); - - entity.ToTable("Config"); - - entity.Property(e => e.Chiave) - .HasMaxLength(50) - .HasColumnName("chiave"); - - entity.Property(e => e.Note).HasColumnName("note"); - - entity.Property(e => e.Valore).HasColumnName("valore"); - - entity.Property(e => e.ValoreStd) - .HasColumnName("valoreStd") - .HasComment("Valore di default/riferimento per la variabile"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.DataOraRif, e.IdxMacchina, e.IdxStato }) - .HasName("PK_DDB_1"); - - entity.ToTable("DDB"); - - entity.Property(e => e.DataOraRif).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.DurataMinuti).HasColumnType("decimal(18, 8)"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToTable("DDB", "raw"); - - entity.HasIndex(e => e.InizioStato, "ci_DDB_Data") - .IsClustered(); - - entity.HasIndex(e => e.CodArticolo, "i_DDB_CodArt"); - - entity.HasIndex(e => e.IdxMacchina, "i_DDB_IdxMacc"); - - entity.HasIndex(e => e.IdxStato, "i_DDB_IdxStato"); - - entity.HasIndex(e => e.MatrOpr, "i_DDB_MatrOpr"); - - entity.Property(e => e.ClasseTempo).HasMaxLength(50); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.Descrizione).HasMaxLength(50); - - entity.Property(e => e.FineStato).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.InizioStato).HasColumnType("datetime"); - - entity.Property(e => e.Pallet) - .HasMaxLength(20) - .HasColumnName("pallet"); - - entity.Property(e => e.Value).HasMaxLength(50); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.DataRif, e.IdxMacchina, e.Turno, e.IdxStato, e.CodArticolo, e.InizioPeriodo }); - - entity.ToTable("DDB_Turni"); - - entity.Property(e => e.DataRif).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.Turno).HasMaxLength(5); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.InizioPeriodo).HasColumnType("datetime"); - - entity.Property(e => e.ClasseTempo).HasMaxLength(50); - - entity.Property(e => e.DataTurnoFine).HasColumnType("datetime"); - - entity.Property(e => e.DataTurnoInizio).HasColumnType("datetime"); - - entity.Property(e => e.Descrizione).HasMaxLength(50); - - entity.Property(e => e.FinePeriodo).HasColumnType("datetime"); - - entity.Property(e => e.FineStato).HasColumnType("datetime"); - - entity.Property(e => e.InizioStato).HasColumnType("datetime"); - - entity.Property(e => e.Pallet) - .HasMaxLength(20) - .HasColumnName("pallet"); - - entity.Property(e => e.TempoCicloBase).HasColumnType("decimal(18, 8)"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.DataRif, e.IdxMacchina, e.Turno, e.IdxStato, e.CodArticolo, e.InizioPeriodo }); - - entity.ToTable("DDB_TurniNew"); - - entity.Property(e => e.DataRif).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.Turno).HasMaxLength(5); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.InizioPeriodo).HasColumnType("datetime"); - - entity.Property(e => e.ClasseTempo).HasMaxLength(50); - - entity.Property(e => e.DataTurnoFine).HasColumnType("datetime"); - - entity.Property(e => e.DataTurnoInizio).HasColumnType("datetime"); - - entity.Property(e => e.Descrizione).HasMaxLength(50); - - entity.Property(e => e.FinePeriodo).HasColumnType("datetime"); - - entity.Property(e => e.FineStato).HasColumnType("datetime"); - - entity.Property(e => e.InizioStato).HasColumnType("datetime"); - - entity.Property(e => e.Pallet) - .HasMaxLength(20) - .HasColumnName("pallet"); - - entity.Property(e => e.TempoCicloBase).HasColumnType("decimal(18, 8)"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.IdxMacchina, e.DataRif, e.Turno, e.CodArticolo, e.IdxStato, e.TempoCicloBase, e.PzPalletProd }); - - entity.ToTable("DDB_TurniSummary"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.DataRif).HasColumnType("datetime"); - - entity.Property(e => e.Turno).HasMaxLength(5); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.TempoCicloBase).HasColumnType("decimal(18, 8)"); - - entity.Property(e => e.Durata).HasColumnType("numeric(27, 7)"); - - entity.Property(e => e.Inizio).HasColumnType("datetime"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.IdxMacchina, e.DataRif, e.Turno, e.CodArticolo, e.IdxStato, e.TempoCicloBase, e.PzPalletProd }); - - entity.ToTable("DDB_TurniSummaryNew"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.DataRif).HasColumnType("datetime"); - - entity.Property(e => e.Turno).HasMaxLength(5); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.TempoCicloBase).HasColumnType("decimal(18, 8)"); - - entity.Property(e => e.Durata).HasColumnType("numeric(27, 7)"); - - entity.Property(e => e.Inizio).HasColumnType("datetime"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => e.IdxEcp); - - entity.ToTable("ECP"); - - entity.Property(e => e.IdxEcp).HasColumnName("idxECP"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Cognome) - .IsRequired() - .HasMaxLength(50) - .HasDefaultValueSql("('')"); - - entity.Property(e => e.DataOraConf).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50) - .HasColumnName("idxMacchina"); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Nome) - .IsRequired() - .HasMaxLength(50) - .HasDefaultValueSql("('')"); - - entity.Property(e => e.PezziConf).HasColumnName("pezziConf"); - - entity.Property(e => e.PezziDaRilav).HasColumnName("pezziDaRilav"); - - entity.Property(e => e.PezziScar).HasColumnName("pezziScar"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToTable("ECP", "raw"); - - entity.HasIndex(e => e.DataOraConf, "ci_ECP_Data") - .IsClustered(); - - entity.HasIndex(e => e.IdxMacchina, "i_ECP_IdxMacc"); - - entity.HasIndex(e => e.MatrApp, "i_ECP_MatrApp"); - - entity.HasIndex(e => e.IdxMacchina, "i_ODL_IdxMacc"); - - entity.Property(e => e.CommessaEsterna) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataFrom) - .HasColumnType("datetime") - .HasColumnName("dataFrom"); - - entity.Property(e => e.DataOraConf).HasColumnType("datetime"); - - entity.Property(e => e.DataTo) - .HasColumnType("datetime") - .HasColumnName("dataTo"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50) - .HasColumnName("idxMacchina"); - - entity.Property(e => e.PezziConf).HasColumnName("pezziConf"); - - entity.Property(e => e.PezziDaRilav).HasColumnName("pezziDaRilav"); - - entity.Property(e => e.PezziScar).HasColumnName("pezziScar"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => e.KeyKit); - - entity.ToTable("KIT", "raw"); - - entity.Property(e => e.KeyKit).HasMaxLength(50); - - entity.Property(e => e.CodArtParent).IsRequired(); - - entity.Property(e => e.KeyExtOrd).IsRequired(); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => e.IdxOdl) - .HasName("PK_ODL_1"); - - entity.ToTable("ODL"); - - entity.Property(e => e.IdxOdl) - .ValueGeneratedNever() - .HasColumnName("IdxODL"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodArticoloParent) - .IsRequired() - .HasDefaultValueSql("('')"); - - entity.Property(e => e.DataFine).HasColumnType("datetime"); - - entity.Property(e => e.DataInizio).HasColumnType("datetime"); - - entity.Property(e => e.DueDate).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50) - .HasComment("Chiave: ordine esterno o KIT"); - - entity.Property(e => e.KeyRichiestaParent) - .IsRequired() - .HasDefaultValueSql("('')") - .HasComment("Chiave: ordine esterno o KIT"); - - entity.Property(e => e.PzPallet).HasDefaultValueSql("((1))"); - - entity.Property(e => e.Tcassegnato) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCAssegnato"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => e.IdxOdl) - .IsClustered(false); - - entity.ToTable("ODL", "raw"); - - entity.HasIndex(e => e.IdxOdl, "ci_ODL_Data") - .IsClustered(); - - entity.HasIndex(e => e.IdxMacchina, "i_ODL_IdxMacc"); - - entity.HasIndex(e => e.KeyRichiesta, "i_ODL_KeyRic"); - - entity.Property(e => e.IdxOdl) - .ValueGeneratedNever() - .HasColumnName("IdxODL"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CommessaAs400) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataAppr).HasColumnType("datetime"); - - entity.Property(e => e.DataFine).HasColumnType("datetime"); - - entity.Property(e => e.DataInizio).HasColumnType("datetime"); - - entity.Property(e => e.DueDate).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Note).HasMaxLength(2500); - - entity.Property(e => e.Provvisorio).HasColumnName("provvisorio"); - - entity.Property(e => e.Tcassegnato) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCAssegnato"); - - entity.Property(e => e.TcrichAttr) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCRichAttr"); - - entity.Property(e => e.UserAppr).HasMaxLength(50); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.DataOraRif, e.IdxMacchina, e.Causale, e.IdxOdl }); - - entity.ToTable("RS"); - - entity.Property(e => e.DataOraRif).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.Causale).HasMaxLength(50); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Cognome) - .IsRequired() - .HasMaxLength(50) - .HasDefaultValueSql("('')"); - - entity.Property(e => e.Descrizione) - .IsRequired() - .HasMaxLength(250); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Nome) - .IsRequired() - .HasMaxLength(50) - .HasDefaultValueSql("('')"); - - entity.Property(e => e.Note) - .IsRequired() - .HasMaxLength(250); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToTable("RS", "raw"); - - entity.HasIndex(e => e.DataOra, "ci_RS_Data") - .IsClustered(); - - entity.HasIndex(e => e.Causale, "i_RS_Causale"); - - entity.HasIndex(e => e.CodArticolo, "i_RS_CodArt"); - - entity.HasIndex(e => e.IdxMacchina, "i_RS_IdxMacc"); - - entity.HasIndex(e => e.MatrOpr, "i_RS_MatrOpr"); - - entity.Property(e => e.Causale) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataOra).HasColumnType("datetime"); - - entity.Property(e => e.DataOraProdRec).HasColumnType("datetime"); - - entity.Property(e => e.Descrizione) - .IsRequired() - .HasMaxLength(250); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Note) - .IsRequired() - .HasMaxLength(250); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => e.IdxControllo) - .IsClustered(false); - - entity.ToTable("RC", "raw"); - - entity.HasIndex(e => e.DataOra, "ci_RC_Data") - .IsClustered(); - - entity.HasIndex(e => e.CodArticolo, "i_RC_CodArt"); - - entity.HasIndex(e => e.EsitoOk, "i_RC_EsitoOk"); - - entity.HasIndex(e => e.IdxMacchina, "i_RC_IdxMacc"); - - entity.HasIndex(e => e.MatrOpr, "i_RC_MatrOpr"); - - entity.Property(e => e.IdxControllo).ValueGeneratedNever(); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataOra).HasColumnType("datetime"); - - entity.Property(e => e.EsitoOk).HasColumnName("EsitoOK"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.Note) - .IsRequired() - .HasMaxLength(250); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => e.N) - .HasName("PK_Tally_N"); - - entity.ToTable("Tally"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.CodArticolo, e.CodGruppo, e.IdxMacchina }); - - entity.ToTable("TC_Stat"); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.CodGruppo).HasMaxLength(50); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.TcStat1) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TC_Stat"); - - entity.Property(e => e.TcType).HasColumnName("TC_Type"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.IdxMacchina, e.CodArticolo, e.DataOraRif }) - .IsClustered(false); - - entity.ToTable("TCR"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.DataOraRif).HasColumnType("datetime"); - - entity.Property(e => e.Tc50p) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TC50p") - .HasComment("Valore percentile 50"); - - entity.Property(e => e.Tcmax) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMax") - .HasComment("Valore MASSIMO"); - - entity.Property(e => e.Tcmedio) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMedio") - .HasComment("Valore di MEDIA arimetica"); - - entity.Property(e => e.Tcmin) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMin") - .HasComment("Valore minimo"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToTable("TCR", "raw"); - - entity.HasIndex(e => e.DataOraRif, "ci_TCR_Data") - .IsClustered(); - - entity.HasIndex(e => e.CodArticolo, "i_TCR_CodArt"); - - entity.HasIndex(e => e.IdxMacchina, "i_TCR_IdxMacc"); - - entity.HasIndex(e => e.KeyRichiesta, "i_TCR_KeyRich"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataOraRif).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Tcassegnato) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCAssegnato"); - - entity.Property(e => e.Tcmedio) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMedio"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.IdxMacchina, e.CodArticolo, e.DataOraRif }) - .HasName("PK_TCRDay") - .IsClustered(false); - - entity.ToTable("TCR_Day"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.DataOraRif).HasColumnType("date"); - - entity.Property(e => e.Tc50p) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TC50p") - .HasComment("Valore percentile 50"); - - entity.Property(e => e.Tcmax) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMax") - .HasComment("Valore MASSIMO"); - - entity.Property(e => e.Tcmedio) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMedio") - .HasComment("Valore di MEDIA arimetica"); - - entity.Property(e => e.Tcmin) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMin") - .HasComment("Valore minimo"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToTable("TCR_DayTest"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataOraRif).HasColumnType("date"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Tc50p) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TC50p"); - - entity.Property(e => e.Tcmax) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMax"); - - entity.Property(e => e.Tcmedio) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMedio"); - - entity.Property(e => e.Tcmin) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMin"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToTable("TestJason"); - - entity.Property(e => e.Data).HasColumnType("date"); - }); - - modelBuilder.Entity
                      (entity => - { - entity.HasKey(e => e.IdxLog) - .HasName("PK_UserLog"); - - entity.ToTable("UL"); - - entity.HasIndex(e => e.DataOraRif, "i_UL_DataOra"); - - entity.Property(e => e.Azione) - .IsRequired() - .HasMaxLength(50) - .HasDefaultValueSql("('ND')") - .HasComment("Azione dell'operatore"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Cognome) - .IsRequired() - .HasMaxLength(50) - .HasDefaultValueSql("('')"); - - entity.Property(e => e.DataOraRif).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Nome) - .IsRequired() - .HasMaxLength(50) - .HasDefaultValueSql("('')"); - - entity.Property(e => e.Qta).HasColumnType("decimal(18, 8)"); - - entity.Property(e => e.Valore) - .IsRequired() - .HasMaxLength(250) - .HasDefaultValueSql("('')"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("vDDB"); - - entity.Property(e => e.ClasseTempo).HasMaxLength(50); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.Descrizione).HasMaxLength(50); - - entity.Property(e => e.FineStato).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.InizioStato).HasColumnType("datetime"); - - entity.Property(e => e.Pallet) - .HasMaxLength(20) - .HasColumnName("pallet"); - - entity.Property(e => e.Value).HasMaxLength(50); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_DDB_Light", "export"); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.CodMacchina).HasMaxLength(50); - - entity.Property(e => e.DescMacchina).HasMaxLength(50); - - entity.Property(e => e.InizioStato).HasColumnType("datetime"); - - entity.Property(e => e.Operatore) - .IsRequired() - .HasMaxLength(101); - - entity.Property(e => e.Stato).HasMaxLength(50); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("vDDB_Light_OLD"); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.CodMacchina).HasMaxLength(50); - - entity.Property(e => e.DescMacchina).HasMaxLength(50); - - entity.Property(e => e.InizioStato).HasColumnType("datetime"); - - entity.Property(e => e.Operatore) - .IsRequired() - .HasMaxLength(101); - - entity.Property(e => e.Stato).HasMaxLength(50); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_DDB_Turni", "export"); - - entity.Property(e => e.ClasseTempo).HasMaxLength(50); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodMacchina).HasMaxLength(50); - - entity.Property(e => e.DataRif).HasColumnType("datetime"); - - entity.Property(e => e.DescClasseTempo).HasMaxLength(50); - - entity.Property(e => e.DescMacchina).HasMaxLength(50); - - entity.Property(e => e.Durata).HasColumnType("numeric(38, 7)"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.SemColore) - .IsRequired() - .HasMaxLength(6) - .IsUnicode(false); - - entity.Property(e => e.Semaforo).HasMaxLength(50); - - entity.Property(e => e.TempoCicloBase).HasColumnType("decimal(18, 8)"); - - entity.Property(e => e.Turno) - .IsRequired() - .HasMaxLength(5); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("vECP"); - - entity.Property(e => e.CommessaEsterna) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataFrom) - .HasColumnType("datetime") - .HasColumnName("dataFrom"); - - entity.Property(e => e.DataOraConf).HasColumnType("datetime"); - - entity.Property(e => e.DataTo) - .HasColumnType("datetime") - .HasColumnName("dataTo"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50) - .HasColumnName("idxMacchina"); - - entity.Property(e => e.PezziConf).HasColumnName("pezziConf"); - - entity.Property(e => e.PezziDaRilav).HasColumnName("pezziDaRilav"); - - entity.Property(e => e.PezziScar).HasColumnName("pezziScar"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_ECP", "export"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodMacchina).HasMaxLength(50); - - entity.Property(e => e.Cognome) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataOraConf).HasColumnType("datetime"); - - entity.Property(e => e.DescMacchina).HasMaxLength(50); - - entity.Property(e => e.IdxEcp).HasColumnName("idxECP"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50) - .HasColumnName("idxMacchina"); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Nome) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.PezziConf).HasColumnName("pezziConf"); - - entity.Property(e => e.PezziDaRilav).HasColumnName("pezziDaRilav"); - - entity.Property(e => e.PezziScar).HasColumnName("pezziScar"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_ECP_Extended", "export"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodMacchina).HasMaxLength(50); - - entity.Property(e => e.Cognome) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataOraConf).HasColumnType("datetime"); - - entity.Property(e => e.DescMacchina).HasMaxLength(50); - - entity.Property(e => e.DueDate).HasColumnType("datetime"); - - entity.Property(e => e.IdxEcp).HasColumnName("idxECP"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50) - .HasColumnName("idxMacchina"); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Nome) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.PezziConf).HasColumnName("pezziConf"); - - entity.Property(e => e.PezziDaRilav).HasColumnName("pezziDaRilav"); - - entity.Property(e => e.PezziScar).HasColumnName("pezziScar"); - - entity.Property(e => e.Tcassegnato) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCAssegnato"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("vKIT"); - - entity.Property(e => e.KeyKit) - .IsRequired() - .HasMaxLength(50); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("vODL"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CommessaAs400) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataAppr).HasColumnType("datetime"); - - entity.Property(e => e.DataFine).HasColumnType("datetime"); - - entity.Property(e => e.DataInizio).HasColumnType("datetime"); - - entity.Property(e => e.DueDate).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Note).HasMaxLength(2500); - - entity.Property(e => e.Provvisorio).HasColumnName("provvisorio"); - - entity.Property(e => e.Tcassegnato) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCAssegnato"); - - entity.Property(e => e.TcrichAttr) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCRichAttr"); - - entity.Property(e => e.UserAppr).HasMaxLength(50); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_ODL", "export"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodArticoloParent).IsRequired(); - - entity.Property(e => e.CodMacchina).HasMaxLength(50); - - entity.Property(e => e.DataFine).HasColumnType("datetime"); - - entity.Property(e => e.DataInizio).HasColumnType("datetime"); - - entity.Property(e => e.DescMacchina).HasMaxLength(50); - - entity.Property(e => e.DueDate).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.KeyRichiestaParent).IsRequired(); - - entity.Property(e => e.Tcassegnato) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCAssegnato"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_PODL_NonChiusi", "export"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodGruppo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataInizio).HasColumnType("datetime"); - - entity.Property(e => e.DescArticolo).HasMaxLength(301); - - entity.Property(e => e.DueDate).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.IdxPromessa).HasColumnName("idxPromessa"); - - entity.Property(e => e.KeyBcode) - .IsRequired() - .HasMaxLength(50) - .HasColumnName("KeyBCode"); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Nome).HasMaxLength(50); - - entity.Property(e => e.Tcassegnato) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCAssegnato"); - - entity.Property(e => e.TotMinProg).HasColumnType("decimal(29, 8)"); - - entity.Property(e => e.TotOreProg).HasColumnType("decimal(32, 11)"); - }); -#endif - modelBuilder.Entity(entity => { entity.HasNoKey(); - entity.ToView("vRS"); + entity.ToView("v_UI_RS"); entity.Property(e => e.Causale) .IsRequired() @@ -1308,43 +80,7 @@ namespace MP.Data .IsRequired() .HasMaxLength(50); - entity.Property(e => e.DataOra).HasColumnType("datetime"); - - entity.Property(e => e.DataOraProdRec).HasColumnType("datetime"); - - entity.Property(e => e.Descrizione) - .IsRequired() - .HasMaxLength(250); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Note) - .IsRequired() - .HasMaxLength(250); - }); -#if false - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_RS", "export"); - - entity.Property(e => e.Causale) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); + entity.Property(e => e.CodMacchina).HasMaxLength(50); entity.Property(e => e.Cognome) .IsRequired() @@ -1374,7 +110,6 @@ namespace MP.Data .IsRequired() .HasMaxLength(250); }); -#endif modelBuilder.Entity(entity => { @@ -1403,142 +138,6 @@ namespace MP.Data .HasMaxLength(250); }); -#if false - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_TC_Stat", "export"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodGruppo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodMacchina).HasMaxLength(50); - - entity.Property(e => e.DescMacchina).HasMaxLength(50); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.TcStat) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TC_Stat"); - - entity.Property(e => e.TcType).HasColumnName("TC_Type"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("vTCR"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.DataOraRif).HasColumnType("datetime"); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.KeyRichiesta) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Tcassegnato) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCAssegnato"); - - entity.Property(e => e.Tcmedio) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMedio"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_TCR", "export"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodMacchina).HasMaxLength(50); - - entity.Property(e => e.DataOraRif).HasColumnType("datetime"); - - entity.Property(e => e.DescMacchina).HasMaxLength(50); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Tc50p) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TC50p"); - - entity.Property(e => e.Tcmax) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMax"); - - entity.Property(e => e.Tcmedio) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMedio"); - - entity.Property(e => e.Tcmin) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMin"); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_TCR_Day", "export"); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodMacchina).HasMaxLength(50); - - entity.Property(e => e.DataOraRif).HasColumnType("datetime"); - - entity.Property(e => e.DescMacchina).HasMaxLength(50); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.Tc50p) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TC50p"); - - entity.Property(e => e.Tcmax) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMax"); - - entity.Property(e => e.Tcmedio) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMedio"); - - entity.Property(e => e.Tcmin) - .HasColumnType("decimal(18, 8)") - .HasColumnName("TCMin"); - }); -#endif - modelBuilder.Entity(entity => { entity.HasNoKey(); @@ -1575,28 +174,6 @@ namespace MP.Data .IsRequired() .HasMaxLength(250); }); -#if false - - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.IdxMacchina, e.CodArticolo }); - - entity.ToTable("VetoTC"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.CodArticolo).HasMaxLength(50); - - entity.Property(e => e.SogliaTc) - .HasColumnType("decimal(18, 8)") - .HasColumnName("SogliaTC"); - - entity.Property(e => e.VetoTc1) - .IsRequired() - .HasColumnName("VetoTC") - .HasDefaultValueSql("((1))"); - }); -#endif OnModelCreatingPartial(modelBuilder); } diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index c6503e13..0cf4dde2 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -24,23 +24,32 @@ Data ODL/Commessa Articolo - Descrizione - Qta - Operatore + Descrizione + Qta + Operatore @foreach (var record in ListRecords) { - + @* *@ - @record.IdxMacchina - @record.DataOra + +
                      @record.CodMacchina
                      +
                      @record.IdxMacchina
                      + + +
                      @record.DataOraRif.ToString("yyyy.MM.dd")
                      +
                      @record.DataOraRif.ToString("ddd HH:mm.ss")
                      + @record.IdxOdl | @record.KeyRichiesta @record.CodArticolo - @record.Descrizione - @record.CodArticolo - @record.MatrOpr + +
                      [@record.Causale] @record.Descrizione
                      +
                      @record.Note
                      + + @record.Qta + @record.Cognome @record.Nome (@record.MatrOpr) } diff --git a/MP.Stats/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs index 2a8a3d36..7e3329fd 100644 --- a/MP.Stats/Pages/Scarti.razor.cs +++ b/MP.Stats/Pages/Scarti.razor.cs @@ -70,14 +70,14 @@ namespace MP.Stats.Pages #region Public Methods - public string checkSelect(DateTime DataOra, string IdxMacchina, string Causale) + public string checkSelect(DateTime DataOraRif, string IdxMacchina, string Causale) { string answ = ""; if (currRecord != null) { try { - answ = (currRecord.DataOra == DataOra && currRecord.IdxMacchina == IdxMacchina && currRecord.Causale == Causale) ? "table-info" : ""; + answ = (currRecord.DataOraRif == DataOraRif && currRecord.IdxMacchina == IdxMacchina && currRecord.Causale == Causale) ? "table-info" : ""; } catch { } From c6486d34562ce8ba050c3978d36ae5c3f2128126 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 16:48:43 +0200 Subject: [PATCH 017/158] fix profili pubblicazione --- MP.Stats/.config/dotnet-tools.json | 5 ++++ MP.Stats/MP.Stats.csproj | 7 +++++ .../Properties/PublishProfiles/IIS01.pubxml | 27 +++++++++++++++++++ .../Properties/PublishProfiles/IIS02.pubxml | 27 +++++++++++++++++++ .../W2019-IIS-DEVProfile.pubxml | 27 +++++++++++++++++++ 5 files changed, 93 insertions(+) create mode 100644 MP.Stats/.config/dotnet-tools.json create mode 100644 MP.Stats/Properties/PublishProfiles/IIS01.pubxml create mode 100644 MP.Stats/Properties/PublishProfiles/IIS02.pubxml create mode 100644 MP.Stats/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml diff --git a/MP.Stats/.config/dotnet-tools.json b/MP.Stats/.config/dotnet-tools.json new file mode 100644 index 00000000..b0e38abd --- /dev/null +++ b/MP.Stats/.config/dotnet-tools.json @@ -0,0 +1,5 @@ +{ + "version": 1, + "isRoot": true, + "tools": {} +} \ No newline at end of file diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index 52359c8b..455c5433 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -3,6 +3,7 @@ net5.0 MP.Stats + 826e877c-ba70-4253-84cb-d0b1cafd4440 @@ -14,6 +15,12 @@ <_ContentIncludedByDefault Remove="wwwroot\css\fonts.min.css" /> + + <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS01.pubxml" /> + <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS02.pubxml" /> + <_WebToolingArtifacts Remove="Properties\PublishProfiles\W2019-IIS-DEVProfile.pubxml" /> + + diff --git a/MP.Stats/Properties/PublishProfiles/IIS01.pubxml b/MP.Stats/Properties/PublishProfiles/IIS01.pubxml new file mode 100644 index 00000000..2935d88e --- /dev/null +++ b/MP.Stats/Properties/PublishProfiles/IIS01.pubxml @@ -0,0 +1,27 @@ + + + + + MSDeploy + True + Release + Any CPU + + + False + d9901b50-e61c-400c-b62c-fa060cf72c29 + false + https://IIS01:8172/MsDeploy.axd + Default Web Site/MP/STATS + + False + WMSVC + True + jenkins + <_SavePWD>True + net5.0 + + \ No newline at end of file diff --git a/MP.Stats/Properties/PublishProfiles/IIS02.pubxml b/MP.Stats/Properties/PublishProfiles/IIS02.pubxml new file mode 100644 index 00000000..7e9f176e --- /dev/null +++ b/MP.Stats/Properties/PublishProfiles/IIS02.pubxml @@ -0,0 +1,27 @@ + + + + + MSDeploy + True + Release + Any CPU + + + False + d9901b50-e61c-400c-b62c-fa060cf72c29 + false + https://IIS02:8172/MsDeploy.axd + Default Web Site/MP/STATS + + False + WMSVC + True + jenkins + <_SavePWD>True + net5.0 + + \ No newline at end of file diff --git a/MP.Stats/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml b/MP.Stats/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml new file mode 100644 index 00000000..6b790904 --- /dev/null +++ b/MP.Stats/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml @@ -0,0 +1,27 @@ + + + + + MSDeploy + True + Release + Any CPU + + + False + d9901b50-e61c-400c-b62c-fa060cf72c29 + false + https://w2019-iis-dev:8172/MsDeploy.axd + Default Web Site/MP/STATS + + False + WMSVC + True + jenkins + <_SavePWD>True + net5.0 + + \ No newline at end of file From c23d4d944911ada26a324c027b22637ff03454fa Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 16:52:09 +0200 Subject: [PATCH 018/158] update readme --- MP.Data/Resources/Readme.md | 13 ++++++++----- MP.Data/Resources/Readme.pdf | Bin 0 -> 33280 bytes 2 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 MP.Data/Resources/Readme.pdf diff --git a/MP.Data/Resources/Readme.md b/MP.Data/Resources/Readme.md index 29cc121b..5e20fed5 100644 --- a/MP.Data/Resources/Readme.md +++ b/MP.Data/Resources/Readme.md @@ -3,15 +3,18 @@ Per la gestione dell'accesso al DB statistiche si opera con EFCore --> apop blazor server -## Scaffolding DB iniziale +## Scaffolding + +Per generare le classi da un DB esistente con cui operare EFCore CodeFirst usare lo scaffolding coi seguenti comandi. +Attenzione: la classe DbCOntext viene creata INSIEME alle viste nella folder DatabaseModel (nell'esempio seguente...) + +### DB iniziale Scaffold-DbContext "Server=SQL2016DEV;Database=MoonPro_STATS;Trusted_Connection=True;" Microsoft.EntityFrameworkCore.SqlServer -OutputDir DatabaseModels -## Scaffolding SOLO di tabelle/viste selezionate (con force update) - - Scaffold-DbContext "Server=SQL2016DEV;Database=MoonPro_STATS;Trusted_Connection=True;" Microsoft.EntityFrameworkCore.SqlServer -OutputDir DatabaseModels -Tables v_RS, v_TC_Stat, v_TCR, v_TCR_Day, v_UL - +### SOLO di tabelle/viste selezionate (con force update) +Scaffold-DbContext "Server=SQL2016DEV;Database=MoonPro_STATS;Trusted_Connection=True;" Microsoft.EntityFrameworkCore.SqlServer -OutputDir DatabaseModels -Tables v_RS, v_TC_Stat, v_TCR, v_TCR_Day, v_UL ## Approfondimenti diff --git a/MP.Data/Resources/Readme.pdf b/MP.Data/Resources/Readme.pdf new file mode 100644 index 0000000000000000000000000000000000000000..36045894bb8c6ea05254eb387f32b252fdbc3c02 GIT binary patch literal 33280 zcmaI81yo$m((au=f;++8T?QE(5?lxO;O_43?(XjH!6CT2y9IamkNnSh?>YD0Z{4*v zGkdD5Yj<^5ul3Akew$22P?!!t&jLd>b9}f310ZB1w9++&;pS!#ur<)Jx3VRq6fm~6 zvM_P5pn_qLv9;27&@=cj%A1+!FnshSv|wlaX!yt3#L7}o$KHUDQjn90kqN-a3Sa}U zumV_FX&4zPK8_DRDJ%W|w+k;XjDe;8-ytynXDE6)ga8-@ekno*kd>{4j`@F_fd6q4 zHZiyV7#V}G`NtRp4fL$^4PY1~4J?i9jR~1pSU7lj3GM7ZaH*RwBw!q}MA8O3`Sb1*-4at;>Ub}Cg+yr9Iyt8h;)E|teSRSE zx`g}w=E*HY%!Ry_1Cv}s;3xqf2sAuUnil{~$&zr~B!=R?>gwt0FLxo$vu_7LW@5_@` z=UQ2Bo4Ch2DhwE4T0Mq(+JSEN|A(hF${m8vYvSAz&7}L zf^Y%*8Cc}YOvg*A>nUm#WJk8l1E95vWnWwn$-52A54Zf~o}=A4jCA1=9ADheSFhW}(Y^6{xV&ud z{?c^w-x5HJnW!z?J9`4|R9P?SR*zlrc%RygO3uC3N~<}$gzeU?V-JI+BhaoWrcn^? z#ikQw2 zKl8IgK)GWfV}np36C6Xlsjb-s)87v*XA1;7$WBORt6L^picDkXDrVqq;Dtnw-ek!K zWTNU-_{}A#wSuZVCkTSpj$UMcL0aTjb1UBx&6zACRlNe_Qt=~KO&99(iXy|6pV6J0 z2~L?9O*uy$0)C)*BL{10h0SP<-@-FsBwM3Blz&cq>QX@yhHB$P5fq~TNg_GXKeF}= zge@u>%@rqajn2BCJQ6-5Tb3(IZt#X=l$ykp1*$3^R)a0EJYb5+vnDHLfR*U+FZ3Cz zIJe@6`G1Budn}J<4*tofA^koPq|lZi-j0fu#8sfQdVIAFDkGehfm@0FS`De0Bxf=4 zlseZ{dBXb~`zr|>yxk1SZIhS2b`I4q70iL>FfRs)mf#zvvy2aYrF;m>$T;pmSx|?6>wFsXW!)MYA8;VP|g0D+;5W>)Y z`9@)@5o4&m{9?0B7J$Jc!CEeHQSF9A20}57XbXLH(mU1Zs(di3r|gl=+bgk=uGqYo z1S(;^tJAG^T&MY_+*o+){T&ll!eoiVkq?@aEs%1ZU)L!d~zpo>n# zsSpQ9j&S-^K;$qQl17cF1feE&w}u}`ZWTsi$6N+Mo$GZ;>F4%`I>JDMZ-N&CCK+<2 z0k}U%Boca)N5C2FAic)RKOK9s^TYviZ+!K3oR#+pzE3S;p@H_0hQZ%{70g&HtjAvB zWwx;HtSE#3#^!l1jZMtqj5DvqNhpbyyVxOHCh<9n&vm(^I13JUn^J- zDtuyQu8DW?LNG|>gF#VBwV={rT`nawlGPQTb()n^xq@s)27HsH#rs^hU^vpo-*fRe zKf%uc%ohOxWyRZPR=d6g7UMoNPAmt`R_W3|&3+>^@M;w&7^&Y(xyTJVJ7{x=*Bj4I z#D&BtMP;!^H+JM;3@n-xfDWlGaJ|}6Npfv|-eiamv$w$sEoH#Xaam|(J>+$;1}DU} z|57vNMH!NJF~YnNGG4me4oE^}{YjKpGQ_`@$5v+&g=nq5~FpOy<8UpPlcl1i>% z$Rcet4^ESRhidgDkWy0Iasptcsh`|GjUtddDG13Bmv?|hs90(orcOAe6)8g<;pID- zjKz`io5pUGh_1&ct(_PzN(a>$Z-*>W$wz13Vfu(nN;Z5hLEfv=?mhw^o$D1J=KQsS zkK51C_bBR+t@E0A2jkuq!kK`&6$`R0IO%-r<*FVbtX*+gAGNGqKflkEj>Sg4Y;e9` zt^#*hz5xTBM9h+?X=nzI)K2c!@)}FAU&n?n1Wa_Sff-6cv7#ouI~Tw2J6$OAVEqzH zvb@x9Od|4zLe5kld4sr;e)hPT8F=#hq9(~0%+6HX)Hi7in_=c~uLWgVNS2Ura+Y<+ zfc2%(1j2vk76Esz~x$rU(e#Ndx@s6lNu*`e4)%WSeAL z{`B4P;2svLka~Uud9wU&evmJ=oE7*`y=$vB0;&P1I=P2s%Yr#rOfdw_Hrdq|HwSA_ z>=%C|f>|RCP6aGYb<%`_goI?nf^NOxc&Vb7u}#?q1eD4z8J=dBQSpyt@76g*ug>zudn8etiF8Or81Gp*hJ}1JUJPT z$^6`Bj3krLasiJ13ORUA$^2aWrIX`ak~#P*?c(yH5l9%KtUYzf@M)@dVO@a;!d1{j z!tc<)`SH)<{RF73;TxR&s`nsD7Mrdx=SO@{STR2bvFR7?6UG2r%X@#<@3TQVoRc%KvvRQ2Gq5B45U3wwR8QW(o>2WC9m=3!;A~IGAZGF5 z$p7zmfq%b?X}~ZDIopfK+y9lPA6-S53IEDVxep=9AZ%r6|JNqWLdf#h_F-WqWc^p` z-*zbjeG?siD`!G=#t$Pa2Maw1D+dRVkevlU&jH}zVE+g%@Dann(%z2nuO9t~Aa8H$ zpl2_mWBZSh@k2QOb4tkeudx3kasPh&x7z+smUe%`Ied)iL-IR}+uN231^$qZm(V`cu|G_yOjbNt-n zx!d^tSn5)pWGohwRx;^#awJi2q+oq8=&%@`UcnGjQlBqi&|=?Z%4*P(jL|CGEHupK zOjAgMKbz->W0Vvtnw3?AhK5!^oo>jnG2J_jkM=^xufLyqoV81z&zz4uX56P=XWqIs zSusHah;6|XY-!aJwI&@mDHf0b45r6rBN(%^9R{ZxG97S|O~6X4147s_B60g{o+=x= zrn}ybCM&^af6-1Ihk?}F8P8}GLUFfrN}~G0oHD;@$~a25uMc=;%Z-(pbEg`T@yt<_ zJS7Dtujrn028x0|>Tx0)S=d-!n`@t3>ccLJ8nb^Z8jDk;Do5HXjXa&vk#RYk=dAj& zCNwp$0lDw5tQfr{px%_$daj~sNIdr{W;PY7a88t>JX4Tg*ue5F==|n zbmZ)-xwkEMSYKw^Z64vP^Rq=cFtM7yM{=HkG>{2_Q>00GRCwrnz&CRGj9kWX%z`6c z(4uq}R*ycZo^!CIK1>!dbBYgi{HOZpuf}9FljKt%V7A}McZv%d+ZfbjQF?6@GO#!w zEjbvn&uj5;l3zW2igq9}KqlEd@d!8KxI*~a5H3AganiZMdEP0z;F09;2auk^s`1dH zg;QO)n;Rx@k3M=-uXuedQBp zqWd79N^CwL*<6WSD`$qHCgtI!_@RN}& zv^DU8K>@V?iN=`R8X+N2dh#cCGb&5eu=lkI`o+(X1Qr};`~+}}$@B{wHA)-gv9I)n zE?s0Sd@s;+3BSU}zbeTZJYdoleeE(0*`MLphNpw^l5D8QbpCvSsUa%yy(-(Fi?b9= zlhlTc4)HzZs04fQ`#!kx=Xb#f1z7W3Snn}=B5T$PC@(=X(ncA)>I8Zif`SGGMAwX7 zpy{W|BE{m3?-5;&A$YUj-lBnW%++!8pIS*BZ0e6VOy z+_tEPcjnRnZ}Y1ZI?m{7I;3wwaAvy=+{itjzU^{5fY`hz^~|#TvM#~)`8@Bm>)FR@ z8r+`w;z!HZ2P6;32k;iw7ZKNFOW1cGPthiDf*daIC~^1jvoCMKXJEXbjjy~!mjm{Q z){q{En7QZR&)!xtd~2|{+0Wiwhdvj_H>5n6Z#<{558rsc;N}y2a+>Ms;z7BeCh00V zoVqwapt!-jC_=fPit>IwwAq|EfZk-j(c7%6Cwalf%SO7`pT&5id*$C|C?R;D!G`J- zpO^w|{%}QkFkAlWo|y@TpZjAIwjSppw>QZc@q+D!<-*`e>;cX7>jP7}IN#T|#JkU0 zd9Pa=ljo#wnVFwEKoeja+2CD#qAw(`xDVv7U=Qf8OfM+ybeD`g7@jffIeuMEhYMZz zr1&}eKIbz;n~*nP7Xq$SFJO2H56G_&4-~E(?!j-8RiF40ox?T1dh%BVWEJh)aBV_| zc;#$>zl&FazlW`V@}$1Bx*52rIwWm}e&K5W`U2-1&0Eyuqcy3snRJ72K@(DR(0*aZ zA}Hdm<4W*AkoM-aUiiMZv0C{4*l97t#~CK|egK!|c|!|)?O`^5f_#Th^VDA~bc(D# zJkRJW?4+=Gax+@IaVn7VVjC~)q_KEvoi6OeF`C)n=qV&f1in_+9|pa{TRa`VN0~pB zz1JN6Jsg3r8$6)*`-VfKu$gzge~ucd_qlgSU`FuBgaH(~DiOIInv%+F7&=PU7GaK1 zQ_ytuv;$v03#-V*cW~(C5cgtMcZK?}^mphrh`bO&8|i8#(Rp6iz>M!zc+rs=&XJaj zzudBun)vH(s#!aImFW5^1YRp>>Do}yA3VzsJ-HRx%4hbXi@qhoJX?RYkk|ZCWpTll zr^AKOqvW2JfwBID=C<*PPG$RATYytV`WLyo-b3Prz@*>Wa8-Vlc#wx_ul%Fny_<2r z^UW{#^ir_Z@?s@BPD-~P1Qo}NIJ}0dgBTDRli9ewqzkE;uoY72ke(| z_Y)(E_O3e`fuc%W>b{UeYw?{;fj@d$d;zPSy)P$5Z5l>XXa~M65`;ry7osCI%LKXm zkSFIawyVmNoih9WM%~Yre(l{R0&eR%hqPIAx^wQhR{I;uoLimOlTIinb~NM9pzt?z z*lLZ{-&zXz3SRl1B?PSY?B+eFLq2nyi)Tb(Qtiz70($we0heu(inEOAoTQ!`j&XCul>?aOD2Xui}#1}4aWsuT) znXYERft7eI9>re96tr$knL3=HZb-z=FP_z(H7#IipAZT6s~BO&=`;3fQ%<k=C6kISWqv{LT2bs=Tjyx{k*qu6Lc@29R7zVrbx1=)jfp7i-0vrCP{1#o`;2N-YSLmfPEX$QMc8_Itv*PT zi1B`Hhu~Q)L^>h!TgJ9KY(ZcXA(IE%Wsd>oCGtaB+5vK-#erO}6xL*V)1pfY$BWQf z`i1lQh}Qnd!zoD?1BffF;5X_kv}TrZp(Vp@X{SKA3U~44jtkrZ@MjO4%PqtnUPEEQ`M~09lP8}aBJhEqGHrs}!(TPU$J|YRshi-N z_HnHG%R_C~1H0dT7FjBE7I;P;92y>sIw6m}e3BhPD0%+YX07g|yx$*r2Yi-yjrNdKG7bSQN&v zhEP9leWU?nnW4t#ifkZA(z|s)e-d$(g(^k_i{ z?krWqPRhMZ5uPV9HZWf{s zlt~1(lHATfW+Ak3rf_@2Ojlr8Vvce#v~)hJeyYaCaWegp(0erf%GQGGyKwZU_nIh? zc@{ylo2AIk7{Y*bxG?NxJ$p(dsJ%Zh$biv)=00qr;j8#dmo&)cjg76z=&c81z<6Vh zqbqMDAG197<}svSJxqYiL~N?4YMx@IC(Iv6Q-L&DMTu$#2YiN)N z)tRh5jlXRlV;$wJ3co4P^G2>X4FX{aL0(T%_~*3 zAyWoP1gOsV{f$_0Y8y&eI=-@xEZ@$39T&4@eVxP80%YZ3)ua8(C_&5a!OiK~=z+N% z5A7DvjRkk!ypEb`CqOq|8X!fGwU0s9-Y(^ludkPyT@)pjYkYUxkR#-y=4Gtdm33HU z(y#ec7)MrD>ItL-)jhqOER%Wsa6GMrHFe|)t~V<)ed5@uJ2slTGsvkhY=TfGGHWhI zOUTU*0aIkcmEvO)_nbH*l#Mc1Gzg$&Ltu(^=vTqZ>;HjYVkbyG9E185Sp|qt8k49U zt}c`TkXu0A!pGSI=JpY(-63%!4D}Dr1@S9NP5%6rj-QU4J|w{b5>&X&GemSYV#H1! z5>F}mxRI1F=T}~2B|KTD9$C*ayaW!CU10thlmOfK%ZE`*e`lm~z55E*6v7atKM5*Q zbsHrSJuG;E$Ryc6J&T~Y=3;%=Ao}~1apoVu0ION9Uhty;&8s?7-x>ehTSZFoO%RKU z8RPBLPb&+ns=$>fd6V+WkZfaJ7tL@5oFi4Vom*!jR4oj;1L{4~E*kT}3-hFY!{c6a z--8G#4AYmOI-Of0$DHqvBuN`=2`@2^TLmO>ca;b2pRSUzu*t|HE5U`*nv^2F6IQ8| zf9Kno3QAV19mJA{7~X41&<$>z+Jho)y+&$biWnwo!Svl*UB;l}|Z3G|oJ zW|YMgHK&-ZQz@&OJJJzYM8Rzofjx{iD?{de#PMHK!Cjir#q`pLZy%XV>eajUhpRR! z!%2Pp{VUMFO$4M>F57oxtSS}E-QMmwh?JPj138MxOOZd3!oc)m|K$aKjJQ^v4y^T$ z=%CNu@Cvah35LN!w-X&!WUM+U7aXkU-+l4`I^I$mZJz8`9cZ0Ipu0Sly8k06gATOQws zD>mLIEO!L9f$b^LfUCw-gL)l8*9X6(GNomSH^UpuJ@qN@^N1m|M>A!-$A>VyqIveg zUtfgcb}^C|5Au5=cyNs8LF17J@P03q+Qf&mBrqxPN65k^!tG~J%9;JJ)gfzr|qC(U0EN#FgGEK)j(gHc_~WQer|+NZ^e9YHd6@CfYl#HYIvMklI5kYPYL&xdLy zm%6{i5Q|RV+d@<bFhQ#l$@D!6w6eu)MUcwZeO%Eo&-yrY}nvy8!I#` z6WRw>AIv$7_ysKJQ&6>D^FHru3W-N(%#Ch7qN7?x>;q|XVsti!0H+{42Q9i!uBG!} z)c_p5!tKI^8ERz%pV3ST9CS$=@nzet-Hf4IDT*>_m8klWs*y_4Wb$HS8-2xkU4mBm zM!I##EB0$f;0oSEK}WaNOlRT+q}$U)>@e<@bl>^Ng>&f;-douNyjuL5YiFHgrKmO)Owo9C==2uAXNnX#w`Jd;S<~z}vTcg>vXXwz?%k0dfNehQ4yCWMLXt z)4u_#0mU;^x%3+;Ml7C5>Mu+b+MuF|RF>l1bMrd2IeVm6i&BJGWJ>t&Koq>nl7O#N zRF(RW3(q1^Lt^&%-_Ru;IBj3@;Gg!6HJh#Myza{zs#f2R=F^<`T$c=@cwHY2_UA8^ zlZVG$-1oX<9wKsba*VQmT~pn)=Ws=4Y15gXQdB4l^lt=)dO~9{Gp9vYf4;sL*YoFa zRQpCU8dHbK8?SBHfKty%Q6*os$#&TqezZf)9HTja78j|?&SjifWQINwk{qZC*%Rc% ziHkJaeUar0qN>!SssvJ1vR7!QBK0TtiXBQc9r!9e>t|q&koQjmq%dY}G}M0MEB$Wl zHm0@5?T!oP#E**FTMmv1~t!qK-AN75ttz!HOq%i9L;!x;_SwP3U)iG z(c`^>uL8WkihsqYM4}!IqNxA%^Ct+CWhsLjII*SeOB2H|A&TOld*TU42Pe!AriHM* zlg)kV#gaB@3dl;90->jK39t!tDmO`YE?h|L*lG5-OH>pLH;zy1xAr=SZ97yJX`B~z zo^!-lE+t(k5Kl02g}c7~uyT!ENVB{t?2*HsX%A)X0SppgtL*BJ|44kwSD^?AfM>J> zM9DbWrMIL7&8?|foY{7Q3D78Hp6)5f3L^mNjBR*Thn24!J-=$I++EOK)ucV;$If?O zWWqr`(=?#s=ie-rw2*+3q9MCj8=*hri~?YyBa4S2r0|0l0K+j`lkY6 zl3GP`a(HFO{_~+CX1ADdN|}J-Z)fH^iKJz->-oiZoM9OO>~g^hj<$v%!9{b z&P{eCBsu0Kvac)jHB27I#p|+76mN`|sv~BJe9qy8y$b42B!`lUGY5HVmY z8ZnCGH+e{l`=wuFhKS^K2TYl@WhZEt+t8QLoPECOGR$ z!3KDF$optaU-&Bga*(IVCbGvvcG>^1+eX;%e}_cQb4Fe)@JAH+5^5p% zU53j%HMnhF5QjxU3Mi17X)Xb3bW=PeY*T85t)1U6RMsO-WRT0Lo5YH#@6G+Tg|Dld zn4FSc@_m+)W9ZX)Ox+8`kW+()-99Q?x>wJlh}CXYmaFNMBHOu9|CyE7Q<;4Ez?9po z59HaImO|?9_p67=KWG9JUe_aO&xkvVINH~8_I$mnnhZNME1zlPFMA?N#cE=a;zQC) z$io^WWPh>$5t3s-%d}*3OnH+GTNH1Mr70L(UP8M7nKT~w5YLvasMK!G=)vMq1k9md z#!fEi8rcYP*zjg%kcasOG2D&suEPp##GhG(QFA)D!<^^N!@C0s$2X#mzSE} z!X(2cHS9h-`Gzl^>hMEFSCBv48a{9X&$>Wb*i%>gCV2=Xi_dCUOOm>h$Fc0i$4E^v zjo>N5f^pjYNLXvJ?>aG;NLGGPdGDCoxY)Sdlv35Oq2n>jYs_c*Jb6~FN}D>9xof|i z;TSfwx0P~8W!Ns^45m>!6u%9U9CEQb6}9nf%*0f!UBg2W@{)X=qgK2dKBiP@c-M)C1 zd}c2tf)uNzzzCg2a$5 zHYP$COKzl~KT({5=65*15&3VPAI}{E7II$I zk+;G!#mOm0nh^{PxLjKlG^Ux~FaHLvwKw85?g0B5*FsBnyZ|xfus1l@=R?Ic~cm@e@M91Q`sq&d7%rhIfZ-Kou5ZLRmis1kZ z=LCNn_(%xf!gSnu1Ydy=6ZnA6P|hTO(`gB+@p1p|2Nim8r0y@WX$3IN!jHk>UA6ve zNc+&+QQco^PH3C8<2z%SvRDTh;FkNpPz}W7?MaR<#pKbTI}RG|jMzc+R0##QU%1#l z`5dK-O^_H2F-HttIJuY!4Ye zBRqf}$sK45$9zz7Mt$x#FuHq@1+yvfLwfUjGT3s%vqYiTOo+ws65ry0u9?JSNYyIl zI}iz%(hXaxQ2?5+u}Ua%YnE2A;o}#{Il*5a115#Hc*6?Lzx_znbRMLN6G|sPqlz04 zOh1sM*X&xQ8X6L#vh+e&jfn8`Px~4tH(l>`8d7QtFxy}eA+7ztBg>3rB? zMxcJe*et?#>QKcw*^#U5VKxHJk=N1SJ|5Lb*Ji5|JC>T6V6o2lmcATOf>Tum2TbSE z83|!%%3zLY=a@gnY$f#4d<_U2Z&q<1F$O&pUjf?^u z&J+8Je+tA#+RU8eDwk%H70%br-4yRvdf8^yrQP`se?3o_oJVnGs2D!9U}ayFpqGbDh3s9?-8?^(nDjoT)$ZrMe$HUK ztXMc7_*A0yQ9}|tUy*)qXb7$lw)yW=n)JIOUsB}#H~DS%D85<_GD|#hLMaro68ze3 zN}KO^s(4zth6I^JSuMZ#iO{dvzRzuRZjC^m8;GCBGFd+BA~^AQT^Myb?>vI@Z&Pn^ zFl}$!h}}_@%kv5o6D! zk+GYa2^>=YqZY0CM`K$prg3&SFm&&AS&SE6vx3rY>ibZ9(98E;Y@EG}CwOuvf@Kh_Y}>3^ zW{tNUqS}{T2xyKIP%@Od&tZwqU{>9ghSodM>xgd$Fn5-57EJ1d!-SHcZ?WfQ1&}In z)xvd`uMPoRLPAoAuKLm76maUNuCp=GBovFA~`KsLUNh2MyqNoMzF#Ocyz!avLB@zCF8*JZ-O<7C6e!OsvgBP zVMz$P+x4h@&db@MJ&fu!0N%~X+PydS7wVamn%9md^L4WjM>Z)r5tl&M) zCLK>qbec4HTK9A=p-)%^pKwL9wM;OslpSHo`gwke;GTx&W!T&lFUo_TM&$9>*t_D= zJ?Q!F{`=e_1U9R}rk*acabQaK6|jsf(zgmW6@)^35>H?P9ph+g5=1wRFrorsp_OhJ0jaw7z4S61 z;|psp-u%(*$tnJy7-pA1qpQIb?(IC5qU52x&=hV%0IF$_p#Rrl;y*XN+Z2d}%R+6F z1Zlklb+2#1au9K)uS+Lnx+{mg+q~2TLiy2{mhs67?q`F0M$y}T_5iv9K`rr)Wh%qO z7~R;H>}lE^A*?GIHKjYk6{cto3|_+Oiy8K?4J;Q$j_u&G_#ByZb@qnp+~ya*hzw^R zDynW8#&v(Zf%L0u>XMndCJ2kf{N8lZu$i8p^ZJM+mmz-=02+wtdskn^5bRn~MkTX8 zB{A7xxCe_(8F`;r&4~QY0lTy$_QH}qpp{I_0yXc6D1bWcY$Ih3p}vC6vfg8Gw>e(p zb&Mc-zSn$y4^6>qIx9EfJRd$Z9k+m0t}I=u(_1J3ytrA=6m8s1mT)=0C(?zTcRbD> zZ#VI8yUi#<3+wIT%xP(b<}UQ$9|p*Bt{7mdemenJl4QmnjsoBz{0|Kws8<`uozZ6sDM)Wj_F^j3 zjQWWak-v#^ z>Mh-2I>AJUOK{jp2C*akx~_{#;jX1z)LS*lcaf7$(vBP2`|b0~I_uUpigueay=Lb^ zrjX)P3yb+S9H5~Um2!G5E*soB`e%1nzovZ#i0S1bjBe95R6}wnYndoq1Rc@0?bzCP z2U^j7NdWv4Se1onK>DL$E;Ta~6d(CquKZ^(_aotbneN5(nFcVcR!!XCq&6c0W;1=+ z>VaPa)3cX5paqy#9ug7(^YeQ6el0y=^sjE=ZroB?@ghagxji{1sSidJ%S!{Jcz;*n zOpK-Vmp7%&7Xe*eM@OJ6@T^V~Rpf7%)?{jlqKrzkp`qsH=6}sWs%w9(o!)9ez4_Vb zOvCTfOhz5BsV}QW?c)Es2z`Z$%#R{yDOXn=9U@txk5G00YWU2ms5ouHzjF&p3j|LI zd@f&TixKL^->Hn<$YvbHRTHhlyXlK$ptqU4XyVshK=JsQ@Q@bhwa4GdlUubcG!nBe zjLpj@i!p}t)-d(Hz_7;9XNCFJ0DH{M7Mba%@Hp{syM4~yi%h>It-AoZRmE;E^|JQq zaJ40B%cxJQs1Lz~7RAbRrJ7v4$X>`8iYkKs_-7}PbXt2u9i4RA%2FG>G*?xQn}DiO zPbv55Xrs$m87B$u0hbT#WxNfBv@+tyZAHV&23#?_+LBjUwH#Xqfq11IXZ!e4B@q*z zhyA|!vGU*z#zXXozni`F+qF z59+b=BTq?WbkebWBqn+J&t&k3{mcjRlz2;e{*fmDevv!OoH_Q)L3|Q>{U~4HKn2AQ z-tIC|i;%J==+s8hWuia14Y8mvr@7c-6n&QzBR0f4MZI%HLme|@r!m~kvG`~MJ7IZs zq@Bvs&9RMQu5I~!L(F=sPZ2hDs@q3&HSO`T6lYTPJ}o(MYqP)kPdvG=;Ohg?a}Am0 zP{mIv8~p5e+662q*~+kvNE_rb$}+)e@hvT)E7VO=aIL_fLObb?1@R}QxOMBR)CJXP zcwp}3KAkg$gnn0)g?(U6?sII8v<0I3bi$x>Dez4!jNf4_Xmvzj3~U?7E$->5mHIHGc<3_;ZPLp|Vwp z71f10wag$0#F&kn?46NYMGv>Ug00a7N;fCD z(8FuuSy!kA1k;uVQCAO8V#ndbrjp~!fO{pwJ}5KUciA?$M2ALTJza6B<=Kg;#YQ%o zR5H8GkLSR_+91Q+}cjAV(qJJh4ywnaYbo?YM8^U zVUv?%y%W%0uNPWP6{p`=V`h3SAg3jji;ayk{;oP-Y`T_(oI1hT{|6u4{*VC!d_T-eLq)&KlY;S?+ok9 z-kQk%t=Ib=!+m{Jwyczxy&IAiRVceF4<=3z#-0_sQbn+bqtK7AoByQgs)i*J6!VLz zl8Thv$CyEyLlUNhhz+cEO;Zy>G$QJ{AqDA@LPmUG*KQ=uIM|W zcK`eVYG(biz}ZN9hH0It+;F+J*VGAFps<*L7BbT!8XKMn3<;G=5l&r;3G%dfep>XI z(6j`v>`bKn*J<8-)LOFQU(Z%ly~}H_3nS**7V18acf71(Z~a`N2Y*-r)poe8 z*n`7VznrpiQRLZk`^c{X?rF+5j%X>FuNnCwABG3`wg!mlUKYK_RIRO+nqM@Qed-a# zw$8UbgE|G2tuKYBAgjL}YUX>0G7#g5Okel>+US2p=Ld0l#a+dS$0!l6h1DY-vd8*# zLfc>Pg>EY5W=q7dzmrUMzk6G}em35>@^^eJec)>8Oct&ZaJLb){(iDD@oZ(Z;W z?kee-j{q`cxH~RT@KjNFhb~(NYb}chdOK-ZYx)Rh_Z;5%^M;23>SNhA{@-O^CVldW z=!8o}j=oR(xx&wy&HB~j9rETQq2$9Ie4l>!k-s0KnHM7ZBfn2n_)U(l5Nns=Zh!PD zq2L1Jf#GueWGCpMO8<@fJz&&p%!~edKiY_pZ_sNhYb&qzOFilndo)+{exAmF7chG7 zDqtktonU+%a#Vy`NX@?<<&d0|XJbI*p6&4`ral863kv)5AxR3KBqAo&uX&8o6!_1x zUv?$=Air&Dp04BKk2b&3fBU+->I_TynL~N)llb>>vX5^@(KC%$@!si$4cT9Ie^#S> zoC+ysfAV{ImNtmEM59w1sAuBp#4NH0fDU!jr~C4+!uq7L%5*I@PAA6tLe}u$!bfgz zPjq;s>oN<<_dn0ijJnbr@hI13qRiVNA46B;GaL_T^Zb~vOOoo5y{X}FIql;vQrBj6hYig6dpz`#HbhW$P^kdy2Q*ZXo^wb&Nd`_<>w zHMpD7EsIb^vYA}8x@&L;*GT#CbCEDgvVh*ANa20Ly0fR&+qzEmAqB&2wyQM%!#^u| zk5aE$J@$26&vtiD!?8FJS)fSc0qiqi=6j8Dy9jf5kON#ctY zu7(ZjR1A#0NE9ol`6-efAyZt2z7l14p~E&)m(-dn8LMU6P9kYyQ^P0(!i6!EAL^a- ztIY;JH28&=nnI|mC|Fzv^VMxgg>y7{tdLyQtaNCoOO#NhNytlRFlY4H4ZnY$6#<+z znU;_o$ky>UDbtr7W?e1n7o-=H|MyJ%#835tb#o=ht+4Bj#RX3>o<+p}Xf}F%!Exi9FO!5xA=ogJ%s1F2ype=*PNK zqq=)&sG{w8sH(;eL`;fY**7;hXZkH|4vi;rQ}Ni#T;WO{B6H`Y#P%J3l?YU>t+u}s zM`w^oqMg&K+Z9o*#4&6JjptWaxwIkUA8%ns-7-3l-yM%ISN>7;`Gk`!yYh?wg~rd- zONd#{utaNak@za`k4!~pGxzKP!@`qc`2*w_jo>w$mkU8f zadGLPIW2qF|aFLsrb;QV)IzkVEG5W+M0dePN|kyxNo+{^Q~A zfYLLm?Jg3`1J0Fz#!#8+oVK#GVy5`kawdhAUEfq*zt0V~x)M2uH7)-Bq1_j6qI+Ky zKo|+3Orw-X;({4N-we2~AFV?FT!l6BY)6UuV!<)UG>B8?)rR&ED+s*YhnWY1!Y(mfq%Ie0}CZW7FK$84t5r1_7BoU$6D0D#K_p5kPQH& zXJ%w)<$z%j`=D7&^nO?xnHvy(urq&0!T%3{Lk9%1(6h2Kvau7=F*C8yvoW$UG7~Z} zGBOeZ7@0Z#)%1bm{O$3@Nd)KC`=!DhzTlKiHHeG=~#a-NBSRWo7lVjW0rTZ`$$^M z($MNJWF%)`Wb#2exe!wR_<-CEK8Sc}TYUpt6H6mP%Kz#1VU%~Uwl+7g_&a-ye;Fj@ zzwnVd8!My62e$-ZCuCw{qi1Jk`bZwYLC6FoWMu`?16Y}uSqNE~Km3@O=m9`B4mJ%! zAUh!&(|u(e15b zjt4rE!W`*EX>m|In)Nzup9%^(QBQ5ZB^vx#rK=mLVeRQX!X|u%npooWKQ?+AP1N9XkT@(}d zdkH24lnh(TiCE_I#8DoYBl~`&D0l1E1|zc8I+?LAv@W+F|&gB{hzff1XtpDn73xxD$L z>sTv`)=7ZA6Uq61Z?V6C+5fe}{x0{wi|TJReN_DaPu&Swemv0NZ<+kB>Y@||1Tblg&Dx| z--~|Q2I;Jz_{8^?sb09A;#OoBE0!|!of4Iah$vc{GzmrRlgZPVx3PDQAE8v}x1>el zO5a}J*2QRsvPuL403r2pOL=j5yOTa06n$Cch%VE$+XgeU*r!f|to`?wtc`P*JJ8ww ztlPNDh|7fAcm^Ef2Tvr5gsH*h`2p{smSfr_NRSH-A8EGiBSkLn^?)d!qbF4qcW~Es>SZ{{}uPvL2))s!!LmV3GVLh&awn2xJ$6$ z?ykYz-Q6X)ySux)y9I*l+1&5@+>d?Vsq^32DyFV&uIcHq9*UY@x0#~FI#$^x^k|kE zlVd;0*O2p%T@R1R2z1HS4kt&%vb-V35y@I!^K+1_GMXxZSD#@bn_Z@R$R*=;w{X10 zg{*a^cd)}Q9spi^g{L2+z8o-DAsPR|D3Dw_C-M{Dph?pA;X@Ct?3U^_jfE_w6MH}w z0$$?q5F>%{ge1L)=;76-5TN;kRgoo#6ImBz62rRnAZjkHVk@FZ>BvxY!C?r&iqfhg zqszrw>OgSi;?Eh-{>&ye+v0cdW_?5jc1IlT90k$|AwI+!%P;t=MMoU@;q_SzNxz}m z5g|?^J_a|-c_%~r>|qZD5$SzEBZ116ye352Q~jig{8i3>39^OQDd1w5Fz1sik&|C$ z@H%n&3)hXeUSFo1FIJ$~H8fSALZ8+YZuQ3zBvL%d9NBBPBY5;+!zs*ayeHy2pOHOh zxerRg9yxq^d_P6X_EaG;Dc_-9b-{Lo<@{9PA>xX*^|1VbV1Yyn{Pekz4=Pxnz9K_+ zGxc>d;n{u)7xRRzXF{>1nj=Q=lMn9Ib+|?g_m)Hw?NROff)xaWxgrY>yb9LWA=x3f zq25t#g0sbY5xvI6Lc9$|B?<*1Q;^Gc6)<66u{7ab@omBMxkk!2u{^R%`4$JqacUvV z#%Xt>1ruw1U`49*PZ?&+`CvpW6Tlff3zP|J4rWeHdI2};0`E()LEoWM4F=+3kiUc5 zZ<+NqS7F%_&Zn^exMU=3*8lLg0e*}6Kcb`vR8#GMNYEOfLSDA@M9m=ufkg( z(SkTdRw43)qTR*}E(KNuiu9RpyY{i$e7#mwh2>VGL-TGo8_yTDmvZ59uKIi-yav}P*ap!+Y~}MDd-;`hEy{(G+uH?`JJ^MTJKi1f!sk3#eOtHBO&5Bn za*HqSvZqp)atH7LzvJxB5)t@g##Q#r{zBPd#mfrF3l2ik_Sx*E4W8^S z4ffi4;BHHNVSPc~;OB<3CVBh3A?W^LLxv!L^cTWT*e`}1$zKFJqrW__4S_I(ByTCZ zw7-ydN`Kj2le@t43cKU;eszb4B<}c}MXBxIxCPu<{e{`*yan6mygj;y?1I=K=uRj@ zshvdn&_eTujUq(-4+)+OjCn3hV)S!;04sI;eq^oyd7j zMqn#>GAh^c-y+TXo#w{WZH%e!CFKF>XM$k=ARdOt~0%Qv+PJvP0N%ULWMq{ht?j3{|de&Ps zHE8tr6OjXO#Odbt)fZGXSHNe2zK(?+?)ajwN8kv^Hsvh{me2F=k~CfyE%1xsT-$Ox zIy+ovJb`yF-?v5Q5W&(MC@bnwZ6VXcNC^$o%@r9JXx0 zHWW+6L}k>`WNqVdzUFeb71)G=gE9kdYdCg19Rmcuc1M%S5ro`HEQXG51Dj5EE~;-^ z`76T*;J1I5hKGb{)?fNQ{4(*%1~54GcTNozSG(L_-F8RcHFUOfhfem{LoGu4y){jt zzl-P~zeS|u1ozihCllTj*@^V&TJWsX59=o+e@^J8+Ie_#@ua|xcv~a7&)c; zm0n>Wcl#9$Y;yLoqeCDlacV))oIY{6XF?F_#j=Jcu|0TWn9#62z>fIJ+X(A=Han8F zEnsP3^%DSq=EN~S+B!Z)6ZP{cAKJSzSi-TW2%->#^;o+#*obisCLfXSkZ2BVcJvIp7!~pJ2hiYG- zS1iy6@3%WJM+9!a^E3xsLs?RC|7ofp1~rS*BSD9j=K8}!BRv$|$!DqF>8{VkYJEvO zIY4uJor#NohoHyDAM3mlaE!-a*o5LeH(O&Jn?{y#tR;<+kXesb#_Fgrvbi4j`qAE>t# z3WpW#G&CdX@LXAozmQ%}o_^Pf!%*>r%XN_BeIWB<8Xr;Z)xf!4D;6?3U*n&pX9X7H za+?0E^jT^CdQ=E4|Gcf>?yBH%ekNxr8YBi3>8m*8!-X5D?Y+@aRHTQuHG>n)!ePO1 z2+un3=Nq%(_S=0DBIpugfH;%S`a+gEA)%5i6eTa-8*Rdt9LuE~f!n%4mE;dDJ(pW; zzJ|ZxJE^~%qt)-Ydukr^z3JRf)TrIqt4nL~S>cwIjdoFSp(lk1;mE z-`h9$5o3isN@@1?N2#dCTOJl64i4xa*lcWQSSxc=Z1v>Lp5Ljm15%x+C1!J10>QE# z;eI2o?L;B2V?~(5*Q$A;u^g{XT{+q=HVu-d4Fw&c#zu1(< z{Z!9f&SY>uP+(sjqZ55FMNj`ls#nPUwdv{G7qHovR)Hvgc_;X9c2tTx&G8Zo#u6)p z)}M09+#ONhpffJYCZ!{zS>@2TUk(od7<_EVrre6y97=`#=QtXSPXP{6zrxUJ{iofP z25Wm>1a>}uAEuy3b74nY?6Czc5n?Y#wrtL+Hs&%`ZmC+R@}trm(r^pPrg~s$BrD@S z#EOE|On;dKorOv!zop{W@2y|r612edYP~W6WqAS7++HOez1So$+6NT$mc^|I1-A^ezcq~d+ zMe{h!{VVp4=U$cDr}Dj(t5_KkEBK3UB#=HZXNi-EA-ARsN>8)3!B02>`RVE#6a7*d zu+8cmSLxr1oJ<8i>Dd}SuVtwc65>p-B}gE`K66n9WvOtJD8dbec5K=K^j>}$8UXHGXh;G z)JnO=W|GOq68q(cKVDWKg*vTb9OJAO(7P!foS8>fA~>P3yi>Xf0+y4#FnQTCjT@_O zTgO`Xl=OKPrW8rrj%Ok(7&E?gihghpCv{>AW-z#SHF!`>ms}d$YZ4I@x~Cx+;@q*G z8PXWc(`7OBBIW`@&l{+yIL$6iuxS!FFGggYMb(-x?sGwH*So?O zmxH~LjToou4X+D-CU6%!MgM9lKL!CCcMY#3&u%9~w@@$crG}=R_Iq4bj;R@) zHXUcFJFWwoXC2+B*WBmy_is4fSq&qr-#d`3JMSdwpDwpJY?GcsI#u`twp(F?4&K-* z9kWuaqz3a-7KKW7ngyf# zuJDGzFcJxXVOPbQwj`RiS03VXrq&VyV-a?{ZAtAW%z%;Z#q+;Qgp?trrux@WK1K^3MXqped!t5R2u;MqG#?V=E36d*Bqh~v(?!-lurEg7vf|uI#zorAQ7MExL*QP?8wW^wmT4=Qf&_SjAvcBY zU}w=qs}>?AdK7sv%i&`|b^{2bYI}3r*Bb>*mNj7mp&#@*?Y76yE0E)ie~tdVj7xYL`OqJ{z8$^C-fCaeaIQrL`Ii2tj4g+Y)VzoHJ&MJZz>6%K=yBm zT5p8Ag7r}q6`j9JQmvB8usHO4kHEM47t~v{H@LmV@YWg85mEt6(TcgwVTc6Eyyth+ zNr3Y2b6yW)CUx)ly$qX8PUqwati}@prgTE4WHxIbjv&6?GRVNL;lbU(8|U%cg*AxS z+u2Jh70s5nG}}mUeGZ!Cug#+&FJeK7&kGeY6vdI4@ueBPMne|Pw3CTumd+l`V2n?K zN9yZ~M&~M=@VZI;fO_%c{)s*gqrz&*bzXSpW>;m6z4Cn`SGN{gliTfE)8S9fC-0Qr z)>^*tkV-7i4cCt(T(QpsU< z&FkDk8?#k)5Tqr3O(n!T9?pB|kSdG8xr#Zi?2xt*WA&jZ8+X+XsHr>`)4xhl!os-9=V6 zn)Mbbl}DHVj7+k9NV;to9G{2Z`{tSy%Tv5XXzF?Dlv92F{mPCw7Hf5k2AVUO^~?8VHP$5810-S)#(5R&k@w-I{Xg zlh7~AOIZS?RzP z3xsjU>n0Y(+o!6aR!mnL>JWpkpv!*DT+E!D=7kB$8q^?T8Jl{D!?Naf81g)db|Uq4 zKSKIGOWhrfh4!^@8+B7X! zip`i7ie!a<#DvIDBQ8ktfM9GlCl==R6UP4j@Hc6#+KFE7x>z@<db51qE4QoUj-~fnD{Zkw8njZ}^Vj37NxyB@`_Dk|0FGlsCP( zTIv_L$rX$P97ZR#7 zyQ@8~^J=cl5yI$LIOyF54yjlrkyPSGqosMySGV-_m@oECpLOWJ66Azw`(-ja zM~jyIk%)NF*+Z3d{=9#n9B!7ekZZA{(X+-@Z)q@C>5ty53hg_;V4sy z(;_7dz4@udzhCQMKg^rH_LI%&dX(M<9z~iZR8jA7Uj~LLZ}b6#DR0?$PI$WGk=?V2 z#aQ$L?22L)H)cvb9i7ecmvM(&QT0>)FTn(&-^~!d57|B_8H&NupDK=U>MHHU8tKZo zz-)frqS-o{MI7gQT4;iE;X#P?<0x&j=2Ny(eaUhfK9q17q^#lA8ot>YEGy7p_qSiV z)W*zGfB7|+$#asju^g9T0S<*_?aF)_hh*(la0z8 zr`qK2Rb+WaH@-PsPNjbs-*GlLo+=rQ%2uL$|Mi83Fx_NZ0}Aro*P)~O`>uFt73Fz| z{19flchMZF3->Y&PtFV~sHi|5P7lL*bSTcSa2hn&1H5vNQWTYOh$aFy{RK&`B=k@( zn4qf(EVT6WcgFQY7?V%);-n`VfNq4`~fKXZe973-`*Lvv#smc>w5W9@JkP1yLvElpYW;!aS= zQxBA}*ySn#HyZ9cr0J4ID+i{~_YVUZrc@?vO=G{x`!2^yLc|UC zF0Qmm%Tt~>jBh*nN#Rypi#0nXx5nFLtH*pjUF5(Ty8gmODpR7P;&2rK6_mK&zh7JV z^;Fp(#l`VGP8Qz)Lhat;838S+noEvsb6nH?Y(d@H>gi}tnu8ti6p1GwAjSK1h^a*+ z(6+`E|FGAet#LQ?l`4!Ck*CU$R)W;}v>n?NPtbHvki$jdQoEEzzLAyfE;K#Cnq_}? zNIH?5HgcVYMKW<&z)pOeELJj!Ju(4Yy+1jcS$VJJM3_5~7ML##%xca!iSg>rH5Z=* zNV>w;<}WhAh6IhtVz=BV){G2EMz{|sq4WIu-9{gelV(TWoJX!l)z_c2QQ~^tPj`?V zp(&h|8|`ouFx&kB;*><1Ygu1qtMq9#6zmLv@`ydb*A*c7_bGY~_lZmz1a;T@Q66JstXAc-Mo*ZpEA61rY8pESJ#E z&##}uU_;CU`i=zk9JX1|buHrq|B#cn3GwT$L{k*A90LgU~Pxno|Mkv8}CLSjll^|Im<;RGZ6m!z>vujMKq z&Cmf2+wmpSv8b`n-Kz~?>!pCwWxQvdo~gWcApIki-(RB59OA#cfN ztLwAg7yj~I7?$&7Munbn@aB5!5KI4kaxi!~swAOjU7^&qlY@YIzrjd;WYZu4zy67x> z$_?Z}%E4^t;tTyAH+d*Ho;|UrHGaI!rzRlp)dafnb$s z<#MWXt$%dsvf;oHG$tL?H|e&rUCz6CjtmF}9;U56#hXzi3Q$lVnwP5dn)^;!3!RTWVt_m7t}+`?#YIcqI7B;0D<*T(Ci} z9MZ64n-BR-B>7F;rxU=#CnQtgsdx)Q;F4NyGL*kOMP;RXToybcR+_(!H{e>kxsPHz z8mRYI=&Q$W<8^xNJ5x(v(14cYE;TrV5X>zD?_d+=WQQwogDn! z+D|(^_$lrOHi5Z@7W1hb9Ki#5!fB*7^U~Tndc6)JC)Doe>|Lr6P=XWX!htSr!{nZ! zz!BkoK0t07dPankeBM*9_Zpf{%zYB3v(al%?K`2550;&4iPZKC{MZI?hvmzn7}M zMGEdAlpXcy#*%6JjA>asMSP`jLh!6?@?3E5Lxm7oUmXf8wV-^eo`gHKyu^x==~ZLr zdu+G5HCr}!V`cmA>LBap$LT>t*2UtFw5!BrPshJoD?HA651sIN(sRGRd@?-pw{Y2U zEnh@4&-U3lM`YH0C|pWWwUSwS>#WGjI#-JUd)l_-dh46=mSc z$TpJb1<1erEKfq)d|H*}@O;_8E+pW*-j;FN4J|-yS>lQ!P;GO>88v&R1zk{lt=UOh zbz0+Zs03Hq^7Qk@C^zLZ8S;K}5ZUY2h$C6Gkg%UC`~q300r#0=J{;_|HiKk!TqrSR zhy_*cKtyr{^H6uh_8I)%5UbjS2bnQ#=ZI{Vpq1oDKmj=a}Zvm zoG>RJ%>>E?WBWt(Y!RXBP6$Nf9QtU|^X6(pwPRkB!)_#Wrd_NM>SJsm%B_Hki~J%T z3aS!UXg%zrAu2wKqW|UAv%1nsH>^l{NpoT}y}yBL?Kjy>+Dgt)trp5vw{Dholf+p! zev-&%Ro&dxHE9^Rc`zk-x%n=r2(q%6T=V>+@A>LMxz06fYUwWs(vxkqpNwV3w??Qn z>veP+VHk1F>YmJH6y8IB&v%|buy($jS1!|-E^|zJzRo^Z_Sv9tw>@195_A+FH}0-# z5p=ZsSZdvH+q-ugEEo?mu4*-#&+ihx9#7{@#$lX+Ax&n(+jM2PIt%DO6p4@N-%-WV z#GI&a^+1;H){(OQo;-SVKWL5reLodpMBLvdl=>sY!yWeg%l*TlJE>M2rwnW$9uD%U z*y@${SMJ)^RdnEF!Tx2fcn?s6dlJwo$A&N>aU@g*MJbrW6nr+~Sm`N%N&S~B# zlVSzU_Iu6E3w!Z&B0(BG44$TJLX11azRkuC5qMEfCuB%9?Z=g~pOyQw3M1l%+yqZ)4+aQ4sI`mb z-}Ul9m5Eoe0%_y5^++#;$J^ zP5jQ~HFi7*);v?zz8K@+<+6pZ_)y{9>81y|8UNd~06M6cJ|Z)2<@kZ^bj|W|Xf1?G zkD*s2EUJR(rqIVfHKUsPJ*-DJg3$kQ=37FJXSxh(aN7NKYO3A0tung~pnmn}7S`?1dXSZgIWmsw@Fk$W zUhLPFkD*FOh(zWzLr3Uzo1?>+dRS^oGv8n~;d|JR(>Lu&^?NU7>)F{m<3r0(Wkl(< zc|@WRNxrpab*zcNi_V0fu6xb*k%jFs)ndpQF6(7MHIAiBIO*f^zi@2mSxgQkO}`fD zSI)kuQaY~9$G#-D5<6T7!zP%S^4+gQf4R@?ml}IZv1hz)nBbX496i#$nq`Q>?F%0l zex?n7=f2`dw0~j@C+~PPQ6KfuUcW!e<5ji^{anU$)xX?Hxq<53_WPz|@%?2iM`c)F z<|bNfaq=qp6+22z0p2w0QTumt2DlRD&ldjq0Iz9%USr4+m$7q{XKU_*UcxMoOWCj$ zo`VLX$BcHqUFO-9HNVPnA?I4H7(2!kZ7HtgCN2rCWI)hsPr&`VIW%kO3wUa;!TXmV zNtkq%O#)AE_u8y3_qVhrx|)sq)%dtpUTo7}o30=onBvMf7>Y&H7J1*gvz+iB_05c6 zpvfr}@YWGwQqQb}YNquSKG6AUlI9`Ej6PaR;MhXEwp$g!vswB^uy~2b#-!$jI=PCD zj*zfpa};}+*|l-DBfQPT3-+tk$7 ze{=k#aoFU)6mwvFaf$-PVg3aBk{#f zu;V=nTBg?8Wox~HJ?V~sr4+z+RHA-bk!632PfkjEeN8i%h?v4xGPot2HfVK?!qmb(pm8Yx_;~`8BYGD_;_d9ny_^t_BJE4{c=+vBV} z+K9VTGe7(E)w`v{8^_aWr3+2LpwvAMXmh)I^KZbva=79Ro&_yBUc&IT4vZ(#TGR*7 z8SXf4kQuJ{mrmZ6Y&&j7Yr`deQ+r-kVYqNOrl?^CP{Qra7MfwhNGCC!$Y@+cMn`*{T+l|mb)_{h2v~A z<6`;EL~$lgI_+DGIQ>Zj)SYx+Hpv+HM1( z&p52_PgH*0RJic5)4>P{CV(CC;aGXVXib@_^iA^EDy5*1T0El(;qiE#bye!P$ZyDV z+?CZvqZN*1c&O#Vp3o%8%LT! ztvGm|0c*;*(K1n5xKN1ErHS@Popm9zALo3>yu`VB8HEg0_Goc3I_MHny}=3x$RJVmrQhA<^!Pn~A*`eix*nOL<`opl2dC(DIG zwa2_KW@xXTLNp>n(9AS%h#ZT!2<(;rI}2umb?pZ#<$jTuuDfxB)^)SS?{on2*^bY2 z%C+c8KT6?@)M|GEz^hY3P@+aBu!r`A&POSh4ahUW*2QA*X_wIJLNO{7Fp>(XabUWw zM(eDhO7-N+M1*6yNx0D4o_Rev|%Z`ZD z*l}1*itpB~G?wsW8qE%A%qOp0*(<*)txrfj!~8@@`^wJ6M!FQSoZ7oxMTIebQN3*G z!;Q!s{d-1Ck9{Q^Mp z+dNcCJdzF++3U@xM8S7zSmIWazs0RfbAM=&Cs|$wv-E&>9I4hHS zrfF(JsFb{N9ou4q=GLlQEL`T6>Fhl|Qrn}1GSfg5vm8UHO%&FL0%`d1<0$sg?wXsR zqUIvk*PAi={PtkqV8z*+ay8++-td`jtJ>kp(Ac;aK%|5adY>6`IS?7sK#mX>iIQQee?>7 zM@v?%5{x-|RD!s^uBDuz3~Wyn96L+U;SS;lWR3-47D|VfW|&>r^($upWXc^+bVgD_ zQr`YPO?0`x{qO5*JOa^*O3B11PYy&W#0K){FuoVI%QJJc+}BQLmPK?s*_GZxh8$-a zw6DLWe%yMuLm+;(*CpN9xNGy9lBNq0oxel~JJNL+w&x~8YS#=t!5PMXeS|2c$_A$FCd7(IWD0MI!b5y>@HVG~ve%Px= z{y4Yu>9r%)qERDK5E`jMeQFnRi|C|j`&w$l3WN{d@&&7e?5AK+-FeH>qDFu;d|v1^R2 z0V%0V6W;B{xxp;O*f%Fgrw*3Y?JhMLeO<7jkijO^f>mA8?m)w+`5Dy(R%N?Z@v0W9 zcY@t0efGQP=Y(;e&FqFG0qUDTiSUSl^kdZyq{J;A)K&N{owq)cNJVC2gnTs45Ac zo*Cdk;g|*QFxIJsLhlVvX7uIVj+>Q}51i@K>@1M7==U4=;dHW@v2N-N*rg$MqRioq zQIk7-67D|Tu3dWfs#fT3a(4j>_@K~QN^e$c= zygQ4hNV?j8^*IukbEBs^WOp2omh*0RX~-60&=GIZPNUZrXRsPC$i5C$Br`@P2i7J; zD5$FCCW3d~qV#D`(OUT;&6>EZW8qZW!}89&Qs4cN{Szz(@tAfn({$HO1GB)C3XnQqbZgq=_i6}wg|6%{Wr5H zrBWJ?RL#)hTYrn4%mW5U_Q@K7&}>)Cd%Q{;idl#aul?&2y*XBhK4G*Jaz zWrhIE(~Vr4c}(q4-Ph5bSejQ!J|kH=s-L-)eJl#jCjejmqewzMmyafF~PCJ<_Dl*ElIxS-CA z$<`D-*OVH`7&`-Ci($q!TS1qj{cJi13_h4Wcd!dK-9kvZ@ZolqIPZelN}MwsDFnt)9_IJ;Ek56JcmCt1Len7$V0$!7I+Td1 zy=A-ZhQn#6SB}JxQAico-I|HiBU>hIy9GZ#oaWM^eqZ8u2GxX}al_Q==^Pipm(t42 z*LiY4LA^F-@_EyDx5)}0wo;8YU=dI_gb#!-PFoo2;n?;d-B{dh&yk1mT7Q@n(Ul=R zT^M?KyZXA?5K_(@jx`LzABUQt{cpj*czmdJMATyKlazZwf zATI^yIvst=2{SQFutDB%bm{bO^ylI7~_1YFUM|sDjlb#cPN6-4s6_xX1C*{)l1GBI7s_^srqm(sGwFoB^2%(?=AC9O{ z{iD5(^m;n(ZFCx#98nn>onh75BFr2NYjZt1dKxXo!d+dQE;D;i7>UyTi_iC@l*C$# zHm~K=Hb6##Ji>joEX;@``MtX~s=5Brf&SMV0n9c`)t(QPQZ0(yZKZDVmTku8b1t@) zy+~S3bphCBhjmPn=jp}4ImGm1@e&+5bZlhnLa?W@%?b7POs%nIR}R{l7q}Aj^QLGP z!!w4MaOXX?g<1#!NiWXmlRr$vU501i9MN{0ZMEB=IA2-ool`74!qNtId7SLH zDg8q*nWiyOB}|askCQdQeSAE}4eeg}5pltol_Q)9+eUvyZfW{DGjG6bplpzANOh7W zhLh`+S6}LTg=Iv(vOCc@k=*H?y)Ly@bLffcGY)Enq%Fq=|@zOf5aI7 z$24+rnR#1Mt|2rwn&cVU}N?^yyOhnHH;*XhGLC7iymgVGRVETi}GP7_3 z8CY3C6!O2}!p#533iuBm_D>$b{{yi3hqnA@e~JDYkbmQa|L*qRXy^YAyf6R+TK|Ei z|3J@7AZD1Afs=(D#7;92v2wC7F#Tb$HUF^A>MSgr44gnFHVz_ICT7sE{i*WLr@tzL z=xh#701ybO3VQdiF=Y9t49LjY2chL4KAaUu z#0CU1faVjV|1aABAo%&u1poDoje`lqg|mWY63EHHz{$qR!a~Hs24rAj`(r(5Nr0^X zV;MVuiGhh7r0-v4phdyV#`eb&R%V7jFR}b%%m6?Rkde$Fm>R&s%)rFS%E1nzt3lSY zF@vmU1?dE}&dvm6-~j%4W(U3g=Yf@o4e-D8J4gm(00KBby<-Of+W%u2D>LW`2n5;w zFTVw_gLrumz70y#2m-l*9DlmW2I|Zo+Wk-N#{U%pL7M+8Yml{n*8p{h;g4rFq z2MdVf2U+shwEs6q{%1J;cjNrOQN^sxz<*_mHDf11AUWK?<&RLj)~}HHIqKy8bJI#Y zReU(B5L0~)F(Sc&u3P7r7Aq2AACK<)?~HfIlstZxf98Jtf17G*D zYU1aL2pHIH_1kiNaVe`pW`6BeD;?qPAJ^E~V@xbRHBC4_RYA-2&4OAX_N$EN>ft{0 z&;7@~gW-*V9EOcS@vR5jkH5EZVH*WWJbzi9Knz1II% z+Wb!o|3RDonfQN+xZq-EXaoZa&%gl#iqi1EA0hxdJ1aYp5z*f=W{{#kA0n%N$XGc3 zpzQxH105Eiljq-LpfCsQARq8=GFFhM12OOaCSw9QnE%qp!U@^{|M4EnpVY4ZA!B7? z1Dy;1rjHr4tNu#{VEz+0;@{r`fXtEV+ zu+s&Fxv+x)MV3%Bbp^5h9H1Pz*47S0e|#b6K>91}#2@$nXGZKDbnP7enh%iI0HuE= KCl{6#`F{Yz0mPpG literal 0 HcmV?d00001 From 09d3f50de52ec4de1db9b81ca148c4b87a39ca55 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 16:55:43 +0200 Subject: [PATCH 019/158] refresh view x UserAction in MP.Data --- MP.Data/DatabaseModels/UserActionLog.cs | 3 + MP.Data/MP.Data.csproj | 79 ++++++------------------- MP.Data/MoonPro_STATSContext.cs | 12 +++- 3 files changed, 30 insertions(+), 64 deletions(-) diff --git a/MP.Data/DatabaseModels/UserActionLog.cs b/MP.Data/DatabaseModels/UserActionLog.cs index 15426401..1b19f596 100644 --- a/MP.Data/DatabaseModels/UserActionLog.cs +++ b/MP.Data/DatabaseModels/UserActionLog.cs @@ -11,10 +11,13 @@ namespace MP.Data.DatabaseModels public string Azione { get; set; } public string CodArticolo { get; set; } + public string CodMacchina { get; set; } public string Cognome { get; set; } public DateTime DataOraRif { get; set; } public int IdxLog { get; set; } public string IdxMacchina { get; set; } + public int IdxOdl { get; set; } + public string KeyRichiesta { get; set; } public int MatrOpr { get; set; } public string Nome { get; set; } public decimal Qta { get; set; } diff --git a/MP.Data/MP.Data.csproj b/MP.Data/MP.Data.csproj index a8360e39..658bbfa1 100644 --- a/MP.Data/MP.Data.csproj +++ b/MP.Data/MP.Data.csproj @@ -1,65 +1,22 @@ - - net5.0 - MP.Data - MP.Data - + + net5.0 + MP.Data + MP.Data + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + \ No newline at end of file diff --git a/MP.Data/MoonPro_STATSContext.cs b/MP.Data/MoonPro_STATSContext.cs index 3a539ffb..a24410a0 100644 --- a/MP.Data/MoonPro_STATSContext.cs +++ b/MP.Data/MoonPro_STATSContext.cs @@ -142,7 +142,7 @@ namespace MP.Data { entity.HasNoKey(); - entity.ToView("v_UL", "export"); + entity.ToView("v_UI_UL"); entity.Property(e => e.Azione) .IsRequired() @@ -152,18 +152,24 @@ namespace MP.Data .IsRequired() .HasMaxLength(50); + entity.Property(e => e.CodMacchina).HasMaxLength(50); + entity.Property(e => e.Cognome) .IsRequired() .HasMaxLength(50); entity.Property(e => e.DataOraRif).HasColumnType("datetime"); - entity.Property(e => e.IdxLog).ValueGeneratedOnAdd(); - entity.Property(e => e.IdxMacchina) .IsRequired() .HasMaxLength(50); + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50); + entity.Property(e => e.Nome) .IsRequired() .HasMaxLength(50); From 8a8b9ab50a5697015cc6b517a1676bb04b158466 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 17:02:26 +0200 Subject: [PATCH 020/158] completato add UserLog con nuova vista --- MP.Stats/Pages/Scarti.razor | 2 -- MP.Stats/Pages/UserLog.razor | 29 ++++++++++++++++++----------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index e2cf5076..e96035ac 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -19,7 +19,6 @@ - @**@ @@ -33,7 +32,6 @@ @foreach (var record in ListRecords) { - @**@
                      Macchina Data ODL/Commessa
                       
                      @record.CodMacchina
                      @record.IdxMacchina
                      diff --git a/MP.Stats/Pages/UserLog.razor b/MP.Stats/Pages/UserLog.razor index cd9a068c..ab1c54a2 100644 --- a/MP.Stats/Pages/UserLog.razor +++ b/MP.Stats/Pages/UserLog.razor @@ -19,28 +19,35 @@ - @**@ - - - + + + @foreach (var record in ListRecords) { - @**@ - - - + + + - - - + + + } From f2fdd1a72f40abbb77a5dbec4a94955646e46c3f Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 18:04:03 +0200 Subject: [PATCH 021/158] Fix tempalte e lettura dati UL / Scarti --- MP.Data/Controllers/MpStatsController.cs | 15 +++++ MP.Data/DatabaseModels/Actions.cs | 18 ++++++ MP.Data/MoonPro_STATSContext.cs | 23 +++++++ MP.Stats/Data/MpStatsService.cs | 7 +++ MP.Stats/Pages/Scarti.razor | 75 +++++++++++----------- MP.Stats/Pages/UserLog.razor | 79 +++++++++++++----------- MP.Stats/Pages/UserLog.razor.cs | 28 ++++++++- 7 files changed, 170 insertions(+), 75 deletions(-) create mode 100644 MP.Data/DatabaseModels/Actions.cs diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index cb2498ed..68a357fa 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -32,6 +32,21 @@ namespace MP.Data.Controllers #region Public Methods + /// + /// Elenco Azioni (decodifica) + /// + /// + public List ActionsGetAll() + { + List dbResult = new List(); + + dbResult = dbCtx + .DbSetActions + .ToList(); + + return dbResult; + } + public void Dispose() { // Clear database context diff --git a/MP.Data/DatabaseModels/Actions.cs b/MP.Data/DatabaseModels/Actions.cs new file mode 100644 index 00000000..171eff98 --- /dev/null +++ b/MP.Data/DatabaseModels/Actions.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class Actions + { + #region Public Properties + + public string Azione { get; set; } + public string Class { get; set; } + public string Descrizione { get; set; } + + #endregion Public Properties + } +} \ No newline at end of file diff --git a/MP.Data/MoonPro_STATSContext.cs b/MP.Data/MoonPro_STATSContext.cs index a24410a0..079efed5 100644 --- a/MP.Data/MoonPro_STATSContext.cs +++ b/MP.Data/MoonPro_STATSContext.cs @@ -35,6 +35,7 @@ namespace MP.Data #region Public Properties + public virtual DbSet DbSetActions { get; set; } public virtual DbSet DbSetControlli { get; set; } public virtual DbSet DbSetScarti { get; set; } public virtual DbSet DbSetUserLog { get; set; } @@ -66,6 +67,28 @@ namespace MP.Data { modelBuilder.HasAnnotation("Relational:Collation", "SQL_Latin1_General_CP1_CI_AS"); + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Azione); + + entity.ToTable("AAUL"); + + entity.Property(e => e.Azione) + .HasMaxLength(50) + .HasDefaultValueSql("('ND')") + .HasComment("Azione dell'operatore"); + + entity.Property(e => e.Class) + .IsRequired() + .HasMaxLength(50) + .HasDefaultValueSql("('')"); + + entity.Property(e => e.Descrizione) + .IsRequired() + .HasMaxLength(50) + .HasDefaultValueSql("('')"); + }); + modelBuilder.Entity(entity => { entity.HasNoKey(); diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 34b74b1a..ee17cadd 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -17,6 +17,8 @@ namespace MP.Stats.Data private static IConfiguration _configuration; private static ILogger _logger; + private static List ActionsList = new List(); + #endregion Private Fields #region Protected Fields @@ -57,6 +59,11 @@ namespace MP.Stats.Data #region Public Methods + public Task ActionsGetAll() + { + return Task.FromResult(dbController.ActionsGetAll().ToArray()); + } + public void rollBackEdit(object item) { dbController.RollBackEntity(item); diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index e96035ac..eca78837 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -8,50 +8,53 @@
                      @if (currRecord != null) { - @**@ + @**@ } @if (ListRecords == null) { -
                      +
                      } else { -
                      Macchina Data ODL/Commessa ArticoloAzioneDescrizioneOperatoreDescrizioneQtaOperatore
                       @record.IdxMacchina@record.DataOraRif- +
                      @record.CodMacchina
                      +
                      @record.IdxMacchina
                      +                       		+
                      @record.DataOraRif.ToString("yyyy.MM.dd")
                      +
                      @record.DataOraRif.ToString("ddd HH:mm.ss")
                      +                       		@record.IdxOdl | @record.KeyRichiesta @record.CodArticolo@record.Azione@record.Valore@record.Cognome @record.Nome +
                      @record.Valore
                      +
                      [@record.Azione] @record.IdxLog
                      +                       		@record.Qta.ToString("N0")@record.Cognome @record.Nome (@record.MatrOpr)
                      - - - - - - - - - - - - - @foreach (var record in ListRecords) +
                      MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
                      + + + + + + + + + + + + + @foreach (var record in ListRecords) { - - - - - - - - - + + + + + + + + + } - -
                      MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
                      -
                      @record.CodMacchina
                      -
                      @record.IdxMacchina
                      -                       		-
                      @record.DataOraRif.ToString("yyyy.MM.dd")
                      -
                      @record.DataOraRif.ToString("ddd HH:mm.ss")
                      -                       		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo -
                      [@record.Causale] @record.Descrizione
                      -
                      @record.Note
                      -                       		@record.Qta@record.Cognome @record.Nome (@record.MatrOpr)
                      +
                      @record.CodMacchina
                      +
                      @record.IdxMacchina
                      +                       		+
                      @record.DataOraRif.ToString("yyyy.MM.dd")
                      +
                      @record.DataOraRif.ToString("ddd HH:mm.ss")
                      +                       		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo +
                      +
                      [@record.Causale]
                      +
                      @record.Descrizione
                      +
                      +
                      @record.Note
                      +                       		@record.Qta@record.Cognome @record.Nome (@record.MatrOpr)
                      + +
                      }
                  diff --git a/MP.Stats/Pages/UserLog.razor b/MP.Stats/Pages/UserLog.razor index ab1c54a2..9e369bda 100644 --- a/MP.Stats/Pages/UserLog.razor +++ b/MP.Stats/Pages/UserLog.razor @@ -8,50 +8,57 @@
                  @if (currRecord != null) { - @**@ + @**@ } @if (ListRecords == null) { -
                  +
                  } else { - - - - - - - - - - - - - - @foreach (var record in ListRecords) +
                  MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
                  + + + + + + + + + + + + + @foreach (var record in ListRecords) { - - - - - - - - - + + + + + + + + + } - -
                  MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
                  -
                  @record.CodMacchina
                  -
                  @record.IdxMacchina
                  -                   		-
                  @record.DataOraRif.ToString("yyyy.MM.dd")
                  -
                  @record.DataOraRif.ToString("ddd HH:mm.ss")
                  -                   		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo -
                  @record.Valore
                  -
                  [@record.Azione] @record.IdxLog
                  -                   		@record.Qta.ToString("N0")@record.Cognome @record.Nome (@record.MatrOpr)
                  +
                  @record.CodMacchina
                  +
                  @record.IdxMacchina
                  +                   		+
                  @record.DataOraRif.ToString("yyyy.MM.dd")
                  +
                  @record.DataOraRif.ToString("ddd HH:mm.ss")
                  +                   		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo +
                  @record.Valore
                  +
                  +
                  + [@record.IdxLog] +
                  +
                  + @decodeAction(@record.Azione).Descrizione +
                  +
                  +                   		@record.Qta.ToString("N0")@record.Cognome @record.Nome (@record.MatrOpr)
                  + + }
                  diff --git a/MP.Stats/Pages/UserLog.razor.cs b/MP.Stats/Pages/UserLog.razor.cs index a343b2dd..9084314a 100644 --- a/MP.Stats/Pages/UserLog.razor.cs +++ b/MP.Stats/Pages/UserLog.razor.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; using MP.Stats.Data; using System; +using System.Linq; using System.Threading.Tasks; namespace MP.Stats.Pages @@ -10,6 +11,7 @@ namespace MP.Stats.Pages { #region Private Fields + private MP.Data.DatabaseModels.Actions[] ActionsList; private MP.Data.DatabaseModels.UserActionLog currRecord = null; private MP.Data.DatabaseModels.UserActionLog[] ListRecords; @@ -38,12 +40,22 @@ namespace MP.Stats.Pages #endregion Protected Properties + #region Private Methods + + private async Task reloadData() + { + ActionsList = await StatService.ActionsGetAll(); + ListRecords = await StatService.StatUserLogGetAll(numRecord, MessageService.SearchVal); + } + + #endregion Private Methods + #region Protected Methods protected async Task ForceReload(int newNum) { numRecord = newNum; - ListRecords = await StatService.StatUserLogGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } protected override async Task OnInitializedAsync() @@ -51,7 +63,7 @@ namespace MP.Stats.Pages numRecord = 10; MessageService.ShowSearch = true; MessageService.EA_SearchUpdated += OnSeachUpdated; - ListRecords = await StatService.StatUserLogGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } protected void ResetData() @@ -63,7 +75,7 @@ namespace MP.Stats.Pages protected async Task UpdateData() { currRecord = null; - ListRecords = await StatService.StatUserLogGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } #endregion Protected Methods @@ -85,6 +97,16 @@ namespace MP.Stats.Pages return answ; } + public MP.Data.DatabaseModels.Actions decodeAction(string azione) + { + // cerco + MP.Data.DatabaseModels.Actions data = ActionsList + .Where(x => x.Azione == azione) + .FirstOrDefault(); + data = data != null ? data : new MP.Data.DatabaseModels.Actions() { Azione = "ND", Class = "", Descrizione = "ND" }; + return data; + } + public void Dispose() { MessageService.EA_SearchUpdated -= OnSeachUpdated; From 060cc55717495209c53644a1a1f7aefa1bedb90a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 18:04:14 +0200 Subject: [PATCH 022/158] udpate publish profiles --- .../Properties/PublishProfiles/IIS01.pubxml | 40 +++++++++---------- .../Properties/PublishProfiles/IIS02.pubxml | 40 +++++++++---------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/MP.Stats/Properties/PublishProfiles/IIS01.pubxml b/MP.Stats/Properties/PublishProfiles/IIS01.pubxml index 2935d88e..ac3c88c6 100644 --- a/MP.Stats/Properties/PublishProfiles/IIS01.pubxml +++ b/MP.Stats/Properties/PublishProfiles/IIS01.pubxml @@ -4,24 +4,24 @@ This file is used by the publish/package process of your Web project. You can cu by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. --> - - MSDeploy - True - Release - Any CPU - - - False - d9901b50-e61c-400c-b62c-fa060cf72c29 - false - https://IIS01:8172/MsDeploy.axd - Default Web Site/MP/STATS - - False - WMSVC - True - jenkins - <_SavePWD>True - net5.0 - + + MSDeploy + True + Release + Any CPU + + + False + d9901b50-e61c-400c-b62c-fa060cf72c29 + false + https://IIS01:8172/MsDeploy.axd + Default Web Site/MP/STATS + + False + WMSVC + True + jenkins + <_SavePWD>True + net5.0 + \ No newline at end of file diff --git a/MP.Stats/Properties/PublishProfiles/IIS02.pubxml b/MP.Stats/Properties/PublishProfiles/IIS02.pubxml index 7e9f176e..3f2c9acb 100644 --- a/MP.Stats/Properties/PublishProfiles/IIS02.pubxml +++ b/MP.Stats/Properties/PublishProfiles/IIS02.pubxml @@ -4,24 +4,24 @@ This file is used by the publish/package process of your Web project. You can cu by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. --> - - MSDeploy - True - Release - Any CPU - - - False - d9901b50-e61c-400c-b62c-fa060cf72c29 - false - https://IIS02:8172/MsDeploy.axd - Default Web Site/MP/STATS - - False - WMSVC - True - jenkins - <_SavePWD>True - net5.0 - + + MSDeploy + True + Release + Any CPU + + + False + d9901b50-e61c-400c-b62c-fa060cf72c29 + false + https://IIS02:8172/MsDeploy.axd + Default Web Site/MP/STATS + + False + WMSVC + True + jenkins + <_SavePWD>True + net5.0 + \ No newline at end of file From cf5f43f2e7f65e5925f15e308ed527d0bb47803d Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 19:07:59 +0200 Subject: [PATCH 023/158] Bozza pagine diario produzione --- MP.Stats/Pages/Diario.razor | 59 +++++++++++++++++++ MP.Stats/Pages/Diario.razor.cs | 104 +++++++++++++++++++++++++++++++++ MP.Stats/Shared/NavMenu.razor | 2 +- 3 files changed, 164 insertions(+), 1 deletion(-) create mode 100644 MP.Stats/Pages/Diario.razor create mode 100644 MP.Stats/Pages/Diario.razor.cs diff --git a/MP.Stats/Pages/Diario.razor b/MP.Stats/Pages/Diario.razor new file mode 100644 index 00000000..0bfda3cf --- /dev/null +++ b/MP.Stats/Pages/Diario.razor @@ -0,0 +1,59 @@ +@page "/diario" + +@using MP.Stats.Components +@using MP.Stats.Data + +
                  +
                  Controlli
                  +
                  + @if (currRecord != null) + { + @**@ + } + @if (ListRecords == null) + { +
                  + } + else + { + + + + @**@ + + + + + + + + + + + @foreach (var record in ListRecords) + { + + @**@ + + + + + + + + + } + +
                  MacchinaDataODL/CommessaArticoloEsitoNoteOperatore
                   @record.IdxMacchina@record.DataOra@record.IdxOdl@record.CodArticolo@record.EsitoOk@record.Note@record.MatrOpr
                  + } +
                  +
                  +
                  +
                  +
                  +
                  + +
                  +
                  +
                  +
                  \ No newline at end of file diff --git a/MP.Stats/Pages/Diario.razor.cs b/MP.Stats/Pages/Diario.razor.cs new file mode 100644 index 00000000..2bbe8d86 --- /dev/null +++ b/MP.Stats/Pages/Diario.razor.cs @@ -0,0 +1,104 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.JSInterop; +using MP.Stats.Data; +using System; +using System.Threading.Tasks; + +namespace MP.Stats.Pages +{ + public partial class Diario : ComponentBase, IDisposable + { + #region Private Fields + + private MP.Data.DatabaseModels.ResControlli currRecord = null; + + private MP.Data.DatabaseModels.ResControlli[] ListRecords; + + #endregion Private Fields + + #region Private Properties + + private int numRecord { get; set; } = 10; + + #endregion Private Properties + + #region Protected Properties + + [Inject] + protected IJSRuntime JSRuntime { get; set; } + + [Inject] + protected MessageService MessageService { get; set; } + + [Inject] + protected NavigationManager NavManager { get; set; } + + [Inject] + protected MpStatsService StatService { get; set; } + + #endregion Protected Properties + + #region Protected Methods + + protected async Task ForceReload(int newNum) + { + numRecord = newNum; + ListRecords = await StatService.StatControlliGetAll(numRecord, MessageService.SearchVal); + } + + protected override async Task OnInitializedAsync() + { + numRecord = 10; + MessageService.ShowSearch = true; + MessageService.EA_SearchUpdated += OnSeachUpdated; + ListRecords = await StatService.StatControlliGetAll(numRecord, MessageService.SearchVal); + } + + protected void ResetData() + { + StatService.rollBackEdit(currRecord); + currRecord = null; + } + + protected async Task UpdateData() + { + currRecord = null; + ListRecords = await StatService.StatControlliGetAll(numRecord, MessageService.SearchVal); + } + + #endregion Protected Methods + + #region Public Methods + + public string checkSelect(int IdxControllo) + { + string answ = ""; + if (currRecord != null) + { + try + { + answ = (currRecord.IdxControllo == IdxControllo) ? "table-info" : ""; + } + catch + { } + } + return answ; + } + + public void Dispose() + { + MessageService.EA_SearchUpdated -= OnSeachUpdated; + } + + public void OnSeachUpdated() + { + InvokeAsync(() => + { + UpdateData(); + StateHasChanged(); + }); + } + + #endregion Public Methods + } +} \ No newline at end of file diff --git a/MP.Stats/Shared/NavMenu.razor b/MP.Stats/Shared/NavMenu.razor index 78ef73f4..d152ea26 100644 --- a/MP.Stats/Shared/NavMenu.razor +++ b/MP.Stats/Shared/NavMenu.razor @@ -13,7 +13,7 @@
                • - + Diario Produzione
                  • From 48fe8312080b2b5b56b2a8e112b201e198fdafe5 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 19:28:36 +0200 Subject: [PATCH 024/158] Renaming action(s) --- MP.Data/Controllers/MpStatsController.cs | 26 ++++++++++++++++--- .../{Actions.cs => AzioniUL.cs} | 2 +- 2 files changed, 24 insertions(+), 4 deletions(-) rename MP.Data/DatabaseModels/{Actions.cs => AzioniUL.cs} (90%) diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index 68a357fa..81ff033a 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -36,12 +36,12 @@ namespace MP.Data.Controllers /// Elenco Azioni (decodifica) /// /// - public List ActionsGetAll() + public List ActionsGetAll() { - List dbResult = new List(); + List dbResult = new List(); dbResult = dbCtx - .DbSetActions + .DbSetAzioniUL .ToList(); return dbResult; @@ -95,6 +95,26 @@ namespace MP.Data.Controllers return dbResult; } + /// + /// Elenco tabella DDB da filtro + /// + /// + /// + /// + public List StatDdbGetAll(int numRecord, string searchVal = "") + { + List dbResult = new List(); + + dbResult = dbCtx + .DbSetDdbTurni + .Where(x => x.Descrizione.Contains(searchVal) || x.IdxMacchina.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || x.KeyRichiesta.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) + .OrderByDescending(x => x.InizioStato) + .Take(numRecord) + .ToList(); + + return dbResult; + } + /// /// Elenco tabella scarti da filtro /// diff --git a/MP.Data/DatabaseModels/Actions.cs b/MP.Data/DatabaseModels/AzioniUL.cs similarity index 90% rename from MP.Data/DatabaseModels/Actions.cs rename to MP.Data/DatabaseModels/AzioniUL.cs index 171eff98..ce81115b 100644 --- a/MP.Data/DatabaseModels/Actions.cs +++ b/MP.Data/DatabaseModels/AzioniUL.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; namespace MP.Data.DatabaseModels { - public partial class Actions + public partial class AzioniUL { #region Public Properties From 84a769cfcf56f0849e21ec9aa5cd74cbeab90fec Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 19:28:41 +0200 Subject: [PATCH 025/158] Bozza gestione DDB --- MP.Data/DatabaseModels/DdbTurni.cs | 37 ++++++++++++++++++++ MP.Data/MoonPro_STATSContext.cs | 56 +++++++++++++++++++++++++++--- MP.Stats/Data/MpStatsService.cs | 4 +-- MP.Stats/Pages/Diario.razor | 2 +- MP.Stats/Pages/Diario.razor.cs | 14 ++++---- MP.Stats/Pages/UserLog.razor.cs | 8 ++--- 6 files changed, 103 insertions(+), 18 deletions(-) create mode 100644 MP.Data/DatabaseModels/DdbTurni.cs diff --git a/MP.Data/DatabaseModels/DdbTurni.cs b/MP.Data/DatabaseModels/DdbTurni.cs new file mode 100644 index 00000000..5a14c106 --- /dev/null +++ b/MP.Data/DatabaseModels/DdbTurni.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class DdbTurni + { + #region Public Properties + + public string ClasseTempo { get; set; } + public string CodArticolo { get; set; } + public string CodMacchina { get; set; } + public DateTime DataRif { get; set; } + public DateTime? DataTurnoFine { get; set; } + public DateTime? DataTurnoInizio { get; set; } + public string Descrizione { get; set; } + public long? DurataPeriodo { get; set; } + public long? DurataStato { get; set; } + public DateTime? FinePeriodo { get; set; } + public DateTime FineStato { get; set; } + public string IdxMacchina { get; set; } + public int? IdxOdl { get; set; } + public int IdxStato { get; set; } + public DateTime InizioPeriodo { get; set; } + public DateTime InizioStato { get; set; } + public string KeyRichiesta { get; set; } + public string Pallet { get; set; } + public int? PzPalletProd { get; set; } + public decimal? TempoCicloBase { get; set; } + public int TotPzProd { get; set; } + public string Turno { get; set; } + + #endregion Public Properties + } +} \ No newline at end of file diff --git a/MP.Data/MoonPro_STATSContext.cs b/MP.Data/MoonPro_STATSContext.cs index 079efed5..f84e76fb 100644 --- a/MP.Data/MoonPro_STATSContext.cs +++ b/MP.Data/MoonPro_STATSContext.cs @@ -35,8 +35,9 @@ namespace MP.Data #region Public Properties - public virtual DbSet DbSetActions { get; set; } + public virtual DbSet DbSetAzioniUL { get; set; } public virtual DbSet DbSetControlli { get; set; } + public virtual DbSet DbSetDdbTurni { get; set; } public virtual DbSet DbSetScarti { get; set; } public virtual DbSet DbSetUserLog { get; set; } @@ -57,8 +58,6 @@ namespace MP.Data string connString = _configuration.GetConnectionString("Mp.Stats"); optionsBuilder.UseSqlServer(_configuration.GetConnectionString("Mp.Stats")); - -#warning To protect potentially sensitive information in your connection string, you should move it out of source code. You can avoid scaffolding the connection string by using the Name= syntax to read it from configuration - see https://go.microsoft.com/fwlink/?linkid=2131148. For more guidance on storing connection strings, see http://go.microsoft.com/fwlink/?LinkId=723263. //optionsBuilder.UseSqlServer("Server=SQL2016DEV;Database=MoonPro_STATS;Trusted_Connection=True;"); } } @@ -67,7 +66,56 @@ namespace MP.Data { modelBuilder.HasAnnotation("Relational:Collation", "SQL_Latin1_General_CP1_CI_AS"); - modelBuilder.Entity(entity => + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_UI_DDB_Turni"); + + entity.Property(e => e.ClasseTempo).HasMaxLength(50); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodMacchina).HasMaxLength(50); + + entity.Property(e => e.DataRif).HasColumnType("datetime"); + + entity.Property(e => e.DataTurnoFine).HasColumnType("datetime"); + + entity.Property(e => e.DataTurnoInizio).HasColumnType("datetime"); + + entity.Property(e => e.Descrizione).HasMaxLength(50); + + entity.Property(e => e.FinePeriodo).HasColumnType("datetime"); + + entity.Property(e => e.FineStato).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.InizioPeriodo).HasColumnType("datetime"); + + entity.Property(e => e.InizioStato).HasColumnType("datetime"); + + entity.Property(e => e.KeyRichiesta).HasMaxLength(50); + + entity.Property(e => e.Pallet) + .HasMaxLength(20) + .HasColumnName("pallet"); + + entity.Property(e => e.TempoCicloBase).HasColumnType("decimal(18, 8)"); + + entity.Property(e => e.Turno) + .IsRequired() + .HasMaxLength(5); + }); + + modelBuilder.Entity(entity => { entity.HasKey(e => e.Azione); diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index ee17cadd..85a9053d 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -17,7 +17,7 @@ namespace MP.Stats.Data private static IConfiguration _configuration; private static ILogger _logger; - private static List ActionsList = new List(); + private static List ActionsList = new List(); #endregion Private Fields @@ -59,7 +59,7 @@ namespace MP.Stats.Data #region Public Methods - public Task ActionsGetAll() + public Task ActionsGetAll() { return Task.FromResult(dbController.ActionsGetAll().ToArray()); } diff --git a/MP.Stats/Pages/Diario.razor b/MP.Stats/Pages/Diario.razor index 0bfda3cf..54e6fa6f 100644 --- a/MP.Stats/Pages/Diario.razor +++ b/MP.Stats/Pages/Diario.razor @@ -4,7 +4,7 @@ @using MP.Stats.Data
                  -
                  Controlli
                  +
                  Diario Produzione
                  @if (currRecord != null) { diff --git a/MP.Stats/Pages/Diario.razor.cs b/MP.Stats/Pages/Diario.razor.cs index 2bbe8d86..4e407d62 100644 --- a/MP.Stats/Pages/Diario.razor.cs +++ b/MP.Stats/Pages/Diario.razor.cs @@ -10,9 +10,9 @@ namespace MP.Stats.Pages { #region Private Fields - private MP.Data.DatabaseModels.ResControlli currRecord = null; + private MP.Data.DatabaseModels.DdbTurni currRecord = null; - private MP.Data.DatabaseModels.ResControlli[] ListRecords; + private MP.Data.DatabaseModels.DdbTurni[] ListRecords; #endregion Private Fields @@ -43,7 +43,7 @@ namespace MP.Stats.Pages protected async Task ForceReload(int newNum) { numRecord = newNum; - ListRecords = await StatService.StatControlliGetAll(numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatDdbGetAll(numRecord, MessageService.SearchVal); } protected override async Task OnInitializedAsync() @@ -51,7 +51,7 @@ namespace MP.Stats.Pages numRecord = 10; MessageService.ShowSearch = true; MessageService.EA_SearchUpdated += OnSeachUpdated; - ListRecords = await StatService.StatControlliGetAll(numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatDdbGetAll(numRecord, MessageService.SearchVal); } protected void ResetData() @@ -63,21 +63,21 @@ namespace MP.Stats.Pages protected async Task UpdateData() { currRecord = null; - ListRecords = await StatService.StatControlliGetAll(numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatDdbGetAll(numRecord, MessageService.SearchVal); } #endregion Protected Methods #region Public Methods - public string checkSelect(int IdxControllo) + public string checkSelect(string IdxMacchina, string CodArticolo, DateTime InizioStato) { string answ = ""; if (currRecord != null) { try { - answ = (currRecord.IdxControllo == IdxControllo) ? "table-info" : ""; + answ = (currRecord.IdxMacchina == IdxMacchina && currRecord.CodArticolo == CodArticolo && currRecord.InizioStato == InizioStato) ? "table-info" : ""; } catch { } diff --git a/MP.Stats/Pages/UserLog.razor.cs b/MP.Stats/Pages/UserLog.razor.cs index 9084314a..3c87c098 100644 --- a/MP.Stats/Pages/UserLog.razor.cs +++ b/MP.Stats/Pages/UserLog.razor.cs @@ -11,7 +11,7 @@ namespace MP.Stats.Pages { #region Private Fields - private MP.Data.DatabaseModels.Actions[] ActionsList; + private MP.Data.DatabaseModels.AzioniUL[] ActionsList; private MP.Data.DatabaseModels.UserActionLog currRecord = null; private MP.Data.DatabaseModels.UserActionLog[] ListRecords; @@ -97,13 +97,13 @@ namespace MP.Stats.Pages return answ; } - public MP.Data.DatabaseModels.Actions decodeAction(string azione) + public MP.Data.DatabaseModels.AzioniUL decodeAction(string azione) { // cerco - MP.Data.DatabaseModels.Actions data = ActionsList + MP.Data.DatabaseModels.AzioniUL data = ActionsList .Where(x => x.Azione == azione) .FirstOrDefault(); - data = data != null ? data : new MP.Data.DatabaseModels.Actions() { Azione = "ND", Class = "", Descrizione = "ND" }; + data = data != null ? data : new MP.Data.DatabaseModels.AzioniUL() { Azione = "ND", Class = "", Descrizione = "ND" }; return data; } From f7e19dcf9de9b2f02fa4980d1076df16aec9e09a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 19:46:29 +0200 Subject: [PATCH 026/158] Bozza pagina DDB --- MP.Data/DatabaseModels/DdbTurni.cs | 14 ++++++++++++++ MP.Stats/Data/MpStatsService.cs | 5 +++++ MP.Stats/Pages/Diario.razor | 27 +++++++++++++++++---------- 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/MP.Data/DatabaseModels/DdbTurni.cs b/MP.Data/DatabaseModels/DdbTurni.cs index 5a14c106..ca6059ec 100644 --- a/MP.Data/DatabaseModels/DdbTurni.cs +++ b/MP.Data/DatabaseModels/DdbTurni.cs @@ -1,5 +1,7 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; #nullable disable @@ -16,6 +18,18 @@ namespace MP.Data.DatabaseModels public DateTime? DataTurnoFine { get; set; } public DateTime? DataTurnoInizio { get; set; } public string Descrizione { get; set; } + + [NotMapped] + [DisplayFormat(DataFormatString = "{0:N2}", ApplyFormatInEditMode = true)] + public long? DurataMin + { + get + { + long answ = (long)(DurataStato != null ? DurataStato : 0); + return answ / 60000; + } + } + public long? DurataPeriodo { get; set; } public long? DurataStato { get; set; } public DateTime? FinePeriodo { get; set; } diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 85a9053d..56df3569 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -74,6 +74,11 @@ namespace MP.Stats.Data return Task.FromResult(dbController.StatControlliGetAll(numRecord, searchVal).ToArray()); } + public Task StatDdbGetAll(int numRecord, string searchVal = "") + { + return Task.FromResult(dbController.StatDdbGetAll(numRecord, searchVal).ToArray()); + } + public Task StatScartiGetAll(int numRecord, string searchVal = "") { return Task.FromResult(dbController.StatScartiGetAll(numRecord, searchVal).ToArray()); diff --git a/MP.Stats/Pages/Diario.razor b/MP.Stats/Pages/Diario.razor index 54e6fa6f..ad4bf737 100644 --- a/MP.Stats/Pages/Diario.razor +++ b/MP.Stats/Pages/Diario.razor @@ -24,23 +24,30 @@ Data ODL/Commessa Articolo - Esito - Note - Operatore + Stato + Durata + Pezzi + @*Operatore*@ @foreach (var record in ListRecords) { - + @* *@ - @record.IdxMacchina - @record.DataOra - @record.IdxOdl + +
                  @record.CodMacchina
                  +
                  @record.IdxMacchina
                  + + +
                  @record.InizioStato.ToString("yyyy.MM.dd")
                  +
                  @record.InizioStato.ToString("ddd HH:mm.ss")
                  + + @record.IdxOdl | @record.KeyRichiesta @record.CodArticolo - @record.EsitoOk - @record.Note - @record.MatrOpr + @record.Descrizione + @record.DurataMin + @record.TotPzProd } From e31d71b4c099be16af4792ce185609a27a430edb Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 19:55:08 +0200 Subject: [PATCH 027/158] Prima bozza corretta display durata DDB --- MP.Data/DatabaseModels/DdbTurni.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MP.Data/DatabaseModels/DdbTurni.cs b/MP.Data/DatabaseModels/DdbTurni.cs index ca6059ec..dbdd1e8e 100644 --- a/MP.Data/DatabaseModels/DdbTurni.cs +++ b/MP.Data/DatabaseModels/DdbTurni.cs @@ -21,7 +21,7 @@ namespace MP.Data.DatabaseModels [NotMapped] [DisplayFormat(DataFormatString = "{0:N2}", ApplyFormatInEditMode = true)] - public long? DurataMin + public long DurataMin { get { From 1d9ac27f6e4846057c1adb8c5b1f5a67a8ca0b69 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 May 2021 12:21:06 +0200 Subject: [PATCH 028/158] Bozza ODL --- MP.Data/Controllers/MpStatsController.cs | 20 +++++ MP.Data/DatabaseModels/ODL.cs | 30 +++++++ MP.Data/MoonPro_STATSContext.cs | 45 ++++++++++ MP.Stats/Data/MpStatsService.cs | 5 ++ MP.Stats/Pages/Index.razor | 1 + MP.Stats/Pages/ReportODL.razor | 70 +++++++++++++++ MP.Stats/Pages/ReportODL.razor.cs | 104 +++++++++++++++++++++++ MP.Stats/Shared/NavMenu.razor | 7 +- 8 files changed, 281 insertions(+), 1 deletion(-) create mode 100644 MP.Data/DatabaseModels/ODL.cs create mode 100644 MP.Stats/Pages/ReportODL.razor create mode 100644 MP.Stats/Pages/ReportODL.razor.cs diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index 81ff033a..029298b6 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -115,6 +115,26 @@ namespace MP.Data.Controllers return dbResult; } + /// + /// Elenco tabella ODL da filtro + /// + /// + /// + /// + public List StatOdlGetAll(int numRecord, string searchVal = "") + { + List dbResult = new List(); + + dbResult = dbCtx + .DbSetODL + .Where(x => x.CodArticolo.Contains(searchVal) || x.IdxMacchina.Contains(searchVal) || x.KeyRichiesta.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) + .OrderByDescending(x => x.DataInizio) + .Take(numRecord) + .ToList(); + + return dbResult; + } + /// /// Elenco tabella scarti da filtro /// diff --git a/MP.Data/DatabaseModels/ODL.cs b/MP.Data/DatabaseModels/ODL.cs new file mode 100644 index 00000000..003e2f8e --- /dev/null +++ b/MP.Data/DatabaseModels/ODL.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class ODL + { + #region Public Properties + + public string CodArticolo { get; set; } + public string CodArticoloParent { get; set; } + public DateTime? DataFine { get; set; } + public DateTime? DataInizio { get; set; } + public DateTime? DueDate { get; set; } + public string IdxMacchina { get; set; } + public int IdxOdl { get; set; } + public string KeyRichiesta { get; set; } + public string KeyRichiestaParent { get; set; } + public int NumPezzi { get; set; } + public int NumPezziEv { get; set; } + public int NumPezziRil { get; set; } + public int NumPezziSca { get; set; } + public int? PzPallet { get; set; } + public decimal Tcassegnato { get; set; } + + #endregion Public Properties + } +} \ No newline at end of file diff --git a/MP.Data/MoonPro_STATSContext.cs b/MP.Data/MoonPro_STATSContext.cs index f84e76fb..f7e26640 100644 --- a/MP.Data/MoonPro_STATSContext.cs +++ b/MP.Data/MoonPro_STATSContext.cs @@ -38,6 +38,7 @@ namespace MP.Data public virtual DbSet DbSetAzioniUL { get; set; } public virtual DbSet DbSetControlli { get; set; } public virtual DbSet DbSetDdbTurni { get; set; } + public virtual DbSet DbSetODL { get; set; } public virtual DbSet DbSetScarti { get; set; } public virtual DbSet DbSetUserLog { get; set; } @@ -252,6 +253,50 @@ namespace MP.Data .HasMaxLength(250); }); + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.IdxOdl) + .HasName("PK_ODL_1"); + + entity.ToTable("ODL"); + + entity.Property(e => e.IdxOdl) + .ValueGeneratedNever() + .HasColumnName("IdxODL"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodArticoloParent) + .IsRequired() + .HasDefaultValueSql("('')"); + + entity.Property(e => e.DataFine).HasColumnType("datetime"); + + entity.Property(e => e.DataInizio).HasColumnType("datetime"); + + entity.Property(e => e.DueDate).HasColumnType("datetime"); + + entity.Property(e => e.IdxMacchina).HasMaxLength(50); + + entity.Property(e => e.KeyRichiesta) + .IsRequired() + .HasMaxLength(50) + .HasComment("Chiave: ordine esterno o KIT"); + + entity.Property(e => e.KeyRichiestaParent) + .IsRequired() + .HasDefaultValueSql("('')") + .HasComment("Chiave: ordine esterno o KIT"); + + entity.Property(e => e.PzPallet).HasDefaultValueSql("((1))"); + + entity.Property(e => e.Tcassegnato) + .HasColumnType("decimal(18, 8)") + .HasColumnName("TCAssegnato"); + }); + OnModelCreatingPartial(modelBuilder); } diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 56df3569..8bc879e9 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -79,6 +79,11 @@ namespace MP.Stats.Data return Task.FromResult(dbController.StatDdbGetAll(numRecord, searchVal).ToArray()); } + public Task StatOdlGetAll(int numRecord, string searchVal = "") + { + return Task.FromResult(dbController.StatOdlGetAll(numRecord, searchVal).ToArray()); + } + public Task StatScartiGetAll(int numRecord, string searchVal = "") { return Task.FromResult(dbController.StatScartiGetAll(numRecord, searchVal).ToArray()); diff --git a/MP.Stats/Pages/Index.razor b/MP.Stats/Pages/Index.razor index 14365445..f87d3dda 100644 --- a/MP.Stats/Pages/Index.razor +++ b/MP.Stats/Pages/Index.razor @@ -26,6 +26,7 @@
                  Main Topics
                  + diff --git a/MP.Stats/Pages/ReportODL.razor b/MP.Stats/Pages/ReportODL.razor new file mode 100644 index 00000000..12deece5 --- /dev/null +++ b/MP.Stats/Pages/ReportODL.razor @@ -0,0 +1,70 @@ +@page "/reportodl" + +@using MP.Stats.Components +@using MP.Stats.Data + +
                  +
                  Report ODL
                  +
                  + @if (currRecord != null) + { + @**@ + } + @if (ListRecords == null) + { +
                  + } + else + { + + + + @**@ + + + + + + + + + + @**@ + + + + @foreach (var record in ListRecords) + { + + @**@ + + @**@ + + + + + + + + + + } + +
                  MacchinaODL/CommessaArticoloInizioFinePezzi RichPezzi EvasiPezzi ScartiPezzi RilavOperatore
                    + @record.IdxMacchina + +
                  @record.CodMacchina
                  +
                  @record.IdxMacchina
                  +                   		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo@record.DataInizio@record.DataFine@record.NumPezzi@record.NumPezziEv@record.NumPezziRil@record.NumPezziSca
                  + } +
                  +
                  +
                  +
                  +
                  +
                  + +
                  +
                  +
                  +
                  \ No newline at end of file diff --git a/MP.Stats/Pages/ReportODL.razor.cs b/MP.Stats/Pages/ReportODL.razor.cs new file mode 100644 index 00000000..f77a086f --- /dev/null +++ b/MP.Stats/Pages/ReportODL.razor.cs @@ -0,0 +1,104 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.JSInterop; +using MP.Stats.Data; +using System; +using System.Threading.Tasks; + +namespace MP.Stats.Pages +{ + public partial class ReportODL : ComponentBase, IDisposable + { + #region Private Fields + + private MP.Data.DatabaseModels.ODL currRecord = null; + + private MP.Data.DatabaseModels.ODL[] ListRecords; + + #endregion Private Fields + + #region Private Properties + + private int numRecord { get; set; } = 10; + + #endregion Private Properties + + #region Protected Properties + + [Inject] + protected IJSRuntime JSRuntime { get; set; } + + [Inject] + protected MessageService MessageService { get; set; } + + [Inject] + protected NavigationManager NavManager { get; set; } + + [Inject] + protected MpStatsService StatService { get; set; } + + #endregion Protected Properties + + #region Protected Methods + + protected async Task ForceReload(int newNum) + { + numRecord = newNum; + ListRecords = await StatService.StatOdlGetAll(numRecord, MessageService.SearchVal); + } + + protected override async Task OnInitializedAsync() + { + numRecord = 10; + MessageService.ShowSearch = true; + MessageService.EA_SearchUpdated += OnSeachUpdated; + ListRecords = await StatService.StatOdlGetAll(numRecord, MessageService.SearchVal); + } + + protected void ResetData() + { + StatService.rollBackEdit(currRecord); + currRecord = null; + } + + protected async Task UpdateData() + { + currRecord = null; + ListRecords = await StatService.StatOdlGetAll(numRecord, MessageService.SearchVal); + } + + #endregion Protected Methods + + #region Public Methods + + public string checkSelect(int IdxODL) + { + string answ = ""; + if (currRecord != null) + { + try + { + answ = (currRecord.IdxODL == IdxODL) ? "table-info" : ""; + } + catch + { } + } + return answ; + } + + public void Dispose() + { + MessageService.EA_SearchUpdated -= OnSeachUpdated; + } + + public void OnSeachUpdated() + { + InvokeAsync(() => + { + UpdateData(); + StateHasChanged(); + }); + } + + #endregion Public Methods + } +} \ No newline at end of file diff --git a/MP.Stats/Shared/NavMenu.razor b/MP.Stats/Shared/NavMenu.razor index d152ea26..5b846d8b 100644 --- a/MP.Stats/Shared/NavMenu.razor +++ b/MP.Stats/Shared/NavMenu.razor @@ -12,9 +12,14 @@ Home +
                • + + Diario ODL + +
                • - Diario Produzione + Dettaglio Produzione
                • From b344b1fd0df41c3d6488c6f882b431494cc1d861 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 May 2021 18:05:55 +0200 Subject: [PATCH 029/158] Aggiunta preliminare componente selezione filtro --- MP.Stats/Components/InputDateTime.cs | 119 +++++++++++++++++++ MP.Stats/Components/SelectionFilter.razor | 135 ++++++++++++++++++++++ MP.Stats/Data/SelectData.cs | 51 ++++++++ 3 files changed, 305 insertions(+) create mode 100644 MP.Stats/Components/InputDateTime.cs create mode 100644 MP.Stats/Components/SelectionFilter.razor create mode 100644 MP.Stats/Data/SelectData.cs diff --git a/MP.Stats/Components/InputDateTime.cs b/MP.Stats/Components/InputDateTime.cs new file mode 100644 index 00000000..2aa787fd --- /dev/null +++ b/MP.Stats/Components/InputDateTime.cs @@ -0,0 +1,119 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Forms; +using Microsoft.AspNetCore.Components.Rendering; +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Threading.Tasks; + +namespace MP.Stats.Components +{ + public class InputDateTime : InputDate + { + #region Private Fields + + private const string DateFormat = "yyyy-MM-ddTHH:mm"; + + #endregion Private Fields + + #region Private Methods + + private static bool TryParseDateTime(string value, out TValue result) + { + var success = BindConverter.TryConvertToDateTime(value, CultureInfo.InvariantCulture, DateFormat, out var parsedValue); + if (success) + { + result = (TValue)(object)parsedValue; + return true; + } + else + { + result = default; + return false; + } + } + + private static bool TryParseDateTimeOffset(string value, out TValue result) + { + var success = BindConverter.TryConvertToDateTimeOffset(value, CultureInfo.InvariantCulture, DateFormat, out var parsedValue); + if (success) + { + result = (TValue)(object)parsedValue; + return true; + } + else + { + result = default; + return false; + } + } + + #endregion Private Methods + + #region Protected Methods + + /// + protected override void BuildRenderTree(RenderTreeBuilder builder) + { + builder.OpenElement(0, "input"); + builder.AddMultipleAttributes(1, AdditionalAttributes); + builder.AddAttribute(2, "type", "datetime-local"); + builder.AddAttribute(3, "class", CssClass); + builder.AddAttribute(4, "value", BindConverter.FormatValue(CurrentValueAsString)); + builder.AddAttribute(5, "onchange", EventCallback.Factory.CreateBinder(this, __value => CurrentValueAsString = __value, CurrentValueAsString)); + builder.CloseElement(); + } + + /// + protected override string FormatValueAsString(TValue value) + { + switch (value) + { + case DateTime dateTimeValue: + return BindConverter.FormatValue(dateTimeValue, DateFormat, CultureInfo.InvariantCulture); + + case DateTimeOffset dateTimeOffsetValue: + return BindConverter.FormatValue(dateTimeOffsetValue, DateFormat, CultureInfo.InvariantCulture); + + default: + return string.Empty; // Handles null for Nullable, etc. + } + } + + /// + protected override bool TryParseValueFromString(string value, out TValue result, out string validationErrorMessage) + { + // Unwrap nullable types. We don't have to deal with receiving empty values for nullable + // types here, because the underlying InputBase already covers that. + var targetType = Nullable.GetUnderlyingType(typeof(TValue)) ?? typeof(TValue); + + bool success; + if (targetType == typeof(DateTime)) + { + success = TryParseDateTime(value, out result); + } + else if (targetType == typeof(DateTimeOffset)) + { + success = TryParseDateTimeOffset(value, out result); + } + else + { + throw new InvalidOperationException($"The type '{targetType}' is not a supported date type."); + } + + if (success) + { + validationErrorMessage = null; + return true; + } + else + { + validationErrorMessage = string.Format(ParsingErrorMessage, FieldIdentifier.FieldName); + return false; + } + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/MP.Stats/Components/SelectionFilter.razor b/MP.Stats/Components/SelectionFilter.razor new file mode 100644 index 00000000..d88bd68b --- /dev/null +++ b/MP.Stats/Components/SelectionFilter.razor @@ -0,0 +1,135 @@ +@using MP.Stats.Components +@using MP.Stats.Data + + +
                  +
                  +
                  + + +
                  +
                  +
                  +
                  + + +
                  +
                  +
                  +
                  + + +
                  +
                  +
                  +
                  + + +
                  +
                  +
                  + +
                  + + +
                  +
                  +
                  +                   + +@code { + + protected DateTime DateStart + { + get + { + return SelFilter.DateStart; + } + set + { + bool doReport = (!SelFilter.DateStart.Equals(value)); + SelFilter.DateStart = value; + if (doReport) + { + reportChange(); + } + } + } + protected DateTime DateEnd + { + get + { + return SelFilter.DateEnd; + } + set + { + bool doReport = (!SelFilter.DateEnd.Equals(value)); + SelFilter.DateEnd = value; + if (doReport) + { + reportChange(); + } + } + } + + protected string IdxMacchina + { + get + { + return SelFilter.IdxMacchina; + } + set + { + bool doReport = (!SelFilter.IdxMacchina.Equals(value)); + SelFilter.IdxMacchina = value; + if (doReport) + { + reportChange(); + } + } + } + protected int IdxODL + { + get + { + return SelFilter.IdxOdl; + } + set + { + bool doReport = (!SelFilter.IdxOdl.Equals(value)); + SelFilter.IdxOdl = value; + if (doReport) + { + reportChange(); + } + } + } + + protected string CodArticolo + { + get + { + return SelFilter.CodArticolo; + } + set + { + bool doReport = (!SelFilter.CodArticolo.Equals(value)); + SelFilter.CodArticolo = value; + if (doReport) + { + reportChange(); + } + } + } + + [Parameter] + public SelectData SelFilter { get; set; } + + [Parameter] + public EventCallback filterChanged { get; set; } + + private void reportChange() + { + filterChanged.InvokeAsync(SelFilter); + } +} \ No newline at end of file diff --git a/MP.Stats/Data/SelectData.cs b/MP.Stats/Data/SelectData.cs new file mode 100644 index 00000000..05be9c99 --- /dev/null +++ b/MP.Stats/Data/SelectData.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace MP.Stats.Data +{ + public class SelectData + { + #region Public Properties + + public string CodArticolo { get; set; } = "*"; + public DateTime DateEnd { get; set; } = DateTime.Now.AddMinutes(1); + public DateTime DateStart { get; set; } = DateTime.Now.AddDays(-7); + public string IdxMacchina { get; set; } = "*"; + public int IdxOdl { get; set; } = -999; + public string KeyRichiesta { get; set; } = "*"; + + #endregion Public Properties + + #region Public Methods + + public override bool Equals(object obj) + { + if (!(obj is SelectData item)) + return false; + + if (CodArticolo != item.CodArticolo) + return false; + if (DateEnd != item.DateEnd) + return false; + if (DateStart != item.DateStart) + return false; + if (IdxMacchina != item.IdxMacchina) + return false; + if (IdxOdl != item.IdxOdl) + return false; + if (KeyRichiesta != item.KeyRichiesta) + return false; + + return true; + } + + public override int GetHashCode() + { + return base.GetHashCode(); + } + + #endregion Public Methods + } +} \ No newline at end of file From bac6441fedc104bce14b3e0c1320684d92fd81bb Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 May 2021 18:06:04 +0200 Subject: [PATCH 030/158] Update pagina scarti con filtro --- MP.Data/Controllers/MpStatsController.cs | 27 ++++++++++++++++++------ MP.Stats/Data/MpStatsService.cs | 5 +++-- MP.Stats/MP.Stats.csproj | 4 ---- MP.Stats/Pages/Index.razor | 6 +++--- MP.Stats/Pages/ReportODL.razor.cs | 2 +- MP.Stats/Pages/Scarti.razor | 9 +++++++- MP.Stats/Pages/Scarti.razor.cs | 23 +++++++++++++++++--- MP.Stats/Shared/NavMenu.razor | 4 ++-- 8 files changed, 58 insertions(+), 22 deletions(-) diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index 029298b6..9f91a030 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -6,6 +6,8 @@ using System.Threading.Tasks; using System.Configuration; using NLog; using Microsoft.Extensions.Configuration; +using Microsoft.EntityFrameworkCore; +using Microsoft.Data.SqlClient; namespace MP.Data.Controllers { @@ -138,18 +140,31 @@ namespace MP.Data.Controllers /// /// Elenco tabella scarti da filtro /// - /// - /// + /// + /// + /// + /// /// - public List StatScartiGetAll(int numRecord, string searchVal = "") + public List StatScartiGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) { List dbResult = new List(); + //dbResult = dbCtx + // .DbSetScarti + // .Where(x => x.KeyRichiesta.Contains(searchVal) || x.Descrizione.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) + // .OrderByDescending(x => x.DataOraRif) + // .Take(numRecord) + // .ToList(); + + var dataFrom = new SqlParameter("@dataFrom", DataStart); + var dataTo = new SqlParameter("@dataTo", DataEnd); + var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); + var idxODL = new SqlParameter("@IdxODL", IdxODL); + var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); + var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); dbResult = dbCtx .DbSetScarti - .Where(x => x.KeyRichiesta.Contains(searchVal) || x.Descrizione.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) - .OrderByDescending(x => x.DataOraRif) - .Take(numRecord) + .FromSqlRaw("EXEC stp_UI_RS_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) .ToList(); return dbResult; diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 8bc879e9..619b6e5e 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -84,9 +84,10 @@ namespace MP.Stats.Data return Task.FromResult(dbController.StatOdlGetAll(numRecord, searchVal).ToArray()); } - public Task StatScartiGetAll(int numRecord, string searchVal = "") + public Task StatScartiGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int numRecord, string searchVal = "") { - return Task.FromResult(dbController.StatScartiGetAll(numRecord, searchVal).ToArray()); + // filtra e restituisce SOLO i primi record... + return Task.FromResult(dbController.StatScartiGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).Take(numRecord).ToArray()); } public Task StatUserLogGetAll(int numRecord, string searchVal = "") diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index 455c5433..794cdd30 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -25,10 +25,6 @@ - - - - diff --git a/MP.Stats/Pages/Index.razor b/MP.Stats/Pages/Index.razor index f87d3dda..3e38a5bf 100644 --- a/MP.Stats/Pages/Index.razor +++ b/MP.Stats/Pages/Index.razor @@ -26,9 +26,9 @@
                  Main Topics
                  - - - + + + @**@ diff --git a/MP.Stats/Pages/ReportODL.razor.cs b/MP.Stats/Pages/ReportODL.razor.cs index f77a086f..c7aade73 100644 --- a/MP.Stats/Pages/ReportODL.razor.cs +++ b/MP.Stats/Pages/ReportODL.razor.cs @@ -77,7 +77,7 @@ namespace MP.Stats.Pages { try { - answ = (currRecord.IdxODL == IdxODL) ? "table-info" : ""; + answ = (currRecord.IdxOdl == IdxODL) ? "table-info" : ""; } catch { } diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index eca78837..d493a385 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -4,7 +4,14 @@ @using MP.Stats.Data
                  -
                  Scarti
                  +
                  +
                  +
                  Scarti
                  +
                  + +
                  +
                  +
                  @if (currRecord != null) { diff --git a/MP.Stats/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs index a9f103a7..769fc8cb 100644 --- a/MP.Stats/Pages/Scarti.razor.cs +++ b/MP.Stats/Pages/Scarti.razor.cs @@ -18,6 +18,7 @@ namespace MP.Stats.Pages #region Private Properties + private SelectData currFilter { get; set; } private int numRecord { get; set; } = 10; #endregion Private Properties @@ -38,20 +39,36 @@ namespace MP.Stats.Pages #endregion Protected Properties + #region Private Methods + + private async Task reloadData() + { + ListRecords = await StatService.StatScartiGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, numRecord, MessageService.SearchVal); + } + + #endregion Private Methods + #region Protected Methods + protected async Task DoFilter(SelectData newFilter) + { + currFilter = newFilter; + await reloadData(); + } + protected async Task ForceReload(int newNum) { numRecord = newNum; - ListRecords = await StatService.StatScartiGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } protected override async Task OnInitializedAsync() { numRecord = 10; + currFilter = new SelectData(); MessageService.ShowSearch = true; MessageService.EA_SearchUpdated += OnSeachUpdated; - ListRecords = await StatService.StatScartiGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } protected void ResetData() @@ -63,7 +80,7 @@ namespace MP.Stats.Pages protected async Task UpdateData() { currRecord = null; - ListRecords = await StatService.StatScartiGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } #endregion Protected Methods diff --git a/MP.Stats/Shared/NavMenu.razor b/MP.Stats/Shared/NavMenu.razor index 5b846d8b..71e774ac 100644 --- a/MP.Stats/Shared/NavMenu.razor +++ b/MP.Stats/Shared/NavMenu.razor @@ -14,12 +14,12 @@
                • - Diario ODL + Report ODL
                • - Dettaglio Produzione + Diario Produzione
                • From 91e29d0be1ea933aeb775da669e64a1c8d1eeed0 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 May 2021 18:15:35 +0200 Subject: [PATCH 031/158] Aggancio filtro x keyrichiesta --- MP.Stats/Components/SelectionFilter.razor | 118 ++---------------- MP.Stats/Components/SelectionFilter.razor.cs | 121 +++++++++++++++++++ 2 files changed, 130 insertions(+), 109 deletions(-) create mode 100644 MP.Stats/Components/SelectionFilter.razor.cs diff --git a/MP.Stats/Components/SelectionFilter.razor b/MP.Stats/Components/SelectionFilter.razor index d88bd68b..8d277f2b 100644 --- a/MP.Stats/Components/SelectionFilter.razor +++ b/MP.Stats/Components/SelectionFilter.razor @@ -1,33 +1,30 @@ -@using MP.Stats.Components -@using MP.Stats.Data - - +
                  -
                  +
                  -
                  +
                  -
                  +
                  -
                  +
                  - - + +
                  -
                  +
                  @@ -35,101 +32,4 @@
                  - - -@code { - - protected DateTime DateStart - { - get - { - return SelFilter.DateStart; - } - set - { - bool doReport = (!SelFilter.DateStart.Equals(value)); - SelFilter.DateStart = value; - if (doReport) - { - reportChange(); - } - } - } - protected DateTime DateEnd - { - get - { - return SelFilter.DateEnd; - } - set - { - bool doReport = (!SelFilter.DateEnd.Equals(value)); - SelFilter.DateEnd = value; - if (doReport) - { - reportChange(); - } - } - } - - protected string IdxMacchina - { - get - { - return SelFilter.IdxMacchina; - } - set - { - bool doReport = (!SelFilter.IdxMacchina.Equals(value)); - SelFilter.IdxMacchina = value; - if (doReport) - { - reportChange(); - } - } - } - protected int IdxODL - { - get - { - return SelFilter.IdxOdl; - } - set - { - bool doReport = (!SelFilter.IdxOdl.Equals(value)); - SelFilter.IdxOdl = value; - if (doReport) - { - reportChange(); - } - } - } - - protected string CodArticolo - { - get - { - return SelFilter.CodArticolo; - } - set - { - bool doReport = (!SelFilter.CodArticolo.Equals(value)); - SelFilter.CodArticolo = value; - if (doReport) - { - reportChange(); - } - } - } - - [Parameter] - public SelectData SelFilter { get; set; } - - [Parameter] - public EventCallback filterChanged { get; set; } - - private void reportChange() - { - filterChanged.InvokeAsync(SelFilter); - } -} \ No newline at end of file + \ No newline at end of file diff --git a/MP.Stats/Components/SelectionFilter.razor.cs b/MP.Stats/Components/SelectionFilter.razor.cs new file mode 100644 index 00000000..b9b00a3e --- /dev/null +++ b/MP.Stats/Components/SelectionFilter.razor.cs @@ -0,0 +1,121 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Components; +using MP.Stats.Components; +using MP.Stats.Data; + +namespace MP.Stats.Components +{ + public partial class SelectionFilter + { + #region Protected Properties + + protected string CodArticolo + { + get + { + return SelFilter.CodArticolo; + } + set + { + bool doReport = (!SelFilter.CodArticolo.Equals(value)); + SelFilter.CodArticolo = value; + if (doReport) + { + reportChange(); + } + } + } + + protected DateTime DateEnd + { + get + { + return SelFilter.DateEnd; + } + set + { + bool doReport = (!SelFilter.DateEnd.Equals(value)); + SelFilter.DateEnd = value; + if (doReport) + { + reportChange(); + } + } + } + + protected DateTime DateStart + { + get + { + return SelFilter.DateStart; + } + set + { + bool doReport = (!SelFilter.DateStart.Equals(value)); + SelFilter.DateStart = value; + if (doReport) + { + reportChange(); + } + } + } + + protected string IdxMacchina + { + get + { + return SelFilter.IdxMacchina; + } + set + { + bool doReport = (!SelFilter.IdxMacchina.Equals(value)); + SelFilter.IdxMacchina = value; + if (doReport) + { + reportChange(); + } + } + } + + protected string KeyRichiesta + { + get + { + return SelFilter.KeyRichiesta; + } + set + { + bool doReport = (!SelFilter.KeyRichiesta.Equals(value)); + SelFilter.KeyRichiesta = value; + if (doReport) + { + reportChange(); + } + } + } + + #endregion Protected Properties + + #region Public Properties + + [Parameter] + public EventCallback filterChanged { get; set; } + + [Parameter] + public SelectData SelFilter { get; set; } + + #endregion Public Properties + + #region Private Methods + + private void reportChange() + { + filterChanged.InvokeAsync(SelFilter); + } + + #endregion Private Methods + } +} \ No newline at end of file From aac8c11585261db5d469862f7e8fa36832273354 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 May 2021 19:01:51 +0200 Subject: [PATCH 032/158] Fix gestione scarti x init --- MP.Stats/Pages/Scarti.razor | 2 +- MP.Stats/Pages/Scarti.razor.cs | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index d493a385..e80607d2 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -1,7 +1,7 @@ @page "/scarti" @using MP.Stats.Components -@using MP.Stats.Data +@using MP.Stats.Components
                  diff --git a/MP.Stats/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs index 769fc8cb..871d963c 100644 --- a/MP.Stats/Pages/Scarti.razor.cs +++ b/MP.Stats/Pages/Scarti.razor.cs @@ -18,7 +18,7 @@ namespace MP.Stats.Pages #region Private Properties - private SelectData currFilter { get; set; } + private SelectData currFilter { get; set; } = new SelectData(); private int numRecord { get; set; } = 10; #endregion Private Properties @@ -64,8 +64,6 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { - numRecord = 10; - currFilter = new SelectData(); MessageService.ShowSearch = true; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); From 70735a9970b5db57b2011ba2fa5f82263c694f07 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 May 2021 19:02:05 +0200 Subject: [PATCH 033/158] update metodi x impiegare stored --- MP.Data/Controllers/MpStatsController.cs | 40 +++++++++++++++++++----- MP.Stats/Data/MpStatsService.cs | 8 ++--- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index 9f91a030..1b697546 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -83,15 +83,27 @@ namespace MP.Data.Controllers /// /// /// - public List StatControlliGetAll(int numRecord, string searchVal = "") + public List StatControlliGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) { List dbResult = new List(); + //dbResult = dbCtx + // .DbSetControlli + // .Where(x => x.Note.Contains(searchVal) || x.IdxMacchina.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) + // .OrderByDescending(x => x.DataOra) + // .Take(numRecord) + // .ToList(); + + var dataFrom = new SqlParameter("@dataFrom", DataStart); + var dataTo = new SqlParameter("@dataTo", DataEnd); + var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); + var idxODL = new SqlParameter("@IdxODL", IdxODL); + var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); + var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); + dbResult = dbCtx .DbSetControlli - .Where(x => x.Note.Contains(searchVal) || x.IdxMacchina.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) - .OrderByDescending(x => x.DataOra) - .Take(numRecord) + .FromSqlRaw("EXEC stp_UI_RC_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) .ToList(); return dbResult; @@ -176,15 +188,27 @@ namespace MP.Data.Controllers /// /// /// - public List StatUserLogGetAll(int numRecord, string searchVal = "") + public List StatUserLogGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) { List dbResult = new List(); + //dbResult = dbCtx + // .DbSetUserLog + // .Where(x => x.Valore.Contains(searchVal) || x.Cognome.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) + // .OrderByDescending(x => x.DataOraRif) + // .Take(numRecord) + // .ToList(); + + var dataFrom = new SqlParameter("@dataFrom", DataStart); + var dataTo = new SqlParameter("@dataTo", DataEnd); + var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); + var idxODL = new SqlParameter("@IdxODL", IdxODL); + var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); + var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); + dbResult = dbCtx .DbSetUserLog - .Where(x => x.Valore.Contains(searchVal) || x.Cognome.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) - .OrderByDescending(x => x.DataOraRif) - .Take(numRecord) + .FromSqlRaw("EXEC stp_UI_UL_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) .ToList(); return dbResult; diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 619b6e5e..35e34fb4 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -69,9 +69,9 @@ namespace MP.Stats.Data dbController.RollBackEntity(item); } - public Task StatControlliGetAll(int numRecord, string searchVal = "") + public Task StatControlliGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int numRecord, string searchVal = "") { - return Task.FromResult(dbController.StatControlliGetAll(numRecord, searchVal).ToArray()); + return Task.FromResult(dbController.StatControlliGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).Take(numRecord).ToArray()); } public Task StatDdbGetAll(int numRecord, string searchVal = "") @@ -90,9 +90,9 @@ namespace MP.Stats.Data return Task.FromResult(dbController.StatScartiGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).Take(numRecord).ToArray()); } - public Task StatUserLogGetAll(int numRecord, string searchVal = "") + public Task StatUserLogGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int numRecord, string searchVal = "") { - return Task.FromResult(dbController.StatUserLogGetAll(numRecord, searchVal).ToArray()); + return Task.FromResult(dbController.StatUserLogGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).Take(numRecord).ToArray()); } #endregion Public Methods From 49b9ff4d0772cac6db0f76f4c194e95e3804ce5d Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 May 2021 19:02:14 +0200 Subject: [PATCH 034/158] update controlli con ricerca --- MP.Stats/Pages/Controlli.razor | 9 ++++++++- MP.Stats/Pages/Controlli.razor.cs | 23 +++++++++++++++++++---- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor index 0aea2bac..d2296715 100644 --- a/MP.Stats/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -4,7 +4,14 @@ @using MP.Stats.Data
                  -
                  Controlli
                  +
                  +
                  +
                  Controlli
                  +
                  + +
                  +
                  +
                  @if (currRecord != null) { diff --git a/MP.Stats/Pages/Controlli.razor.cs b/MP.Stats/Pages/Controlli.razor.cs index 53842097..d2543dfc 100644 --- a/MP.Stats/Pages/Controlli.razor.cs +++ b/MP.Stats/Pages/Controlli.razor.cs @@ -18,6 +18,7 @@ namespace MP.Stats.Pages #region Private Properties + private SelectData currFilter { get; set; } = new SelectData(); private int numRecord { get; set; } = 10; #endregion Private Properties @@ -38,20 +39,34 @@ namespace MP.Stats.Pages #endregion Protected Properties + #region Private Methods + + private async Task reloadData() + { + ListRecords = await StatService.StatControlliGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, numRecord, MessageService.SearchVal); + } + + #endregion Private Methods + #region Protected Methods + protected async Task DoFilter(SelectData newFilter) + { + currFilter = newFilter; + await reloadData(); + } + protected async Task ForceReload(int newNum) { numRecord = newNum; - ListRecords = await StatService.StatControlliGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } protected override async Task OnInitializedAsync() { - numRecord = 10; MessageService.ShowSearch = true; MessageService.EA_SearchUpdated += OnSeachUpdated; - ListRecords = await StatService.StatControlliGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } protected void ResetData() @@ -63,7 +78,7 @@ namespace MP.Stats.Pages protected async Task UpdateData() { currRecord = null; - ListRecords = await StatService.StatControlliGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } #endregion Protected Methods From f84b42e101d932137385c25b71df71297d4d6d95 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 May 2021 19:02:21 +0200 Subject: [PATCH 035/158] update UserLog con ricerca --- MP.Stats/Pages/UserLog.razor | 9 ++++++++- MP.Stats/Pages/UserLog.razor.cs | 10 ++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/MP.Stats/Pages/UserLog.razor b/MP.Stats/Pages/UserLog.razor index 9e369bda..c24463f1 100644 --- a/MP.Stats/Pages/UserLog.razor +++ b/MP.Stats/Pages/UserLog.razor @@ -4,7 +4,14 @@ @using MP.Stats.Data
                  -
                  User Log
                  +
                  +
                  +
                  User Log
                  +
                  + +
                  +
                  +
                  @if (currRecord != null) { diff --git a/MP.Stats/Pages/UserLog.razor.cs b/MP.Stats/Pages/UserLog.razor.cs index 3c87c098..374c1cfd 100644 --- a/MP.Stats/Pages/UserLog.razor.cs +++ b/MP.Stats/Pages/UserLog.razor.cs @@ -20,6 +20,7 @@ namespace MP.Stats.Pages #region Private Properties + private SelectData currFilter { get; set; } = new SelectData(); private int numRecord { get; set; } = 10; #endregion Private Properties @@ -45,13 +46,19 @@ namespace MP.Stats.Pages private async Task reloadData() { ActionsList = await StatService.ActionsGetAll(); - ListRecords = await StatService.StatUserLogGetAll(numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatUserLogGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, numRecord, MessageService.SearchVal); } #endregion Private Methods #region Protected Methods + protected async Task DoFilter(SelectData newFilter) + { + currFilter = newFilter; + await reloadData(); + } + protected async Task ForceReload(int newNum) { numRecord = newNum; @@ -60,7 +67,6 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { - numRecord = 10; MessageService.ShowSearch = true; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); From 2730752df3eb03d7bb99de77855ecc9a5776e6f7 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 May 2021 19:26:49 +0200 Subject: [PATCH 036/158] Aggiunta modelli e DbSet Articoli e Macchine --- MP.Data/DatabaseModels/AnagArticoli.cs | 19 ++++++++++++ MP.Data/DatabaseModels/Macchine.cs | 19 ++++++++++++ MP.Data/MoonPro_STATSContext.cs | 41 ++++++++++++++++++++++++++ 3 files changed, 79 insertions(+) create mode 100644 MP.Data/DatabaseModels/AnagArticoli.cs create mode 100644 MP.Data/DatabaseModels/Macchine.cs diff --git a/MP.Data/DatabaseModels/AnagArticoli.cs b/MP.Data/DatabaseModels/AnagArticoli.cs new file mode 100644 index 00000000..0480a0bb --- /dev/null +++ b/MP.Data/DatabaseModels/AnagArticoli.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class AnagArticoli + { + #region Public Properties + + public string CodArticolo { get; set; } + public string DescArticolo { get; set; } + public string Disegno { get; set; } + public string Tipo { get; set; } + + #endregion Public Properties + } +} \ No newline at end of file diff --git a/MP.Data/DatabaseModels/Macchine.cs b/MP.Data/DatabaseModels/Macchine.cs new file mode 100644 index 00000000..f9469bb1 --- /dev/null +++ b/MP.Data/DatabaseModels/Macchine.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class Macchine + { + #region Public Properties + + public string CodMacchina { get; set; } + public string Descrizione { get; set; } + public string IdxMacchina { get; set; } + public string Nome { get; set; } + + #endregion Public Properties + } +} \ No newline at end of file diff --git a/MP.Data/MoonPro_STATSContext.cs b/MP.Data/MoonPro_STATSContext.cs index f7e26640..6a821592 100644 --- a/MP.Data/MoonPro_STATSContext.cs +++ b/MP.Data/MoonPro_STATSContext.cs @@ -35,9 +35,11 @@ namespace MP.Data #region Public Properties + public virtual DbSet DbSetArticoli { get; set; } public virtual DbSet DbSetAzioniUL { get; set; } public virtual DbSet DbSetControlli { get; set; } public virtual DbSet DbSetDdbTurni { get; set; } + public virtual DbSet DbSetMacchine { get; set; } public virtual DbSet DbSetODL { get; set; } public virtual DbSet DbSetScarti { get; set; } public virtual DbSet DbSetUserLog { get; set; } @@ -66,6 +68,45 @@ namespace MP.Data protected override void OnModelCreating(ModelBuilder modelBuilder) { modelBuilder.HasAnnotation("Relational:Collation", "SQL_Latin1_General_CP1_CI_AS"); + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_UI_AnagArticoli"); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.DescArticolo) + .IsRequired() + .HasMaxLength(250); + + entity.Property(e => e.Disegno) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Tipo) + .IsRequired() + .HasMaxLength(50); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_UI_Macchine"); + + entity.Property(e => e.CodMacchina).HasMaxLength(50); + + entity.Property(e => e.Descrizione).HasMaxLength(50); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.Nome).HasMaxLength(50); + }); modelBuilder.Entity(entity => { From 050b9a9d4c53e49d1d50757718bb4c0d4336d18f Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 May 2021 19:29:39 +0200 Subject: [PATCH 037/158] Aggiunta metodi in controller --- MP.Data/Controllers/MpStatsController.cs | 38 ++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index 1b697546..61036130 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -77,6 +77,26 @@ namespace MP.Data.Controllers return answ; } + /// + /// Elenco tabella Articoli da filtro + /// + /// + /// + /// + public List StatArticoliGetSearch(int numRecord, string searchVal = "") + { + List dbResult = new List(); + + dbResult = dbCtx + .DbSetArticoli + .Where(x => x.CodArticolo.Contains(searchVal) || x.DescArticolo.Contains(searchVal) || x.Disegno.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) + .OrderBy(x => x.CodArticolo) + .Take(numRecord) + .ToList(); + + return dbResult; + } + /// /// Elenco tabella controlli da filtro /// @@ -129,6 +149,24 @@ namespace MP.Data.Controllers return dbResult; } + /// + /// Elenco tabella MAcchine + /// + /// + /// + /// + public List StatMacchineGetAll() + { + List dbResult = new List(); + + dbResult = dbCtx + .DbSetMacchine + .OrderBy(x => x.IdxMacchina) + .ToList(); + + return dbResult; + } + /// /// Elenco tabella ODL da filtro /// From 9612d977f857b6ebd4b87d4ff499cb7a50af0993 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 May 2021 19:31:18 +0200 Subject: [PATCH 038/158] Aggiunta metodi search in MpStatService --- MP.Stats/Data/MpStatsService.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 35e34fb4..f6da8ea2 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -69,6 +69,11 @@ namespace MP.Stats.Data dbController.RollBackEntity(item); } + public Task StatArticoliGetSearch(int numRecord, string searchVal = "") + { + return Task.FromResult(dbController.StatArticoliGetSearch(numRecord, searchVal).ToArray()); + } + public Task StatControlliGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int numRecord, string searchVal = "") { return Task.FromResult(dbController.StatControlliGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).Take(numRecord).ToArray()); @@ -79,6 +84,11 @@ namespace MP.Stats.Data return Task.FromResult(dbController.StatDdbGetAll(numRecord, searchVal).ToArray()); } + public Task StatMacchineGetAll() + { + return Task.FromResult(dbController.StatMacchineGetAll().ToArray()); + } + public Task StatOdlGetAll(int numRecord, string searchVal = "") { return Task.FromResult(dbController.StatOdlGetAll(numRecord, searchVal).ToArray()); From 79eb24c1dc61341f421e589bc9bc9c9b5349c8d7 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 May 2021 19:32:05 +0200 Subject: [PATCH 039/158] Eliminazione oggetti weather forecast in Data --- MP.Stats/Data/WeatherForecast.cs | 15 --------------- MP.Stats/Data/WeatherForecastService.cs | 25 ------------------------- 2 files changed, 40 deletions(-) delete mode 100644 MP.Stats/Data/WeatherForecast.cs delete mode 100644 MP.Stats/Data/WeatherForecastService.cs diff --git a/MP.Stats/Data/WeatherForecast.cs b/MP.Stats/Data/WeatherForecast.cs deleted file mode 100644 index b5ff87aa..00000000 --- a/MP.Stats/Data/WeatherForecast.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace MP.Stats.Data -{ - public class WeatherForecast - { - public DateTime Date { get; set; } - - public int TemperatureC { get; set; } - - public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); - - public string Summary { get; set; } - } -} diff --git a/MP.Stats/Data/WeatherForecastService.cs b/MP.Stats/Data/WeatherForecastService.cs deleted file mode 100644 index 02f62be9..00000000 --- a/MP.Stats/Data/WeatherForecastService.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Linq; -using System.Threading.Tasks; - -namespace MP.Stats.Data -{ - public class WeatherForecastService - { - private static readonly string[] Summaries = new[] - { - "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" - }; - - public Task GetForecastAsync(DateTime startDate) - { - var rng = new Random(); - return Task.FromResult(Enumerable.Range(1, 5).Select(index => new WeatherForecast - { - Date = startDate.AddDays(index), - TemperatureC = rng.Next(-20, 55), - Summary = Summaries[rng.Next(Summaries.Length)] - }).ToArray()); - } - } -} From 38bf4b95e721b7b3aa1ab8df4fc3c4984ffc4616 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 May 2021 19:32:27 +0200 Subject: [PATCH 040/158] rimozione pagina fetchData --- MP.Stats/Pages/FetchData.razor | 46 ---------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 MP.Stats/Pages/FetchData.razor diff --git a/MP.Stats/Pages/FetchData.razor b/MP.Stats/Pages/FetchData.razor deleted file mode 100644 index de4d781b..00000000 --- a/MP.Stats/Pages/FetchData.razor +++ /dev/null @@ -1,46 +0,0 @@ -@page "/fetchdata" - -@using MP.Stats.Data -@inject WeatherForecastService ForecastService - -

                  Weather forecast

                  - -

                  This component demonstrates fetching data from a service.

                  - -@if (forecasts == null) -{ -

                  Loading...

                  -} -else -{ - - - - - - - - - - - @foreach (var forecast in forecasts) - { - - - - - - - } - -
                  DateTemp. (C)Temp. (F)Summary
                  @forecast.Date.ToShortDateString()@forecast.TemperatureC@forecast.TemperatureF@forecast.Summary
                  -} - -@code { - private WeatherForecast[] forecasts; - - protected override async Task OnInitializedAsync() - { - forecasts = await ForecastService.GetForecastAsync(DateTime.Now); - } -} From 7a32377ed3b5a11b3e3849b99e0be4cdbf2e4f6e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 May 2021 19:32:48 +0200 Subject: [PATCH 041/158] rimozione pagina counter --- MP.Stats/Pages/Counter.razor | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 MP.Stats/Pages/Counter.razor diff --git a/MP.Stats/Pages/Counter.razor b/MP.Stats/Pages/Counter.razor deleted file mode 100644 index 8641f781..00000000 --- a/MP.Stats/Pages/Counter.razor +++ /dev/null @@ -1,16 +0,0 @@ -@page "/counter" - -

                  Counter

                  - -

                  Current count: @currentCount

                  - - - -@code { - private int currentCount = 0; - - private void IncrementCount() - { - currentCount++; - } -} From 1a97e786656251d2d2acf2966cebd6bfdaae9d63 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 May 2021 19:33:41 +0200 Subject: [PATCH 042/158] cleanup Startup --- MP.Stats/Startup.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/MP.Stats/Startup.cs b/MP.Stats/Startup.cs index ce078b63..5604ce52 100644 --- a/MP.Stats/Startup.cs +++ b/MP.Stats/Startup.cs @@ -90,7 +90,6 @@ namespace MP.Stats //services.AddScoped(); services.AddSingleton(); services.AddScoped(); - services.AddSingleton(); } #endregion Public Methods From 3c674fffbb788775c381740e218977fd43622ef6 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 May 2021 19:47:38 +0200 Subject: [PATCH 043/158] Add filtro in report ODL (non connesso) --- MP.Stats/Pages/ReportODL.razor | 10 ++++++++-- MP.Stats/Pages/ReportODL.razor.cs | 23 ++++++++++++++++++++--- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/MP.Stats/Pages/ReportODL.razor b/MP.Stats/Pages/ReportODL.razor index 12deece5..0291d66b 100644 --- a/MP.Stats/Pages/ReportODL.razor +++ b/MP.Stats/Pages/ReportODL.razor @@ -1,10 +1,16 @@ @page "/reportodl" @using MP.Stats.Components -@using MP.Stats.Data
                  -
                  Report ODL
                  +
                  +
                  +
                  Report ODL/Comm.
                  +
                  + +
                  +
                  +
                  @if (currRecord != null) { diff --git a/MP.Stats/Pages/ReportODL.razor.cs b/MP.Stats/Pages/ReportODL.razor.cs index c7aade73..6c1ae7d9 100644 --- a/MP.Stats/Pages/ReportODL.razor.cs +++ b/MP.Stats/Pages/ReportODL.razor.cs @@ -18,6 +18,7 @@ namespace MP.Stats.Pages #region Private Properties + private SelectData currFilter { get; set; } = new SelectData(); private int numRecord { get; set; } = 10; #endregion Private Properties @@ -38,12 +39,28 @@ namespace MP.Stats.Pages #endregion Protected Properties + #region Private Methods + + private async Task reloadData() + { + //ListRecords = await StatService.StatScartiGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatOdlGetAll(numRecord, MessageService.SearchVal); + } + + #endregion Private Methods + #region Protected Methods + protected async Task DoFilter(SelectData newFilter) + { + currFilter = newFilter; + await reloadData(); + } + protected async Task ForceReload(int newNum) { numRecord = newNum; - ListRecords = await StatService.StatOdlGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } protected override async Task OnInitializedAsync() @@ -51,7 +68,7 @@ namespace MP.Stats.Pages numRecord = 10; MessageService.ShowSearch = true; MessageService.EA_SearchUpdated += OnSeachUpdated; - ListRecords = await StatService.StatOdlGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } protected void ResetData() @@ -63,7 +80,7 @@ namespace MP.Stats.Pages protected async Task UpdateData() { currRecord = null; - ListRecords = await StatService.StatOdlGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } #endregion Protected Methods From 4e43f39ba78180a64bd9ba730ca17371449cefd8 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 May 2021 19:47:48 +0200 Subject: [PATCH 044/158] Add filtro in Diario (non connesso) --- MP.Stats/Pages/Diario.razor | 9 ++++++++- MP.Stats/Pages/Diario.razor.cs | 23 ++++++++++++++++++++--- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/MP.Stats/Pages/Diario.razor b/MP.Stats/Pages/Diario.razor index ad4bf737..6a7e2e55 100644 --- a/MP.Stats/Pages/Diario.razor +++ b/MP.Stats/Pages/Diario.razor @@ -4,7 +4,14 @@ @using MP.Stats.Data
                  -
                  Diario Produzione
                  +
                  +
                  +
                  Diario Produzione
                  +
                  + +
                  +
                  +
                  @if (currRecord != null) { diff --git a/MP.Stats/Pages/Diario.razor.cs b/MP.Stats/Pages/Diario.razor.cs index 4e407d62..5f73ddb3 100644 --- a/MP.Stats/Pages/Diario.razor.cs +++ b/MP.Stats/Pages/Diario.razor.cs @@ -18,6 +18,7 @@ namespace MP.Stats.Pages #region Private Properties + private SelectData currFilter { get; set; } = new SelectData(); private int numRecord { get; set; } = 10; #endregion Private Properties @@ -38,12 +39,28 @@ namespace MP.Stats.Pages #endregion Protected Properties + #region Private Methods + + private async Task reloadData() + { + //ListRecords = await StatService.StatScartiGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatDdbGetAll(numRecord, MessageService.SearchVal); + } + + #endregion Private Methods + #region Protected Methods + protected async Task DoFilter(SelectData newFilter) + { + currFilter = newFilter; + await reloadData(); + } + protected async Task ForceReload(int newNum) { numRecord = newNum; - ListRecords = await StatService.StatDdbGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } protected override async Task OnInitializedAsync() @@ -51,7 +68,7 @@ namespace MP.Stats.Pages numRecord = 10; MessageService.ShowSearch = true; MessageService.EA_SearchUpdated += OnSeachUpdated; - ListRecords = await StatService.StatDdbGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } protected void ResetData() @@ -63,7 +80,7 @@ namespace MP.Stats.Pages protected async Task UpdateData() { currRecord = null; - ListRecords = await StatService.StatDdbGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } #endregion Protected Methods From bca047742e45cec701ee312e8c44aad099448ae3 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 May 2021 19:47:58 +0200 Subject: [PATCH 045/158] Fix nomi pagine --- MP.Stats/Pages/Controlli.razor | 2 +- MP.Stats/Pages/Scarti.razor | 81 ++++++++++++++++--------------- MP.Stats/Pages/UserLog.razor | 88 +++++++++++++++++----------------- MP.Stats/Shared/NavMenu.razor | 6 +-- 4 files changed, 88 insertions(+), 89 deletions(-) diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor index d2296715..e53533e1 100644 --- a/MP.Stats/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -6,7 +6,7 @@
                  -
                  Controlli
                  +
                  Registro Controlli
                  diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index e80607d2..343d6c22 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -1,12 +1,11 @@ @page "/scarti" -@using MP.Stats.Components @using MP.Stats.Components
                  -
                  Scarti
                  +
                  Registro Scarti
                  @@ -15,53 +14,53 @@
                  @if (currRecord != null) { - @**@ + @**@ } @if (ListRecords == null) { -
                  +
                  } else { - - - - - - - - - - - - - - @foreach (var record in ListRecords) +
                  MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
                  + + + + + + + + + + + + + @foreach (var record in ListRecords) { - - - - - - - - - + + + + + + + + + } - -
                  MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
                  -
                  @record.CodMacchina
                  -
                  @record.IdxMacchina
                  -                   		-
                  @record.DataOraRif.ToString("yyyy.MM.dd")
                  -
                  @record.DataOraRif.ToString("ddd HH:mm.ss")
                  -                   		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo -
                  -
                  [@record.Causale]
                  -
                  @record.Descrizione
                  -
                  -
                  @record.Note
                  -                   		@record.Qta@record.Cognome @record.Nome (@record.MatrOpr)
                  +
                  @record.CodMacchina
                  +
                  @record.IdxMacchina
                  +                   		+
                  @record.DataOraRif.ToString("yyyy.MM.dd")
                  +
                  @record.DataOraRif.ToString("ddd HH:mm.ss")
                  +                   		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo +
                  +
                  [@record.Causale]
                  +
                  @record.Descrizione
                  +
                  +
                  @record.Note
                  +                   		@record.Qta@record.Cognome @record.Nome (@record.MatrOpr)
                  + + }
                  diff --git a/MP.Stats/Pages/UserLog.razor b/MP.Stats/Pages/UserLog.razor index c24463f1..5d061d1d 100644 --- a/MP.Stats/Pages/UserLog.razor +++ b/MP.Stats/Pages/UserLog.razor @@ -6,7 +6,7 @@
                  -
                  User Log
                  +
                  User ActionLog
                  @@ -15,57 +15,57 @@
                  @if (currRecord != null) { - @**@ + @**@ } @if (ListRecords == null) { -
                  +
                  } else { - - - - - - - - - - - - - - @foreach (var record in ListRecords) +
                  MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
                  + + + + + + + + + + + + + @foreach (var record in ListRecords) { - - - - - - - - - + + + + + + + + + } - -
                  MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
                  -
                  @record.CodMacchina
                  -
                  @record.IdxMacchina
                  -                   		-
                  @record.DataOraRif.ToString("yyyy.MM.dd")
                  -
                  @record.DataOraRif.ToString("ddd HH:mm.ss")
                  -                   		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo -
                  @record.Valore
                  -
                  -
                  - [@record.IdxLog] -
                  -
                  - @decodeAction(@record.Azione).Descrizione -
                  -
                  -                   		@record.Qta.ToString("N0")@record.Cognome @record.Nome (@record.MatrOpr)
                  +
                  @record.CodMacchina
                  +
                  @record.IdxMacchina
                  +                   		+
                  @record.DataOraRif.ToString("yyyy.MM.dd")
                  +
                  @record.DataOraRif.ToString("ddd HH:mm.ss")
                  +                   		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo +
                  @record.Valore
                  +
                  +
                  + [@record.IdxLog] +
                  +
                  + @decodeAction(@record.Azione).Descrizione +
                  +
                  +                   		@record.Qta.ToString("N0")@record.Cognome @record.Nome (@record.MatrOpr)
                  + + }
                  diff --git a/MP.Stats/Shared/NavMenu.razor b/MP.Stats/Shared/NavMenu.razor index 71e774ac..2ebff8ca 100644 --- a/MP.Stats/Shared/NavMenu.razor +++ b/MP.Stats/Shared/NavMenu.razor @@ -14,7 +14,7 @@
                • - Report ODL + Report ODL/Comm.
                • @@ -29,12 +29,12 @@
                • - Controlli + Registro Controlli
                • - Scarti + Registro Scarti
                  • @*
                • From 3acecefa1a90f660bdd2996f0dec1f43c1a36274 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 May 2021 19:56:07 +0200 Subject: [PATCH 046/158] Bozza modifica x ricerca in Controlli.Note --- MP.Stats/Data/MpStatsService.cs | 7 ++++++- MP.Stats/Pages/Controlli.razor.cs | 6 +++--- MP.Stats/Pages/ReportODL.razor.cs | 12 ++++++------ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index f6da8ea2..7f7eff2f 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -76,7 +76,12 @@ namespace MP.Stats.Data public Task StatControlliGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int numRecord, string searchVal = "") { - return Task.FromResult(dbController.StatControlliGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).Take(numRecord).ToArray()); + return Task.FromResult( + dbController + .StatControlliGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo) + //.Where(x => (x.Note.Contains(searchVal) || string.IsNullOrEmpty(searchVal) || string.IsNullOrEmpty(x.Note))) + .Take(numRecord) + .ToArray()); } public Task StatDdbGetAll(int numRecord, string searchVal = "") diff --git a/MP.Stats/Pages/Controlli.razor.cs b/MP.Stats/Pages/Controlli.razor.cs index d2543dfc..6a52ec24 100644 --- a/MP.Stats/Pages/Controlli.razor.cs +++ b/MP.Stats/Pages/Controlli.razor.cs @@ -105,11 +105,11 @@ namespace MP.Stats.Pages MessageService.EA_SearchUpdated -= OnSeachUpdated; } - public void OnSeachUpdated() + public async void OnSeachUpdated() { - InvokeAsync(() => + await InvokeAsync(() => { - UpdateData(); + Task task = UpdateData(); StateHasChanged(); }); } diff --git a/MP.Stats/Pages/ReportODL.razor.cs b/MP.Stats/Pages/ReportODL.razor.cs index 6c1ae7d9..ea07ee63 100644 --- a/MP.Stats/Pages/ReportODL.razor.cs +++ b/MP.Stats/Pages/ReportODL.razor.cs @@ -107,13 +107,13 @@ namespace MP.Stats.Pages MessageService.EA_SearchUpdated -= OnSeachUpdated; } - public void OnSeachUpdated() + public async void OnSeachUpdated() { - InvokeAsync(() => - { - UpdateData(); - StateHasChanged(); - }); + await InvokeAsync(() => + { + Task task = UpdateData(); + StateHasChanged(); + }); } #endregion Public Methods From 1e46acdfcc5d3d2daa310869d76ea841c296fdce Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 19 May 2021 12:26:57 +0200 Subject: [PATCH 047/158] Aggiunta Blazorise components --- MP.Stats/MP.Stats.csproj | 7 +++++++ MP.Stats/Pages/_Host.cshtml | 20 +++++++++++++++++++- MP.Stats/Startup.cs | 11 ++++++++++- MP.Stats/_Imports.razor | 2 ++ 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index 794cdd30..51f424aa 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -29,6 +29,13 @@ + + + + + + + PreserveNewest diff --git a/MP.Stats/Pages/_Host.cshtml b/MP.Stats/Pages/_Host.cshtml index 65bfed2c..c7466b07 100644 --- a/MP.Stats/Pages/_Host.cshtml +++ b/MP.Stats/Pages/_Host.cshtml @@ -14,7 +14,15 @@ MP.STATS - + @**@ + + + + + + + + @@ -32,6 +40,16 @@ 🗙
                  • + + + + + + + + + + \ No newline at end of file diff --git a/MP.Stats/Startup.cs b/MP.Stats/Startup.cs index 5604ce52..57542753 100644 --- a/MP.Stats/Startup.cs +++ b/MP.Stats/Startup.cs @@ -10,9 +10,11 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Localization; using System.Globalization; +using Blazorise; +using Blazorise.Bootstrap; +using Blazorise.Icons.FontAwesome; namespace MP.Stats { @@ -76,6 +78,13 @@ namespace MP.Stats // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 public void ConfigureServices(IServiceCollection services) { + services.AddBlazorise(options => + { + options.ChangeTextOnKeyPress = true; // optional + }) + .AddBootstrapProviders() + .AddFontAwesomeIcons(); + services.AddLocalization(); services.AddRazorPages(); diff --git a/MP.Stats/_Imports.razor b/MP.Stats/_Imports.razor index b335524c..1dc55d9a 100644 --- a/MP.Stats/_Imports.razor +++ b/MP.Stats/_Imports.razor @@ -8,3 +8,5 @@ @using Microsoft.JSInterop @using MP.Stats @using MP.Stats.Shared +@using Blazorise +@using Blazorise.Charts \ No newline at end of file From 5c1ce470a793379cfbe1f668079aa2f9403b17d3 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 19 May 2021 12:27:09 +0200 Subject: [PATCH 048/158] Test page x chats --- MP.Stats/Pages/Test.razor | 51 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 MP.Stats/Pages/Test.razor diff --git a/MP.Stats/Pages/Test.razor b/MP.Stats/Pages/Test.razor new file mode 100644 index 00000000..03d01f64 --- /dev/null +++ b/MP.Stats/Pages/Test.razor @@ -0,0 +1,51 @@ +@page "/test" + +Test + + + + + +@code { + LineChart lineChart; + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender) + { + await HandleRedraw(); + } + } + + async Task HandleRedraw() + { + await lineChart.Clear(); + + await lineChart.AddLabelsDatasetsAndUpdate(Labels, GetLineChartDataset()); + } + + LineChartDataset GetLineChartDataset() + { + return new LineChartDataset + { + Label = "# of randoms", + Data = RandomizeData(), + BackgroundColor = backgroundColors, + BorderColor = borderColors, + Fill = true, + PointRadius = 2, + BorderDash = new List { } + }; + } + + string[] Labels = { "Red", "Blue", "Yellow", "Green", "Purple", "Orange" }; + List backgroundColors = new List { ChartColor.FromRgba(255, 99, 132, 0.2f), ChartColor.FromRgba(54, 162, 235, 0.2f), ChartColor.FromRgba(255, 206, 86, 0.2f), ChartColor.FromRgba(75, 192, 192, 0.2f), ChartColor.FromRgba(153, 102, 255, 0.2f), ChartColor.FromRgba(255, 159, 64, 0.2f) }; + List borderColors = new List { ChartColor.FromRgba(255, 99, 132, 1f), ChartColor.FromRgba(54, 162, 235, 1f), ChartColor.FromRgba(255, 206, 86, 1f), ChartColor.FromRgba(75, 192, 192, 1f), ChartColor.FromRgba(153, 102, 255, 1f), ChartColor.FromRgba(255, 159, 64, 1f) }; + + List RandomizeData() + { + var r = new Random(DateTime.Now.Millisecond); + + return new List { r.Next(3, 50) * r.NextDouble(), r.Next(3, 50) * r.NextDouble(), r.Next(3, 50) * r.NextDouble(), r.Next(3, 50) * r.NextDouble(), r.Next(3, 50) * r.NextDouble(), r.Next(3, 50) * r.NextDouble() }; + } +} \ No newline at end of file From f1c5d18d15c9bdfa0b55ca109eef4a39f48042fa Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 19 May 2021 17:48:09 +0200 Subject: [PATCH 049/158] Completato pagina Test x grafici (da rivedere) --- MP.Stats/Pages/Test.razor | 102 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 98 insertions(+), 4 deletions(-) diff --git a/MP.Stats/Pages/Test.razor b/MP.Stats/Pages/Test.razor index 03d01f64..1cdce18e 100644 --- a/MP.Stats/Pages/Test.razor +++ b/MP.Stats/Pages/Test.razor @@ -2,12 +2,28 @@ Test - + - +
                  +
                  + +
                  +
                  + +
                  +
                  + +
                  +
                  + +
                  +
                  @code { + PieChart pieChart; LineChart lineChart; + HorizontalBarChart barChartHoriz; + BarChart barChart; protected override async Task OnAfterRenderAsync(bool firstRender) { @@ -17,11 +33,66 @@ } } + object horizontalLineChartOptions = new + { + //Title = new + //{ + // Display = true, + // Text = "Line chart sample" + //}, + //Scales = new + //{ + // XAxes = new object[] + // { + // new { + // //ScaleLabel = new { + // //Display = true, LabelString = "value" }, + // Stacked = true + // } + // } + //}, + Tooltips = new + { + Mode = "nearest", + Intersect = false + }, + Hover = new + { + Mode = "nearest", + Intersect = false + }, + Legend = new + { + Display = true, + FullWidth = true + }, + AspectRatio = 2.5 + }; + async Task HandleRedraw() { - await lineChart.Clear(); + await pieChart.Clear(); + await pieChart.AddLabelsDatasetsAndUpdate(Labels, GetPieChartDataset()); + await lineChart.Clear(); await lineChart.AddLabelsDatasetsAndUpdate(Labels, GetLineChartDataset()); + + await barChart.Clear(); + await barChart.AddLabelsDatasetsAndUpdate(Labels, GetBarChartDataset()); + + await barChartHoriz.Clear(); + await barChartHoriz.AddLabelsDatasetsAndUpdate(Labels, GetHorizBarChartDataset()); + } + + PieChartDataset GetPieChartDataset() + { + return new PieChartDataset + { + Label = "# of randoms", + Data = RandomizeData(), + BackgroundColor = backgroundColors, + BorderColor = borderColors + }; } LineChartDataset GetLineChartDataset() @@ -38,6 +109,29 @@ }; } + BarChartDataset GetBarChartDataset() + { + return new BarChartDataset + { + Label = "# of randoms", + Data = RandomizeData(), + BackgroundColor = backgroundColors, + BorderColor = borderColors, + HoverBorderWidth = 5 + }; + } + BarChartDataset GetHorizBarChartDataset() + { + return new BarChartDataset + { + Label = "# of randoms", + Data = RandomizeData(), + BackgroundColor = backgroundColors, + BorderColor = borderColors, + HoverBorderWidth = 5 + }; + } + string[] Labels = { "Red", "Blue", "Yellow", "Green", "Purple", "Orange" }; List backgroundColors = new List { ChartColor.FromRgba(255, 99, 132, 0.2f), ChartColor.FromRgba(54, 162, 235, 0.2f), ChartColor.FromRgba(255, 206, 86, 0.2f), ChartColor.FromRgba(75, 192, 192, 0.2f), ChartColor.FromRgba(153, 102, 255, 0.2f), ChartColor.FromRgba(255, 159, 64, 0.2f) }; List borderColors = new List { ChartColor.FromRgba(255, 99, 132, 1f), ChartColor.FromRgba(54, 162, 235, 1f), ChartColor.FromRgba(255, 206, 86, 1f), ChartColor.FromRgba(75, 192, 192, 1f), ChartColor.FromRgba(153, 102, 255, 1f), ChartColor.FromRgba(255, 159, 64, 1f) }; @@ -46,6 +140,6 @@ { var r = new Random(DateTime.Now.Millisecond); - return new List { r.Next(3, 50) * r.NextDouble(), r.Next(3, 50) * r.NextDouble(), r.Next(3, 50) * r.NextDouble(), r.Next(3, 50) * r.NextDouble(), r.Next(3, 50) * r.NextDouble(), r.Next(3, 50) * r.NextDouble() }; + return new List { r.Next(3, 30) * r.NextDouble(), r.Next(3, 30) * r.NextDouble(), r.Next(3, 30) * r.NextDouble(), r.Next(3, 30) * r.NextDouble(), r.Next(3, 30) * r.NextDouble(), r.Next(3, 30) * r.NextDouble() }; } } \ No newline at end of file From 7487efb7240c306d2fabfbd25f34da20de4d8446 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 19 May 2021 17:49:19 +0200 Subject: [PATCH 050/158] Inizio review paginazione --- MP.Stats/Components/DataPager.razor | 34 +++++++--- MP.Stats/Data/MpStatsService.cs | 4 +- MP.Stats/Pages/Scarti.razor | 100 ++++++++++++++-------------- MP.Stats/Pages/Scarti.razor.cs | 7 +- 4 files changed, 83 insertions(+), 62 deletions(-) diff --git a/MP.Stats/Components/DataPager.razor b/MP.Stats/Components/DataPager.razor index 527b8e78..fe4f3439 100644 --- a/MP.Stats/Components/DataPager.razor +++ b/MP.Stats/Components/DataPager.razor @@ -1,15 +1,31 @@ -
                  - row/pag:  - +
                  +
                  +
                  +
                  + paginazione +
                  +
                  + @totalCount records +
                  +
                  +
                  +
                  +
                  + row/pag:  + +
                  +
                  @code { + [Parameter] + public int totalCount { get; set; } = 0; protected int _numRecord { get; set; } = 10; diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 7f7eff2f..60e542c8 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -99,10 +99,10 @@ namespace MP.Stats.Data return Task.FromResult(dbController.StatOdlGetAll(numRecord, searchVal).ToArray()); } - public Task StatScartiGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int numRecord, string searchVal = "") + public Task StatScartiGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") { // filtra e restituisce SOLO i primi record... - return Task.FromResult(dbController.StatScartiGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).Take(numRecord).ToArray()); + return Task.FromResult(dbController.StatScartiGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); } public Task StatUserLogGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int numRecord, string searchVal = "") diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index 343d6c22..b2a7ee96 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -5,13 +5,12 @@
                  -
                  Registro Scarti
                  -
                  - +
                  Registro Scarti
                  +
                  -
                  +
                  @if (currRecord != null) { @**@ @@ -22,54 +21,55 @@ } else { - - - - - - - - - - - - - - @foreach (var record in ListRecords) - { - - - - - - - - - - } - -
                  MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
                  -
                  @record.CodMacchina
                  -
                  @record.IdxMacchina
                  -                   		-
                  @record.DataOraRif.ToString("yyyy.MM.dd")
                  -
                  @record.DataOraRif.ToString("ddd HH:mm.ss")
                  -                   		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo -
                  -
                  [@record.Causale]
                  -
                  @record.Descrizione
                  -
                  -
                  @record.Note
                  -                   		@record.Qta@record.Cognome @record.Nome (@record.MatrOpr)
                  +
                  +
                  + +
                  +
                  + + + + + + + + + + + + + + @foreach (var record in ListRecords) + { + + + + + + + + + + } + +
                  MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
                  +
                  @record.CodMacchina
                  +
                  @record.IdxMacchina
                  +                   		+
                  @record.DataOraRif.ToString("yyyy.MM.dd")
                  +
                  @record.DataOraRif.ToString("ddd HH:mm.ss")
                  +                   		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo +
                  +
                  [@record.Causale]
                  +
                  @record.Descrizione
                  +
                  +
                  @record.Note
                  +                   		@record.Qta@record.Cognome @record.Nome (@record.MatrOpr)
                  +
                  +
                  }
                  -
                  -
                  -
                  -
                  - -
                  -
                  +
                  \ No newline at end of file diff --git a/MP.Stats/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs index 871d963c..9baea5ad 100644 --- a/MP.Stats/Pages/Scarti.razor.cs +++ b/MP.Stats/Pages/Scarti.razor.cs @@ -2,6 +2,8 @@ using Microsoft.JSInterop; using MP.Stats.Data; using System; +using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; namespace MP.Stats.Pages @@ -14,6 +16,8 @@ namespace MP.Stats.Pages private MP.Data.DatabaseModels.ResScarti[] ListRecords; + private MP.Data.DatabaseModels.ResScarti[] SearchRecords; + #endregion Private Fields #region Private Properties @@ -43,7 +47,8 @@ namespace MP.Stats.Pages private async Task reloadData() { - ListRecords = await StatService.StatScartiGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, numRecord, MessageService.SearchVal); + SearchRecords = await StatService.StatScartiGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, MessageService.SearchVal); + ListRecords = SearchRecords.Take(numRecord).ToArray(); } #endregion Private Methods From a758b0f95e04a055cacf97ece7a1ca4c3b0e2e16 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 19 May 2021 18:48:15 +0200 Subject: [PATCH 051/158] Nuovo controllo DataPager --- MP.Stats/Components/DataPager.razor | 73 ++++++++++++++++++++++++++--- 1 file changed, 67 insertions(+), 6 deletions(-) diff --git a/MP.Stats/Components/DataPager.razor b/MP.Stats/Components/DataPager.razor index fe4f3439..5616729f 100644 --- a/MP.Stats/Components/DataPager.razor +++ b/MP.Stats/Components/DataPager.razor @@ -1,8 +1,29 @@ 
                  -
                  - paginazione +
                  + + + + + + + @for (int i = 1; i <= LastPage; ++i) + { + var pageNum = i; + + + @pageNum + + + } + + + + + + +
                  @totalCount records @@ -12,7 +33,7 @@
                  row/pag:  - @@ -24,13 +45,29 @@
                  @code { + + void HandlePaginationItemClick(string page) + { + currPage = int.Parse(page); + reportChangePage(); + } + + private int LastPage + { + get + { + return Math.Max((int)Math.Ceiling(totalCount / (double)PageSize), 1); + } + } + [Parameter] public int totalCount { get; set; } = 0; protected int _numRecord { get; set; } = 10; + protected int _numPage { get; set; } = 1; [Parameter] - public int numRecord + public int PageSize { get { @@ -39,20 +76,44 @@ set { bool doReport = !_numRecord.Equals(value); - _numRecord = value; if (doReport) { + _numRecord = value; reportChange(); } } } + [Parameter] + public int currPage + { + get + { + return _numPage; + } + set + { + bool doReport = !_numPage.Equals(value); + if (doReport) + { + _numPage = value; + reportChangePage(); + } + } + } + [Parameter] public EventCallback numRecordChanged { get; set; } + [Parameter] + public EventCallback numPageChanged { get; set; } private void reportChange() { - numRecordChanged.InvokeAsync(numRecord); + numRecordChanged.InvokeAsync(PageSize); + } + private void reportChangePage() + { + numPageChanged.InvokeAsync(currPage); } } \ No newline at end of file From e016aeaf0299a8e4267661c036c8cecb7df7ebe5 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 19 May 2021 18:48:24 +0200 Subject: [PATCH 052/158] Update scarti x nuovo datapager --- MP.Stats/Pages/Scarti.razor | 2 +- MP.Stats/Pages/Scarti.razor.cs | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index b2a7ee96..a3e64483 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -70,6 +70,6 @@ }
                  - +
                  \ No newline at end of file diff --git a/MP.Stats/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs index 9baea5ad..188a001b 100644 --- a/MP.Stats/Pages/Scarti.razor.cs +++ b/MP.Stats/Pages/Scarti.razor.cs @@ -23,6 +23,7 @@ namespace MP.Stats.Pages #region Private Properties private SelectData currFilter { get; set; } = new SelectData(); + private int currPage { get; set; } = 1; private int numRecord { get; set; } = 10; #endregion Private Properties @@ -48,7 +49,7 @@ namespace MP.Stats.Pages private async Task reloadData() { SearchRecords = await StatService.StatScartiGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, MessageService.SearchVal); - ListRecords = SearchRecords.Take(numRecord).ToArray(); + ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToArray(); } #endregion Private Methods @@ -67,6 +68,12 @@ namespace MP.Stats.Pages await reloadData(); } + protected async Task ForceReloadPage(int newNum) + { + currPage = newNum; + await reloadData(); + } + protected override async Task OnInitializedAsync() { MessageService.ShowSearch = true; From abdd9d9e39aa37165bcc91d7b258fc066c70db15 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 19 May 2021 19:02:33 +0200 Subject: [PATCH 053/158] Update pagina controlli --- MP.Stats/Components/DataPager.razor | 1 - MP.Stats/Data/MpStatsService.cs | 9 +--- MP.Stats/Pages/Controlli.razor | 80 ++++++++++++++--------------- MP.Stats/Pages/Controlli.razor.cs | 12 ++++- 4 files changed, 53 insertions(+), 49 deletions(-) diff --git a/MP.Stats/Components/DataPager.razor b/MP.Stats/Components/DataPager.razor index 5616729f..39f03d41 100644 --- a/MP.Stats/Components/DataPager.razor +++ b/MP.Stats/Components/DataPager.razor @@ -17,7 +17,6 @@ } - diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 60e542c8..a5b8934f 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -74,14 +74,9 @@ namespace MP.Stats.Data return Task.FromResult(dbController.StatArticoliGetSearch(numRecord, searchVal).ToArray()); } - public Task StatControlliGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int numRecord, string searchVal = "") + public Task StatControlliGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") { - return Task.FromResult( - dbController - .StatControlliGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo) - //.Where(x => (x.Note.Contains(searchVal) || string.IsNullOrEmpty(searchVal) || string.IsNullOrEmpty(x.Note))) - .Take(numRecord) - .ToArray()); + return Task.FromResult(dbController.StatControlliGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); } public Task StatDdbGetAll(int numRecord, string searchVal = "") diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor index e53533e1..abaf527d 100644 --- a/MP.Stats/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -6,13 +6,12 @@
                  -
                  Registro Controlli
                  -
                  - +
                  Registro Controlli
                  +
                  -
                  +
                  @if (currRecord != null) { @**@ @@ -23,44 +22,45 @@ } else { - - - - @**@ - - - - - - - - - - - @foreach (var record in ListRecords) - { - - @**@ - - - - - - - - - } - -
                  MacchinaDataODL/CommessaArticoloEsitoNoteOperatore
                   @record.IdxMacchina@record.DataOra@record.IdxOdl@record.CodArticolo@record.EsitoOk@record.Note@record.MatrOpr
                  +
                  +
                  + +
                  +
                  + + + + @**@ + + + + + + + + + + + @foreach (var record in ListRecords) + { + + @**@ + + + + + + + + + } + +
                  MacchinaDataODL/CommessaArticoloEsitoNoteOperatore
                   @record.IdxMacchina@record.DataOra@record.IdxOdl@record.CodArticolo@record.EsitoOk@record.Note@record.MatrOpr
                  +
                  +
                  }
                  -
                  -
                  -
                  -
                  - -
                  -
                  +
                  \ No newline at end of file diff --git a/MP.Stats/Pages/Controlli.razor.cs b/MP.Stats/Pages/Controlli.razor.cs index 6a52ec24..e9fe603e 100644 --- a/MP.Stats/Pages/Controlli.razor.cs +++ b/MP.Stats/Pages/Controlli.razor.cs @@ -2,6 +2,7 @@ using Microsoft.JSInterop; using MP.Stats.Data; using System; +using System.Linq; using System.Threading.Tasks; namespace MP.Stats.Pages @@ -13,12 +14,14 @@ namespace MP.Stats.Pages private MP.Data.DatabaseModels.ResControlli currRecord = null; private MP.Data.DatabaseModels.ResControlli[] ListRecords; + private MP.Data.DatabaseModels.ResControlli[] SearchRecords; #endregion Private Fields #region Private Properties private SelectData currFilter { get; set; } = new SelectData(); + private int currPage { get; set; } = 1; private int numRecord { get; set; } = 10; #endregion Private Properties @@ -43,7 +46,8 @@ namespace MP.Stats.Pages private async Task reloadData() { - ListRecords = await StatService.StatControlliGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, numRecord, MessageService.SearchVal); + SearchRecords = await StatService.StatControlliGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, MessageService.SearchVal); + ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToArray(); } #endregion Private Methods @@ -62,6 +66,12 @@ namespace MP.Stats.Pages await reloadData(); } + protected async Task ForceReloadPage(int newNum) + { + currPage = newNum; + await reloadData(); + } + protected override async Task OnInitializedAsync() { MessageService.ShowSearch = true; From 548e050094e3a598c7f67d16dd3bace4c2955007 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 19 May 2021 19:07:02 +0200 Subject: [PATCH 054/158] Update pagina UserLog --- MP.Stats/Data/MpStatsService.cs | 4 +- MP.Stats/Pages/Index.razor | 2 +- MP.Stats/Pages/UserLog.razor | 108 ++++++++++++++++---------------- MP.Stats/Pages/UserLog.razor.cs | 11 +++- 4 files changed, 67 insertions(+), 58 deletions(-) diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index a5b8934f..fb5e3995 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -100,9 +100,9 @@ namespace MP.Stats.Data return Task.FromResult(dbController.StatScartiGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); } - public Task StatUserLogGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int numRecord, string searchVal = "") + public Task StatUserLogGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") { - return Task.FromResult(dbController.StatUserLogGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).Take(numRecord).ToArray()); + return Task.FromResult(dbController.StatUserLogGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); } #endregion Public Methods diff --git a/MP.Stats/Pages/Index.razor b/MP.Stats/Pages/Index.razor index 3e38a5bf..014e7f34 100644 --- a/MP.Stats/Pages/Index.razor +++ b/MP.Stats/Pages/Index.razor @@ -25,7 +25,7 @@
                  Main Topics
                  -
                  +
                  diff --git a/MP.Stats/Pages/UserLog.razor b/MP.Stats/Pages/UserLog.razor index 5d061d1d..b1e792e1 100644 --- a/MP.Stats/Pages/UserLog.razor +++ b/MP.Stats/Pages/UserLog.razor @@ -6,13 +6,12 @@
                  -
                  User ActionLog
                  -
                  - +
                  User ActionLog
                  +
                  -
                  +
                  @if (currRecord != null) { @**@ @@ -23,58 +22,59 @@ } else { - - - - - - - - - - - - - - @foreach (var record in ListRecords) - { - - - - - - - - - - } - -
                  MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
                  -
                  @record.CodMacchina
                  -
                  @record.IdxMacchina
                  -                   		-
                  @record.DataOraRif.ToString("yyyy.MM.dd")
                  -
                  @record.DataOraRif.ToString("ddd HH:mm.ss")
                  -                   		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo -
                  @record.Valore
                  -
                  -
                  - [@record.IdxLog] -
                  -
                  - @decodeAction(@record.Azione).Descrizione -
                  -
                  -                   		@record.Qta.ToString("N0")@record.Cognome @record.Nome (@record.MatrOpr)
                  +
                  +
                  + +
                  +
                  + + + + + + + + + + + + + + @foreach (var record in ListRecords) + { + + + + + + + + + + } + +
                  MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
                  +
                  @record.CodMacchina
                  +
                  @record.IdxMacchina
                  +                   		+
                  @record.DataOraRif.ToString("yyyy.MM.dd")
                  +
                  @record.DataOraRif.ToString("ddd HH:mm.ss")
                  +                   		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo +
                  @record.Valore
                  +
                  +
                  + [@record.IdxLog] +
                  +
                  + @decodeAction(@record.Azione).Descrizione +
                  +
                  +                   		@record.Qta.ToString("N0")@record.Cognome @record.Nome (@record.MatrOpr)
                  +
                  +
                  }
                  -
                  -
                  -
                  -
                  - -
                  -
                  +
                  \ No newline at end of file diff --git a/MP.Stats/Pages/UserLog.razor.cs b/MP.Stats/Pages/UserLog.razor.cs index 374c1cfd..8d1b149f 100644 --- a/MP.Stats/Pages/UserLog.razor.cs +++ b/MP.Stats/Pages/UserLog.razor.cs @@ -15,12 +15,14 @@ namespace MP.Stats.Pages private MP.Data.DatabaseModels.UserActionLog currRecord = null; private MP.Data.DatabaseModels.UserActionLog[] ListRecords; + private MP.Data.DatabaseModels.UserActionLog[] SearchRecords; #endregion Private Fields #region Private Properties private SelectData currFilter { get; set; } = new SelectData(); + private int currPage { get; set; } = 1; private int numRecord { get; set; } = 10; #endregion Private Properties @@ -46,7 +48,8 @@ namespace MP.Stats.Pages private async Task reloadData() { ActionsList = await StatService.ActionsGetAll(); - ListRecords = await StatService.StatUserLogGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, numRecord, MessageService.SearchVal); + SearchRecords = await StatService.StatUserLogGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, MessageService.SearchVal); + ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToArray(); } #endregion Private Methods @@ -65,6 +68,12 @@ namespace MP.Stats.Pages await reloadData(); } + protected async Task ForceReloadPage(int newNum) + { + currPage = newNum; + await reloadData(); + } + protected override async Task OnInitializedAsync() { MessageService.ShowSearch = true; From 0fdedd6884a98140dfc5010f92dc57db65da4cf1 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 19 May 2021 19:22:54 +0200 Subject: [PATCH 055/158] Update pagina Diario --- MP.Stats/Pages/Diario.razor | 22 +++++++++++----------- MP.Stats/Pages/Diario.razor.cs | 16 ++++++++++++++-- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/MP.Stats/Pages/Diario.razor b/MP.Stats/Pages/Diario.razor index 6a7e2e55..b9769c30 100644 --- a/MP.Stats/Pages/Diario.razor +++ b/MP.Stats/Pages/Diario.razor @@ -6,13 +6,12 @@
                  -
                  Diario Produzione
                  -
                  - +
                  Diario Produzione
                  +
                  -
                  +
                  @if (currRecord != null) { @**@ @@ -23,6 +22,11 @@ } else { +
                  +
                  + +
                  +
                  @@ -59,15 +63,11 @@ }
                  +
                  +
                  }
                  -
                  -
                  -
                  -
                  - -
                  -
                  +
                  \ No newline at end of file diff --git a/MP.Stats/Pages/Diario.razor.cs b/MP.Stats/Pages/Diario.razor.cs index 5f73ddb3..300ebbb6 100644 --- a/MP.Stats/Pages/Diario.razor.cs +++ b/MP.Stats/Pages/Diario.razor.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; using MP.Stats.Data; using System; +using System.Linq; using System.Threading.Tasks; namespace MP.Stats.Pages @@ -14,11 +15,14 @@ namespace MP.Stats.Pages private MP.Data.DatabaseModels.DdbTurni[] ListRecords; + private MP.Data.DatabaseModels.DdbTurni[] SearchRecords; + #endregion Private Fields #region Private Properties private SelectData currFilter { get; set; } = new SelectData(); + private int currPage { get; set; } = 1; private int numRecord { get; set; } = 10; #endregion Private Properties @@ -43,8 +47,10 @@ namespace MP.Stats.Pages private async Task reloadData() { - //ListRecords = await StatService.StatScartiGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, numRecord, MessageService.SearchVal); - ListRecords = await StatService.StatDdbGetAll(numRecord, MessageService.SearchVal); + // fare VERO filtro periodo + SearchRecords = await StatService.StatDdbGetAll(200, MessageService.SearchVal); + // SearchRecords = await StatService.StatDdbGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, MessageService.SearchVal); + ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToArray(); } #endregion Private Methods @@ -63,6 +69,12 @@ namespace MP.Stats.Pages await reloadData(); } + protected async Task ForceReloadPage(int newNum) + { + currPage = newNum; + await reloadData(); + } + protected override async Task OnInitializedAsync() { numRecord = 10; From 03477da51a6dd6564bf3e5e71419db0c2c13a7a0 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 19 May 2021 19:25:13 +0200 Subject: [PATCH 056/158] Update pagina ReportODL --- MP.Stats/Pages/ReportODL.razor | 106 +++++++++++++++--------------- MP.Stats/Pages/ReportODL.razor.cs | 14 +++- 2 files changed, 65 insertions(+), 55 deletions(-) diff --git a/MP.Stats/Pages/ReportODL.razor b/MP.Stats/Pages/ReportODL.razor index 0291d66b..d6cf488f 100644 --- a/MP.Stats/Pages/ReportODL.razor +++ b/MP.Stats/Pages/ReportODL.razor @@ -5,72 +5,72 @@
                  -
                  Report ODL/Comm.
                  -
                  - +
                  Report ODL/Comm.
                  +
                  -
                  +
                  @if (currRecord != null) { - @**@ + @**@ } @if (ListRecords == null) { -
                  +
                  } else { - - - - @**@ - - - - - - - - - - @**@ - - - - @foreach (var record in ListRecords) - { - - @**@ - - @**@ - - - - - - - - - - } - -
                  MacchinaODL/CommessaArticoloInizioFinePezzi RichPezzi EvasiPezzi ScartiPezzi RilavOperatore
                    - @record.IdxMacchina - -
                  @record.CodMacchina
                  -
                  @record.IdxMacchina
                  -                   		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo@record.DataInizio@record.DataFine@record.NumPezzi@record.NumPezziEv@record.NumPezziRil@record.NumPezziSca
                  +
                  +
                  + +
                  +
                  + + + + @**@ + + + + + + + + + + @**@ + + + + @foreach (var record in ListRecords) + { + + @**@ + + @**@ + + + + + + + + + + } + +
                  MacchinaODL/CommessaArticoloInizioFinePezzi RichPezzi EvasiPezzi ScartiPezzi RilavOperatore
                    + @record.IdxMacchina + +
                  @record.CodMacchina
                  +
                  @record.IdxMacchina
                  +                   		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo@record.DataInizio@record.DataFine@record.NumPezzi@record.NumPezziEv@record.NumPezziRil@record.NumPezziSca
                  +
                  +
                  }
                  -
                  -
                  -
                  -
                  - -
                  -
                  +
                  \ No newline at end of file diff --git a/MP.Stats/Pages/ReportODL.razor.cs b/MP.Stats/Pages/ReportODL.razor.cs index ea07ee63..fa064321 100644 --- a/MP.Stats/Pages/ReportODL.razor.cs +++ b/MP.Stats/Pages/ReportODL.razor.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; using MP.Stats.Data; using System; +using System.Linq; using System.Threading.Tasks; namespace MP.Stats.Pages @@ -13,12 +14,14 @@ namespace MP.Stats.Pages private MP.Data.DatabaseModels.ODL currRecord = null; private MP.Data.DatabaseModels.ODL[] ListRecords; + private MP.Data.DatabaseModels.ODL[] SearchRecords; #endregion Private Fields #region Private Properties private SelectData currFilter { get; set; } = new SelectData(); + private int currPage { get; set; } = 1; private int numRecord { get; set; } = 10; #endregion Private Properties @@ -43,8 +46,9 @@ namespace MP.Stats.Pages private async Task reloadData() { - //ListRecords = await StatService.StatScartiGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, numRecord, MessageService.SearchVal); - ListRecords = await StatService.StatOdlGetAll(numRecord, MessageService.SearchVal); + SearchRecords = await StatService.StatOdlGetAll(200, MessageService.SearchVal); + //SearchRecords = await StatService.StatScartiGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, MessageService.SearchVal); + ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToArray(); } #endregion Private Methods @@ -63,6 +67,12 @@ namespace MP.Stats.Pages await reloadData(); } + protected async Task ForceReloadPage(int newNum) + { + currPage = newNum; + await reloadData(); + } + protected override async Task OnInitializedAsync() { numRecord = 10; From 52c263090b7af11d07b44091dbbe886f328ae7df Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 20 May 2021 08:04:48 +0200 Subject: [PATCH 057/158] link pagina OEE --- MP.Stats/Pages/Index.razor | 3 +-- MP.Stats/Shared/NavMenu.razor | 11 ++++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/MP.Stats/Pages/Index.razor b/MP.Stats/Pages/Index.razor index 014e7f34..f2d91a2f 100644 --- a/MP.Stats/Pages/Index.razor +++ b/MP.Stats/Pages/Index.razor @@ -26,13 +26,12 @@
                  Main Topics
                  + - @**@ - @**@
                  diff --git a/MP.Stats/Shared/NavMenu.razor b/MP.Stats/Shared/NavMenu.razor index 2ebff8ca..810eb676 100644 --- a/MP.Stats/Shared/NavMenu.razor +++ b/MP.Stats/Shared/NavMenu.razor @@ -7,6 +7,11 @@
                    +
                  • + + TRS/OEE % + +
                  • Home @@ -37,11 +42,7 @@ Registro Scarti
                    • - @*
                  • - - Counter - -
                    • + @*
                  • Fetch data From 7f3d789f2ab9e8169f0b604fdacaa589e83168e7 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 20 May 2021 11:27:06 +0200 Subject: [PATCH 058/158] Aggiunta classi x nuove estrazioni --- MP.Data/DatabaseModels/TurniOee.cs | 28 ++++++ MP.Data/DatabaseModels/TurniPareto.cs | 26 ++++++ MP.Data/DatabaseModels/TurniParetoOdl.cs | 28 ++++++ MP.Data/MP.Data.csproj | 3 - MP.Data/MoonPro_STATSContext.cs | 105 +++++++++++++++++++++++ 5 files changed, 187 insertions(+), 3 deletions(-) create mode 100644 MP.Data/DatabaseModels/TurniOee.cs create mode 100644 MP.Data/DatabaseModels/TurniPareto.cs create mode 100644 MP.Data/DatabaseModels/TurniParetoOdl.cs diff --git a/MP.Data/DatabaseModels/TurniOee.cs b/MP.Data/DatabaseModels/TurniOee.cs new file mode 100644 index 00000000..ec0a36c1 --- /dev/null +++ b/MP.Data/DatabaseModels/TurniOee.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class TurniOee + { + #region Public Properties + + public string ClasseTempo { get; set; } + public string CodArticolo { get; set; } + public string CodMacchina { get; set; } + public DateTime DataRif { get; set; } + public string DescArticolo { get; set; } + public string Descrizione { get; set; } + public string IdxMacchina { get; set; } + public int? IdxOdl { get; set; } + public int IdxStato { get; set; } + public string KeyRichiesta { get; set; } + public double? TotPeriodo { get; set; } + public int? TotPz { get; set; } + public string Turno { get; set; } + + #endregion Public Properties + } +} \ No newline at end of file diff --git a/MP.Data/DatabaseModels/TurniPareto.cs b/MP.Data/DatabaseModels/TurniPareto.cs new file mode 100644 index 00000000..73c9d689 --- /dev/null +++ b/MP.Data/DatabaseModels/TurniPareto.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class TurniPareto + { + #region Public Properties + + public string ClasseTempo { get; set; } + public string CodArticolo { get; set; } + public string CodMacchina { get; set; } + public DateTime DataRif { get; set; } + public string DescArticolo { get; set; } + public string Descrizione { get; set; } + public string IdxMacchina { get; set; } + public int IdxStato { get; set; } + public double? TotPeriodo { get; set; } + public int? TotPz { get; set; } + public string Turno { get; set; } + + #endregion Public Properties + } +} \ No newline at end of file diff --git a/MP.Data/DatabaseModels/TurniParetoOdl.cs b/MP.Data/DatabaseModels/TurniParetoOdl.cs new file mode 100644 index 00000000..7a15b270 --- /dev/null +++ b/MP.Data/DatabaseModels/TurniParetoOdl.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; + +#nullable disable + +namespace MP.Data.DatabaseModels +{ + public partial class TurniParetoOdl + { + #region Public Properties + + public string ClasseTempo { get; set; } + public string CodArticolo { get; set; } + public string CodMacchina { get; set; } + public DateTime DataRif { get; set; } + public string DescArticolo { get; set; } + public string Descrizione { get; set; } + public string IdxMacchina { get; set; } + public int? IdxOdl { get; set; } + public int IdxStato { get; set; } + public string KeyRichiesta { get; set; } + public double? TotPeriodo { get; set; } + public int? TotPz { get; set; } + public string Turno { get; set; } + + #endregion Public Properties + } +} \ No newline at end of file diff --git a/MP.Data/MP.Data.csproj b/MP.Data/MP.Data.csproj index 658bbfa1..0c89b33d 100644 --- a/MP.Data/MP.Data.csproj +++ b/MP.Data/MP.Data.csproj @@ -6,9 +6,6 @@ MP.Data - - - diff --git a/MP.Data/MoonPro_STATSContext.cs b/MP.Data/MoonPro_STATSContext.cs index 6a821592..ffb3bcc6 100644 --- a/MP.Data/MoonPro_STATSContext.cs +++ b/MP.Data/MoonPro_STATSContext.cs @@ -42,6 +42,9 @@ namespace MP.Data public virtual DbSet DbSetMacchine { get; set; } public virtual DbSet DbSetODL { get; set; } public virtual DbSet DbSetScarti { get; set; } + public virtual DbSet DbSetTurniOee { get; set; } + public virtual DbSet DbSetTurniPareto { get; set; } + public virtual DbSet DbSetTurniParetoOdl { get; set; } public virtual DbSet DbSetUserLog { get; set; } #endregion Public Properties @@ -68,6 +71,108 @@ namespace MP.Data protected override void OnModelCreating(ModelBuilder modelBuilder) { modelBuilder.HasAnnotation("Relational:Collation", "SQL_Latin1_General_CP1_CI_AS"); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_UI_OEE_Turni"); + + entity.Property(e => e.ClasseTempo).HasMaxLength(50); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodMacchina).HasMaxLength(50); + + entity.Property(e => e.DataRif).HasColumnType("datetime"); + + entity.Property(e => e.DescArticolo).HasMaxLength(250); + + entity.Property(e => e.Descrizione).HasMaxLength(50); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.KeyRichiesta).HasMaxLength(50); + + entity.Property(e => e.TotPeriodo).HasColumnName("totPeriodo"); + + entity.Property(e => e.Turno) + .IsRequired() + .HasMaxLength(5); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_UI_Pareto_Turni"); + + entity.Property(e => e.ClasseTempo).HasMaxLength(50); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodMacchina).HasMaxLength(50); + + entity.Property(e => e.DataRif).HasColumnType("datetime"); + + entity.Property(e => e.DescArticolo).HasMaxLength(250); + + entity.Property(e => e.Descrizione).HasMaxLength(50); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.TotPeriodo).HasColumnName("totPeriodo"); + + entity.Property(e => e.Turno) + .IsRequired() + .HasMaxLength(5); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + + entity.ToView("v_UI_Pareto_TurniOdl"); + + entity.Property(e => e.ClasseTempo).HasMaxLength(50); + + entity.Property(e => e.CodArticolo) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.CodMacchina).HasMaxLength(50); + + entity.Property(e => e.DataRif).HasColumnType("datetime"); + + entity.Property(e => e.DescArticolo).HasMaxLength(250); + + entity.Property(e => e.Descrizione).HasMaxLength(50); + + entity.Property(e => e.IdxMacchina) + .IsRequired() + .HasMaxLength(50); + + entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); + + entity.Property(e => e.KeyRichiesta).HasMaxLength(50); + + entity.Property(e => e.TotPeriodo).HasColumnName("totPeriodo"); + + entity.Property(e => e.Turno) + .IsRequired() + .HasMaxLength(5); + }); + modelBuilder.Entity(entity => { entity.HasNoKey(); From 081a4792ba6d75396e9e6a6f0b6a9c9b39f121a8 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 20 May 2021 12:03:58 +0200 Subject: [PATCH 059/158] Completato calcoli OEE --- MP.Data/Controllers/MpStatsController.cs | 81 ++++++++++++++++++++++++ MP.Data/DatabaseModels/TurniOee.cs | 13 +++- MP.Data/MoonPro_STATSContext.cs | 4 -- 3 files changed, 91 insertions(+), 7 deletions(-) diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index 61036130..853d1c02 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -220,6 +220,87 @@ namespace MP.Data.Controllers return dbResult; } + /// + /// Elenco tabella TurniOee da filtro + /// + /// + /// + /// + /// + /// + public List StatTurniOeeGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) + { + List dbResult = new List(); + + var dataFrom = new SqlParameter("@dataFrom", DataStart); + var dataTo = new SqlParameter("@dataTo", DataEnd); + var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); + var idxODL = new SqlParameter("@IdxODL", IdxODL); + var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); + var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); + + dbResult = dbCtx + .DbSetTurniOee + .FromSqlRaw("EXEC stp_UI_TurniOee_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) + .ToList(); + + return dbResult; + } + + /// + /// Elenco tabella TurniPareto da filtro + /// + /// + /// + /// + /// + /// + public List StatTurniParetoGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) + { + List dbResult = new List(); + + var dataFrom = new SqlParameter("@dataFrom", DataStart); + var dataTo = new SqlParameter("@dataTo", DataEnd); + var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); + var idxODL = new SqlParameter("@IdxODL", IdxODL); + var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); + var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); + + dbResult = dbCtx + .DbSetTurniPareto + .FromSqlRaw("EXEC stp_UI_ParetoTurni_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) + .ToList(); + + return dbResult; + } + + /// + /// Elenco tabella TurniParetoOdl da filtro + /// + /// + /// + /// + /// + /// + public List StatTurniParetoOdlGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) + { + List dbResult = new List(); + + var dataFrom = new SqlParameter("@dataFrom", DataStart); + var dataTo = new SqlParameter("@dataTo", DataEnd); + var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); + var idxODL = new SqlParameter("@IdxODL", IdxODL); + var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); + var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); + + dbResult = dbCtx + .DbSetTurniParetoOdl + .FromSqlRaw("EXEC stp_UI_ParetoTurniOdl_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) + .ToList(); + + return dbResult; + } + /// /// Elenco tabella UserLog da filtro /// diff --git a/MP.Data/DatabaseModels/TurniOee.cs b/MP.Data/DatabaseModels/TurniOee.cs index ec0a36c1..2187765c 100644 --- a/MP.Data/DatabaseModels/TurniOee.cs +++ b/MP.Data/DatabaseModels/TurniOee.cs @@ -1,5 +1,7 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; #nullable disable @@ -16,10 +18,15 @@ namespace MP.Data.DatabaseModels public string DescArticolo { get; set; } public string Descrizione { get; set; } public string IdxMacchina { get; set; } - public int? IdxOdl { get; set; } public int IdxStato { get; set; } - public string KeyRichiesta { get; set; } - public double? TotPeriodo { get; set; } + + [NotMapped] + [DisplayFormat(DataFormatString = "{0:P2}", ApplyFormatInEditMode = true)] + public double OEE => (double)TotPeriodo / 480; + + [DisplayFormat(DataFormatString = "{0:N2}", ApplyFormatInEditMode = true)] + public double TotPeriodo { get; set; } + public int? TotPz { get; set; } public string Turno { get; set; } diff --git a/MP.Data/MoonPro_STATSContext.cs b/MP.Data/MoonPro_STATSContext.cs index ffb3bcc6..b6161519 100644 --- a/MP.Data/MoonPro_STATSContext.cs +++ b/MP.Data/MoonPro_STATSContext.cs @@ -96,10 +96,6 @@ namespace MP.Data .IsRequired() .HasMaxLength(50); - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.KeyRichiesta).HasMaxLength(50); - entity.Property(e => e.TotPeriodo).HasColumnName("totPeriodo"); entity.Property(e => e.Turno) From bbe18f38d6174d8d367225ba96355ee82cd7dcca Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 20 May 2021 12:04:06 +0200 Subject: [PATCH 060/158] update controlli recupero dati OEE --- MP.Stats/Data/MpStatsService.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index fb5e3995..0ef4c259 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -100,6 +100,21 @@ namespace MP.Stats.Data return Task.FromResult(dbController.StatScartiGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); } + public Task StatTurniOeeGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") + { + return Task.FromResult(dbController.StatTurniOeeGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); + } + + public Task StatTurniParetoGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") + { + return Task.FromResult(dbController.StatTurniParetoGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); + } + + public Task StatTurniParetoOdlGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") + { + return Task.FromResult(dbController.StatTurniParetoOdlGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); + } + public Task StatUserLogGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") { return Task.FromResult(dbController.StatUserLogGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); From 1121f0f3dad709d45199af297ab0fdaed4d2d202 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 20 May 2021 12:04:12 +0200 Subject: [PATCH 061/158] Prima vers pagina OEE --- MP.Stats/Pages/Oee.razor | 71 ++++++++++++++++++ MP.Stats/Pages/Oee.razor.cs | 131 ++++++++++++++++++++++++++++++++++ MP.Stats/Shared/NavMenu.razor | 10 +-- 3 files changed, 207 insertions(+), 5 deletions(-) create mode 100644 MP.Stats/Pages/Oee.razor create mode 100644 MP.Stats/Pages/Oee.razor.cs diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor new file mode 100644 index 00000000..68d95794 --- /dev/null +++ b/MP.Stats/Pages/Oee.razor @@ -0,0 +1,71 @@ +@page "/oee" + +@using MP.Stats.Components +@using MP.Stats.Data + +
                    +
                    +
                    +
                    TRS / OEE %
                    +
                    +
                    +
                    +
                    +
                    + @if (currRecord != null) + { + @**@ + } + @if (ListRecords == null) + { +
                    + } + else + { +
                    +
                    + +
                    +
                    + + + + @**@ + + + + + + + + + + + @foreach (var record in ListRecords) + { + + @**@ + + + + + + + + + } + +
                    DataTurnoMacchinaArticoloDurataPezziOEE
                      +
                    @record.DataRif.ToString("yyyy.MM.dd")
                    +                     		@record.Turno +
                    @record.CodMacchina
                    +
                    @record.IdxMacchina
                    +                     		@record.CodArticolo@record.TotPeriodo.ToString("N2")@record.TotPz@record.OEE
                    +
                    +
                    + } +
                    +
                    + +
                    +
                    \ No newline at end of file diff --git a/MP.Stats/Pages/Oee.razor.cs b/MP.Stats/Pages/Oee.razor.cs new file mode 100644 index 00000000..be601c8e --- /dev/null +++ b/MP.Stats/Pages/Oee.razor.cs @@ -0,0 +1,131 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.JSInterop; +using MP.Stats.Data; +using System; +using System.Linq; +using System.Threading.Tasks; + +namespace MP.Stats.Pages +{ + public partial class Oee : ComponentBase, IDisposable + { + #region Private Fields + + private MP.Data.DatabaseModels.TurniOee currRecord = null; + + private MP.Data.DatabaseModels.TurniOee[] ListRecords; + + private MP.Data.DatabaseModels.TurniOee[] SearchRecords; + + #endregion Private Fields + + #region Private Properties + + private SelectData currFilter { get; set; } = new SelectData(); + private int currPage { get; set; } = 1; + private int numRecord { get; set; } = 10; + + #endregion Private Properties + + #region Protected Properties + + [Inject] + protected IJSRuntime JSRuntime { get; set; } + + [Inject] + protected MessageService MessageService { get; set; } + + [Inject] + protected NavigationManager NavManager { get; set; } + + [Inject] + protected MpStatsService StatService { get; set; } + + #endregion Protected Properties + + #region Private Methods + + private async Task reloadData() + { + SearchRecords = await StatService.StatTurniOeeGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, MessageService.SearchVal); + ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToArray(); + } + + #endregion Private Methods + + #region Protected Methods + + protected async Task DoFilter(SelectData newFilter) + { + currFilter = newFilter; + await reloadData(); + } + + protected async Task ForceReload(int newNum) + { + numRecord = newNum; + await reloadData(); + } + + protected async Task ForceReloadPage(int newNum) + { + currPage = newNum; + await reloadData(); + } + + protected override async Task OnInitializedAsync() + { + numRecord = 10; + MessageService.ShowSearch = true; + MessageService.EA_SearchUpdated += OnSeachUpdated; + await reloadData(); + } + + protected void ResetData() + { + StatService.rollBackEdit(currRecord); + currRecord = null; + } + + protected async Task UpdateData() + { + currRecord = null; + await reloadData(); + } + + #endregion Protected Methods + + #region Public Methods + + public string checkSelect(DateTime DataRif, string Turno, string IdxMacchina) + { + string answ = ""; + if (currRecord != null) + { + try + { + answ = (currRecord.IdxMacchina == IdxMacchina && currRecord.Turno == Turno && currRecord.DataRif == DataRif) ? "table-info" : ""; + } + catch + { } + } + return answ; + } + + public void Dispose() + { + MessageService.EA_SearchUpdated -= OnSeachUpdated; + } + + public void OnSeachUpdated() + { + InvokeAsync(() => + { + UpdateData(); + StateHasChanged(); + }); + } + + #endregion Public Methods + } +} \ No newline at end of file diff --git a/MP.Stats/Shared/NavMenu.razor b/MP.Stats/Shared/NavMenu.razor index 810eb676..ef470f19 100644 --- a/MP.Stats/Shared/NavMenu.razor +++ b/MP.Stats/Shared/NavMenu.razor @@ -7,16 +7,16 @@
                      -
                    • - - TRS/OEE % - -
                    • Home
                      • +
                    • + + TRS/OEE % + +
                    • Report ODL/Comm. From dba6ab60abf601012eda9a215a9d06cf2650eda4 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 20 May 2021 12:08:03 +0200 Subject: [PATCH 062/158] Update visualizzazione OEE (da DB) --- MP.Data/DatabaseModels/TurniOee.cs | 4 ++-- MP.Stats/Pages/Oee.razor | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MP.Data/DatabaseModels/TurniOee.cs b/MP.Data/DatabaseModels/TurniOee.cs index 2187765c..94697231 100644 --- a/MP.Data/DatabaseModels/TurniOee.cs +++ b/MP.Data/DatabaseModels/TurniOee.cs @@ -21,8 +21,8 @@ namespace MP.Data.DatabaseModels public int IdxStato { get; set; } [NotMapped] - [DisplayFormat(DataFormatString = "{0:P2}", ApplyFormatInEditMode = true)] - public double OEE => (double)TotPeriodo / 480; + [DisplayFormat(DataFormatString = "{0:N2}", ApplyFormatInEditMode = true)] + public double OEE => (double)TotPeriodo * 100 / 480; [DisplayFormat(DataFormatString = "{0:N2}", ApplyFormatInEditMode = true)] public double TotPeriodo { get; set; } diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor index 68d95794..0a2def79 100644 --- a/MP.Stats/Pages/Oee.razor +++ b/MP.Stats/Pages/Oee.razor @@ -37,7 +37,7 @@ Articolo Durata Pezzi - OEE + OEE % From 80705cb480b036e772ac699d8e4acbcf298f201d Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 20 May 2021 12:20:40 +0200 Subject: [PATCH 063/158] Fix display % x OEE --- MP.Data/DatabaseModels/TurniOee.cs | 2 +- MP.Stats/Pages/Oee.razor | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MP.Data/DatabaseModels/TurniOee.cs b/MP.Data/DatabaseModels/TurniOee.cs index 94697231..969bcc0c 100644 --- a/MP.Data/DatabaseModels/TurniOee.cs +++ b/MP.Data/DatabaseModels/TurniOee.cs @@ -22,7 +22,7 @@ namespace MP.Data.DatabaseModels [NotMapped] [DisplayFormat(DataFormatString = "{0:N2}", ApplyFormatInEditMode = true)] - public double OEE => (double)TotPeriodo * 100 / 480; + public double OEE => (double)TotPeriodo / 480; [DisplayFormat(DataFormatString = "{0:N2}", ApplyFormatInEditMode = true)] public double TotPeriodo { get; set; } diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor index 0a2def79..a2e0beff 100644 --- a/MP.Stats/Pages/Oee.razor +++ b/MP.Stats/Pages/Oee.razor @@ -56,7 +56,7 @@ @record.CodArticolo @record.TotPeriodo.ToString("N2") @record.TotPz - @record.OEE + @record.OEE.ToString("P2") } From 70369312b309c46ec02351a635c9624871ada5f8 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 20 May 2021 12:21:43 +0200 Subject: [PATCH 064/158] Install redis cache, nuget! --- MP.Data/MP - Backup.Data.csproj | 19 +++++++++++++++++++ MP.Data/MP.Data.csproj | 1 + 2 files changed, 20 insertions(+) create mode 100644 MP.Data/MP - Backup.Data.csproj diff --git a/MP.Data/MP - Backup.Data.csproj b/MP.Data/MP - Backup.Data.csproj new file mode 100644 index 00000000..0c89b33d --- /dev/null +++ b/MP.Data/MP - Backup.Data.csproj @@ -0,0 +1,19 @@ + + + + net5.0 + MP.Data + MP.Data + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + \ No newline at end of file diff --git a/MP.Data/MP.Data.csproj b/MP.Data/MP.Data.csproj index 0c89b33d..de2014da 100644 --- a/MP.Data/MP.Data.csproj +++ b/MP.Data/MP.Data.csproj @@ -14,6 +14,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + \ No newline at end of file From ce77f20b680f32f0aea2b04994fa501ba75bc601 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 20 May 2021 12:40:46 +0200 Subject: [PATCH 065/158] Errore tipo async/await da debuggare.. --- MP.Stats/Data/MpStatsService.cs | 32 +++++++++++++++++++++++++++++--- MP.Stats/MP.Stats.csproj | 1 + MP.Stats/Startup.cs | 15 ++++++++++----- 3 files changed, 40 insertions(+), 8 deletions(-) diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 0ef4c259..e2054459 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -7,6 +7,9 @@ using System.Text; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; using MP.Data; +using Microsoft.Extensions.Caching.Distributed; +using Microsoft.Extensions.Caching.Memory; +using Newtonsoft.Json; namespace MP.Stats.Data { @@ -18,6 +21,8 @@ namespace MP.Stats.Data private static ILogger _logger; private static List ActionsList = new List(); + private readonly IDistributedCache distributedCache; + private readonly IMemoryCache memoryCache; #endregion Private Fields @@ -36,10 +41,12 @@ namespace MP.Stats.Data #region Public Constructors - public MpStatsService(IConfiguration configuration, ILogger logger) + public MpStatsService(IConfiguration configuration, ILogger logger, IMemoryCache memoryCache, IDistributedCache distributedCache) { _logger = logger; _configuration = configuration; + this.memoryCache = memoryCache; + this.distributedCache = distributedCache; string connStr = _configuration.GetConnectionString("Mp.Stats"); if (string.IsNullOrEmpty(connStr)) { @@ -100,9 +107,28 @@ namespace MP.Stats.Data return Task.FromResult(dbController.StatScartiGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); } - public Task StatTurniOeeGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") + public async Task StatTurniOeeGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") { - return Task.FromResult(dbController.StatTurniOeeGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); + List answ = new List(); + var cacheKey = "oeeData"; + string serializedCustomerList; + var redisCustomerList = await distributedCache.GetAsync(cacheKey); + if (redisCustomerList != null) + { + serializedCustomerList = Encoding.UTF8.GetString(redisCustomerList); + answ = JsonConvert.DeserializeObject>(serializedCustomerList); + } + else + { + answ = dbController.StatTurniOeeGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo); + serializedCustomerList = JsonConvert.SerializeObject(answ); + redisCustomerList = Encoding.UTF8.GetBytes(serializedCustomerList); + var options = new DistributedCacheEntryOptions() + .SetAbsoluteExpiration(DateTime.Now.AddMinutes(10)) + .SetSlidingExpiration(TimeSpan.FromMinutes(2)); + await distributedCache.SetAsync(cacheKey, redisCustomerList, options); + } + return answ.ToArray(); } public Task StatTurniParetoGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index 51f424aa..b033953d 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -34,6 +34,7 @@ + diff --git a/MP.Stats/Startup.cs b/MP.Stats/Startup.cs index 57542753..905e67a9 100644 --- a/MP.Stats/Startup.cs +++ b/MP.Stats/Startup.cs @@ -79,11 +79,16 @@ namespace MP.Stats public void ConfigureServices(IServiceCollection services) { services.AddBlazorise(options => - { - options.ChangeTextOnKeyPress = true; // optional - }) - .AddBootstrapProviders() - .AddFontAwesomeIcons(); + { + options.ChangeTextOnKeyPress = true; // optional + }) + .AddBootstrapProviders() + .AddFontAwesomeIcons(); + + services.AddStackExchangeRedisCache(options => + { + options.Configuration = "localhost:6379"; + }); services.AddLocalization(); From 29e4862e417b8edad100dc28b4755100ebf389c2 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 20 May 2021 15:33:57 +0200 Subject: [PATCH 066/158] Primo prototipo OEE con cache funzionante --- MP.Data/Controllers/MpStatsController.cs | 49 ++++++++++++++++++------ MP.Stats/Data/MpStatsService.cs | 25 ++---------- MP.Stats/Pages/Oee.razor | 4 +- MP.Stats/Pages/Oee.razor.cs | 16 +++++++- 4 files changed, 57 insertions(+), 37 deletions(-) diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index 853d1c02..4a5b58ff 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -7,7 +7,10 @@ using System.Configuration; using NLog; using Microsoft.Extensions.Configuration; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Caching.Distributed; +using Microsoft.Extensions.Caching.Memory; using Microsoft.Data.SqlClient; +using Newtonsoft.Json; namespace MP.Data.Controllers { @@ -18,14 +21,18 @@ namespace MP.Data.Controllers private static IConfiguration _configuration; private static MoonPro_STATSContext dbCtx; private static NLog.Logger Log = LogManager.GetCurrentClassLogger(); + private readonly IDistributedCache distributedCache; + private readonly IMemoryCache memoryCache; #endregion Private Fields #region Public Constructors - public MpStatsController(IConfiguration configuration) + public MpStatsController(IConfiguration configuration, IMemoryCache memoryCache, IDistributedCache distributedCache) { _configuration = configuration; + this.memoryCache = memoryCache; + this.distributedCache = distributedCache; dbCtx = new MoonPro_STATSContext(configuration); Log.Info("Avviata classe MpStatsController.MpStatsController"); } @@ -228,21 +235,39 @@ namespace MP.Data.Controllers /// /// /// - public List StatTurniOeeGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) + public async Task> StatTurniOeeGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) { List dbResult = new List(); - var dataFrom = new SqlParameter("@dataFrom", DataStart); - var dataTo = new SqlParameter("@dataTo", DataEnd); - var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); - var idxODL = new SqlParameter("@IdxODL", IdxODL); - var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); - var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); + var cacheKey = "oeeData"; + string rawData; + var redisCustomerList = await distributedCache.GetAsync(cacheKey); + if (redisCustomerList != null) + { + rawData = Encoding.UTF8.GetString(redisCustomerList); + dbResult = JsonConvert.DeserializeObject>(rawData); + } + else + { + var dataFrom = new SqlParameter("@dataFrom", DataStart); + var dataTo = new SqlParameter("@dataTo", DataEnd); + var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); + var idxODL = new SqlParameter("@IdxODL", IdxODL); + var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); + var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); - dbResult = dbCtx - .DbSetTurniOee - .FromSqlRaw("EXEC stp_UI_TurniOee_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) - .ToList(); + dbResult = dbCtx + .DbSetTurniOee + .FromSqlRaw("EXEC stp_UI_TurniOee_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) + .ToList(); + + rawData = JsonConvert.SerializeObject(dbResult); + redisCustomerList = Encoding.UTF8.GetBytes(rawData); + var options = new DistributedCacheEntryOptions() + .SetAbsoluteExpiration(DateTime.Now.AddMinutes(10)) + .SetSlidingExpiration(TimeSpan.FromMinutes(2)); + await distributedCache.SetAsync(cacheKey, redisCustomerList, options); + } return dbResult; } diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index e2054459..16ee0e52 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -54,7 +54,7 @@ namespace MP.Stats.Data } else { - dbController = new MP.Data.Controllers.MpStatsController(configuration); + dbController = new MP.Data.Controllers.MpStatsController(configuration, memoryCache, distributedCache); StringBuilder sb = new StringBuilder(); sb.AppendLine($"DbController OK"); //sb.AppendLine($"CST: {dbController.CustomersCount()} | CNT: {dbController.CountersCount()} | BSK: {dbController.BasketsCount()} | NGT: {dbController.NegotiationsCount()} | DOC: {dbController.DocsCount()} | ITM: {dbController.ItemsCount()} | RES: {dbController.ResourcesCount()}"); @@ -107,28 +107,9 @@ namespace MP.Stats.Data return Task.FromResult(dbController.StatScartiGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); } - public async Task StatTurniOeeGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") + public Task> StatTurniOeeGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") { - List answ = new List(); - var cacheKey = "oeeData"; - string serializedCustomerList; - var redisCustomerList = await distributedCache.GetAsync(cacheKey); - if (redisCustomerList != null) - { - serializedCustomerList = Encoding.UTF8.GetString(redisCustomerList); - answ = JsonConvert.DeserializeObject>(serializedCustomerList); - } - else - { - answ = dbController.StatTurniOeeGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo); - serializedCustomerList = JsonConvert.SerializeObject(answ); - redisCustomerList = Encoding.UTF8.GetBytes(serializedCustomerList); - var options = new DistributedCacheEntryOptions() - .SetAbsoluteExpiration(DateTime.Now.AddMinutes(10)) - .SetSlidingExpiration(TimeSpan.FromMinutes(2)); - await distributedCache.SetAsync(cacheKey, redisCustomerList, options); - } - return answ.ToArray(); + return dbController.StatTurniOeeGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo); } public Task StatTurniParetoGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor index a2e0beff..f31be4fb 100644 --- a/MP.Stats/Pages/Oee.razor +++ b/MP.Stats/Pages/Oee.razor @@ -16,7 +16,7 @@ { @**@ } - @if (ListRecords == null) + @if (ListRecords == null || totalCount == 0 || ListRecords.Count() == 0) {
                      } @@ -66,6 +66,6 @@ }
                    - +
                  \ No newline at end of file diff --git a/MP.Stats/Pages/Oee.razor.cs b/MP.Stats/Pages/Oee.razor.cs index be601c8e..37330e82 100644 --- a/MP.Stats/Pages/Oee.razor.cs +++ b/MP.Stats/Pages/Oee.razor.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; using MP.Stats.Data; using System; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -15,7 +16,7 @@ namespace MP.Stats.Pages private MP.Data.DatabaseModels.TurniOee[] ListRecords; - private MP.Data.DatabaseModels.TurniOee[] SearchRecords; + private List SearchRecords; #endregion Private Fields @@ -41,6 +42,19 @@ namespace MP.Stats.Pages [Inject] protected MpStatsService StatService { get; set; } + protected int totalCount + { + get + { + int answ = 0; + if (SearchRecords != null) + { + answ = SearchRecords.Count; + } + return answ; + } + } + #endregion Protected Properties #region Private Methods From b826a6759ac2d0cb3c453c6ffda25d10fc00b2fa Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 20 May 2021 15:56:48 +0200 Subject: [PATCH 067/158] COmpletata riorganizzazione cache x OEE --- MP.Data/Controllers/MpStatsController.cs | 49 ++++++------------------ MP.Stats/Data/MpStatsService.cs | 30 +++++++++++++-- MP.Stats/Pages/Oee.razor | 2 +- MP.Stats/Pages/Oee.razor.cs | 3 +- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index 4a5b58ff..853d1c02 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -7,10 +7,7 @@ using System.Configuration; using NLog; using Microsoft.Extensions.Configuration; using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Caching.Distributed; -using Microsoft.Extensions.Caching.Memory; using Microsoft.Data.SqlClient; -using Newtonsoft.Json; namespace MP.Data.Controllers { @@ -21,18 +18,14 @@ namespace MP.Data.Controllers private static IConfiguration _configuration; private static MoonPro_STATSContext dbCtx; private static NLog.Logger Log = LogManager.GetCurrentClassLogger(); - private readonly IDistributedCache distributedCache; - private readonly IMemoryCache memoryCache; #endregion Private Fields #region Public Constructors - public MpStatsController(IConfiguration configuration, IMemoryCache memoryCache, IDistributedCache distributedCache) + public MpStatsController(IConfiguration configuration) { _configuration = configuration; - this.memoryCache = memoryCache; - this.distributedCache = distributedCache; dbCtx = new MoonPro_STATSContext(configuration); Log.Info("Avviata classe MpStatsController.MpStatsController"); } @@ -235,39 +228,21 @@ namespace MP.Data.Controllers /// /// /// - public async Task> StatTurniOeeGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) + public List StatTurniOeeGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) { List dbResult = new List(); - var cacheKey = "oeeData"; - string rawData; - var redisCustomerList = await distributedCache.GetAsync(cacheKey); - if (redisCustomerList != null) - { - rawData = Encoding.UTF8.GetString(redisCustomerList); - dbResult = JsonConvert.DeserializeObject>(rawData); - } - else - { - var dataFrom = new SqlParameter("@dataFrom", DataStart); - var dataTo = new SqlParameter("@dataTo", DataEnd); - var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); - var idxODL = new SqlParameter("@IdxODL", IdxODL); - var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); - var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); + var dataFrom = new SqlParameter("@dataFrom", DataStart); + var dataTo = new SqlParameter("@dataTo", DataEnd); + var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); + var idxODL = new SqlParameter("@IdxODL", IdxODL); + var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); + var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); - dbResult = dbCtx - .DbSetTurniOee - .FromSqlRaw("EXEC stp_UI_TurniOee_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) - .ToList(); - - rawData = JsonConvert.SerializeObject(dbResult); - redisCustomerList = Encoding.UTF8.GetBytes(rawData); - var options = new DistributedCacheEntryOptions() - .SetAbsoluteExpiration(DateTime.Now.AddMinutes(10)) - .SetSlidingExpiration(TimeSpan.FromMinutes(2)); - await distributedCache.SetAsync(cacheKey, redisCustomerList, options); - } + dbResult = dbCtx + .DbSetTurniOee + .FromSqlRaw("EXEC stp_UI_TurniOee_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) + .ToList(); return dbResult; } diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 16ee0e52..ce338d85 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -54,7 +54,7 @@ namespace MP.Stats.Data } else { - dbController = new MP.Data.Controllers.MpStatsController(configuration, memoryCache, distributedCache); + dbController = new MP.Data.Controllers.MpStatsController(configuration); StringBuilder sb = new StringBuilder(); sb.AppendLine($"DbController OK"); //sb.AppendLine($"CST: {dbController.CustomersCount()} | CNT: {dbController.CountersCount()} | BSK: {dbController.BasketsCount()} | NGT: {dbController.NegotiationsCount()} | DOC: {dbController.DocsCount()} | ITM: {dbController.ItemsCount()} | RES: {dbController.ResourcesCount()}"); @@ -107,9 +107,33 @@ namespace MP.Stats.Data return Task.FromResult(dbController.StatScartiGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); } - public Task> StatTurniOeeGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") + public async Task> StatTurniOeeGetAllAsync(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") { - return dbController.StatTurniOeeGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo); + return await Task.FromResult(dbController.StatTurniOeeGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo)); + } + + public async Task> StatTurniOeeGetAllCached(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") + { + List dbResult = new List(); + var cacheKey = "oeeData"; + string rawData; + var redisCustomerList = await distributedCache.GetAsync(cacheKey); + if (redisCustomerList != null) + { + rawData = Encoding.UTF8.GetString(redisCustomerList); + dbResult = JsonConvert.DeserializeObject>(rawData); + } + else + { + dbResult = dbController.StatTurniOeeGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo); + rawData = JsonConvert.SerializeObject(dbResult); + redisCustomerList = Encoding.UTF8.GetBytes(rawData); + var options = new DistributedCacheEntryOptions() + .SetAbsoluteExpiration(DateTime.Now.AddMinutes(10)) + .SetSlidingExpiration(TimeSpan.FromMinutes(2)); + await distributedCache.SetAsync(cacheKey, redisCustomerList, options); + } + return await Task.FromResult(dbResult); } public Task StatTurniParetoGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor index f31be4fb..c974017b 100644 --- a/MP.Stats/Pages/Oee.razor +++ b/MP.Stats/Pages/Oee.razor @@ -16,7 +16,7 @@ { @**@ } - @if (ListRecords == null || totalCount == 0 || ListRecords.Count() == 0) + @if (totalCount == 0 || ListRecords == null || ListRecords.Count() == 0) {
                  } diff --git a/MP.Stats/Pages/Oee.razor.cs b/MP.Stats/Pages/Oee.razor.cs index 37330e82..2e40d0d2 100644 --- a/MP.Stats/Pages/Oee.razor.cs +++ b/MP.Stats/Pages/Oee.razor.cs @@ -61,7 +61,8 @@ namespace MP.Stats.Pages private async Task reloadData() { - SearchRecords = await StatService.StatTurniOeeGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, MessageService.SearchVal); + SearchRecords = await StatService.StatTurniOeeGetAllCached(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, MessageService.SearchVal); + //SearchRecords = await StatService.StatTurniOeeGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, MessageService.SearchVal); ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToArray(); } From eeb5e12bf021a377ab360e65a380985889cdde12 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 20 May 2021 18:08:55 +0200 Subject: [PATCH 068/158] Cache management refinement --- MP.Stats/Data/MpStatsService.cs | 45 +++++++++++++---- MP.Stats/Data/SelectData.cs | 19 +++++++ MP.Stats/Pages/Oee.razor | 89 +++++++++++++++++---------------- MP.Stats/Pages/Oee.razor.cs | 3 +- 4 files changed, 102 insertions(+), 54 deletions(-) diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index ce338d85..f13d3571 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -24,6 +24,19 @@ namespace MP.Stats.Data private readonly IDistributedCache distributedCache; private readonly IMemoryCache memoryCache; + private DistributedCacheEntryOptions cacheOpt; + + /// + /// Durata assoluta massima della cache + /// + private int chAbsExp = 15; + + /// + /// Durata della cache in modalità inattiva (non acceduta) prima di venire rimossa + /// NON estende oltre il tempo massimo di validità Abs della cache + /// + private int chSliExp = 5; + #endregion Private Fields #region Protected Fields @@ -45,8 +58,11 @@ namespace MP.Stats.Data { _logger = logger; _configuration = configuration; + // conf cache this.memoryCache = memoryCache; this.distributedCache = distributedCache; + cacheOpt = new DistributedCacheEntryOptions().SetAbsoluteExpiration(DateTime.Now.AddMinutes(chAbsExp)).SetSlidingExpiration(TimeSpan.FromMinutes(chSliExp)); + // conf DB string connStr = _configuration.GetConnectionString("Mp.Stats"); if (string.IsNullOrEmpty(connStr)) { @@ -64,6 +80,16 @@ namespace MP.Stats.Data #endregion Public Constructors + #region Protected Methods + + protected string getCacheKey(string TableName, SelectData CurrFilter) + { + string answ = $"{TableName}:M_{CurrFilter.IdxMacchina}:A_{CurrFilter.CodArticolo}:K_{CurrFilter.KeyRichiesta}:O_{CurrFilter.IdxOdl}:D_{CurrFilter.DateStart:yyyyMMddHHmm}_{CurrFilter.DateEnd:yyyyMMddHHmm}"; + return answ; + } + + #endregion Protected Methods + #region Public Methods public Task ActionsGetAll() @@ -112,26 +138,23 @@ namespace MP.Stats.Data return await Task.FromResult(dbController.StatTurniOeeGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo)); } - public async Task> StatTurniOeeGetAllCached(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") + public async Task> StatTurniOeeGetAllCached(SelectData CurrFilter, string searchVal = "") { List dbResult = new List(); - var cacheKey = "oeeData"; + string cacheKey = getCacheKey("MP:STATS:OEE", CurrFilter); string rawData; - var redisCustomerList = await distributedCache.GetAsync(cacheKey); - if (redisCustomerList != null) + var redisDataList = await distributedCache.GetAsync(cacheKey); + if (redisDataList != null) { - rawData = Encoding.UTF8.GetString(redisCustomerList); + rawData = Encoding.UTF8.GetString(redisDataList); dbResult = JsonConvert.DeserializeObject>(rawData); } else { - dbResult = dbController.StatTurniOeeGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo); + dbResult = dbController.StatTurniOeeGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo); rawData = JsonConvert.SerializeObject(dbResult); - redisCustomerList = Encoding.UTF8.GetBytes(rawData); - var options = new DistributedCacheEntryOptions() - .SetAbsoluteExpiration(DateTime.Now.AddMinutes(10)) - .SetSlidingExpiration(TimeSpan.FromMinutes(2)); - await distributedCache.SetAsync(cacheKey, redisCustomerList, options); + redisDataList = Encoding.UTF8.GetBytes(rawData); + await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt); } return await Task.FromResult(dbResult); } diff --git a/MP.Stats/Data/SelectData.cs b/MP.Stats/Data/SelectData.cs index 05be9c99..546014d8 100644 --- a/MP.Stats/Data/SelectData.cs +++ b/MP.Stats/Data/SelectData.cs @@ -20,6 +20,25 @@ namespace MP.Stats.Data #region Public Methods + /// + /// Inizializzazione con periodo e arrotondamento + /// + /// + /// + /// + public static SelectData Init(int minRound, int numDayPrev) + { + TimeSpan DayElapsed = DateTime.Now.Subtract(DateTime.Today); + int minDay = (int)(DayElapsed.TotalMinutes / minRound) * minRound; + DateTime endRounded = DateTime.Today.AddMinutes(minDay); + SelectData answ = new SelectData() + { + DateEnd = endRounded, + DateStart = endRounded.AddDays(-numDayPrev) + }; + return answ; + } + public override bool Equals(object obj) { if (!(obj is SelectData item)) diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor index c974017b..db8b562a 100644 --- a/MP.Stats/Pages/Oee.razor +++ b/MP.Stats/Pages/Oee.razor @@ -14,55 +14,60 @@
                  @if (currRecord != null) { - @**@ + @**@ } @if (totalCount == 0 || ListRecords == null || ListRecords.Count() == 0) { -
                  +
                  +
                  +

                  loading data

                  + +
                  +
                  } else { -
                  -
                  - -
                  -
                  - - - - @**@ - - - - - - - - - - - @foreach (var record in ListRecords) - { - - @**@ - - - - - - - - - } - -
                  DataTurnoMacchinaArticoloDurataPezziOEE %
                    -
                  @record.DataRif.ToString("yyyy.MM.dd")
                  -                   		@record.Turno -
                  @record.CodMacchina
                  -
                  @record.IdxMacchina
                  -                   		@record.CodArticolo@record.TotPeriodo.ToString("N2")@record.TotPz@record.OEE.ToString("P2")
                  -
                  +
                  +
                  +
                  +
                  + + + + @**@ + + + + + + + + + + + @foreach (var record in ListRecords) + { + + @**@ + + + + + + + + + } + +
                  DataTurnoMacchinaArticoloDurataPezziOEE %
                    +
                  @record.DataRif.ToString("yyyy.MM.dd")
                  +                   		@record.Turno +
                  @record.CodMacchina
                  +
                  @record.IdxMacchina
                  +                   		@record.CodArticolo@record.TotPeriodo.ToString("N2")@record.TotPz@record.OEE.ToString("P2")
                  +
                  +
                  }
                  diff --git a/MP.Stats/Pages/Oee.razor.cs b/MP.Stats/Pages/Oee.razor.cs index 2e40d0d2..b8846e63 100644 --- a/MP.Stats/Pages/Oee.razor.cs +++ b/MP.Stats/Pages/Oee.razor.cs @@ -61,7 +61,7 @@ namespace MP.Stats.Pages private async Task reloadData() { - SearchRecords = await StatService.StatTurniOeeGetAllCached(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, MessageService.SearchVal); + SearchRecords = await StatService.StatTurniOeeGetAllCached(currFilter, MessageService.SearchVal); //SearchRecords = await StatService.StatTurniOeeGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, MessageService.SearchVal); ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToArray(); } @@ -91,6 +91,7 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { numRecord = 10; + currFilter = SelectData.Init(5, 7); MessageService.ShowSearch = true; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); From b051d3e330aee5019cbc5d2840fcfe30c0c240e3 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 20 May 2021 18:22:53 +0200 Subject: [PATCH 069/158] Ok pagina OEE, da estendere... --- MP.Stats/Pages/Controlli.razor.cs | 2 +- MP.Stats/Pages/Diario.razor.cs | 2 +- MP.Stats/Pages/Oee.razor | 93 ++++++++++++++----------------- MP.Stats/Pages/Oee.razor.cs | 9 +-- MP.Stats/Pages/ReportODL.razor.cs | 2 +- MP.Stats/Pages/Scarti.razor.cs | 2 +- MP.Stats/Pages/UserLog.razor.cs | 2 +- 7 files changed, 53 insertions(+), 59 deletions(-) diff --git a/MP.Stats/Pages/Controlli.razor.cs b/MP.Stats/Pages/Controlli.razor.cs index e9fe603e..71af34c9 100644 --- a/MP.Stats/Pages/Controlli.razor.cs +++ b/MP.Stats/Pages/Controlli.razor.cs @@ -74,7 +74,7 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { - MessageService.ShowSearch = true; + MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); } diff --git a/MP.Stats/Pages/Diario.razor.cs b/MP.Stats/Pages/Diario.razor.cs index 300ebbb6..e94b882d 100644 --- a/MP.Stats/Pages/Diario.razor.cs +++ b/MP.Stats/Pages/Diario.razor.cs @@ -78,7 +78,7 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { numRecord = 10; - MessageService.ShowSearch = true; + MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); } diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor index db8b562a..3319ad45 100644 --- a/MP.Stats/Pages/Oee.razor +++ b/MP.Stats/Pages/Oee.razor @@ -12,63 +12,56 @@
                  - @if (currRecord != null) - { - @**@ - } - @if (totalCount == 0 || ListRecords == null || ListRecords.Count() == 0) - { -
                  -
                  -

                  loading data

                  - -
                  -
                  - } - else - {
                  -
                  - - - - @**@ - - - - - - - - - - - @foreach (var record in ListRecords) + @if (totalCount == 0 || ListRecords == null || ListRecords.Count() == 0) + { +
                  +

                  loading data

                  + +
                  + } + else + { +
                  +
                  DataTurnoMacchinaArticoloDurataPezziOEE %
                  + + + @**@ + + + + + + + + + + + @foreach (var record in ListRecords) { - - @**@ - - - - - - - - + + + + + + + + + } - -
                  DataTurnoMacchinaArticoloDurataPezziOEE %
                    -
                  @record.DataRif.ToString("yyyy.MM.dd")
                  -                   		@record.Turno -
                  @record.CodMacchina
                  -
                  @record.IdxMacchina
                  -                   		@record.CodArticolo@record.TotPeriodo.ToString("N2")@record.TotPz@record.OEE.ToString("P2")
                  +
                  @record.DataRif.ToString("yyyy.MM.dd")
                  +                   		@record.Turno +
                  @record.CodMacchina
                  +
                  @record.IdxMacchina
                  +                   		@record.CodArticolo@record.TotPeriodo.ToString("N2")@record.TotPz@record.OEE.ToString("P2")
                  -
                  + + +
                  + }
                  - }
                  diff --git a/MP.Stats/Pages/Oee.razor.cs b/MP.Stats/Pages/Oee.razor.cs index b8846e63..b63488ec 100644 --- a/MP.Stats/Pages/Oee.razor.cs +++ b/MP.Stats/Pages/Oee.razor.cs @@ -14,7 +14,7 @@ namespace MP.Stats.Pages private MP.Data.DatabaseModels.TurniOee currRecord = null; - private MP.Data.DatabaseModels.TurniOee[] ListRecords; + private List ListRecords; private List SearchRecords; @@ -61,9 +61,10 @@ namespace MP.Stats.Pages private async Task reloadData() { + SearchRecords = null; + ListRecords = null; SearchRecords = await StatService.StatTurniOeeGetAllCached(currFilter, MessageService.SearchVal); - //SearchRecords = await StatService.StatTurniOeeGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, MessageService.SearchVal); - ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToArray(); + ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); } #endregion Private Methods @@ -92,7 +93,7 @@ namespace MP.Stats.Pages { numRecord = 10; currFilter = SelectData.Init(5, 7); - MessageService.ShowSearch = true; + MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); } diff --git a/MP.Stats/Pages/ReportODL.razor.cs b/MP.Stats/Pages/ReportODL.razor.cs index fa064321..67103791 100644 --- a/MP.Stats/Pages/ReportODL.razor.cs +++ b/MP.Stats/Pages/ReportODL.razor.cs @@ -76,7 +76,7 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { numRecord = 10; - MessageService.ShowSearch = true; + MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); } diff --git a/MP.Stats/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs index 188a001b..087c1057 100644 --- a/MP.Stats/Pages/Scarti.razor.cs +++ b/MP.Stats/Pages/Scarti.razor.cs @@ -76,7 +76,7 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { - MessageService.ShowSearch = true; + MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); } diff --git a/MP.Stats/Pages/UserLog.razor.cs b/MP.Stats/Pages/UserLog.razor.cs index 8d1b149f..24eb1c4f 100644 --- a/MP.Stats/Pages/UserLog.razor.cs +++ b/MP.Stats/Pages/UserLog.razor.cs @@ -76,7 +76,7 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { - MessageService.ShowSearch = true; + MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); } From de187a5c839a13c5155de22567cd87539b98a8ee Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 20 May 2021 18:28:03 +0200 Subject: [PATCH 070/158] Ok elemento paginazione e loading in reload --- MP.Stats/Components/DataPager.razor | 64 +++++++++++++++------------ MP.Stats/Components/LoadingData.razor | 6 +++ MP.Stats/Pages/Oee.razor | 27 ++++++----- MP.Stats/Pages/Oee.razor.cs | 4 +- 4 files changed, 56 insertions(+), 45 deletions(-) create mode 100644 MP.Stats/Components/LoadingData.razor diff --git a/MP.Stats/Components/DataPager.razor b/MP.Stats/Components/DataPager.razor index 39f03d41..eab20eca 100644 --- a/MP.Stats/Components/DataPager.razor +++ b/MP.Stats/Components/DataPager.razor @@ -2,27 +2,30 @@
                  - - - - - - - @for (int i = 1; i <= LastPage; ++i) - { - var pageNum = i; - - - @pageNum + @if (totalCount > 0) + { + + + + - } - - - - - - + @for (int i = 1; i <= LastPage; ++i) + { + var pageNum = i; + + + @pageNum + + + } + + + + + + + }
                  @totalCount records @@ -30,16 +33,19 @@
                  -
                  - row/pag:  - -
                  + @if (totalCount > 0) + { +
                  + row/pag:  + +
                  + }
                  diff --git a/MP.Stats/Components/LoadingData.razor b/MP.Stats/Components/LoadingData.razor new file mode 100644 index 00000000..4eb9ffb3 --- /dev/null +++ b/MP.Stats/Components/LoadingData.razor @@ -0,0 +1,6 @@ +
                  +
                  +

                  loading data

                  + +
                  +
                  \ No newline at end of file diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor index 3319ad45..84b296c3 100644 --- a/MP.Stats/Pages/Oee.razor +++ b/MP.Stats/Pages/Oee.razor @@ -16,15 +16,14 @@
                  - @if (totalCount == 0 || ListRecords == null || ListRecords.Count() == 0) - { -
                  -

                  loading data

                  - -
                  - } - else - { +
                  + @if (totalCount == 0 || ListRecords == null || ListRecords.Count() == 0) + { + + } + else + { +
                  @@ -60,10 +59,10 @@
                  - } -
                  -
                  -
                  - +
                  + }
                  +
                  +
                  +
                  \ No newline at end of file diff --git a/MP.Stats/Pages/Oee.razor.cs b/MP.Stats/Pages/Oee.razor.cs index b63488ec..d5fd3934 100644 --- a/MP.Stats/Pages/Oee.razor.cs +++ b/MP.Stats/Pages/Oee.razor.cs @@ -61,8 +61,6 @@ namespace MP.Stats.Pages private async Task reloadData() { - SearchRecords = null; - ListRecords = null; SearchRecords = await StatService.StatTurniOeeGetAllCached(currFilter, MessageService.SearchVal); ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); } @@ -73,6 +71,8 @@ namespace MP.Stats.Pages protected async Task DoFilter(SelectData newFilter) { + SearchRecords = null; + ListRecords = null; currFilter = newFilter; await reloadData(); } From 47af4a2a86403e2fa78de791a45aa1c6a915bed6 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 20 May 2021 19:07:52 +0200 Subject: [PATCH 071/158] Report ODL sotto cache redis e filtro! --- MP.Data/Controllers/MpStatsController.cs | 20 +++++++-- MP.Stats/Data/MpStatsService.cs | 21 ++++++++- MP.Stats/Pages/Oee.razor | 8 ++-- MP.Stats/Pages/ReportODL.razor | 55 ++++++++++-------------- MP.Stats/Pages/ReportODL.razor.cs | 26 ++++++++--- 5 files changed, 82 insertions(+), 48 deletions(-) diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index 853d1c02..c0a8869e 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -173,15 +173,27 @@ namespace MP.Data.Controllers /// /// /// - public List StatOdlGetAll(int numRecord, string searchVal = "") + public List StatOdlGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) { List dbResult = new List(); + //dbResult = dbCtx + // .DbSetODL + // .Where(x => x.CodArticolo.Contains(searchVal) || x.IdxMacchina.Contains(searchVal) || x.KeyRichiesta.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) + // .OrderByDescending(x => x.DataInizio) + // .Take(numRecord) + // .ToList(); + + var dataFrom = new SqlParameter("@dataFrom", DataStart); + var dataTo = new SqlParameter("@dataTo", DataEnd); + var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); + var idxODL = new SqlParameter("@IdxODL", IdxODL); + var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); + var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); + dbResult = dbCtx .DbSetODL - .Where(x => x.CodArticolo.Contains(searchVal) || x.IdxMacchina.Contains(searchVal) || x.KeyRichiesta.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) - .OrderByDescending(x => x.DataInizio) - .Take(numRecord) + .FromSqlRaw("EXEC stp_UI_RS_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) .ToList(); return dbResult; diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index f13d3571..4b2a9352 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -122,9 +122,26 @@ namespace MP.Stats.Data return Task.FromResult(dbController.StatMacchineGetAll().ToArray()); } - public Task StatOdlGetAll(int numRecord, string searchVal = "") + public async Task> StatOdlGetAll(SelectData CurrFilter, string searchVal = "") { - return Task.FromResult(dbController.StatOdlGetAll(numRecord, searchVal).ToArray()); + //return Task.FromResult(dbController.StatOdlGetAll(numRecord, searchVal)); + List dbResult = new List(); + string cacheKey = getCacheKey("MP:STATS:ODL", CurrFilter); + string rawData; + var redisDataList = await distributedCache.GetAsync(cacheKey); + if (redisDataList != null) + { + rawData = Encoding.UTF8.GetString(redisDataList); + dbResult = JsonConvert.DeserializeObject>(rawData); + } + else + { + dbResult = dbController.StatOdlGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo); + rawData = JsonConvert.SerializeObject(dbResult); + redisDataList = Encoding.UTF8.GetBytes(rawData); + await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt); + } + return await Task.FromResult(dbResult); } public Task StatScartiGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor index 84b296c3..d48e8323 100644 --- a/MP.Stats/Pages/Oee.razor +++ b/MP.Stats/Pages/Oee.razor @@ -1,7 +1,6 @@ @page "/oee" @using MP.Stats.Components -@using MP.Stats.Data
                  @@ -28,7 +27,6 @@ - @**@ @@ -62,7 +60,7 @@ } - -
                  - +
                  + +
                  \ No newline at end of file diff --git a/MP.Stats/Pages/ReportODL.razor b/MP.Stats/Pages/ReportODL.razor index d6cf488f..1b30d59d 100644 --- a/MP.Stats/Pages/ReportODL.razor +++ b/MP.Stats/Pages/ReportODL.razor @@ -11,25 +11,22 @@
                  - @if (currRecord != null) +
                  +
                  + +
                  +
                  + @if (totalCount == 0 || ListRecords == null || ListRecords.Count() == 0) { - @**@ - } - @if (ListRecords == null) - { -
                  + } else {
                  -
                  - -
                  Data Turno Macchina
                  - @**@ @@ -39,31 +36,25 @@ - @**@ @foreach (var record in ListRecords) - { - - @**@ - - @**@ - - - - - - - - - - } + { + + + + + + + + + + + + }
                  Macchina ODL/Commessa ArticoloPezzi Evasi Pezzi Scarti Pezzi RilavOperatore
                    - @record.IdxMacchina - -
                  @record.CodMacchina
                  -
                  @record.IdxMacchina
                  -                   		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo@record.DataInizio@record.DataFine@record.NumPezzi@record.NumPezziEv@record.NumPezziRil@record.NumPezziSca
                  + @record.IdxMacchina + @record.IdxOdl | @record.KeyRichiesta@record.CodArticolo@record.DataInizio@record.DataFine@record.NumPezzi@record.NumPezziEv@record.NumPezziRil@record.NumPezziSca
                  @@ -71,6 +62,6 @@ }
                  - +
                  \ No newline at end of file diff --git a/MP.Stats/Pages/ReportODL.razor.cs b/MP.Stats/Pages/ReportODL.razor.cs index 67103791..6f16bbaf 100644 --- a/MP.Stats/Pages/ReportODL.razor.cs +++ b/MP.Stats/Pages/ReportODL.razor.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; using MP.Stats.Data; using System; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -13,8 +14,8 @@ namespace MP.Stats.Pages private MP.Data.DatabaseModels.ODL currRecord = null; - private MP.Data.DatabaseModels.ODL[] ListRecords; - private MP.Data.DatabaseModels.ODL[] SearchRecords; + private List ListRecords; + private List SearchRecords; #endregion Private Fields @@ -40,15 +41,27 @@ namespace MP.Stats.Pages [Inject] protected MpStatsService StatService { get; set; } + protected int totalCount + { + get + { + int answ = 0; + if (SearchRecords != null) + { + answ = SearchRecords.Count; + } + return answ; + } + } + #endregion Protected Properties #region Private Methods private async Task reloadData() { - SearchRecords = await StatService.StatOdlGetAll(200, MessageService.SearchVal); - //SearchRecords = await StatService.StatScartiGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, MessageService.SearchVal); - ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToArray(); + SearchRecords = await StatService.StatOdlGetAll(currFilter, MessageService.SearchVal); + ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); } #endregion Private Methods @@ -57,6 +70,8 @@ namespace MP.Stats.Pages protected async Task DoFilter(SelectData newFilter) { + SearchRecords = null; + ListRecords = null; currFilter = newFilter; await reloadData(); } @@ -76,6 +91,7 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { numRecord = 10; + currFilter = SelectData.Init(5, 7); MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); From 5c06e2258fe63b1a7e8b9474aa1c6a0297a609eb Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 20 May 2021 19:12:09 +0200 Subject: [PATCH 072/158] Ok cache e filtro nuovi --- MP.Data/Controllers/MpStatsController.cs | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index c0a8869e..90de21ef 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -177,13 +177,6 @@ namespace MP.Data.Controllers { List dbResult = new List(); - //dbResult = dbCtx - // .DbSetODL - // .Where(x => x.CodArticolo.Contains(searchVal) || x.IdxMacchina.Contains(searchVal) || x.KeyRichiesta.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) - // .OrderByDescending(x => x.DataInizio) - // .Take(numRecord) - // .ToList(); - var dataFrom = new SqlParameter("@dataFrom", DataStart); var dataTo = new SqlParameter("@dataTo", DataEnd); var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); @@ -193,7 +186,7 @@ namespace MP.Data.Controllers dbResult = dbCtx .DbSetODL - .FromSqlRaw("EXEC stp_UI_RS_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) + .FromSqlRaw("EXEC stp_UI_Odl_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) .ToList(); return dbResult; @@ -210,12 +203,6 @@ namespace MP.Data.Controllers public List StatScartiGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) { List dbResult = new List(); - //dbResult = dbCtx - // .DbSetScarti - // .Where(x => x.KeyRichiesta.Contains(searchVal) || x.Descrizione.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) - // .OrderByDescending(x => x.DataOraRif) - // .Take(numRecord) - // .ToList(); var dataFrom = new SqlParameter("@dataFrom", DataStart); var dataTo = new SqlParameter("@dataTo", DataEnd); From 728feeab665fd66cb6167644bcba56b75b16db2c Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 20 May 2021 19:22:05 +0200 Subject: [PATCH 073/158] Aggiunta apgiona diario a cache --- MP.Data/Controllers/MpStatsController.cs | 20 ++++++-- MP.Stats/Data/MpStatsService.cs | 21 +++++++- MP.Stats/Pages/Diario.razor | 65 +++++++++++------------- MP.Stats/Pages/Diario.razor.cs | 29 ++++++++--- 4 files changed, 88 insertions(+), 47 deletions(-) diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index 90de21ef..1fdb1f9b 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -135,15 +135,27 @@ namespace MP.Data.Controllers /// /// /// - public List StatDdbGetAll(int numRecord, string searchVal = "") + public List StatDdbGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) { List dbResult = new List(); + //dbResult = dbCtx + // . + // .Where(x => x.Descrizione.Contains(searchVal) || x.IdxMacchina.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || x.KeyRichiesta.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) + // .OrderByDescending(x => x.InizioStato) + // .Take(numRecord) + // .ToList(); + + var dataFrom = new SqlParameter("@dataFrom", DataStart); + var dataTo = new SqlParameter("@dataTo", DataEnd); + var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); + var idxODL = new SqlParameter("@IdxODL", IdxODL); + var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); + var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); + dbResult = dbCtx .DbSetDdbTurni - .Where(x => x.Descrizione.Contains(searchVal) || x.IdxMacchina.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || x.KeyRichiesta.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) - .OrderByDescending(x => x.InizioStato) - .Take(numRecord) + .FromSqlRaw("EXEC stp_UI_DDBTurni_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) .ToList(); return dbResult; diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 4b2a9352..7455e85d 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -112,9 +112,26 @@ namespace MP.Stats.Data return Task.FromResult(dbController.StatControlliGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); } - public Task StatDdbGetAll(int numRecord, string searchVal = "") + public async Task> StatDdbGetAll(SelectData CurrFilter, string searchVal = "") { - return Task.FromResult(dbController.StatDdbGetAll(numRecord, searchVal).ToArray()); + //return Task.FromResult(dbController.StatDdbGetAll(numRecord, searchVal).ToArray()); + List dbResult = new List(); + string cacheKey = getCacheKey("MP:STATS:DDBT", CurrFilter); + string rawData; + var redisDataList = await distributedCache.GetAsync(cacheKey); + if (redisDataList != null) + { + rawData = Encoding.UTF8.GetString(redisDataList); + dbResult = JsonConvert.DeserializeObject>(rawData); + } + else + { + dbResult = dbController.StatDdbGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo); + rawData = JsonConvert.SerializeObject(dbResult); + redisDataList = Encoding.UTF8.GetBytes(rawData); + await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt); + } + return await Task.FromResult(dbResult); } public Task StatMacchineGetAll() diff --git a/MP.Stats/Pages/Diario.razor b/MP.Stats/Pages/Diario.razor index b9769c30..94f8c0ef 100644 --- a/MP.Stats/Pages/Diario.razor +++ b/MP.Stats/Pages/Diario.razor @@ -1,7 +1,6 @@ @page "/diario" @using MP.Stats.Components -@using MP.Stats.Data
                  @@ -12,40 +11,38 @@
                  - @if (currRecord != null) +
                  +
                  + +
                  +
                  + @if (totalCount == 0 || ListRecords == null || ListRecords.Count() == 0) { - @**@ - } - @if (ListRecords == null) - { -
                  + } else { -
                  -
                  - -
                  -
                  - - - - @**@ - - - - - - - - @**@ - - - - @foreach (var record in ListRecords) +
                  +
                  + +
                  +
                  +
                  MacchinaDataODL/CommessaArticoloStatoDurataPezziOperatore
                  + + + + + + + + + + + + + @foreach (var record in ListRecords) { - @**@ } - -
                  MacchinaDataODL/CommessaArticoloStatoDurataPezzi
                   
                  @record.CodMacchina
                  @record.IdxMacchina
                  @@ -61,13 +58,13 @@                   		@record.TotPzProd
                  -
                  -
                  + + +
                  +
                  }
                  - +
                  \ No newline at end of file diff --git a/MP.Stats/Pages/Diario.razor.cs b/MP.Stats/Pages/Diario.razor.cs index e94b882d..69ea6466 100644 --- a/MP.Stats/Pages/Diario.razor.cs +++ b/MP.Stats/Pages/Diario.razor.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; using MP.Stats.Data; using System; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -13,9 +14,8 @@ namespace MP.Stats.Pages private MP.Data.DatabaseModels.DdbTurni currRecord = null; - private MP.Data.DatabaseModels.DdbTurni[] ListRecords; - - private MP.Data.DatabaseModels.DdbTurni[] SearchRecords; + private List ListRecords; + private List SearchRecords; #endregion Private Fields @@ -41,16 +41,28 @@ namespace MP.Stats.Pages [Inject] protected MpStatsService StatService { get; set; } + protected int totalCount + { + get + { + int answ = 0; + if (SearchRecords != null) + { + answ = SearchRecords.Count; + } + return answ; + } + } + #endregion Protected Properties #region Private Methods private async Task reloadData() { - // fare VERO filtro periodo - SearchRecords = await StatService.StatDdbGetAll(200, MessageService.SearchVal); - // SearchRecords = await StatService.StatDdbGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, MessageService.SearchVal); - ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToArray(); + // SearchRecords = await StatService.StatDdbGetAll(200, MessageService.SearchVal); + SearchRecords = await StatService.StatDdbGetAll(currFilter, MessageService.SearchVal); + ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); } #endregion Private Methods @@ -59,6 +71,8 @@ namespace MP.Stats.Pages protected async Task DoFilter(SelectData newFilter) { + SearchRecords = null; + ListRecords = null; currFilter = newFilter; await reloadData(); } @@ -78,6 +92,7 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { numRecord = 10; + currFilter = SelectData.Init(5, 7); MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); From b5ab8f73023d6d8f84b23ac8366a268285d44685 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 20 May 2021 19:34:21 +0200 Subject: [PATCH 074/158] Fix paginatore sul cambio pagina --- MP.Stats/Components/DataPager.razor | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/MP.Stats/Components/DataPager.razor b/MP.Stats/Components/DataPager.razor index eab20eca..6b407189 100644 --- a/MP.Stats/Components/DataPager.razor +++ b/MP.Stats/Components/DataPager.razor @@ -10,7 +10,7 @@ - @for (int i = 1; i <= LastPage; ++i) + @for (int i = @startPage; i <= endPage; ++i) { var pageNum = i; @@ -57,6 +57,28 @@ reportChangePage(); } + private int numPages { get; set; } = 10; + + // calcola un set 1..numPOages centrato sulla pagina corrente... + private int startPage + { + get + { + int answ = (int)(currPage / numPages) * numPages - 2; + answ = answ > 0 ? answ : 1; + return answ; + } + } + private int endPage + { + get + { + int answ = (int)(currPage / numPages) * numPages + numPages + 2; + answ = answ < LastPage ? answ : LastPage; + return answ; + } + } + private int LastPage { get From 0e974c868d02adb45d3da34ada6a4d971d43b290 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 20 May 2021 19:35:55 +0200 Subject: [PATCH 075/158] Fix doppio filtro diario... --- MP.Stats/Pages/Diario.razor | 77 ++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/MP.Stats/Pages/Diario.razor b/MP.Stats/Pages/Diario.razor index 94f8c0ef..73c79d77 100644 --- a/MP.Stats/Pages/Diario.razor +++ b/MP.Stats/Pages/Diario.razor @@ -18,50 +18,47 @@
                  @if (totalCount == 0 || ListRecords == null || ListRecords.Count() == 0) { - + } else { -
                  -
                  - +
                  +
                  + + + + + + + + + + + + + + @foreach (var record in ListRecords) + { + + + + + + + + + + } + +
                  MacchinaDataODL/CommessaArticoloStatoDurataPezzi
                  +
                  @record.CodMacchina
                  +
                  @record.IdxMacchina
                  +                   		+
                  @record.InizioStato.ToString("yyyy.MM.dd")
                  +
                  @record.InizioStato.ToString("ddd HH:mm.ss")
                  +                   		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo@record.Descrizione@record.DurataMin@record.TotPzProd
                  +
                  -
                  - - - - - - - - - - - - - - @foreach (var record in ListRecords) - { - - - - - - - - - - } - -
                  MacchinaDataODL/CommessaArticoloStatoDurataPezzi
                  -
                  @record.CodMacchina
                  -
                  @record.IdxMacchina
                  -                   		-
                  @record.InizioStato.ToString("yyyy.MM.dd")
                  -
                  @record.InizioStato.ToString("ddd HH:mm.ss")
                  -                   		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo@record.Descrizione@record.DurataMin@record.TotPzProd
                  -
                  -
                  }
                  From 12503672284a239d2c55a416b41ff9d2f55b496a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 20 May 2021 19:38:27 +0200 Subject: [PATCH 076/158] Fix display x diario --- MP.Stats/Pages/Diario.razor.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/MP.Stats/Pages/Diario.razor.cs b/MP.Stats/Pages/Diario.razor.cs index 69ea6466..bec9f26f 100644 --- a/MP.Stats/Pages/Diario.razor.cs +++ b/MP.Stats/Pages/Diario.razor.cs @@ -60,7 +60,8 @@ namespace MP.Stats.Pages private async Task reloadData() { - // SearchRecords = await StatService.StatDdbGetAll(200, MessageService.SearchVal); + SearchRecords = null; + ListRecords = null; SearchRecords = await StatService.StatDdbGetAll(currFilter, MessageService.SearchVal); ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); } @@ -71,8 +72,6 @@ namespace MP.Stats.Pages protected async Task DoFilter(SelectData newFilter) { - SearchRecords = null; - ListRecords = null; currFilter = newFilter; await reloadData(); } @@ -92,7 +91,7 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { numRecord = 10; - currFilter = SelectData.Init(5, 7); + currFilter = SelectData.Init(5, 3); MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); From e264ed05ea3fa6c4f9717777761cef8842cd454d Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 21 May 2021 08:10:34 +0200 Subject: [PATCH 077/158] Cambio display datapager --- MP.Stats/Components/DataPager.razor | 14 +++++- MP.Stats/Pages/Diario.razor | 72 ++++++++++++++--------------- MP.Stats/Pages/Diario.razor.cs | 7 ++- MP.Stats/Pages/Oee.razor | 70 ++++++++++++++-------------- MP.Stats/Pages/Oee.razor.cs | 3 ++ 5 files changed, 92 insertions(+), 74 deletions(-) diff --git a/MP.Stats/Components/DataPager.razor b/MP.Stats/Components/DataPager.razor index 6b407189..6d8d6074 100644 --- a/MP.Stats/Components/DataPager.razor +++ b/MP.Stats/Components/DataPager.razor @@ -28,7 +28,16 @@ }
                  - @totalCount records + @if (showLoading) + { + + + + } + else + { + @totalCountrecords + }
                  @@ -87,6 +96,9 @@ } } + [Parameter] + public bool showLoading { get; set; } = false; + [Parameter] public int totalCount { get; set; } = 0; diff --git a/MP.Stats/Pages/Diario.razor b/MP.Stats/Pages/Diario.razor index 73c79d77..4126fe6c 100644 --- a/MP.Stats/Pages/Diario.razor +++ b/MP.Stats/Pages/Diario.razor @@ -18,50 +18,50 @@
                  @if (totalCount == 0 || ListRecords == null || ListRecords.Count() == 0) { - + } else { -
                  -
                  - - - - - - - - - - - - - - @foreach (var record in ListRecords) +
                  +
                  +
                  MacchinaDataODL/CommessaArticoloStatoDurataPezzi
                  + + + + + + + + + + + + + @foreach (var record in ListRecords) { - - - - - - - - - + + + + + + + + + } - -
                  MacchinaDataODL/CommessaArticoloStatoDurataPezzi
                  -
                  @record.CodMacchina
                  -
                  @record.IdxMacchina
                  -                   		-
                  @record.InizioStato.ToString("yyyy.MM.dd")
                  -
                  @record.InizioStato.ToString("ddd HH:mm.ss")
                  -                   		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo@record.Descrizione@record.DurataMin@record.TotPzProd
                  +
                  @record.CodMacchina
                  +
                  @record.IdxMacchina
                  +                   		+
                  @record.InizioStato.ToString("yyyy.MM.dd")
                  +
                  @record.InizioStato.ToString("ddd HH:mm.ss")
                  +                   		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo@record.Descrizione@record.DurataMin@record.TotPzProd
                  -
                  + +
                  +
                  }
                  - +
                  \ No newline at end of file diff --git a/MP.Stats/Pages/Diario.razor.cs b/MP.Stats/Pages/Diario.razor.cs index bec9f26f..992e8e1e 100644 --- a/MP.Stats/Pages/Diario.razor.cs +++ b/MP.Stats/Pages/Diario.razor.cs @@ -23,6 +23,7 @@ namespace MP.Stats.Pages private SelectData currFilter { get; set; } = new SelectData(); private int currPage { get; set; } = 1; + private bool isLoading { get; set; } = false; private int numRecord { get; set; } = 10; #endregion Private Properties @@ -60,10 +61,10 @@ namespace MP.Stats.Pages private async Task reloadData() { - SearchRecords = null; - ListRecords = null; + isLoading = true; SearchRecords = await StatService.StatDdbGetAll(currFilter, MessageService.SearchVal); ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + isLoading = false; } #endregion Private Methods @@ -72,6 +73,8 @@ namespace MP.Stats.Pages protected async Task DoFilter(SelectData newFilter) { + SearchRecords = null; + ListRecords = null; currFilter = newFilter; await reloadData(); } diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor index d48e8323..97424547 100644 --- a/MP.Stats/Pages/Oee.razor +++ b/MP.Stats/Pages/Oee.razor @@ -18,49 +18,49 @@
                  @if (totalCount == 0 || ListRecords == null || ListRecords.Count() == 0) { - + } else { -
                  -
                  - - - - - - - - - - - - - - @foreach (var record in ListRecords) +
                  +
                  +
                  DataTurnoMacchinaArticoloDurataPezziOEE %
                  + + + + + + + + + + + + + @foreach (var record in ListRecords) { - - - - - - - - - + + + + + + + + + } - -
                  DataTurnoMacchinaArticoloDurataPezziOEE %
                  -
                  @record.DataRif.ToString("yyyy.MM.dd")
                  -                   		@record.Turno -
                  @record.CodMacchina
                  -
                  @record.IdxMacchina
                  -                   		@record.CodArticolo@record.TotPeriodo.ToString("N2")@record.TotPz@record.OEE.ToString("P2")
                  +
                  @record.DataRif.ToString("yyyy.MM.dd")
                  +                   		@record.Turno +
                  @record.CodMacchina
                  +
                  @record.IdxMacchina
                  +                   		@record.CodArticolo@record.TotPeriodo.ToString("N2")@record.TotPz@record.OEE.ToString("P2")
                  -
                  + +
                  +
                  }
                  - +
                  \ No newline at end of file diff --git a/MP.Stats/Pages/Oee.razor.cs b/MP.Stats/Pages/Oee.razor.cs index d5fd3934..310db664 100644 --- a/MP.Stats/Pages/Oee.razor.cs +++ b/MP.Stats/Pages/Oee.razor.cs @@ -24,6 +24,7 @@ namespace MP.Stats.Pages private SelectData currFilter { get; set; } = new SelectData(); private int currPage { get; set; } = 1; + private bool isLoading { get; set; } = false; private int numRecord { get; set; } = 10; #endregion Private Properties @@ -61,8 +62,10 @@ namespace MP.Stats.Pages private async Task reloadData() { + isLoading = true; SearchRecords = await StatService.StatTurniOeeGetAllCached(currFilter, MessageService.SearchVal); ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + isLoading = false; } #endregion Private Methods From 229980b54837019277daee52fd552092a212748b Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 21 May 2021 08:11:33 +0200 Subject: [PATCH 078/158] fix display --- MP.Stats/Components/DataPager.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MP.Stats/Components/DataPager.razor b/MP.Stats/Components/DataPager.razor index 6d8d6074..32f4c64f 100644 --- a/MP.Stats/Components/DataPager.razor +++ b/MP.Stats/Components/DataPager.razor @@ -36,7 +36,7 @@ } else { - @totalCountrecords + @totalCount records }
                  From 50079ddb37f373c0f3907e6d9fa02d28512ba5a4 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 21 May 2021 13:17:12 +0200 Subject: [PATCH 079/158] INSERIMENTO SERVIZIO TIMER (DA APPROFONDIRE) --- MP.Stats/Services/BlazorTimer.cs | 49 ++++++++++++++++++++++++++++++++ MP.Stats/Startup.cs | 1 + 2 files changed, 50 insertions(+) create mode 100644 MP.Stats/Services/BlazorTimer.cs diff --git a/MP.Stats/Services/BlazorTimer.cs b/MP.Stats/Services/BlazorTimer.cs new file mode 100644 index 00000000..2836323d --- /dev/null +++ b/MP.Stats/Services/BlazorTimer.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using System.Timers; + +namespace MP.Stats.Services +{ + /// + /// Timer a consumo + /// https://wellsb.com/csharp/aspnet/blazor-timer-navigate-programmatically/ + /// (da verificare) + /// + public class BlazorTimer + { + #region Private Fields + + private Timer _timer; + + #endregion Private Fields + + #region Public Events + + public event Action OnElapsed; + + #endregion Public Events + + #region Private Methods + + private void NotifyTimerElapsed(Object source, ElapsedEventArgs e) + { + OnElapsed?.Invoke(); + _timer.Dispose(); + } + + #endregion Private Methods + + #region Public Methods + + public void SetTimer(double interval) + { + _timer = new Timer(interval); + _timer.Elapsed += NotifyTimerElapsed; + _timer.Enabled = true; + } + + #endregion Public Methods + } +} \ No newline at end of file diff --git a/MP.Stats/Startup.cs b/MP.Stats/Startup.cs index 905e67a9..42f0661d 100644 --- a/MP.Stats/Startup.cs +++ b/MP.Stats/Startup.cs @@ -95,6 +95,7 @@ namespace MP.Stats services.AddRazorPages(); services.AddServerSideBlazor(); services.AddSingleton(Configuration); + services.AddTransient(); #if false services.AddDbContext(options => From 61db2f33e59377b68b0046578bdb4a45fe12c7e1 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 21 May 2021 13:17:19 +0200 Subject: [PATCH 080/158] update pager con avanzamento random --- MP.Stats/Components/DataPager.razor | 49 ++++++++++++++++++++++++----- MP.Stats/Data/MpStatsService.cs | 16 ++++++++-- 2 files changed, 55 insertions(+), 10 deletions(-) diff --git a/MP.Stats/Components/DataPager.razor b/MP.Stats/Components/DataPager.razor index 32f4c64f..03cdd0d5 100644 --- a/MP.Stats/Components/DataPager.razor +++ b/MP.Stats/Components/DataPager.razor @@ -1,4 +1,6 @@ -
                  +@inject Services.BlazorTimer Timer + +
                  @@ -28,16 +30,20 @@ }
                  + @if (!showLoading) + { + @totalCount records + } +
                  +
                  +
                  +
                  @if (showLoading) { - + } - else - { - @totalCount records - }
                  @@ -96,8 +102,37 @@ } } + protected override Task OnInitializedAsync() + { + showLoading = false; + return base.OnInitializedAsync(); + } + + protected int percLoading { get; set; } = 0; + + protected bool _showLoading = false; + [Parameter] - public bool showLoading { get; set; } = false; + public bool showLoading + { + get + { + return _showLoading; + } + set + { + if (value) + { + Random random = new Random(); + percLoading = random.Next(30, 90); + } + else + { + percLoading = 5; + } + _showLoading = value; + } + } [Parameter] public int totalCount { get; set; } = 0; diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 7455e85d..cc9fa595 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -24,8 +24,6 @@ namespace MP.Stats.Data private readonly IDistributedCache distributedCache; private readonly IMemoryCache memoryCache; - private DistributedCacheEntryOptions cacheOpt; - /// /// Durata assoluta massima della cache /// @@ -42,6 +40,7 @@ namespace MP.Stats.Data #region Protected Fields protected static string connStringBBM = ""; + protected static string connStringFatt = ""; #endregion Protected Fields @@ -61,7 +60,6 @@ namespace MP.Stats.Data // conf cache this.memoryCache = memoryCache; this.distributedCache = distributedCache; - cacheOpt = new DistributedCacheEntryOptions().SetAbsoluteExpiration(DateTime.Now.AddMinutes(chAbsExp)).SetSlidingExpiration(TimeSpan.FromMinutes(chSliExp)); // conf DB string connStr = _configuration.GetConnectionString("Mp.Stats"); if (string.IsNullOrEmpty(connStr)) @@ -80,6 +78,18 @@ namespace MP.Stats.Data #endregion Public Constructors + #region Private Properties + + private DistributedCacheEntryOptions cacheOpt + { + get + { + return new DistributedCacheEntryOptions().SetAbsoluteExpiration(DateTime.Now.AddMinutes(chAbsExp)).SetSlidingExpiration(TimeSpan.FromMinutes(chSliExp)); + } + } + + #endregion Private Properties + #region Protected Methods protected string getCacheKey(string TableName, SelectData CurrFilter) From 2952046ae25ff311aa5f4e35ef0c950116cbad7c Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 21 May 2021 13:38:10 +0200 Subject: [PATCH 081/158] COmpletata review pagiazione --- MP.Stats/Components/DataPager.razor | 37 ++++++++++++-- MP.Stats/Components/LoadingData.razor | 4 +- MP.Stats/Pages/Index.razor | 2 +- MP.Stats/Pages/Oee.razor | 70 +++++++++++++-------------- 4 files changed, 71 insertions(+), 42 deletions(-) diff --git a/MP.Stats/Components/DataPager.razor b/MP.Stats/Components/DataPager.razor index 03cdd0d5..424d7640 100644 --- a/MP.Stats/Components/DataPager.razor +++ b/MP.Stats/Components/DataPager.razor @@ -9,7 +9,12 @@ - + + + + + + @for (int i = @startPage; i <= endPage; ++i) @@ -21,9 +26,14 @@ } + + + + + - + @@ -79,7 +89,7 @@ { get { - int answ = (int)(currPage / numPages) * numPages - 2; + int answ = (int)(currPage / numPages) * numPages; answ = answ > 0 ? answ : 1; return answ; } @@ -88,7 +98,26 @@ { get { - int answ = (int)(currPage / numPages) * numPages + numPages + 2; + int answ = (int)(currPage / numPages) * numPages + numPages; + answ = answ < LastPage ? answ : LastPage; + return answ; + } + } + + private int prevBlock + { + get + { + int answ = currPage - numPages; + answ = answ > 0 ? answ : 1; + return answ; + } + } + private int nextBlock + { + get + { + int answ = currPage + numPages; answ = answ < LastPage ? answ : LastPage; return answ; } diff --git a/MP.Stats/Components/LoadingData.razor b/MP.Stats/Components/LoadingData.razor index 4eb9ffb3..2ffebab8 100644 --- a/MP.Stats/Components/LoadingData.razor +++ b/MP.Stats/Components/LoadingData.razor @@ -1,5 +1,5 @@ -
                  -
                  +
                  +

                  loading data

                  diff --git a/MP.Stats/Pages/Index.razor b/MP.Stats/Pages/Index.razor index f2d91a2f..8466112e 100644 --- a/MP.Stats/Pages/Index.razor +++ b/MP.Stats/Pages/Index.razor @@ -28,7 +28,7 @@
                  - + diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor index 97424547..3b2527fa 100644 --- a/MP.Stats/Pages/Oee.razor +++ b/MP.Stats/Pages/Oee.razor @@ -16,48 +16,48 @@
                  - @if (totalCount == 0 || ListRecords == null || ListRecords.Count() == 0) + @if (totalCount == 0 || ListRecords == null) { - + } else { -
                  -
                  - - - - - - - - - - - - - - @foreach (var record in ListRecords) +
                  +
                  +
                  DataTurnoMacchinaArticoloDurataPezziOEE %
                  + + + + + + + + + + + + + @foreach (var record in ListRecords) { - - - - - - - - - + + + + + + + + + } - -
                  DataTurnoMacchinaArticoloDurataPezziOEE %
                  -
                  @record.DataRif.ToString("yyyy.MM.dd")
                  -                   		@record.Turno -
                  @record.CodMacchina
                  -
                  @record.IdxMacchina
                  -                   		@record.CodArticolo@record.TotPeriodo.ToString("N2")@record.TotPz@record.OEE.ToString("P2")
                  +
                  @record.DataRif.ToString("yyyy.MM.dd")
                  +                   		@record.Turno +
                  @record.CodMacchina
                  +
                  @record.IdxMacchina
                  +                   		@record.CodArticolo@record.TotPeriodo.ToString("N2")@record.TotPz@record.OEE.ToString("P2")
                  + + +
                  -
                  }
                  From 709e8c0ec7f81ac804cf16d5272b8a048bce5c99 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 21 May 2021 14:33:19 +0200 Subject: [PATCH 082/158] fix grafici --- MP.Stats/Pages/Diario.razor | 4 ++-- MP.Stats/Pages/Oee.razor | 4 ++-- MP.Stats/Pages/ReportODL.razor | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MP.Stats/Pages/Diario.razor b/MP.Stats/Pages/Diario.razor index 4126fe6c..80a93461 100644 --- a/MP.Stats/Pages/Diario.razor +++ b/MP.Stats/Pages/Diario.razor @@ -5,8 +5,8 @@
                  -
                  Diario Produzione
                  -
                  +
                  Diario Produzione
                  +
                  diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor index 3b2527fa..6197ed80 100644 --- a/MP.Stats/Pages/Oee.razor +++ b/MP.Stats/Pages/Oee.razor @@ -5,8 +5,8 @@
                  -
                  TRS / OEE %
                  -
                  +
                  TRS / OEE %
                  +
                  diff --git a/MP.Stats/Pages/ReportODL.razor b/MP.Stats/Pages/ReportODL.razor index 1b30d59d..9d867de9 100644 --- a/MP.Stats/Pages/ReportODL.razor +++ b/MP.Stats/Pages/ReportODL.razor @@ -5,8 +5,8 @@
                  -
                  Report ODL/Comm.
                  -
                  +
                  Report ODL/Comm.
                  +
                  From 8d169e011cd9839141f183830c8421f70f8855c6 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 21 May 2021 14:35:30 +0200 Subject: [PATCH 083/158] conversione pagina Controlli --- MP.Stats/Data/MpStatsService.cs | 21 +++++++++++++++++++-- MP.Stats/Pages/Controlli.razor | 23 ++++++++++------------- MP.Stats/Pages/Controlli.razor.cs | 29 +++++++++++++++++++++++++---- 3 files changed, 54 insertions(+), 19 deletions(-) diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index cc9fa595..647d7dac 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -117,9 +117,26 @@ namespace MP.Stats.Data return Task.FromResult(dbController.StatArticoliGetSearch(numRecord, searchVal).ToArray()); } - public Task StatControlliGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") + public async Task> StatControlliGetAll(SelectData CurrFilter, string searchVal = "") { - return Task.FromResult(dbController.StatControlliGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); + //return Task.FromResult(dbController.StatControlliGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); + List dbResult = new List(); + string cacheKey = getCacheKey("MP:STATS:CONTROLLI", CurrFilter); + string rawData; + var redisDataList = await distributedCache.GetAsync(cacheKey); + if (redisDataList != null) + { + rawData = Encoding.UTF8.GetString(redisDataList); + dbResult = JsonConvert.DeserializeObject>(rawData); + } + else + { + dbResult = dbController.StatControlliGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo); + rawData = JsonConvert.SerializeObject(dbResult); + redisDataList = Encoding.UTF8.GetBytes(rawData); + await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt); + } + return await Task.FromResult(dbResult); } public async Task> StatDdbGetAll(SelectData CurrFilter, string searchVal = "") diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor index abaf527d..494ccd16 100644 --- a/MP.Stats/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -1,31 +1,28 @@ @page "/controlli" @using MP.Stats.Components -@using MP.Stats.Data
                  -
                  Registro Controlli
                  -
                  +
                  Registro Controlli
                  +
                  - @if (currRecord != null) +
                  +
                  + +
                  +
                  + @if (totalCount == 0 || ListRecords == null) { - @**@ - } - @if (ListRecords == null) - { -
                  + } else {
                  -
                  - -
                  @@ -61,6 +58,6 @@ }
                  - +
                  \ No newline at end of file diff --git a/MP.Stats/Pages/Controlli.razor.cs b/MP.Stats/Pages/Controlli.razor.cs index 71af34c9..fd6ddda6 100644 --- a/MP.Stats/Pages/Controlli.razor.cs +++ b/MP.Stats/Pages/Controlli.razor.cs @@ -2,6 +2,7 @@ using Microsoft.JSInterop; using MP.Stats.Data; using System; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -13,8 +14,8 @@ namespace MP.Stats.Pages private MP.Data.DatabaseModels.ResControlli currRecord = null; - private MP.Data.DatabaseModels.ResControlli[] ListRecords; - private MP.Data.DatabaseModels.ResControlli[] SearchRecords; + private List ListRecords; + private List SearchRecords; #endregion Private Fields @@ -22,6 +23,7 @@ namespace MP.Stats.Pages private SelectData currFilter { get; set; } = new SelectData(); private int currPage { get; set; } = 1; + private bool isLoading { get; set; } = false; private int numRecord { get; set; } = 10; #endregion Private Properties @@ -40,14 +42,29 @@ namespace MP.Stats.Pages [Inject] protected MpStatsService StatService { get; set; } + protected int totalCount + { + get + { + int answ = 0; + if (SearchRecords != null) + { + answ = SearchRecords.Count; + } + return answ; + } + } + #endregion Protected Properties #region Private Methods private async Task reloadData() { - SearchRecords = await StatService.StatControlliGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, MessageService.SearchVal); - ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToArray(); + isLoading = true; + SearchRecords = await StatService.StatControlliGetAll(currFilter, MessageService.SearchVal); + ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + isLoading = false; } #endregion Private Methods @@ -56,6 +73,8 @@ namespace MP.Stats.Pages protected async Task DoFilter(SelectData newFilter) { + SearchRecords = null; + ListRecords = null; currFilter = newFilter; await reloadData(); } @@ -74,6 +93,8 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { + numRecord = 10; + currFilter = SelectData.Init(5, 7); MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); From 68c2e290ac41ea21133930239c2e3407cfcd4800 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 21 May 2021 14:42:28 +0200 Subject: [PATCH 084/158] Update pagina Scarti --- MP.Stats/Data/MpStatsService.cs | 22 +++++++++++++++++++--- MP.Stats/Pages/Scarti.razor | 22 ++++++++++------------ MP.Stats/Pages/Scarti.razor.cs | 28 +++++++++++++++++++++++----- 3 files changed, 52 insertions(+), 20 deletions(-) diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 647d7dac..a0e29965 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -188,10 +188,26 @@ namespace MP.Stats.Data return await Task.FromResult(dbResult); } - public Task StatScartiGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") + public async Task> StatScartiGetAll(SelectData CurrFilter, string searchVal = "") { - // filtra e restituisce SOLO i primi record... - return Task.FromResult(dbController.StatScartiGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); + //return Task.FromResult(dbController.StatScartiGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); + List dbResult = new List(); + string cacheKey = getCacheKey("MP:STATS:SCARTI", CurrFilter); + string rawData; + var redisDataList = await distributedCache.GetAsync(cacheKey); + if (redisDataList != null) + { + rawData = Encoding.UTF8.GetString(redisDataList); + dbResult = JsonConvert.DeserializeObject>(rawData); + } + else + { + dbResult = dbController.StatScartiGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo); + rawData = JsonConvert.SerializeObject(dbResult); + redisDataList = Encoding.UTF8.GetBytes(rawData); + await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt); + } + return await Task.FromResult(dbResult); } public async Task> StatTurniOeeGetAllAsync(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index a3e64483..a220ae80 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -5,26 +5,24 @@
                  -
                  Registro Scarti
                  -
                  +
                  Registro Scarti
                  +
                  - @if (currRecord != null) +
                  +
                  + +
                  +
                  + @if (totalCount == 0 || ListRecords == null) { - @**@ - } - @if (ListRecords == null) - { -
                  + } else {
                  -
                  - -
                  @@ -70,6 +68,6 @@ }
                  - +
                  \ No newline at end of file diff --git a/MP.Stats/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs index 087c1057..42190233 100644 --- a/MP.Stats/Pages/Scarti.razor.cs +++ b/MP.Stats/Pages/Scarti.razor.cs @@ -14,9 +14,8 @@ namespace MP.Stats.Pages private MP.Data.DatabaseModels.ResScarti currRecord = null; - private MP.Data.DatabaseModels.ResScarti[] ListRecords; - - private MP.Data.DatabaseModels.ResScarti[] SearchRecords; + private List ListRecords; + private List SearchRecords; #endregion Private Fields @@ -24,6 +23,7 @@ namespace MP.Stats.Pages private SelectData currFilter { get; set; } = new SelectData(); private int currPage { get; set; } = 1; + private bool isLoading { get; set; } = false; private int numRecord { get; set; } = 10; #endregion Private Properties @@ -42,14 +42,28 @@ namespace MP.Stats.Pages [Inject] protected MpStatsService StatService { get; set; } + protected int totalCount + { + get + { + int answ = 0; + if (SearchRecords != null) + { + answ = SearchRecords.Count; + } + return answ; + } + } #endregion Protected Properties #region Private Methods private async Task reloadData() { - SearchRecords = await StatService.StatScartiGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, MessageService.SearchVal); - ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToArray(); + isLoading = true; + SearchRecords = await StatService.StatScartiGetAll(currFilter, MessageService.SearchVal); + ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + isLoading = false; } #endregion Private Methods @@ -58,6 +72,8 @@ namespace MP.Stats.Pages protected async Task DoFilter(SelectData newFilter) { + SearchRecords = null; + ListRecords = null; currFilter = newFilter; await reloadData(); } @@ -76,6 +92,8 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { + numRecord = 10; + currFilter = SelectData.Init(5, 7); MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); From 9c34eaa71c5ca14c8d93487106e99da0eef18df9 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 21 May 2021 14:47:01 +0200 Subject: [PATCH 085/158] Update pagina UserLog --- MP.Stats/Data/MpStatsService.cs | 42 +++++++++++++++++++++++++++++---- MP.Stats/Pages/UserLog.razor | 23 ++++++++---------- MP.Stats/Pages/UserLog.razor.cs | 31 ++++++++++++++++++++---- 3 files changed, 74 insertions(+), 22 deletions(-) diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index a0e29965..922b3656 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -102,9 +102,26 @@ namespace MP.Stats.Data #region Public Methods - public Task ActionsGetAll() + public async Task> ActionsGetAll() { - return Task.FromResult(dbController.ActionsGetAll().ToArray()); + //return Task.FromResult(dbController.ActionsGetAll()); + List dbResult = new List(); + string cacheKey = "MP:STATS:AZIONI_ALL"; + string rawData; + var redisDataList = await distributedCache.GetAsync(cacheKey); + if (redisDataList != null) + { + rawData = Encoding.UTF8.GetString(redisDataList); + dbResult = JsonConvert.DeserializeObject>(rawData); + } + else + { + dbResult = dbController.ActionsGetAll(); + rawData = JsonConvert.SerializeObject(dbResult); + redisDataList = Encoding.UTF8.GetBytes(rawData); + await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt); + } + return await Task.FromResult(dbResult); } public void rollBackEdit(object item) @@ -246,9 +263,26 @@ namespace MP.Stats.Data return Task.FromResult(dbController.StatTurniParetoOdlGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); } - public Task StatUserLogGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") + public async Task> StatUserLogGetAll(SelectData CurrFilter, string searchVal = "") { - return Task.FromResult(dbController.StatUserLogGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); + //return Task.FromResult(dbController.StatUserLogGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); + List dbResult = new List(); + string cacheKey = getCacheKey("MP:STATS:USRACTLOG", CurrFilter); + string rawData; + var redisDataList = await distributedCache.GetAsync(cacheKey); + if (redisDataList != null) + { + rawData = Encoding.UTF8.GetString(redisDataList); + dbResult = JsonConvert.DeserializeObject>(rawData); + } + else + { + dbResult = dbController.StatUserLogGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo); + rawData = JsonConvert.SerializeObject(dbResult); + redisDataList = Encoding.UTF8.GetBytes(rawData); + await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt); + } + return await Task.FromResult(dbResult); } #endregion Public Methods diff --git a/MP.Stats/Pages/UserLog.razor b/MP.Stats/Pages/UserLog.razor index b1e792e1..6c628007 100644 --- a/MP.Stats/Pages/UserLog.razor +++ b/MP.Stats/Pages/UserLog.razor @@ -1,31 +1,28 @@ @page "/userlog" @using MP.Stats.Components -@using MP.Stats.Data
                  -
                  User ActionLog
                  -
                  +
                  User ActionLog
                  +
                  - @if (currRecord != null) +
                  +
                  + +
                  +
                  + @if (totalCount == 0 || ListRecords == null) { - @**@ - } - @if (ListRecords == null) - { -
                  + } else {
                  -
                  - -
                  @@ -75,6 +72,6 @@ }
                  - +
                  \ No newline at end of file diff --git a/MP.Stats/Pages/UserLog.razor.cs b/MP.Stats/Pages/UserLog.razor.cs index 24eb1c4f..248addff 100644 --- a/MP.Stats/Pages/UserLog.razor.cs +++ b/MP.Stats/Pages/UserLog.razor.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; using MP.Stats.Data; using System; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -11,11 +12,11 @@ namespace MP.Stats.Pages { #region Private Fields - private MP.Data.DatabaseModels.AzioniUL[] ActionsList; + private List ActionsList; private MP.Data.DatabaseModels.UserActionLog currRecord = null; - private MP.Data.DatabaseModels.UserActionLog[] ListRecords; - private MP.Data.DatabaseModels.UserActionLog[] SearchRecords; + private List ListRecords; + private List SearchRecords; #endregion Private Fields @@ -23,6 +24,7 @@ namespace MP.Stats.Pages private SelectData currFilter { get; set; } = new SelectData(); private int currPage { get; set; } = 1; + private bool isLoading { get; set; } = false; private int numRecord { get; set; } = 10; #endregion Private Properties @@ -41,15 +43,30 @@ namespace MP.Stats.Pages [Inject] protected MpStatsService StatService { get; set; } + protected int totalCount + { + get + { + int answ = 0; + if (SearchRecords != null) + { + answ = SearchRecords.Count; + } + return answ; + } + } + #endregion Protected Properties #region Private Methods private async Task reloadData() { + isLoading = true; ActionsList = await StatService.ActionsGetAll(); - SearchRecords = await StatService.StatUserLogGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, MessageService.SearchVal); - ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToArray(); + SearchRecords = await StatService.StatUserLogGetAll(currFilter, MessageService.SearchVal); + ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + isLoading = false; } #endregion Private Methods @@ -58,6 +75,8 @@ namespace MP.Stats.Pages protected async Task DoFilter(SelectData newFilter) { + SearchRecords = null; + ListRecords = null; currFilter = newFilter; await reloadData(); } @@ -76,6 +95,8 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { + numRecord = 10; + currFilter = SelectData.Init(5, 7); MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); From 8224d2765a5523c4f80074d7a35e9ed1ebd315c2 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 21 May 2021 16:33:09 +0200 Subject: [PATCH 086/158] OK filtro OEE --> CONTROLLI (da perfezionare grafica dettaglio) --- MP.Stats/Components/DetailOee.razor | 100 ++++++++++++++++++++++++++++ MP.Stats/Data/MessageService.cs | 30 +++++++-- MP.Stats/Pages/Controlli.razor | 3 +- MP.Stats/Pages/Controlli.razor.cs | 22 +++++- MP.Stats/Pages/Oee.razor | 8 +++ MP.Stats/Pages/Oee.razor.cs | 7 ++ 6 files changed, 162 insertions(+), 8 deletions(-) create mode 100644 MP.Stats/Components/DetailOee.razor diff --git a/MP.Stats/Components/DetailOee.razor b/MP.Stats/Components/DetailOee.razor new file mode 100644 index 00000000..78baaabf --- /dev/null +++ b/MP.Stats/Components/DetailOee.razor @@ -0,0 +1,100 @@ +@using MP.Stats.Data +@inject NavigationManager NavManager +@inject MessageService MessageService + +
                  +
                  + GRAFICO +
                  +
                  + +
                  +
                  + +
                  +
                  + +
                  +
                  + +
                  +
                  + +
                  +
                  + +@code{ + + protected MP.Data.DatabaseModels.TurniOee _currRecord = new MP.Data.DatabaseModels.TurniOee(); + + [Parameter] + public MP.Data.DatabaseModels.TurniOee currRecord + { + get + { + return _currRecord; + } + set + { + _currRecord = value; + } + } + + [Parameter] + public SelectData CurrFilter { get; set; } + + protected void ShowCont() + { + SetFilter(); + // rimando... + NavManager.NavigateTo($"controlli/{currRecord.IdxMacchina}"); + } + + protected void ShowDDB() + { + SetFilter(); + // rimando... + NavManager.NavigateTo($"diario"); + } + + protected void ShowScar() + { + SetFilter(); + // rimando... + NavManager.NavigateTo($"scarti"); + } + + protected void ShowUAL() + { + SetFilter(); + // rimando... + NavManager.NavigateTo($"userlog"); + } + + protected void SetFilter() + { + int oraStart = 0; + switch (currRecord.Turno) + { + case "T1": + oraStart = 6; + break; + case "T2": + oraStart = 14; + break; + case "T3": + oraStart = 22; + break; + default: + break; + } + CurrFilter = new SelectData() + { + IdxMacchina = currRecord.IdxMacchina, + CodArticolo = currRecord.CodArticolo, + DateStart = currRecord.DataRif.AddHours(oraStart), + DateEnd = currRecord.DataRif.AddHours(oraStart + 8) + }; + MessageService.ActiveFilter = CurrFilter; + } +} \ No newline at end of file diff --git a/MP.Stats/Data/MessageService.cs b/MP.Stats/Data/MessageService.cs index c01e734c..4f733938 100644 --- a/MP.Stats/Data/MessageService.cs +++ b/MP.Stats/Data/MessageService.cs @@ -9,13 +9,16 @@ namespace MP.Stats.Data { #region Private Fields - private string searchVal; + private SelectData _activeFilter = new SelectData(); + private string _searchVal; private bool showSearch; #endregion Private Fields #region Public Events + public event Action EA_FilterUpdated; + public event Action EA_HideSearch; public event Action EA_SearchUpdated; @@ -26,14 +29,31 @@ namespace MP.Stats.Data #region Public Properties - public string SearchVal + public SelectData ActiveFilter { - get => searchVal; + get => _activeFilter; set { - if (searchVal != value) + if (_activeFilter != value) { - searchVal = value; + _activeFilter = value; + + if (EA_FilterUpdated != null) + { + EA_FilterUpdated?.Invoke(); + } + } + } + } + + public string SearchVal + { + get => _searchVal; + set + { + if (_searchVal != value) + { + _searchVal = value; if (EA_SearchUpdated != null) { diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor index 494ccd16..1a1396a1 100644 --- a/MP.Stats/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -1,4 +1,5 @@ @page "/controlli" +@page "/controlli/{IdxMacchina}" @using MP.Stats.Components @@ -13,7 +14,7 @@
                  - +
                  @if (totalCount == 0 || ListRecords == null) diff --git a/MP.Stats/Pages/Controlli.razor.cs b/MP.Stats/Pages/Controlli.razor.cs index fd6ddda6..bc12ddc0 100644 --- a/MP.Stats/Pages/Controlli.razor.cs +++ b/MP.Stats/Pages/Controlli.razor.cs @@ -21,9 +21,10 @@ namespace MP.Stats.Pages #region Private Properties - private SelectData currFilter { get; set; } = new SelectData(); private int currPage { get; set; } = 1; + private bool isLoading { get; set; } = false; + private int numRecord { get; set; } = 10; #endregion Private Properties @@ -57,6 +58,16 @@ namespace MP.Stats.Pages #endregion Protected Properties + #region Public Properties + + [Parameter] + public SelectData currFilter { get; set; } = new SelectData(); + + [Parameter] + public string IdxMacchina { get; set; } = ""; + + #endregion Public Properties + #region Private Methods private async Task reloadData() @@ -94,7 +105,14 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { numRecord = 10; - currFilter = SelectData.Init(5, 7); + if (string.IsNullOrEmpty(IdxMacchina)) + { + currFilter = SelectData.Init(5, 7); + } + else + { + currFilter = MessageService.ActiveFilter; + } MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor index 6197ed80..7db71094 100644 --- a/MP.Stats/Pages/Oee.razor +++ b/MP.Stats/Pages/Oee.razor @@ -16,6 +16,10 @@
                  + @if (currRecord != null) + { + + } @if (totalCount == 0 || ListRecords == null) { @@ -27,6 +31,7 @@
                  + @@ -40,8 +45,11 @@ @foreach (var record in ListRecords) { + +
                  Data Turno Macchina
                  @record.DataRif.ToString("yyyy.MM.dd")
                  +
                  @record.DataRif.ToString("dddd")
                  		 @record.Turno diff --git a/MP.Stats/Pages/Oee.razor.cs b/MP.Stats/Pages/Oee.razor.cs index 310db664..7f91a0f2 100644 --- a/MP.Stats/Pages/Oee.razor.cs +++ b/MP.Stats/Pages/Oee.razor.cs @@ -74,6 +74,7 @@ namespace MP.Stats.Pages protected async Task DoFilter(SelectData newFilter) { + currRecord = null; SearchRecords = null; ListRecords = null; currFilter = newFilter; @@ -107,6 +108,12 @@ namespace MP.Stats.Pages currRecord = null; } + protected void Select(MP.Data.DatabaseModels.TurniOee selRecord) + { + // applico filtro da selezione + currRecord = selRecord; + } + protected async Task UpdateData() { currRecord = null; From 9f077ad0389ab2253d637cfc632ccd0a447d6842 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 21 May 2021 16:53:50 +0200 Subject: [PATCH 087/158] OK salvataggio filtri per componenti in modo separato prime pagine --- MP.Stats/Components/DetailOee.razor | 2 +- MP.Stats/Data/MessageService.cs | 17 ++++++++++++----- MP.Stats/Pages/Controlli.razor.cs | 2 +- MP.Stats/Pages/Diario.razor.cs | 16 +++++++++++++++- MP.Stats/Pages/Oee.razor.cs | 15 ++++++++++++++- MP.Stats/Pages/ReportODL.razor.cs | 15 ++++++++++++++- 6 files changed, 57 insertions(+), 10 deletions(-) diff --git a/MP.Stats/Components/DetailOee.razor b/MP.Stats/Components/DetailOee.razor index 78baaabf..746c8308 100644 --- a/MP.Stats/Components/DetailOee.razor +++ b/MP.Stats/Components/DetailOee.razor @@ -95,6 +95,6 @@ DateStart = currRecord.DataRif.AddHours(oraStart), DateEnd = currRecord.DataRif.AddHours(oraStart + 8) }; - MessageService.ActiveFilter = CurrFilter; + MessageService.DetailFilter = CurrFilter; } } \ No newline at end of file diff --git a/MP.Stats/Data/MessageService.cs b/MP.Stats/Data/MessageService.cs index 4f733938..13417b00 100644 --- a/MP.Stats/Data/MessageService.cs +++ b/MP.Stats/Data/MessageService.cs @@ -9,7 +9,8 @@ namespace MP.Stats.Data { #region Private Fields - private SelectData _activeFilter = new SelectData(); + private SelectData _detailFilter = new SelectData(); + private SelectData _masterFilter = new SelectData(); private string _searchVal; private bool showSearch; @@ -29,14 +30,16 @@ namespace MP.Stats.Data #region Public Properties - public SelectData ActiveFilter + public SelectData DDB_Filter { get; set; } = SelectData.Init(5, 3); + + public SelectData DetailFilter { - get => _activeFilter; + get => _detailFilter; set { - if (_activeFilter != value) + if (_detailFilter != value) { - _activeFilter = value; + _detailFilter = value; if (EA_FilterUpdated != null) { @@ -46,6 +49,10 @@ namespace MP.Stats.Data } } + public SelectData KRE_Filter { get; set; } = SelectData.Init(5, 7); + public SelectData ODL_Filter { get; set; } = SelectData.Init(5, 7); + public SelectData OEE_Filter { get; set; } = SelectData.Init(5, 7); + public string SearchVal { get => _searchVal; diff --git a/MP.Stats/Pages/Controlli.razor.cs b/MP.Stats/Pages/Controlli.razor.cs index bc12ddc0..9783c590 100644 --- a/MP.Stats/Pages/Controlli.razor.cs +++ b/MP.Stats/Pages/Controlli.razor.cs @@ -111,7 +111,7 @@ namespace MP.Stats.Pages } else { - currFilter = MessageService.ActiveFilter; + currFilter = MessageService.DetailFilter; } MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; diff --git a/MP.Stats/Pages/Diario.razor.cs b/MP.Stats/Pages/Diario.razor.cs index 992e8e1e..048e8139 100644 --- a/MP.Stats/Pages/Diario.razor.cs +++ b/MP.Stats/Pages/Diario.razor.cs @@ -21,7 +21,19 @@ namespace MP.Stats.Pages #region Private Properties - private SelectData currFilter { get; set; } = new SelectData(); + private SelectData currFilter + + { + get + { + return MessageService.DDB_Filter; + } + set + { + MessageService.DDB_Filter = value; + } + } + private int currPage { get; set; } = 1; private bool isLoading { get; set; } = false; private int numRecord { get; set; } = 10; @@ -94,7 +106,9 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { numRecord = 10; +#if false currFilter = SelectData.Init(5, 3); +#endif MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); diff --git a/MP.Stats/Pages/Oee.razor.cs b/MP.Stats/Pages/Oee.razor.cs index 7f91a0f2..7afb9c35 100644 --- a/MP.Stats/Pages/Oee.razor.cs +++ b/MP.Stats/Pages/Oee.razor.cs @@ -22,7 +22,18 @@ namespace MP.Stats.Pages #region Private Properties - private SelectData currFilter { get; set; } = new SelectData(); + private SelectData currFilter + { + get + { + return MessageService.OEE_Filter; + } + set + { + MessageService.OEE_Filter = value; + } + } + private int currPage { get; set; } = 1; private bool isLoading { get; set; } = false; private int numRecord { get; set; } = 10; @@ -96,7 +107,9 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { numRecord = 10; +#if false currFilter = SelectData.Init(5, 7); +#endif MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); diff --git a/MP.Stats/Pages/ReportODL.razor.cs b/MP.Stats/Pages/ReportODL.razor.cs index 6f16bbaf..fe994c2d 100644 --- a/MP.Stats/Pages/ReportODL.razor.cs +++ b/MP.Stats/Pages/ReportODL.razor.cs @@ -21,7 +21,18 @@ namespace MP.Stats.Pages #region Private Properties - private SelectData currFilter { get; set; } = new SelectData(); + private SelectData currFilter + { + get + { + return MessageService.ODL_Filter; + } + set + { + MessageService.ODL_Filter = value; + } + } + private int currPage { get; set; } = 1; private int numRecord { get; set; } = 10; @@ -91,7 +102,9 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { numRecord = 10; +#if false currFilter = SelectData.Init(5, 7); +#endif MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); From d699b46e2d3281e3ac932485c1b6e63e06594d2d Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 21 May 2021 16:58:44 +0200 Subject: [PATCH 088/158] Completato aggancio filtri navigazione --- MP.Stats/Components/DetailOee.razor | 5 ++++- MP.Stats/Pages/Controlli.razor | 2 +- MP.Stats/Pages/Controlli.razor.cs | 20 +++++++++++--------- MP.Stats/Pages/Diario.razor.cs | 3 --- MP.Stats/Pages/Oee.razor.cs | 3 --- MP.Stats/Pages/ReportODL.razor.cs | 3 --- MP.Stats/Pages/Scarti.razor.cs | 15 +++++++++++++-- MP.Stats/Pages/UserLog.razor.cs | 14 ++++++++++++-- 8 files changed, 41 insertions(+), 24 deletions(-) diff --git a/MP.Stats/Components/DetailOee.razor b/MP.Stats/Components/DetailOee.razor index 746c8308..767bd4f0 100644 --- a/MP.Stats/Components/DetailOee.razor +++ b/MP.Stats/Components/DetailOee.razor @@ -47,7 +47,10 @@ { SetFilter(); // rimando... - NavManager.NavigateTo($"controlli/{currRecord.IdxMacchina}"); + NavManager.NavigateTo($"controlli"); +#if false + NavManager.NavigateTo($"controlli/{currRecord.IdxMacchina}"); +#endif } protected void ShowDDB() diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor index 1a1396a1..1e72a42c 100644 --- a/MP.Stats/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -1,5 +1,5 @@ @page "/controlli" -@page "/controlli/{IdxMacchina}" +@*@page "/controlli/{IdxMacchina}"*@ @using MP.Stats.Components diff --git a/MP.Stats/Pages/Controlli.razor.cs b/MP.Stats/Pages/Controlli.razor.cs index 9783c590..db75f1a6 100644 --- a/MP.Stats/Pages/Controlli.razor.cs +++ b/MP.Stats/Pages/Controlli.razor.cs @@ -61,7 +61,17 @@ namespace MP.Stats.Pages #region Public Properties [Parameter] - public SelectData currFilter { get; set; } = new SelectData(); + public SelectData currFilter + { + get + { + return MessageService.DetailFilter; + } + set + { + MessageService.DetailFilter = value; + } + } [Parameter] public string IdxMacchina { get; set; } = ""; @@ -105,14 +115,6 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { numRecord = 10; - if (string.IsNullOrEmpty(IdxMacchina)) - { - currFilter = SelectData.Init(5, 7); - } - else - { - currFilter = MessageService.DetailFilter; - } MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); diff --git a/MP.Stats/Pages/Diario.razor.cs b/MP.Stats/Pages/Diario.razor.cs index 048e8139..47d620fb 100644 --- a/MP.Stats/Pages/Diario.razor.cs +++ b/MP.Stats/Pages/Diario.razor.cs @@ -106,9 +106,6 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { numRecord = 10; -#if false - currFilter = SelectData.Init(5, 3); -#endif MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); diff --git a/MP.Stats/Pages/Oee.razor.cs b/MP.Stats/Pages/Oee.razor.cs index 7afb9c35..eaf7b98d 100644 --- a/MP.Stats/Pages/Oee.razor.cs +++ b/MP.Stats/Pages/Oee.razor.cs @@ -107,9 +107,6 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { numRecord = 10; -#if false - currFilter = SelectData.Init(5, 7); -#endif MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); diff --git a/MP.Stats/Pages/ReportODL.razor.cs b/MP.Stats/Pages/ReportODL.razor.cs index fe994c2d..da15122a 100644 --- a/MP.Stats/Pages/ReportODL.razor.cs +++ b/MP.Stats/Pages/ReportODL.razor.cs @@ -102,9 +102,6 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { numRecord = 10; -#if false - currFilter = SelectData.Init(5, 7); -#endif MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); diff --git a/MP.Stats/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs index 42190233..77fec8ac 100644 --- a/MP.Stats/Pages/Scarti.razor.cs +++ b/MP.Stats/Pages/Scarti.razor.cs @@ -21,7 +21,18 @@ namespace MP.Stats.Pages #region Private Properties - private SelectData currFilter { get; set; } = new SelectData(); + private SelectData currFilter + { + get + { + return MessageService.DetailFilter; + } + set + { + MessageService.DetailFilter = value; + } + } + private int currPage { get; set; } = 1; private bool isLoading { get; set; } = false; private int numRecord { get; set; } = 10; @@ -54,6 +65,7 @@ namespace MP.Stats.Pages return answ; } } + #endregion Protected Properties #region Private Methods @@ -93,7 +105,6 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { numRecord = 10; - currFilter = SelectData.Init(5, 7); MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); diff --git a/MP.Stats/Pages/UserLog.razor.cs b/MP.Stats/Pages/UserLog.razor.cs index 248addff..45eda1a9 100644 --- a/MP.Stats/Pages/UserLog.razor.cs +++ b/MP.Stats/Pages/UserLog.razor.cs @@ -22,7 +22,18 @@ namespace MP.Stats.Pages #region Private Properties - private SelectData currFilter { get; set; } = new SelectData(); + private SelectData currFilter + { + get + { + return MessageService.DetailFilter; + } + set + { + MessageService.DetailFilter = value; + } + } + private int currPage { get; set; } = 1; private bool isLoading { get; set; } = false; private int numRecord { get; set; } = 10; @@ -96,7 +107,6 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { numRecord = 10; - currFilter = SelectData.Init(5, 7); MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); From 9bada60148ba19c3f4ad2c82b7c687ac63603245 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 21 May 2021 16:59:31 +0200 Subject: [PATCH 089/158] code cleanup --- MP.Stats/Components/DetailOee.razor | 3 --- MP.Stats/Startup.cs | 5 ----- 2 files changed, 8 deletions(-) diff --git a/MP.Stats/Components/DetailOee.razor b/MP.Stats/Components/DetailOee.razor index 767bd4f0..032aae93 100644 --- a/MP.Stats/Components/DetailOee.razor +++ b/MP.Stats/Components/DetailOee.razor @@ -48,9 +48,6 @@ SetFilter(); // rimando... NavManager.NavigateTo($"controlli"); -#if false - NavManager.NavigateTo($"controlli/{currRecord.IdxMacchina}"); -#endif } protected void ShowDDB() diff --git a/MP.Stats/Startup.cs b/MP.Stats/Startup.cs index 42f0661d..ce61a417 100644 --- a/MP.Stats/Startup.cs +++ b/MP.Stats/Startup.cs @@ -97,11 +97,6 @@ namespace MP.Stats services.AddSingleton(Configuration); services.AddTransient(); -#if false - services.AddDbContext(options => - options.UseSqlServer(Configuration.GetConnectionString("BloggingDatabase"))); -#endif - //services.AddScoped(); services.AddSingleton(); services.AddScoped(); From 356cebf38ef39490035532c5a13fc10da7028b45 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 21 May 2021 17:29:23 +0200 Subject: [PATCH 090/158] Modifica messaggio loading/no record in pagine --- MP.Stats/Pages/Controlli.razor | 6 ++- MP.Stats/Pages/Diario.razor | 76 ++++++++++++++++++---------------- MP.Stats/Pages/Oee.razor | 6 ++- MP.Stats/Pages/ReportODL.razor | 6 ++- MP.Stats/Pages/Scarti.razor | 6 ++- MP.Stats/Pages/UserLog.razor | 6 ++- 6 files changed, 65 insertions(+), 41 deletions(-) diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor index 1e72a42c..c0e351b5 100644 --- a/MP.Stats/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -17,10 +17,14 @@ - @if (totalCount == 0 || ListRecords == null) + @if (ListRecords == null) { } + else if (totalCount == 0) + { +
                  Nessun record trovato
                  + } else {
                  diff --git a/MP.Stats/Pages/Diario.razor b/MP.Stats/Pages/Diario.razor index 80a93461..84e5820d 100644 --- a/MP.Stats/Pages/Diario.razor +++ b/MP.Stats/Pages/Diario.razor @@ -16,49 +16,53 @@
                  - @if (totalCount == 0 || ListRecords == null || ListRecords.Count() == 0) + @if (ListRecords == null) { - + + } + else if (totalCount == 0) + { +
                  Nessun record trovato
                  } else { -
                  -
                  - - - - - - - - - - - - - - @foreach (var record in ListRecords) +
                  +
                  +
                  MacchinaDataODL/CommessaArticoloStatoDurataPezzi
                  + + + + + + + + + + + + + @foreach (var record in ListRecords) { - - - - - - - - - + + + + + + + + + } - -
                  MacchinaDataODL/CommessaArticoloStatoDurataPezzi
                  -
                  @record.CodMacchina
                  -
                  @record.IdxMacchina
                  -                   		-
                  @record.InizioStato.ToString("yyyy.MM.dd")
                  -
                  @record.InizioStato.ToString("ddd HH:mm.ss")
                  -                   		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo@record.Descrizione@record.DurataMin@record.TotPzProd
                  +
                  @record.CodMacchina
                  +
                  @record.IdxMacchina
                  +                   		+
                  @record.InizioStato.ToString("yyyy.MM.dd")
                  +
                  @record.InizioStato.ToString("ddd HH:mm.ss")
                  +                   		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo@record.Descrizione@record.DurataMin@record.TotPzProd
                  + +
                  +
                  -
                  }
                  diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor index 7db71094..519b7e76 100644 --- a/MP.Stats/Pages/Oee.razor +++ b/MP.Stats/Pages/Oee.razor @@ -20,10 +20,14 @@ { } - @if (totalCount == 0 || ListRecords == null) + @if (ListRecords == null) { } + else if (totalCount == 0) + { +
                  Nessun record trovato
                  + } else {
                  diff --git a/MP.Stats/Pages/ReportODL.razor b/MP.Stats/Pages/ReportODL.razor index 9d867de9..cbb05d25 100644 --- a/MP.Stats/Pages/ReportODL.razor +++ b/MP.Stats/Pages/ReportODL.razor @@ -16,10 +16,14 @@
                  - @if (totalCount == 0 || ListRecords == null || ListRecords.Count() == 0) + @if (ListRecords == null) { } + else if (totalCount == 0) + { +
                  Nessun record trovato
                  + } else {
                  diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index a220ae80..8c5e0c0f 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -16,10 +16,14 @@
                  - @if (totalCount == 0 || ListRecords == null) + @if (ListRecords == null) { } + else if (totalCount == 0) + { +
                  Nessun record trovato
                  + } else {
                  diff --git a/MP.Stats/Pages/UserLog.razor b/MP.Stats/Pages/UserLog.razor index 6c628007..83873c00 100644 --- a/MP.Stats/Pages/UserLog.razor +++ b/MP.Stats/Pages/UserLog.razor @@ -16,10 +16,14 @@
                  - @if (totalCount == 0 || ListRecords == null) + @if (ListRecords == null) { } + else if (totalCount == 0) + { +
                  Nessun record trovato
                  + } else {
                  From ae625b59332ee6f92f507ca15302189409a201c0 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 21 May 2021 17:41:53 +0200 Subject: [PATCH 091/158] OK reset filtraggio --- MP.Stats/Components/SelectionFilter.razor | 7 ++++++- MP.Stats/Components/SelectionFilter.razor.cs | 12 ++++++++++++ MP.Stats/Pages/Controlli.razor | 2 +- MP.Stats/Pages/Controlli.razor.cs | 9 +++++++++ MP.Stats/Pages/Diario.razor | 2 +- MP.Stats/Pages/Diario.razor.cs | 9 +++++++++ MP.Stats/Pages/Oee.razor | 2 +- MP.Stats/Pages/Oee.razor.cs | 9 +++++++++ MP.Stats/Pages/ReportODL.razor | 2 +- MP.Stats/Pages/ReportODL.razor.cs | 9 +++++++++ MP.Stats/Pages/Scarti.razor | 2 +- MP.Stats/Pages/Scarti.razor.cs | 9 +++++++++ MP.Stats/Pages/UserLog.razor | 2 +- MP.Stats/Pages/UserLog.razor.cs | 9 +++++++++ 14 files changed, 78 insertions(+), 7 deletions(-) diff --git a/MP.Stats/Components/SelectionFilter.razor b/MP.Stats/Components/SelectionFilter.razor index 8d277f2b..13cb06a8 100644 --- a/MP.Stats/Components/SelectionFilter.razor +++ b/MP.Stats/Components/SelectionFilter.razor @@ -25,11 +25,16 @@
                  -
                  +
                  +
                  +
                  + +
                  +
                  \ No newline at end of file diff --git a/MP.Stats/Components/SelectionFilter.razor.cs b/MP.Stats/Components/SelectionFilter.razor.cs index b9b00a3e..eca1d54d 100644 --- a/MP.Stats/Components/SelectionFilter.razor.cs +++ b/MP.Stats/Components/SelectionFilter.razor.cs @@ -104,6 +104,9 @@ namespace MP.Stats.Components [Parameter] public EventCallback filterChanged { get; set; } + [Parameter] + public EventCallback filterReset { get; set; } + [Parameter] public SelectData SelFilter { get; set; } @@ -117,5 +120,14 @@ namespace MP.Stats.Components } #endregion Private Methods + + #region Protected Methods + + protected void resetFilter() + { + filterReset.InvokeAsync(SelFilter); + } + + #endregion Protected Methods } } \ No newline at end of file diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor index c0e351b5..afb31fb5 100644 --- a/MP.Stats/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -14,7 +14,7 @@
                  - +
                  @if (ListRecords == null) diff --git a/MP.Stats/Pages/Controlli.razor.cs b/MP.Stats/Pages/Controlli.razor.cs index db75f1a6..9078500b 100644 --- a/MP.Stats/Pages/Controlli.razor.cs +++ b/MP.Stats/Pages/Controlli.razor.cs @@ -126,6 +126,15 @@ namespace MP.Stats.Pages currRecord = null; } + protected async Task ResetFilter(SelectData newFilter) + { + currRecord = null; + SearchRecords = null; + ListRecords = null; + currFilter = SelectData.Init(5, 7); + await reloadData(); + } + protected async Task UpdateData() { currRecord = null; diff --git a/MP.Stats/Pages/Diario.razor b/MP.Stats/Pages/Diario.razor index 84e5820d..e31d0977 100644 --- a/MP.Stats/Pages/Diario.razor +++ b/MP.Stats/Pages/Diario.razor @@ -13,7 +13,7 @@
                  - +
                  @if (ListRecords == null) diff --git a/MP.Stats/Pages/Diario.razor.cs b/MP.Stats/Pages/Diario.razor.cs index 47d620fb..51f547ca 100644 --- a/MP.Stats/Pages/Diario.razor.cs +++ b/MP.Stats/Pages/Diario.razor.cs @@ -117,6 +117,15 @@ namespace MP.Stats.Pages currRecord = null; } + protected async Task ResetFilter(SelectData newFilter) + { + currRecord = null; + SearchRecords = null; + ListRecords = null; + currFilter = SelectData.Init(5, 3); + await reloadData(); + } + protected async Task UpdateData() { currRecord = null; diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor index 519b7e76..7b50107c 100644 --- a/MP.Stats/Pages/Oee.razor +++ b/MP.Stats/Pages/Oee.razor @@ -13,7 +13,7 @@
                  - +
                  @if (currRecord != null) diff --git a/MP.Stats/Pages/Oee.razor.cs b/MP.Stats/Pages/Oee.razor.cs index eaf7b98d..02d80146 100644 --- a/MP.Stats/Pages/Oee.razor.cs +++ b/MP.Stats/Pages/Oee.razor.cs @@ -118,6 +118,15 @@ namespace MP.Stats.Pages currRecord = null; } + protected async Task ResetFilter(SelectData newFilter) + { + currRecord = null; + SearchRecords = null; + ListRecords = null; + currFilter = SelectData.Init(5, 7); + await reloadData(); + } + protected void Select(MP.Data.DatabaseModels.TurniOee selRecord) { // applico filtro da selezione diff --git a/MP.Stats/Pages/ReportODL.razor b/MP.Stats/Pages/ReportODL.razor index cbb05d25..05f9aed3 100644 --- a/MP.Stats/Pages/ReportODL.razor +++ b/MP.Stats/Pages/ReportODL.razor @@ -13,7 +13,7 @@
                  - +
                  @if (ListRecords == null) diff --git a/MP.Stats/Pages/ReportODL.razor.cs b/MP.Stats/Pages/ReportODL.razor.cs index da15122a..7b472ac7 100644 --- a/MP.Stats/Pages/ReportODL.razor.cs +++ b/MP.Stats/Pages/ReportODL.razor.cs @@ -113,6 +113,15 @@ namespace MP.Stats.Pages currRecord = null; } + protected async Task ResetFilter(SelectData newFilter) + { + currRecord = null; + SearchRecords = null; + ListRecords = null; + currFilter = SelectData.Init(5, 7); + await reloadData(); + } + protected async Task UpdateData() { currRecord = null; diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index 8c5e0c0f..05b81ddf 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -13,7 +13,7 @@
                  - +
                  @if (ListRecords == null) diff --git a/MP.Stats/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs index 77fec8ac..025e10be 100644 --- a/MP.Stats/Pages/Scarti.razor.cs +++ b/MP.Stats/Pages/Scarti.razor.cs @@ -116,6 +116,15 @@ namespace MP.Stats.Pages currRecord = null; } + protected async Task ResetFilter(SelectData newFilter) + { + currRecord = null; + SearchRecords = null; + ListRecords = null; + currFilter = SelectData.Init(5, 7); + await reloadData(); + } + protected async Task UpdateData() { currRecord = null; diff --git a/MP.Stats/Pages/UserLog.razor b/MP.Stats/Pages/UserLog.razor index 83873c00..614e1f2a 100644 --- a/MP.Stats/Pages/UserLog.razor +++ b/MP.Stats/Pages/UserLog.razor @@ -13,7 +13,7 @@
                  - +
                  @if (ListRecords == null) diff --git a/MP.Stats/Pages/UserLog.razor.cs b/MP.Stats/Pages/UserLog.razor.cs index 45eda1a9..2f092c0a 100644 --- a/MP.Stats/Pages/UserLog.razor.cs +++ b/MP.Stats/Pages/UserLog.razor.cs @@ -118,6 +118,15 @@ namespace MP.Stats.Pages currRecord = null; } + protected async Task ResetFilter(SelectData newFilter) + { + currRecord = null; + SearchRecords = null; + ListRecords = null; + currFilter = SelectData.Init(5, 7); + await reloadData(); + } + protected async Task UpdateData() { currRecord = null; From e8d2afe2731b8fee18edea091e10bb92487b216b Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 21 May 2021 17:46:51 +0200 Subject: [PATCH 092/158] Commentata selezione dettaglio OEE (temporaneamente) x sviluppo autocomplete --- MP.Stats/Pages/Oee.razor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor index 7b50107c..0a661c25 100644 --- a/MP.Stats/Pages/Oee.razor +++ b/MP.Stats/Pages/Oee.razor @@ -35,7 +35,7 @@ - + @**@ @@ -50,7 +50,7 @@ { - + @**@
                  Data Turno Macchina
                  @record.DataRif.ToString("yyyy.MM.dd")
                  @record.DataRif.ToString("dddd")
                  From 49241006b7be830647a59a506cd5914a2ad89d45 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 21 May 2021 19:39:18 +0200 Subject: [PATCH 093/158] Ok modello prefiltraggio ddl x articoli --- MP.Data/Controllers/MpStatsController.cs | 81 +++++++++----------- MP.Stats/Components/SelectionFilter.razor | 26 ++++++- MP.Stats/Components/SelectionFilter.razor.cs | 60 +++++++++++++-- MP.Stats/Data/AutocompleteModel.cs | 17 ++++ MP.Stats/Data/MpStatsService.cs | 42 +++++++--- MP.Stats/MP.Stats.csproj | 1 + 6 files changed, 162 insertions(+), 65 deletions(-) create mode 100644 MP.Stats/Data/AutocompleteModel.cs diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index 1fdb1f9b..882bdf73 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -49,12 +49,48 @@ namespace MP.Data.Controllers return dbResult; } + /// + /// Elenco tabella Articoli da filtro + /// + /// + /// + /// + public List ArticoliGetSearch(int numRecord, string searchVal = "") + { + List dbResult = new List(); + + dbResult = dbCtx + .DbSetArticoli + .Where(x => x.CodArticolo.Contains(searchVal) || x.DescArticolo.Contains(searchVal) || x.Disegno.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) + .OrderBy(x => x.CodArticolo) + .Take(numRecord) + .ToList(); + + return dbResult; + } + public void Dispose() { // Clear database context dbCtx.Dispose(); } + /// + /// Elenco tabella Macchine + /// + /// + public List MacchineGetAll() + { + List dbResult = new List(); + + dbResult = dbCtx + .DbSetMacchine + .OrderBy(x => x.IdxMacchina) + .ToList(); + + return dbResult; + } + /// /// Annulla modifiche su una specifica entity (cancel update) /// @@ -77,26 +113,6 @@ namespace MP.Data.Controllers return answ; } - /// - /// Elenco tabella Articoli da filtro - /// - /// - /// - /// - public List StatArticoliGetSearch(int numRecord, string searchVal = "") - { - List dbResult = new List(); - - dbResult = dbCtx - .DbSetArticoli - .Where(x => x.CodArticolo.Contains(searchVal) || x.DescArticolo.Contains(searchVal) || x.Disegno.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) - .OrderBy(x => x.CodArticolo) - .Take(numRecord) - .ToList(); - - return dbResult; - } - /// /// Elenco tabella controlli da filtro /// @@ -107,13 +123,6 @@ namespace MP.Data.Controllers { List dbResult = new List(); - //dbResult = dbCtx - // .DbSetControlli - // .Where(x => x.Note.Contains(searchVal) || x.IdxMacchina.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) - // .OrderByDescending(x => x.DataOra) - // .Take(numRecord) - // .ToList(); - var dataFrom = new SqlParameter("@dataFrom", DataStart); var dataTo = new SqlParameter("@dataTo", DataEnd); var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); @@ -161,24 +170,6 @@ namespace MP.Data.Controllers return dbResult; } - /// - /// Elenco tabella MAcchine - /// - /// - /// - /// - public List StatMacchineGetAll() - { - List dbResult = new List(); - - dbResult = dbCtx - .DbSetMacchine - .OrderBy(x => x.IdxMacchina) - .ToList(); - - return dbResult; - } - /// /// Elenco tabella ODL da filtro /// diff --git a/MP.Stats/Components/SelectionFilter.razor b/MP.Stats/Components/SelectionFilter.razor index 13cb06a8..ab0890fc 100644 --- a/MP.Stats/Components/SelectionFilter.razor +++ b/MP.Stats/Components/SelectionFilter.razor @@ -1,4 +1,7 @@ - +@using Blazorise.Components +@using MP.Stats.Data + +
                  @@ -15,7 +18,12 @@
                  - + + @foreach (var item in ddlMacchine) + { + + } +
                  @@ -26,8 +34,18 @@
                  - - +
                  +
                  + +
                  + +
                  + + @foreach (var item in ddlArticoli) + { + + } +
                  diff --git a/MP.Stats/Components/SelectionFilter.razor.cs b/MP.Stats/Components/SelectionFilter.razor.cs index eca1d54d..5890be9e 100644 --- a/MP.Stats/Components/SelectionFilter.razor.cs +++ b/MP.Stats/Components/SelectionFilter.razor.cs @@ -10,6 +10,21 @@ namespace MP.Stats.Components { public partial class SelectionFilter { + #region Protected Fields + + protected string _searchArt = ""; + protected int minChar = 3; + + #endregion Protected Fields + + #region Private Properties + + private List ddlArticoli { get; set; } + private List ddlMacchine { get; set; } + private string selectedSearchValue { get; set; } = "*"; + + #endregion Private Properties + #region Protected Properties protected string CodArticolo @@ -20,10 +35,9 @@ namespace MP.Stats.Components } set { - bool doReport = (!SelFilter.CodArticolo.Equals(value)); - SelFilter.CodArticolo = value; - if (doReport) + if (!SelFilter.CodArticolo.Equals(value)) { + SelFilter.CodArticolo = value; reportChange(); } } @@ -71,10 +85,9 @@ namespace MP.Stats.Components } set { - bool doReport = (!SelFilter.IdxMacchina.Equals(value)); - SelFilter.IdxMacchina = value; - if (doReport) + if (!SelFilter.IdxMacchina.Equals(value)) { + SelFilter.IdxMacchina = value; reportChange(); } } @@ -97,6 +110,25 @@ namespace MP.Stats.Components } } + protected string SearchArt + { + get => _searchArt; + set + { + _searchArt = value; + int numRowArt = -1; + if (SearchArt.Count() > minChar) + { + numRowArt = 20; + } + ddlArticoli = StatService.ArticoliGetSearch(numRowArt, SearchArt).Result; + CodArticolo = "*"; + } + } + + [Inject] + protected MpStatsService StatService { get; set; } + #endregion Protected Properties #region Public Properties @@ -114,6 +146,17 @@ namespace MP.Stats.Components #region Private Methods + private void MySearchHandler(string newValue) + { + IdxMacchina = newValue; + } + + private async Task reloadData() + { + ddlMacchine = await StatService.MachineList(); + ddlArticoli = await StatService.ArticoliGetSearch(-1, SearchArt); + } + private void reportChange() { filterChanged.InvokeAsync(SelFilter); @@ -123,6 +166,11 @@ namespace MP.Stats.Components #region Protected Methods + protected override async Task OnInitializedAsync() + { + await reloadData(); + } + protected void resetFilter() { filterReset.InvokeAsync(SelFilter); diff --git a/MP.Stats/Data/AutocompleteModel.cs b/MP.Stats/Data/AutocompleteModel.cs new file mode 100644 index 00000000..59249ec0 --- /dev/null +++ b/MP.Stats/Data/AutocompleteModel.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace MP.Stats.Data +{ + public class AutocompleteModel + { + #region Public Properties + + public string LabelField { get; set; } + public string ValueField { get; set; } + + #endregion Public Properties + } +} \ No newline at end of file diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 922b3656..dda39b90 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -124,16 +124,43 @@ namespace MP.Stats.Data return await Task.FromResult(dbResult); } + public Task> ArticoliGetSearch(int numRecord, string searchVal = "") + { + List answ = new List(); + answ.Add(new AutocompleteModel { LabelField = "--- TUTTE ---", ValueField = "*" }); + if (numRecord > -1) + { + answ.AddRange(dbController.ArticoliGetSearch(numRecord, searchVal).Select(x => new AutocompleteModel { LabelField = $"{x.CodArticolo} {x.DescArticolo} {x.Disegno}", ValueField = x.CodArticolo }).ToList()); + } + return Task.FromResult(answ); + } + + public Task> ArticoliList(string searchVal) + { + List answ = new List(); + answ.Add(new AutocompleteModel { LabelField = "--- TUTTE ---", ValueField = "*" }); + answ.AddRange(dbController.MacchineGetAll().Select(x => new AutocompleteModel { LabelField = x.IdxMacchina, ValueField = x.IdxMacchina }).ToList()); + return Task.FromResult(answ); + } + + public Task> MacchineGetAll() + { + return Task.FromResult(dbController.MacchineGetAll().ToList()); + } + + public Task> MachineList() + { + List answ = new List(); + answ.Add(new AutocompleteModel { LabelField = "--- TUTTE ---", ValueField = "*" }); + answ.AddRange(dbController.MacchineGetAll().Select(x => new AutocompleteModel { LabelField = $"{x.IdxMacchina} | {x.Nome} {x.Descrizione} ", ValueField = x.IdxMacchina }).ToList()); + return Task.FromResult(answ); + } + public void rollBackEdit(object item) { dbController.RollBackEntity(item); } - public Task StatArticoliGetSearch(int numRecord, string searchVal = "") - { - return Task.FromResult(dbController.StatArticoliGetSearch(numRecord, searchVal).ToArray()); - } - public async Task> StatControlliGetAll(SelectData CurrFilter, string searchVal = "") { //return Task.FromResult(dbController.StatControlliGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); @@ -178,11 +205,6 @@ namespace MP.Stats.Data return await Task.FromResult(dbResult); } - public Task StatMacchineGetAll() - { - return Task.FromResult(dbController.StatMacchineGetAll().ToArray()); - } - public async Task> StatOdlGetAll(SelectData CurrFilter, string searchVal = "") { //return Task.FromResult(dbController.StatOdlGetAll(numRecord, searchVal)); diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index b033953d..b775dfbc 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -33,6 +33,7 @@ + From d03265321d689967b36b0edab3acc2060438c67b Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 21 May 2021 19:53:05 +0200 Subject: [PATCH 094/158] OK anche filtro commessa --- MP.Data/Controllers/MpStatsController.cs | 20 +++++++++++++++ MP.Stats/Components/SelectionFilter.razor | 22 ++++++++++++----- MP.Stats/Components/SelectionFilter.razor.cs | 26 +++++++++++++++++--- MP.Stats/Data/MpStatsService.cs | 11 +++++++++ 4 files changed, 69 insertions(+), 10 deletions(-) diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index 882bdf73..843c0daf 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -69,6 +69,26 @@ namespace MP.Data.Controllers return dbResult; } + /// + /// Elenco tabella Articoli da filtro + /// + /// + /// + /// + public List CommesseGetSearch(int numRecord, string searchVal = "") + { + List dbResult = new List(); + + dbResult = dbCtx + .DbSetODL + .Where(x => x.KeyRichiesta.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) + .OrderBy(x => x.KeyRichiesta) + .Take(numRecord) + .ToList(); + + return dbResult; + } + public void Dispose() { // Clear database context diff --git a/MP.Stats/Components/SelectionFilter.razor b/MP.Stats/Components/SelectionFilter.razor index ab0890fc..f1bd95d1 100644 --- a/MP.Stats/Components/SelectionFilter.razor +++ b/MP.Stats/Components/SelectionFilter.razor @@ -28,19 +28,29 @@
                  - - +
                  +
                  + +
                  + +
                  + + @foreach (var item in ddlCommesse) + { + + } +
                  -
                  +
                  - +
                  - +
                  - + @foreach (var item in ddlArticoli) { diff --git a/MP.Stats/Components/SelectionFilter.razor.cs b/MP.Stats/Components/SelectionFilter.razor.cs index 5890be9e..70af721e 100644 --- a/MP.Stats/Components/SelectionFilter.razor.cs +++ b/MP.Stats/Components/SelectionFilter.razor.cs @@ -13,6 +13,7 @@ namespace MP.Stats.Components #region Protected Fields protected string _searchArt = ""; + protected string _searchCom = ""; protected int minChar = 3; #endregion Protected Fields @@ -20,6 +21,7 @@ namespace MP.Stats.Components #region Private Properties private List ddlArticoli { get; set; } + private List ddlCommesse { get; set; } private List ddlMacchine { get; set; } private string selectedSearchValue { get; set; } = "*"; @@ -101,10 +103,9 @@ namespace MP.Stats.Components } set { - bool doReport = (!SelFilter.KeyRichiesta.Equals(value)); - SelFilter.KeyRichiesta = value; - if (doReport) + if (!SelFilter.KeyRichiesta.Equals(value)) { + SelFilter.KeyRichiesta = value; reportChange(); } } @@ -117,7 +118,7 @@ namespace MP.Stats.Components { _searchArt = value; int numRowArt = -1; - if (SearchArt.Count() > minChar) + if (value.Count() > minChar) { numRowArt = 20; } @@ -126,6 +127,22 @@ namespace MP.Stats.Components } } + protected string SearchCom + { + get => _searchCom; + set + { + _searchCom = value; + int numRowArt = -1; + if (value.Count() > minChar) + { + numRowArt = 20; + } + ddlCommesse = StatService.CommesseGetSearch(numRowArt, SearchCom).Result; + KeyRichiesta = "*"; + } + } + [Inject] protected MpStatsService StatService { get; set; } @@ -155,6 +172,7 @@ namespace MP.Stats.Components { ddlMacchine = await StatService.MachineList(); ddlArticoli = await StatService.ArticoliGetSearch(-1, SearchArt); + ddlCommesse = await StatService.CommesseGetSearch(-1, SearchArt); } private void reportChange() diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index dda39b90..9b17ab77 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -143,6 +143,17 @@ namespace MP.Stats.Data return Task.FromResult(answ); } + public Task> CommesseGetSearch(int numRecord, string searchVal = "") + { + List answ = new List(); + answ.Add(new AutocompleteModel { LabelField = "--- TUTTE ---", ValueField = "*" }); + if (numRecord > -1) + { + answ.AddRange(dbController.CommesseGetSearch(numRecord, searchVal).Select(x => new AutocompleteModel { LabelField = $"{x.CodArticolo} | {x.KeyRichiesta}", ValueField = x.KeyRichiesta }).ToList()); + } + return Task.FromResult(answ); + } + public Task> MacchineGetAll() { return Task.FromResult(dbController.MacchineGetAll().ToList()); From 4ea64ea7d59dc8729a94fe4ec6f7937137cd75e9 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Sat, 22 May 2021 11:54:08 +0200 Subject: [PATCH 095/158] aggiunto valorie gestione messageservice --- MP.Stats/Data/MessageService.cs | 44 ++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/MP.Stats/Data/MessageService.cs b/MP.Stats/Data/MessageService.cs index 13417b00..1394318c 100644 --- a/MP.Stats/Data/MessageService.cs +++ b/MP.Stats/Data/MessageService.cs @@ -11,6 +11,8 @@ namespace MP.Stats.Data private SelectData _detailFilter = new SelectData(); private SelectData _masterFilter = new SelectData(); + private string _pageIcon; + private string _pageName; private string _searchVal; private bool showSearch; @@ -22,6 +24,8 @@ namespace MP.Stats.Data public event Action EA_HideSearch; + public event Action EA_PageUpdated; + public event Action EA_SearchUpdated; public event Action EA_ShowSearch; @@ -53,6 +57,32 @@ namespace MP.Stats.Data public SelectData ODL_Filter { get; set; } = SelectData.Init(5, 7); public SelectData OEE_Filter { get; set; } = SelectData.Init(5, 7); + public string PageIcon + { + get => _pageIcon; + set + { + if (_pageIcon != value) + { + _pageIcon = value; + ReportPageUpd(); + } + } + } + + public string PageName + { + get => _pageName; + set + { + if (_pageName != value) + { + _pageName = value; + ReportPageUpd(); + } + } + } + public string SearchVal { get => _searchVal; @@ -98,9 +128,17 @@ namespace MP.Stats.Data #endregion Public Properties - #region Protected Methods + #region Private Methods - protected void ReportSearch() + private void ReportPageUpd() + { + if (EA_PageUpdated != null) + { + EA_PageUpdated?.Invoke(); + } + } + + private void ReportSearch() { if (EA_SearchUpdated != null) { @@ -108,6 +146,6 @@ namespace MP.Stats.Data } } - #endregion Protected Methods + #endregion Private Methods } } \ No newline at end of file From ddbba0e90e20abca868d654ebb459f4ead13519f Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Sat, 22 May 2021 11:54:20 +0200 Subject: [PATCH 096/158] bozza gestione detail/jump oee --- MP.Stats/Components/DetailOee.razor | 50 ++++-------------------- MP.Stats/Components/JumpDetail.razor | 58 ++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 43 deletions(-) create mode 100644 MP.Stats/Components/JumpDetail.razor diff --git a/MP.Stats/Components/DetailOee.razor b/MP.Stats/Components/DetailOee.razor index 032aae93..2e65aa37 100644 --- a/MP.Stats/Components/DetailOee.razor +++ b/MP.Stats/Components/DetailOee.razor @@ -6,20 +6,11 @@
                  GRAFICO
                  -
                  +
                  -
                  - -
                  -
                  - -
                  -
                  - -
                  -
                  - +
                  +
                  @@ -40,38 +31,9 @@ } } - [Parameter] public SelectData CurrFilter { get; set; } - protected void ShowCont() - { - SetFilter(); - // rimando... - NavManager.NavigateTo($"controlli"); - } - - protected void ShowDDB() - { - SetFilter(); - // rimando... - NavManager.NavigateTo($"diario"); - } - - protected void ShowScar() - { - SetFilter(); - // rimando... - NavManager.NavigateTo($"scarti"); - } - - protected void ShowUAL() - { - SetFilter(); - // rimando... - NavManager.NavigateTo($"userlog"); - } - - protected void SetFilter() + protected override Task OnInitializedAsync() { int oraStart = 0; switch (currRecord.Turno) @@ -95,6 +57,8 @@ DateStart = currRecord.DataRif.AddHours(oraStart), DateEnd = currRecord.DataRif.AddHours(oraStart + 8) }; - MessageService.DetailFilter = CurrFilter; + + return base.OnInitializedAsync(); } + } \ No newline at end of file diff --git a/MP.Stats/Components/JumpDetail.razor b/MP.Stats/Components/JumpDetail.razor new file mode 100644 index 00000000..bab4c64f --- /dev/null +++ b/MP.Stats/Components/JumpDetail.razor @@ -0,0 +1,58 @@ +@using MP.Stats.Data +@inject NavigationManager NavManager +@inject MessageService MessageService + +
                  +
                  + +
                  +
                  + +
                  +
                  +
                  +
                  + +
                  +
                  + +
                  +
                  + +@code{ + [Parameter] + public SelectData DetailFilterSel { get; set; } + + protected void ShowCont() + { + SetFilter(); + // rimando... + NavManager.NavigateTo($"controlli"); + } + + protected void ShowDDB() + { + SetFilter(); + // rimando... + NavManager.NavigateTo($"diario"); + } + + protected void ShowScar() + { + SetFilter(); + // rimando... + NavManager.NavigateTo($"scarti"); + } + + protected void ShowUAL() + { + SetFilter(); + // rimando... + NavManager.NavigateTo($"userlog"); + } + + protected void SetFilter() + { + MessageService.DetailFilter = DetailFilterSel; + } +} \ No newline at end of file From 612125575929c69b9511ab710d09f8cc6d256809 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Sat, 22 May 2021 11:54:29 +0200 Subject: [PATCH 097/158] fix pagine x headers --- MP.Stats/Components/CmpTop.razor | 31 ++++++++++++++++++++++++++++--- MP.Stats/Pages/Controlli.razor.cs | 2 ++ MP.Stats/Pages/Diario.razor.cs | 2 ++ MP.Stats/Pages/Index.razor | 2 ++ MP.Stats/Pages/Oee.razor.cs | 2 ++ MP.Stats/Pages/ReportODL.razor.cs | 2 ++ MP.Stats/Pages/Scarti.razor.cs | 2 ++ MP.Stats/Pages/UserLog.razor.cs | 2 ++ 8 files changed, 42 insertions(+), 3 deletions(-) diff --git a/MP.Stats/Components/CmpTop.razor b/MP.Stats/Components/CmpTop.razor index 187e684f..ab4bb84b 100644 --- a/MP.Stats/Components/CmpTop.razor +++ b/MP.Stats/Components/CmpTop.razor @@ -1,16 +1,19 @@ @using MP.Stats.Components @using System.Security.Claims @using Microsoft.AspNetCore.Components.Authorization +@using MP.Stats.Data +@inject MessageService AppMessages @inject AuthenticationStateProvider AuthenticationStateProvider
                  -
                  +
                  @userName
                  -
                  +
                  + @PageName
                  -
                  +
                  @if (ShowSearch) { @@ -25,11 +28,33 @@ private string userName = ""; + private string PageName { get; set; } + private string PageIcon { get; set; } + protected override async Task OnInitializedAsync() { await forceReload(); } + protected override void OnInitialized() + { + AppMessages.EA_PageUpdated += OnPageUpdate; + } + public void OnPageUpdate() + { + PageName = AppMessages.PageName; + PageIcon = AppMessages.PageIcon; + InvokeAsync(() => + { + StateHasChanged(); + }); + } + + public void Dispose() + { + AppMessages.EA_PageUpdated -= OnPageUpdate; + } + private async Task forceReload() { diff --git a/MP.Stats/Pages/Controlli.razor.cs b/MP.Stats/Pages/Controlli.razor.cs index 9078500b..86463196 100644 --- a/MP.Stats/Pages/Controlli.razor.cs +++ b/MP.Stats/Pages/Controlli.razor.cs @@ -116,6 +116,8 @@ namespace MP.Stats.Pages { numRecord = 10; MessageService.ShowSearch = false; + MessageService.PageName = "Registro Controlli"; + MessageService.PageIcon = "oi oi-beaker"; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); } diff --git a/MP.Stats/Pages/Diario.razor.cs b/MP.Stats/Pages/Diario.razor.cs index 51f547ca..aff832fd 100644 --- a/MP.Stats/Pages/Diario.razor.cs +++ b/MP.Stats/Pages/Diario.razor.cs @@ -107,6 +107,8 @@ namespace MP.Stats.Pages { numRecord = 10; MessageService.ShowSearch = false; + MessageService.PageName = "Diario Produzione"; + MessageService.PageIcon = "oi oi-clipboard"; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); } diff --git a/MP.Stats/Pages/Index.razor b/MP.Stats/Pages/Index.razor index 8466112e..bafa7164 100644 --- a/MP.Stats/Pages/Index.razor +++ b/MP.Stats/Pages/Index.razor @@ -42,6 +42,8 @@ protected override Task OnInitializedAsync() { MessageService.ShowSearch = false; + MessageService.PageName = "Home"; + MessageService.PageIcon = "oi oi-home"; return base.OnInitializedAsync(); } } \ No newline at end of file diff --git a/MP.Stats/Pages/Oee.razor.cs b/MP.Stats/Pages/Oee.razor.cs index 02d80146..5b260e77 100644 --- a/MP.Stats/Pages/Oee.razor.cs +++ b/MP.Stats/Pages/Oee.razor.cs @@ -108,6 +108,8 @@ namespace MP.Stats.Pages { numRecord = 10; MessageService.ShowSearch = false; + MessageService.PageName = "TRS/OEE %"; + MessageService.PageIcon = "oi oi-monitor"; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); } diff --git a/MP.Stats/Pages/ReportODL.razor.cs b/MP.Stats/Pages/ReportODL.razor.cs index 7b472ac7..e4477774 100644 --- a/MP.Stats/Pages/ReportODL.razor.cs +++ b/MP.Stats/Pages/ReportODL.razor.cs @@ -103,6 +103,8 @@ namespace MP.Stats.Pages { numRecord = 10; MessageService.ShowSearch = false; + MessageService.PageName = "Report ODL/Comm."; + MessageService.PageIcon = "oi oi-book"; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); } diff --git a/MP.Stats/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs index 025e10be..bfb8cc7c 100644 --- a/MP.Stats/Pages/Scarti.razor.cs +++ b/MP.Stats/Pages/Scarti.razor.cs @@ -106,6 +106,8 @@ namespace MP.Stats.Pages { numRecord = 10; MessageService.ShowSearch = false; + MessageService.PageName = "Registro Scarti"; + MessageService.PageIcon = "oi oi-warning"; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); } diff --git a/MP.Stats/Pages/UserLog.razor.cs b/MP.Stats/Pages/UserLog.razor.cs index 2f092c0a..8a3f824d 100644 --- a/MP.Stats/Pages/UserLog.razor.cs +++ b/MP.Stats/Pages/UserLog.razor.cs @@ -108,6 +108,8 @@ namespace MP.Stats.Pages { numRecord = 10; MessageService.ShowSearch = false; + MessageService.PageName = "User ActionLog"; + MessageService.PageIcon = "oi oi-document"; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); } From d6f2dfa96bbe307da8cc9fa78033cff011ff6d80 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Sat, 22 May 2021 12:03:03 +0200 Subject: [PATCH 098/158] Update layout filtro selezione --- MP.Stats/Components/SelectionFilter.razor | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/MP.Stats/Components/SelectionFilter.razor b/MP.Stats/Components/SelectionFilter.razor index f1bd95d1..abc3bb9f 100644 --- a/MP.Stats/Components/SelectionFilter.razor +++ b/MP.Stats/Components/SelectionFilter.razor @@ -4,19 +4,19 @@
                  -
                  +
                  -
                  +
                  -
                  +
                  @foreach (var item in ddlMacchine) @@ -27,7 +27,7 @@
                  -
                  +
                  @@ -43,7 +43,7 @@
                  -
                  +
                  @@ -59,7 +59,7 @@
                  -
                  +

                  From f8d2cc88b4c54e6dcef6973b52cdfdc39cb026c8 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Sat, 22 May 2021 12:03:19 +0200 Subject: [PATCH 099/158] Update pagine x spostare filtro in header --- MP.Stats/Pages/Controlli.razor | 15 ++---- MP.Stats/Pages/Diario.razor | 15 ++---- MP.Stats/Pages/Index.razor | 17 +++---- MP.Stats/Pages/Oee.razor | 93 +++++++++++++++------------------- MP.Stats/Pages/ReportODL.razor | 15 ++---- MP.Stats/Pages/Scarti.razor | 15 ++---- MP.Stats/Pages/UserLog.razor | 15 ++---- 7 files changed, 63 insertions(+), 122 deletions(-) diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor index afb31fb5..6fa4103f 100644 --- a/MP.Stats/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -4,19 +4,10 @@ @using MP.Stats.Components
                  -
                  -
                  -
                  Registro Controlli
                  -
                  -
                  -
                  +
                  +
                  -
                  -
                  -
                  - -
                  -
                  +
                  @if (ListRecords == null) { diff --git a/MP.Stats/Pages/Diario.razor b/MP.Stats/Pages/Diario.razor index e31d0977..313bd370 100644 --- a/MP.Stats/Pages/Diario.razor +++ b/MP.Stats/Pages/Diario.razor @@ -3,19 +3,10 @@ @using MP.Stats.Components
                  -
                  -
                  -
                  Diario Produzione
                  -
                  -
                  -
                  +
                  +
                  -
                  -
                  -
                  - -
                  -
                  +
                  @if (ListRecords == null) { diff --git a/MP.Stats/Pages/Index.razor b/MP.Stats/Pages/Index.razor index bafa7164..ba17de50 100644 --- a/MP.Stats/Pages/Index.razor +++ b/MP.Stats/Pages/Index.razor @@ -23,17 +23,12 @@
                  -
                  -
                  Main Topics
                  -
                  - - - - - - -
                  -
                  + + + + + +
                  diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor index 0a661c25..598eb0c3 100644 --- a/MP.Stats/Pages/Oee.razor +++ b/MP.Stats/Pages/Oee.razor @@ -3,73 +3,64 @@ @using MP.Stats.Components
                  -
                  -
                  -
                  TRS / OEE %
                  -
                  -
                  -
                  +
                  +
                  -
                  -
                  -
                  - -
                  -
                  +
                  @if (currRecord != null) { - + } @if (ListRecords == null) { - + } else if (totalCount == 0) { -
                  Nessun record trovato
                  +
                  Nessun record trovato
                  } else { -
                  -
                  - - - - @**@ - - - - - - - - - - - @foreach (var record in ListRecords) +
                  +
                  +
                  DataTurnoMacchinaArticoloDurataPezziOEE %
                  + + + @**@ + + + + + + + + + + + @foreach (var record in ListRecords) { - + - @**@ - - - - - - - - + @**@ + + + + + + + + } - -
                  DataTurnoMacchinaArticoloDurataPezziOEE %
                  -
                  @record.DataRif.ToString("yyyy.MM.dd")
                  -
                  @record.DataRif.ToString("dddd")
                  -                   		@record.Turno -
                  @record.CodMacchina
                  -
                  @record.IdxMacchina
                  -                   		@record.CodArticolo@record.TotPeriodo.ToString("N2")@record.TotPz@record.OEE.ToString("P2")
                  +
                  @record.DataRif.ToString("yyyy.MM.dd")
                  +
                  @record.DataRif.ToString("dddd")
                  +                   		@record.Turno +
                  @record.CodMacchina
                  +
                  @record.IdxMacchina
                  +                   		@record.CodArticolo@record.TotPeriodo.ToString("N2")@record.TotPz@record.OEE.ToString("P2")
                  -
                  + +
                  +
                  }
                  diff --git a/MP.Stats/Pages/ReportODL.razor b/MP.Stats/Pages/ReportODL.razor index 05f9aed3..ebf165af 100644 --- a/MP.Stats/Pages/ReportODL.razor +++ b/MP.Stats/Pages/ReportODL.razor @@ -3,19 +3,10 @@ @using MP.Stats.Components
                  -
                  -
                  -
                  Report ODL/Comm.
                  -
                  -
                  -
                  +
                  +
                  -
                  -
                  -
                  - -
                  -
                  +
                  @if (ListRecords == null) { diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index 05b81ddf..6e1d4d55 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -3,19 +3,10 @@ @using MP.Stats.Components
                  -
                  -
                  -
                  Registro Scarti
                  -
                  -
                  -
                  +
                  +
                  -
                  -
                  -
                  - -
                  -
                  +
                  @if (ListRecords == null) { diff --git a/MP.Stats/Pages/UserLog.razor b/MP.Stats/Pages/UserLog.razor index 614e1f2a..29465fa5 100644 --- a/MP.Stats/Pages/UserLog.razor +++ b/MP.Stats/Pages/UserLog.razor @@ -3,19 +3,10 @@ @using MP.Stats.Components
                  -
                  -
                  -
                  User ActionLog
                  -
                  -
                  -
                  +
                  +
                  -
                  -
                  -
                  - -
                  -
                  +
                  @if (ListRecords == null) { From a13a6832c621c5904cac3328d3067ef51c0953be Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Sat, 22 May 2021 12:07:32 +0200 Subject: [PATCH 100/158] Fix comportamento filtri dettaglio --- MP.Stats/Data/MessageService.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MP.Stats/Data/MessageService.cs b/MP.Stats/Data/MessageService.cs index 1394318c..21022dda 100644 --- a/MP.Stats/Data/MessageService.cs +++ b/MP.Stats/Data/MessageService.cs @@ -9,8 +9,7 @@ namespace MP.Stats.Data { #region Private Fields - private SelectData _detailFilter = new SelectData(); - private SelectData _masterFilter = new SelectData(); + private SelectData _detailFilter = SelectData.Init(5, 7); private string _pageIcon; private string _pageName; private string _searchVal; From 7c8040b4411df1ed7a809e64ae77b591cb09fc3a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Sat, 22 May 2021 12:42:30 +0200 Subject: [PATCH 101/158] Abbozzato recupero dati scarti --- MP.Stats/Components/ChartScarti.razor | 35 +++++++++++++++++++++++++++ MP.Stats/Data/ChartKV.cs | 17 +++++++++++++ MP.Stats/Data/MpStatsService.cs | 31 +++++++++++++++++++++++- MP.Stats/Pages/Scarti.razor | 1 + 4 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 MP.Stats/Components/ChartScarti.razor create mode 100644 MP.Stats/Data/ChartKV.cs diff --git a/MP.Stats/Components/ChartScarti.razor b/MP.Stats/Components/ChartScarti.razor new file mode 100644 index 00000000..cfa6718c --- /dev/null +++ b/MP.Stats/Components/ChartScarti.razor @@ -0,0 +1,35 @@ +@using MP.Stats.Data + +@inject MessageService MessageService +@inject MpStatsService StatService + +
                  +
                  +
                    + + @foreach (var item in CurrData) + { +
                  • @item.label: @item.value
                    • + } +
                  +
                  +
                  +
                  + +@code { + + [Parameter] + public SelectData currFilter { get; set; } + + protected List CurrData = new List(); + + protected override async Task OnInitializedAsync() + { + await reloadData(); + } + + private async Task reloadData() + { + CurrData = await StatService.StatScartiGetPareto(currFilter, MessageService.SearchVal); + } +} \ No newline at end of file diff --git a/MP.Stats/Data/ChartKV.cs b/MP.Stats/Data/ChartKV.cs new file mode 100644 index 00000000..6fcca452 --- /dev/null +++ b/MP.Stats/Data/ChartKV.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace MP.Stats.Data +{ + public class ChartKV + { + #region Public Properties + + public string label { get; set; } = ""; + public double value { get; set; } = 0; + + #endregion Public Properties + } +} \ No newline at end of file diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 9b17ab77..decb5923 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -242,7 +242,7 @@ namespace MP.Stats.Data { //return Task.FromResult(dbController.StatScartiGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); List dbResult = new List(); - string cacheKey = getCacheKey("MP:STATS:SCARTI", CurrFilter); + string cacheKey = getCacheKey("MP:STATS:SCARTI:RAW", CurrFilter); string rawData; var redisDataList = await distributedCache.GetAsync(cacheKey); if (redisDataList != null) @@ -260,6 +260,35 @@ namespace MP.Stats.Data return await Task.FromResult(dbResult); } + public async Task> StatScartiGetPareto(SelectData CurrFilter, string searchVal = "") + { + List statResult = new List(); + string cacheKey = getCacheKey("MP:STATS:SCARTI:PARETO", CurrFilter); + string rawData; + var redisDataList = await distributedCache.GetAsync(cacheKey); + if (redisDataList != null) + { + rawData = Encoding.UTF8.GetString(redisDataList); + statResult = JsonConvert.DeserializeObject>(rawData); + } + else + { + // recupero dal DB (eventualmente con cache) + var dbResult = StatScartiGetAll(CurrFilter, searchVal); + // faccio conteggio... + statResult = dbResult + .Result + .GroupBy(x => x.Causale) + .Select(y => new ChartKV() { label = y.First().Causale, value = y.Sum(c => c.Qta) }) + .ToList(); + + rawData = JsonConvert.SerializeObject(statResult); + redisDataList = Encoding.UTF8.GetBytes(rawData); + await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt); + } + return await Task.FromResult(statResult); + } + public async Task> StatTurniOeeGetAllAsync(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") { return await Task.FromResult(dbController.StatTurniOeeGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo)); diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index 6e1d4d55..9e35ebee 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -7,6 +7,7 @@
                  + @**@ @if (ListRecords == null) { From 8a190f3da9e8ae3cc855788e526f00ec6ce0adf2 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 22 May 2021 14:33:33 +0200 Subject: [PATCH 102/158] corretto recupero dati x scarti (pareto) --- MP.Stats/Components/ChartScarti.razor | 4 ++-- MP.Stats/Data/MpStatsService.cs | 6 +++--- MP.Stats/Pages/Scarti.razor | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MP.Stats/Components/ChartScarti.razor b/MP.Stats/Components/ChartScarti.razor index cfa6718c..c080c4bf 100644 --- a/MP.Stats/Components/ChartScarti.razor +++ b/MP.Stats/Components/ChartScarti.razor @@ -7,7 +7,7 @@
                    - @foreach (var item in CurrData) + @foreach (var item in @CurrData) {
                  • @item.label: @item.value
                    • } @@ -21,7 +21,7 @@ [Parameter] public SelectData currFilter { get; set; } - protected List CurrData = new List(); + protected List CurrData { get; set; } = new List(); protected override async Task OnInitializedAsync() { diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index decb5923..55c0d61d 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -274,12 +274,12 @@ namespace MP.Stats.Data else { // recupero dal DB (eventualmente con cache) - var dbResult = StatScartiGetAll(CurrFilter, searchVal); + var dbResult = await StatScartiGetAll(CurrFilter, searchVal); // faccio conteggio... statResult = dbResult - .Result .GroupBy(x => x.Causale) - .Select(y => new ChartKV() { label = y.First().Causale, value = y.Sum(c => c.Qta) }) + .Select(y => new ChartKV() { label = y.First().Descrizione, value = y.Sum(c => c.Qta) }) + .OrderByDescending(x => x.value) .ToList(); rawData = JsonConvert.SerializeObject(statResult); diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index 9e35ebee..7f392517 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -7,7 +7,7 @@
                  - @**@ + @if (ListRecords == null) { From 42d93a146663a549608a7be7441b8de63d7c66b3 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 22 May 2021 15:26:51 +0200 Subject: [PATCH 103/158] inizio gestione refresh chart on refilter --- MP.Stats/Components/ChartScarti.razor | 152 ++++++++++++++++++++++++-- MP.Stats/Data/MpStatsService.cs | 7 +- 2 files changed, 147 insertions(+), 12 deletions(-) diff --git a/MP.Stats/Components/ChartScarti.razor b/MP.Stats/Components/ChartScarti.razor index c080c4bf..ae0651ad 100644 --- a/MP.Stats/Components/ChartScarti.razor +++ b/MP.Stats/Components/ChartScarti.razor @@ -5,24 +5,158 @@
                  -
                    - - @foreach (var item in @CurrData) - { -
                  • @item.label: @item.value
                    • - } -
                  +
                  +
                  +
                    + @foreach (var item in @CurrData) + { +
                  • + @item.label + @item.value +
                    • + } +
                  +
                  +
                  + +
                  +
                  +
                  +
                  -
                  @code { + protected SelectData _currFilter { get; set; } + [Parameter] - public SelectData currFilter { get; set; } + public SelectData currFilter + { + get => _currFilter; + set + { + _currFilter = value; + Task.Run(() => await reloadData()); + Task.Run(() => await HandleRedraw()); + } + } + + BarChart ParetoGuasti; + + object barChartOptions = new + { + //Title = new + //{ + // Display = true, + // Text = "Causali Scarto" + //}, + Scales = new + { + XAxes = new object[] + { + new { + Display = false + } + }, + YAxes = new object[] + { + new { + Display = true, + ticks= new { + suggestedMin = 0 + } + } + } + }, + Tooltips = new + { + Mode = "nearest", + Intersect = false + }, + Hover = new + { + Mode = "nearest", + Intersect = false + }, + //Legend = new + //{ + // Display = true, + // FullWidth = true + //}, + AspectRatio = 2.5 + }; + +#if false +object horizontalLineChartOptions = new +{ +//Title = new +//{ +// Display = true, +// Text = "Line chart sample" +//}, +//Scales = new +//{ +// XAxes = new object[] +// { +// new { +// //ScaleLabel = new { +// //Display = true, LabelString = "value" }, +// Stacked = true +// } +// } +//}, +Tooltips = new +{ +Mode = "nearest", +Intersect = false +}, +Hover = new +{ +Mode = "nearest", +Intersect = false +}, +Legend = new +{ +Display = true, +FullWidth = true +}, +AspectRatio = 2.5 +}; +#endif + protected List CurrData { get; set; } = new List(); + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender) + { + await HandleRedraw(); + } + } + async Task HandleRedraw() + { + await ParetoGuasti.Clear(); + await ParetoGuasti.AddLabelsDatasetsAndUpdate(CurrData.Select(x => x.label).ToList(), GetBarChartDataset()); + } + + BarChartDataset GetBarChartDataset() + { + return new BarChartDataset + { + Label = "Causali Scarto", + Data = CurrData.Select(x => x.value).ToList(), + BackgroundColor = backgroundColors, + //BorderColor = borderColors, + HoverBorderWidth = 5 + }; + } + + + List backgroundColors = new List { ChartColor.FromRgba(255, 99, 132, 0.2f), ChartColor.FromRgba(54, 162, 235, 0.2f), ChartColor.FromRgba(255, 206, 86, 0.2f), ChartColor.FromRgba(75, 192, 192, 0.2f), ChartColor.FromRgba(153, 102, 255, 0.2f), ChartColor.FromRgba(255, 159, 64, 0.2f) }; + List borderColors = new List { ChartColor.FromRgba(255, 99, 132, 1f), ChartColor.FromRgba(54, 162, 235, 1f), ChartColor.FromRgba(255, 206, 86, 1f), ChartColor.FromRgba(75, 192, 192, 1f), ChartColor.FromRgba(153, 102, 255, 1f), ChartColor.FromRgba(255, 159, 64, 1f) }; + protected override async Task OnInitializedAsync() { await reloadData(); diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 55c0d61d..b82acd46 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -135,12 +135,13 @@ namespace MP.Stats.Data return Task.FromResult(answ); } - public Task> ArticoliList(string searchVal) + public async Task> ArticoliList(string searchVal) { List answ = new List(); answ.Add(new AutocompleteModel { LabelField = "--- TUTTE ---", ValueField = "*" }); - answ.AddRange(dbController.MacchineGetAll().Select(x => new AutocompleteModel { LabelField = x.IdxMacchina, ValueField = x.IdxMacchina }).ToList()); - return Task.FromResult(answ); + var listMacchine = dbController.MacchineGetAll(); + answ.AddRange(listMacchine.Select(x => new AutocompleteModel { LabelField = x.IdxMacchina, ValueField = x.IdxMacchina }).ToList()); + return await Task.FromResult(answ); } public Task> CommesseGetSearch(int numRecord, string searchVal = "") From 2e9a774a479b8851c8f9f1132bf765b545cac8d2 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 22 May 2021 16:21:40 +0200 Subject: [PATCH 104/158] Divisione codice/layout x chart scarti --- MP.Stats/Components/ChartScarti.razor | 145 ----------------------- MP.Stats/Components/ChartScarti.razor.cs | 135 +++++++++++++++++++++ MP.Stats/Pages/Scarti.razor | 2 +- 3 files changed, 136 insertions(+), 146 deletions(-) create mode 100644 MP.Stats/Components/ChartScarti.razor.cs diff --git a/MP.Stats/Components/ChartScarti.razor b/MP.Stats/Components/ChartScarti.razor index ae0651ad..f4cde99d 100644 --- a/MP.Stats/Components/ChartScarti.razor +++ b/MP.Stats/Components/ChartScarti.razor @@ -1,8 +1,5 @@ @using MP.Stats.Data -@inject MessageService MessageService -@inject MpStatsService StatService -
                  @@ -25,145 +22,3 @@
                  - -@code { - - protected SelectData _currFilter { get; set; } - - [Parameter] - public SelectData currFilter - { - get => _currFilter; - set - { - _currFilter = value; - Task.Run(() => await reloadData()); - Task.Run(() => await HandleRedraw()); - } - } - - BarChart ParetoGuasti; - - object barChartOptions = new - { - //Title = new - //{ - // Display = true, - // Text = "Causali Scarto" - //}, - Scales = new - { - XAxes = new object[] - { - new { - Display = false - } - }, - YAxes = new object[] - { - new { - Display = true, - ticks= new { - suggestedMin = 0 - } - } - } - }, - Tooltips = new - { - Mode = "nearest", - Intersect = false - }, - Hover = new - { - Mode = "nearest", - Intersect = false - }, - //Legend = new - //{ - // Display = true, - // FullWidth = true - //}, - AspectRatio = 2.5 - }; - -#if false -object horizontalLineChartOptions = new -{ -//Title = new -//{ -// Display = true, -// Text = "Line chart sample" -//}, -//Scales = new -//{ -// XAxes = new object[] -// { -// new { -// //ScaleLabel = new { -// //Display = true, LabelString = "value" }, -// Stacked = true -// } -// } -//}, -Tooltips = new -{ -Mode = "nearest", -Intersect = false -}, -Hover = new -{ -Mode = "nearest", -Intersect = false -}, -Legend = new -{ -Display = true, -FullWidth = true -}, -AspectRatio = 2.5 -}; -#endif - - - protected List CurrData { get; set; } = new List(); - - protected override async Task OnAfterRenderAsync(bool firstRender) - { - if (firstRender) - { - await HandleRedraw(); - } - } - async Task HandleRedraw() - { - await ParetoGuasti.Clear(); - await ParetoGuasti.AddLabelsDatasetsAndUpdate(CurrData.Select(x => x.label).ToList(), GetBarChartDataset()); - } - - BarChartDataset GetBarChartDataset() - { - return new BarChartDataset - { - Label = "Causali Scarto", - Data = CurrData.Select(x => x.value).ToList(), - BackgroundColor = backgroundColors, - //BorderColor = borderColors, - HoverBorderWidth = 5 - }; - } - - - List backgroundColors = new List { ChartColor.FromRgba(255, 99, 132, 0.2f), ChartColor.FromRgba(54, 162, 235, 0.2f), ChartColor.FromRgba(255, 206, 86, 0.2f), ChartColor.FromRgba(75, 192, 192, 0.2f), ChartColor.FromRgba(153, 102, 255, 0.2f), ChartColor.FromRgba(255, 159, 64, 0.2f) }; - List borderColors = new List { ChartColor.FromRgba(255, 99, 132, 1f), ChartColor.FromRgba(54, 162, 235, 1f), ChartColor.FromRgba(255, 206, 86, 1f), ChartColor.FromRgba(75, 192, 192, 1f), ChartColor.FromRgba(153, 102, 255, 1f), ChartColor.FromRgba(255, 159, 64, 1f) }; - - protected override async Task OnInitializedAsync() - { - await reloadData(); - } - - private async Task reloadData() - { - CurrData = await StatService.StatScartiGetPareto(currFilter, MessageService.SearchVal); - } -} \ No newline at end of file diff --git a/MP.Stats/Components/ChartScarti.razor.cs b/MP.Stats/Components/ChartScarti.razor.cs new file mode 100644 index 00000000..1665130d --- /dev/null +++ b/MP.Stats/Components/ChartScarti.razor.cs @@ -0,0 +1,135 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Blazorise.Charts; +using Microsoft.AspNetCore.Components; +using MP.Stats.Data; + +namespace MP.Stats.Components +{ + public partial class ChartScarti + { + [Inject] + protected MessageService MessageService { get; set; } + [Inject] + protected MpStatsService StatService { get; set; } + + protected SelectData _currFilter { get; set; } = new SelectData(); + + + + [Parameter] + public SelectData DataFilter + { + get => _currFilter; + set + { + _currFilter = value; + var dataReload = Task.Run(async () => + { + await reloadData(); + await HandleRedraw(); + }); + } + } + + protected BarChart ParetoGuasti; + + object barChartOptions = new + { + //Title = new + //{ + // Display = true, + // Text = "Causali Scarto" + //}, + Scales = new + { + XAxes = new object[] + { + new { + Display = false + } + }, + YAxes = new object[] + { + new { + Display = true, + ticks= new { + suggestedMin = 0 + } + } + } + }, + Tooltips = new + { + Mode = "nearest", + Intersect = false + }, + Hover = new + { + Mode = "nearest", + Intersect = false + }, + //Legend = new + //{ + // Display = true, + // FullWidth = true + //}, + Animation = false, + AspectRatio = 2.5 + }; + + + protected List CurrData { get; set; } = new List(); + + //protected override async Task OnAfterRenderAsync(bool firstRender) + //{ + // if (firstRender) + // { + // await HandleRedraw(); + // } + //} + protected async Task HandleRedraw() + { + await ParetoGuasti.Clear(); + await ParetoGuasti.AddLabelsDatasetsAndUpdate(GetBarChartLabels(), GetBarChartDataset()); + } + + List GetBarChartLabels() + { + var answ = CurrData.Select(x => x.label).ToList(); + return answ; + } + + BarChartDataset GetBarChartDataset() + { + var answ = new BarChartDataset + { + Label = "Causali Scarto", + Data = CurrData.Select(x => x.value).ToList(), + BackgroundColor = backgroundColors, + //BorderColor = borderColors, + HoverBorderWidth = 5 + }; + return answ; + } + + + List backgroundColors = new List + { ChartColor.FromRgba(255, 99, 132, 0.2f), ChartColor.FromRgba(54, 162, 235, 0.2f), ChartColor.FromRgba(255, 206, 86, 0.2f), ChartColor.FromRgba(75, 192, 192, 0.2f), ChartColor.FromRgba(153, 102, 255, 0.2f), ChartColor.FromRgba(255, 159, 64, 0.2f) }; + List borderColors = new List + { ChartColor.FromRgba(255, 99, 132, 1f), ChartColor.FromRgba(54, 162, 235, 1f), ChartColor.FromRgba(255, 206, 86, 1f), ChartColor.FromRgba(75, 192, 192, 1f), ChartColor.FromRgba(153, 102, 255, 1f), ChartColor.FromRgba(255, 159, 64, 1f) }; + + protected override async Task OnInitializedAsync() + { + await reloadData(); + } + + private async Task reloadData() + { + CurrData = await StatService.StatScartiGetPareto(DataFilter, MessageService.SearchVal); + } + + } +} diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index 7f392517..4d1e1f5e 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -7,7 +7,7 @@
                  - + @if (ListRecords == null) { From 39d1eddb20a6d0aaf8d06c4a86d75a4aeedeea1e Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 22 May 2021 16:34:22 +0200 Subject: [PATCH 105/158] calcolo al volo dati x charting --- MP.Stats/Components/ChartScarti.razor.cs | 29 +++++++++++++----------- MP.Stats/Data/MpStatsService.cs | 29 ------------------------ MP.Stats/Pages/Scarti.razor | 2 +- 3 files changed, 17 insertions(+), 43 deletions(-) diff --git a/MP.Stats/Components/ChartScarti.razor.cs b/MP.Stats/Components/ChartScarti.razor.cs index 1665130d..be8489dd 100644 --- a/MP.Stats/Components/ChartScarti.razor.cs +++ b/MP.Stats/Components/ChartScarti.razor.cs @@ -17,18 +17,20 @@ namespace MP.Stats.Components protected SelectData _currFilter { get; set; } = new SelectData(); - + protected List _listScarti { get; set; } = new List(); [Parameter] - public SelectData DataFilter + public List ListScarti { - get => _currFilter; + get => _listScarti; set { - _currFilter = value; + // salvo valori + _listScarti = value; + // ricalcolo charting data + recalcData(); var dataReload = Task.Run(async () => { - await reloadData(); await HandleRedraw(); }); } @@ -121,15 +123,16 @@ namespace MP.Stats.Components List borderColors = new List { ChartColor.FromRgba(255, 99, 132, 1f), ChartColor.FromRgba(54, 162, 235, 1f), ChartColor.FromRgba(255, 206, 86, 1f), ChartColor.FromRgba(75, 192, 192, 1f), ChartColor.FromRgba(153, 102, 255, 1f), ChartColor.FromRgba(255, 159, 64, 1f) }; - protected override async Task OnInitializedAsync() + private void recalcData() { - await reloadData(); + if (ListScarti != null) + { + CurrData = ListScarti + .GroupBy(x => x.Causale) + .Select(y => new ChartKV() { label = y.First().Descrizione, value = y.Sum(c => c.Qta) }) + .OrderByDescending(x => x.value) + .ToList(); + } } - - private async Task reloadData() - { - CurrData = await StatService.StatScartiGetPareto(DataFilter, MessageService.SearchVal); - } - } } diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index b82acd46..986300d0 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -261,35 +261,6 @@ namespace MP.Stats.Data return await Task.FromResult(dbResult); } - public async Task> StatScartiGetPareto(SelectData CurrFilter, string searchVal = "") - { - List statResult = new List(); - string cacheKey = getCacheKey("MP:STATS:SCARTI:PARETO", CurrFilter); - string rawData; - var redisDataList = await distributedCache.GetAsync(cacheKey); - if (redisDataList != null) - { - rawData = Encoding.UTF8.GetString(redisDataList); - statResult = JsonConvert.DeserializeObject>(rawData); - } - else - { - // recupero dal DB (eventualmente con cache) - var dbResult = await StatScartiGetAll(CurrFilter, searchVal); - // faccio conteggio... - statResult = dbResult - .GroupBy(x => x.Causale) - .Select(y => new ChartKV() { label = y.First().Descrizione, value = y.Sum(c => c.Qta) }) - .OrderByDescending(x => x.value) - .ToList(); - - rawData = JsonConvert.SerializeObject(statResult); - redisDataList = Encoding.UTF8.GetBytes(rawData); - await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt); - } - return await Task.FromResult(statResult); - } - public async Task> StatTurniOeeGetAllAsync(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") { return await Task.FromResult(dbController.StatTurniOeeGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo)); diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index 4d1e1f5e..a4973bd9 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -7,7 +7,7 @@
                  - + @if (ListRecords == null) { From 04c6d0a317561daa1a836c35cbabbf16f18874a1 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 22 May 2021 16:56:27 +0200 Subject: [PATCH 106/158] ok ciclo colori --- MP.Stats/Components/ChartScarti.razor.cs | 39 +++++++++++++++++++----- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/MP.Stats/Components/ChartScarti.razor.cs b/MP.Stats/Components/ChartScarti.razor.cs index be8489dd..f81dea5b 100644 --- a/MP.Stats/Components/ChartScarti.razor.cs +++ b/MP.Stats/Components/ChartScarti.razor.cs @@ -94,8 +94,11 @@ namespace MP.Stats.Components //} protected async Task HandleRedraw() { - await ParetoGuasti.Clear(); - await ParetoGuasti.AddLabelsDatasetsAndUpdate(GetBarChartLabels(), GetBarChartDataset()); + if (ParetoGuasti != null) + { + await ParetoGuasti.Clear(); + await ParetoGuasti.AddLabelsDatasetsAndUpdate(GetBarChartLabels(), GetBarChartDataset()); + } } List GetBarChartLabels() @@ -108,20 +111,40 @@ namespace MP.Stats.Components { var answ = new BarChartDataset { - Label = "Causali Scarto", + Label = "Pareto Causali Scarto", Data = CurrData.Select(x => x.value).ToList(), - BackgroundColor = backgroundColors, + BackgroundColor = backgroundColors(CurrData.Count), //BorderColor = borderColors, HoverBorderWidth = 5 }; return answ; } + /// + /// Genera colori sfondo 33% rosso / arancione / giallo + /// + /// + /// + protected List backgroundColors(int numRecords) + { + List answ = new List(); + // rosso... + for (int i = 0; i < numRecords / 3; i++) + { + answ.Add(ChartColor.FromRgba(255, 99, 132, 0.4f)); + } + // arancione + for (int i = 0; i < numRecords / 3; i++) + { + answ.Add(ChartColor.FromRgba(255, 206, 86, 0.4f)); + } + while (answ.Count < numRecords) + { + answ.Add(ChartColor.FromRgba(54, 82, 235, 0.4f)); + } - List backgroundColors = new List - { ChartColor.FromRgba(255, 99, 132, 0.2f), ChartColor.FromRgba(54, 162, 235, 0.2f), ChartColor.FromRgba(255, 206, 86, 0.2f), ChartColor.FromRgba(75, 192, 192, 0.2f), ChartColor.FromRgba(153, 102, 255, 0.2f), ChartColor.FromRgba(255, 159, 64, 0.2f) }; - List borderColors = new List - { ChartColor.FromRgba(255, 99, 132, 1f), ChartColor.FromRgba(54, 162, 235, 1f), ChartColor.FromRgba(255, 206, 86, 1f), ChartColor.FromRgba(75, 192, 192, 1f), ChartColor.FromRgba(153, 102, 255, 1f), ChartColor.FromRgba(255, 159, 64, 1f) }; + return answ; + } private void recalcData() { From a961542d406628fff8e601e00ff7a2e8a14f5351 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 22 May 2021 17:04:48 +0200 Subject: [PATCH 107/158] Abbozzato grafico a linea --- MP.Stats/Components/ChartScarti.razor | 32 +++++----- MP.Stats/Components/ChartScarti.razor.cs | 77 ++++++++++++++++++++++-- 2 files changed, 89 insertions(+), 20 deletions(-) diff --git a/MP.Stats/Components/ChartScarti.razor b/MP.Stats/Components/ChartScarti.razor index f4cde99d..ec627be6 100644 --- a/MP.Stats/Components/ChartScarti.razor +++ b/MP.Stats/Components/ChartScarti.razor @@ -1,24 +1,26 @@ @using MP.Stats.Data +
                  -
                  +
                  +
                    + @foreach (var item in @CurrData) + { +
                  • + @item.label + @item.value +
                    • + } +
                  +
                  +
                  -
                  -
                    - @foreach (var item in @CurrData) - { -
                  • - @item.label - @item.value -
                    • - } -
                  -
                  -
                  +
                  +
                  + +
                  -
                  -
                  diff --git a/MP.Stats/Components/ChartScarti.razor.cs b/MP.Stats/Components/ChartScarti.razor.cs index f81dea5b..ac07c1ed 100644 --- a/MP.Stats/Components/ChartScarti.razor.cs +++ b/MP.Stats/Components/ChartScarti.razor.cs @@ -37,8 +37,9 @@ namespace MP.Stats.Components } protected BarChart ParetoGuasti; + protected LineChart NumGuasti; - object barChartOptions = new + protected object barChartOptions = new { //Title = new //{ @@ -48,20 +49,20 @@ namespace MP.Stats.Components Scales = new { XAxes = new object[] - { + { new { Display = false } - }, + }, YAxes = new object[] - { + { new { Display = true, ticks= new { suggestedMin = 0 } } - } + } }, Tooltips = new { @@ -82,6 +83,49 @@ namespace MP.Stats.Components AspectRatio = 2.5 }; + protected object lineChartOptions = new + { + //Title = new + //{ + // Display = true, + // Text = "Causali Scarto" + //}, + Scales = new + { + XAxes = new object[] + { + new { + Display = false + } + }, + YAxes = new object[] + { + new { + Display = true, + ticks= new { + suggestedMin = 0 + } + } + } + }, + Tooltips = new + { + Mode = "nearest", + Intersect = false + }, + Hover = new + { + Mode = "nearest", + Intersect = false + }, + //Legend = new + //{ + // Display = true, + // FullWidth = true + //}, + Animation = false, + AspectRatio = 2.5 + }; protected List CurrData { get; set; } = new List(); @@ -99,6 +143,11 @@ namespace MP.Stats.Components await ParetoGuasti.Clear(); await ParetoGuasti.AddLabelsDatasetsAndUpdate(GetBarChartLabels(), GetBarChartDataset()); } + if (NumGuasti != null) + { + await NumGuasti.Clear(); + await NumGuasti.AddLabelsDatasetsAndUpdate(GetLineChartLabels(), GetLineChartDataset()); + } } List GetBarChartLabels() @@ -106,6 +155,11 @@ namespace MP.Stats.Components var answ = CurrData.Select(x => x.label).ToList(); return answ; } + List GetLineChartLabels() + { + var answ = CurrData.Select(x => x.label).ToList(); + return answ; + } BarChartDataset GetBarChartDataset() { @@ -119,6 +173,19 @@ namespace MP.Stats.Components }; return answ; } + LineChartDataset GetLineChartDataset() + { + var answ = new LineChartDataset + { + Label = "Numero Scarti Periodo", + Data = CurrData.Select(x => x.value).ToList(), + BackgroundColor = backgroundColors(CurrData.Count), + Fill = true, + PointRadius = 2, + BorderDash = new List { } + }; + return answ; + } /// /// Genera colori sfondo 33% rosso / arancione / giallo From 9880ef3d75c033bc780552a14b18da0aa4ae34a9 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 22 May 2021 17:27:58 +0200 Subject: [PATCH 108/158] update grafico come stepped line --- MP.Stats/Components/ChartScarti.razor | 2 +- MP.Stats/Components/ChartScarti.razor.cs | 23 +++++++++++++++-------- MP.Stats/Data/ChartTS.cs | 17 +++++++++++++++++ 3 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 MP.Stats/Data/ChartTS.cs diff --git a/MP.Stats/Components/ChartScarti.razor b/MP.Stats/Components/ChartScarti.razor index ec627be6..86b7d6ce 100644 --- a/MP.Stats/Components/ChartScarti.razor +++ b/MP.Stats/Components/ChartScarti.razor @@ -4,7 +4,7 @@
                    - @foreach (var item in @CurrData) + @foreach (var item in @ParetoData) {
                  • @item.label diff --git a/MP.Stats/Components/ChartScarti.razor.cs b/MP.Stats/Components/ChartScarti.razor.cs index ac07c1ed..f5460e9e 100644 --- a/MP.Stats/Components/ChartScarti.razor.cs +++ b/MP.Stats/Components/ChartScarti.razor.cs @@ -127,7 +127,8 @@ namespace MP.Stats.Components AspectRatio = 2.5 }; - protected List CurrData { get; set; } = new List(); + protected List ParetoData { get; set; } = new List(); + protected List TSData { get; set; } = new List(); //protected override async Task OnAfterRenderAsync(bool firstRender) //{ @@ -152,12 +153,12 @@ namespace MP.Stats.Components List GetBarChartLabels() { - var answ = CurrData.Select(x => x.label).ToList(); + var answ = ParetoData.Select(x => x.label).ToList(); return answ; } List GetLineChartLabels() { - var answ = CurrData.Select(x => x.label).ToList(); + var answ = TSData.Select(x => x.TLabel.ToString()).ToList(); return answ; } @@ -166,8 +167,8 @@ namespace MP.Stats.Components var answ = new BarChartDataset { Label = "Pareto Causali Scarto", - Data = CurrData.Select(x => x.value).ToList(), - BackgroundColor = backgroundColors(CurrData.Count), + Data = ParetoData.Select(x => x.value).ToList(), + BackgroundColor = backgroundColors(ParetoData.Count), //BorderColor = borderColors, HoverBorderWidth = 5 }; @@ -178,10 +179,11 @@ namespace MP.Stats.Components var answ = new LineChartDataset { Label = "Numero Scarti Periodo", - Data = CurrData.Select(x => x.value).ToList(), - BackgroundColor = backgroundColors(CurrData.Count), + Data = TSData.Select(x => x.Value).ToList(), + BackgroundColor = backgroundColors(1), Fill = true, PointRadius = 2, + SteppedLine=true, BorderDash = new List { } }; return answ; @@ -217,11 +219,16 @@ namespace MP.Stats.Components { if (ListScarti != null) { - CurrData = ListScarti + ParetoData = ListScarti .GroupBy(x => x.Causale) .Select(y => new ChartKV() { label = y.First().Descrizione, value = y.Sum(c => c.Qta) }) .OrderByDescending(x => x.value) .ToList(); + + TSData = ListScarti + .Select(y => new ChartTS() { TLabel = y.DataOraRif, Value = y.Qta }) + .OrderBy(x => x.TLabel) + .ToList(); } } } diff --git a/MP.Stats/Data/ChartTS.cs b/MP.Stats/Data/ChartTS.cs new file mode 100644 index 00000000..18d64e24 --- /dev/null +++ b/MP.Stats/Data/ChartTS.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace MP.Stats.Data +{ + public class ChartTS + { + #region Public Properties + + public DateTime TLabel { get; set; } = DateTime.Now; + public double Value { get; set; } = 0; + + #endregion Public Properties + } +} \ No newline at end of file From dddeff9dff450f385e8d06dab1aa9ce373e85ecd Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 22 May 2021 17:31:05 +0200 Subject: [PATCH 109/158] ok x stepped --- MP.Stats/Components/ChartScarti.razor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MP.Stats/Components/ChartScarti.razor.cs b/MP.Stats/Components/ChartScarti.razor.cs index f5460e9e..d64aca3d 100644 --- a/MP.Stats/Components/ChartScarti.razor.cs +++ b/MP.Stats/Components/ChartScarti.razor.cs @@ -183,7 +183,7 @@ namespace MP.Stats.Components BackgroundColor = backgroundColors(1), Fill = true, PointRadius = 2, - SteppedLine=true, + SteppedLine = true, BorderDash = new List { } }; return answ; From 567a0e33754b9aed546519f9678012362a36ec53 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 22 May 2021 17:37:18 +0200 Subject: [PATCH 110/158] Group by giornaliero, da inserire date "vuote" --- MP.Stats/Components/ChartScarti.razor.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/MP.Stats/Components/ChartScarti.razor.cs b/MP.Stats/Components/ChartScarti.razor.cs index d64aca3d..3a431c10 100644 --- a/MP.Stats/Components/ChartScarti.razor.cs +++ b/MP.Stats/Components/ChartScarti.razor.cs @@ -95,7 +95,8 @@ namespace MP.Stats.Components XAxes = new object[] { new { - Display = false + Display = true, + //type = "time" } }, YAxes = new object[] @@ -158,7 +159,7 @@ namespace MP.Stats.Components } List GetLineChartLabels() { - var answ = TSData.Select(x => x.TLabel.ToString()).ToList(); + var answ = TSData.Select(x => x.TLabel.ToString("ddd dd.MM")).ToList(); return answ; } @@ -226,7 +227,8 @@ namespace MP.Stats.Components .ToList(); TSData = ListScarti - .Select(y => new ChartTS() { TLabel = y.DataOraRif, Value = y.Qta }) + .GroupBy(x => x.DataOraRif.Date) + .Select(y => new ChartTS() { TLabel = y.First().DataOraRif.Date, Value = y.Sum(c => c.Qta) }) .OrderBy(x => x.TLabel) .ToList(); } From e57755af2feaa55610dc3ff2f4193839b6cee6a0 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 24 May 2021 09:47:51 +0200 Subject: [PATCH 111/158] Completata gestione filtro show/hide charts --- MP.Stats/Components/SelectionFilter.razor | 111 +++++++++++-------- MP.Stats/Components/SelectionFilter.razor.cs | 11 ++ MP.Stats/Pages/Scarti.razor | 9 +- MP.Stats/Pages/Scarti.razor.cs | 10 ++ 4 files changed, 92 insertions(+), 49 deletions(-) diff --git a/MP.Stats/Components/SelectionFilter.razor b/MP.Stats/Components/SelectionFilter.razor index abc3bb9f..186d369e 100644 --- a/MP.Stats/Components/SelectionFilter.razor +++ b/MP.Stats/Components/SelectionFilter.razor @@ -2,63 +2,82 @@ @using MP.Stats.Data -
                    -
                    +
                    +
                    - - -
                    -
                    -
                    -
                    - - -
                    -
                    -
                    -
                    - - - @foreach (var item in ddlMacchine) +
                    +
                    -
                    -
                    -
                    -
                    - +
                    +
                    +
                    +
                    + +
                    -
                    - - @foreach (var item in ddlCommesse) - { - - } - -
                    -
                    -
                    -
                    -
                    -
                    - +
                    +
                    + + +
                    +
                    +
                    +
                    + + + @foreach (var item in ddlMacchine) + { + + } + +
                    +
                    +
                    +
                    +
                    +
                    + +
                    + +
                    + + @foreach (var item in ddlCommesse) + { + + } + +
                    +
                    +
                    +
                    +
                    +
                    + +
                    + +
                    + + @foreach (var item in ddlArticoli) + { + + } +
                    -
                    - - @foreach (var item in ddlArticoli) - { - - } -
                    -
                    +

                    diff --git a/MP.Stats/Components/SelectionFilter.razor.cs b/MP.Stats/Components/SelectionFilter.razor.cs index 70af721e..6cfab2d6 100644 --- a/MP.Stats/Components/SelectionFilter.razor.cs +++ b/MP.Stats/Components/SelectionFilter.razor.cs @@ -150,6 +150,12 @@ namespace MP.Stats.Components #region Public Properties + [Parameter] + public EventCallback chartsToggle { get; set; } + + [Parameter] + public bool chartVisible { get; set; } = false; + [Parameter] public EventCallback filterChanged { get; set; } @@ -194,6 +200,11 @@ namespace MP.Stats.Components filterReset.InvokeAsync(SelFilter); } + protected void toggleChart() + { + chartsToggle.InvokeAsync(chartVisible); + } + #endregion Protected Methods } } \ No newline at end of file diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index a4973bd9..2cbadff3 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -3,11 +3,14 @@ @using MP.Stats.Components
                    -
                    - +
                    +
                    - + @if (ShowCharts == true) + { + + } @if (ListRecords == null) { diff --git a/MP.Stats/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs index bfb8cc7c..bcd6b211 100644 --- a/MP.Stats/Pages/Scarti.razor.cs +++ b/MP.Stats/Pages/Scarti.razor.cs @@ -36,6 +36,7 @@ namespace MP.Stats.Pages private int currPage { get; set; } = 1; private bool isLoading { get; set; } = false; private int numRecord { get; set; } = 10; + private bool ShowCharts { get; set; } = false; #endregion Private Properties @@ -127,6 +128,15 @@ namespace MP.Stats.Pages await reloadData(); } + protected async Task ToggleChart(bool doShow) + { + ShowCharts = !ShowCharts; + if (ShowCharts) + { + await reloadData(); + } + } + protected async Task UpdateData() { currRecord = null; From 51e54796aeb810594fc5d7e61d981945457d04fb Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 24 May 2021 09:48:02 +0200 Subject: [PATCH 112/158] fix spazi filtro --- MP.Stats/Pages/Controlli.razor | 2 +- MP.Stats/Pages/Diario.razor | 2 +- MP.Stats/Pages/Oee.razor | 2 +- MP.Stats/Pages/ReportODL.razor | 2 +- MP.Stats/Pages/UserLog.razor | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor index 6fa4103f..4afbf04a 100644 --- a/MP.Stats/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -4,7 +4,7 @@ @using MP.Stats.Components
                    -
                    +
                    diff --git a/MP.Stats/Pages/Diario.razor b/MP.Stats/Pages/Diario.razor index 313bd370..ac381528 100644 --- a/MP.Stats/Pages/Diario.razor +++ b/MP.Stats/Pages/Diario.razor @@ -3,7 +3,7 @@ @using MP.Stats.Components
                    -
                    +
                    diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor index 598eb0c3..2beb55a2 100644 --- a/MP.Stats/Pages/Oee.razor +++ b/MP.Stats/Pages/Oee.razor @@ -3,7 +3,7 @@ @using MP.Stats.Components
                    -
                    +
                    diff --git a/MP.Stats/Pages/ReportODL.razor b/MP.Stats/Pages/ReportODL.razor index ebf165af..536804d6 100644 --- a/MP.Stats/Pages/ReportODL.razor +++ b/MP.Stats/Pages/ReportODL.razor @@ -3,7 +3,7 @@ @using MP.Stats.Components
                    -
                    +
                    diff --git a/MP.Stats/Pages/UserLog.razor b/MP.Stats/Pages/UserLog.razor index 29465fa5..4dc6b64b 100644 --- a/MP.Stats/Pages/UserLog.razor +++ b/MP.Stats/Pages/UserLog.razor @@ -3,7 +3,7 @@ @using MP.Stats.Components
                    -
                    +
                    From fb451384d24131cbb1762c33fb837348f76fce61 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 24 May 2021 10:23:50 +0200 Subject: [PATCH 113/158] Pulizia metodi pareto non utilizzati --- MP.Data/Controllers/MpStatsController.cs | 61 --------------------- MP.Data/DatabaseModels/TurniPareto.cs | 26 --------- MP.Data/DatabaseModels/TurniParetoOdl.cs | 28 ---------- MP.Data/MP.Data.csproj | 5 ++ MP.Data/MoonPro_STATSContext.cs | 68 +----------------------- 5 files changed, 7 insertions(+), 181 deletions(-) delete mode 100644 MP.Data/DatabaseModels/TurniPareto.cs delete mode 100644 MP.Data/DatabaseModels/TurniParetoOdl.cs diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index 843c0daf..8a01f41f 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -168,13 +168,6 @@ namespace MP.Data.Controllers { List dbResult = new List(); - //dbResult = dbCtx - // . - // .Where(x => x.Descrizione.Contains(searchVal) || x.IdxMacchina.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || x.KeyRichiesta.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) - // .OrderByDescending(x => x.InizioStato) - // .Take(numRecord) - // .ToList(); - var dataFrom = new SqlParameter("@dataFrom", DataStart); var dataTo = new SqlParameter("@dataTo", DataEnd); var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); @@ -269,60 +262,6 @@ namespace MP.Data.Controllers return dbResult; } - /// - /// Elenco tabella TurniPareto da filtro - /// - /// - /// - /// - /// - /// - public List StatTurniParetoGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) - { - List dbResult = new List(); - - var dataFrom = new SqlParameter("@dataFrom", DataStart); - var dataTo = new SqlParameter("@dataTo", DataEnd); - var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); - var idxODL = new SqlParameter("@IdxODL", IdxODL); - var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); - var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); - - dbResult = dbCtx - .DbSetTurniPareto - .FromSqlRaw("EXEC stp_UI_ParetoTurni_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) - .ToList(); - - return dbResult; - } - - /// - /// Elenco tabella TurniParetoOdl da filtro - /// - /// - /// - /// - /// - /// - public List StatTurniParetoOdlGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) - { - List dbResult = new List(); - - var dataFrom = new SqlParameter("@dataFrom", DataStart); - var dataTo = new SqlParameter("@dataTo", DataEnd); - var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); - var idxODL = new SqlParameter("@IdxODL", IdxODL); - var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); - var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); - - dbResult = dbCtx - .DbSetTurniParetoOdl - .FromSqlRaw("EXEC stp_UI_ParetoTurniOdl_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) - .ToList(); - - return dbResult; - } - /// /// Elenco tabella UserLog da filtro /// diff --git a/MP.Data/DatabaseModels/TurniPareto.cs b/MP.Data/DatabaseModels/TurniPareto.cs deleted file mode 100644 index 73c9d689..00000000 --- a/MP.Data/DatabaseModels/TurniPareto.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class TurniPareto - { - #region Public Properties - - public string ClasseTempo { get; set; } - public string CodArticolo { get; set; } - public string CodMacchina { get; set; } - public DateTime DataRif { get; set; } - public string DescArticolo { get; set; } - public string Descrizione { get; set; } - public string IdxMacchina { get; set; } - public int IdxStato { get; set; } - public double? TotPeriodo { get; set; } - public int? TotPz { get; set; } - public string Turno { get; set; } - - #endregion Public Properties - } -} \ No newline at end of file diff --git a/MP.Data/DatabaseModels/TurniParetoOdl.cs b/MP.Data/DatabaseModels/TurniParetoOdl.cs deleted file mode 100644 index 7a15b270..00000000 --- a/MP.Data/DatabaseModels/TurniParetoOdl.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class TurniParetoOdl - { - #region Public Properties - - public string ClasseTempo { get; set; } - public string CodArticolo { get; set; } - public string CodMacchina { get; set; } - public DateTime DataRif { get; set; } - public string DescArticolo { get; set; } - public string Descrizione { get; set; } - public string IdxMacchina { get; set; } - public int? IdxOdl { get; set; } - public int IdxStato { get; set; } - public string KeyRichiesta { get; set; } - public double? TotPeriodo { get; set; } - public int? TotPz { get; set; } - public string Turno { get; set; } - - #endregion Public Properties - } -} \ No newline at end of file diff --git a/MP.Data/MP.Data.csproj b/MP.Data/MP.Data.csproj index de2014da..f9e16cd0 100644 --- a/MP.Data/MP.Data.csproj +++ b/MP.Data/MP.Data.csproj @@ -6,6 +6,11 @@ MP.Data + + + + + diff --git a/MP.Data/MoonPro_STATSContext.cs b/MP.Data/MoonPro_STATSContext.cs index b6161519..3218b430 100644 --- a/MP.Data/MoonPro_STATSContext.cs +++ b/MP.Data/MoonPro_STATSContext.cs @@ -43,8 +43,10 @@ namespace MP.Data public virtual DbSet DbSetODL { get; set; } public virtual DbSet DbSetScarti { get; set; } public virtual DbSet DbSetTurniOee { get; set; } +#if false public virtual DbSet DbSetTurniPareto { get; set; } public virtual DbSet DbSetTurniParetoOdl { get; set; } +#endif public virtual DbSet DbSetUserLog { get; set; } #endregion Public Properties @@ -103,72 +105,6 @@ namespace MP.Data .HasMaxLength(5); }); - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_UI_Pareto_Turni"); - - entity.Property(e => e.ClasseTempo).HasMaxLength(50); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodMacchina).HasMaxLength(50); - - entity.Property(e => e.DataRif).HasColumnType("datetime"); - - entity.Property(e => e.DescArticolo).HasMaxLength(250); - - entity.Property(e => e.Descrizione).HasMaxLength(50); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.TotPeriodo).HasColumnName("totPeriodo"); - - entity.Property(e => e.Turno) - .IsRequired() - .HasMaxLength(5); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_UI_Pareto_TurniOdl"); - - entity.Property(e => e.ClasseTempo).HasMaxLength(50); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodMacchina).HasMaxLength(50); - - entity.Property(e => e.DataRif).HasColumnType("datetime"); - - entity.Property(e => e.DescArticolo).HasMaxLength(250); - - entity.Property(e => e.Descrizione).HasMaxLength(50); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.IdxOdl).HasColumnName("IdxODL"); - - entity.Property(e => e.KeyRichiesta).HasMaxLength(50); - - entity.Property(e => e.TotPeriodo).HasColumnName("totPeriodo"); - - entity.Property(e => e.Turno) - .IsRequired() - .HasMaxLength(5); - }); - modelBuilder.Entity(entity => { entity.HasNoKey(); From 0ea29f61d4ad8886a5d92d1013dbf2065bb0455d Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 24 May 2021 10:23:57 +0200 Subject: [PATCH 114/158] refresh gestione scarti --- MP.Stats/Components/ChartScarti.razor | 3 +-- MP.Stats/Data/MpStatsService.cs | 10 ---------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/MP.Stats/Components/ChartScarti.razor b/MP.Stats/Components/ChartScarti.razor index 86b7d6ce..6b772be2 100644 --- a/MP.Stats/Components/ChartScarti.razor +++ b/MP.Stats/Components/ChartScarti.razor @@ -1,6 +1,5 @@ @using MP.Stats.Data -
                      @@ -23,4 +22,4 @@
                    -
                    +
                    \ No newline at end of file diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 986300d0..659d7a45 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -287,16 +287,6 @@ namespace MP.Stats.Data return await Task.FromResult(dbResult); } - public Task StatTurniParetoGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") - { - return Task.FromResult(dbController.StatTurniParetoGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); - } - - public Task StatTurniParetoOdlGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") - { - return Task.FromResult(dbController.StatTurniParetoOdlGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); - } - public async Task> StatUserLogGetAll(SelectData CurrFilter, string searchVal = "") { //return Task.FromResult(dbController.StatUserLogGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); From fe1153fd699d2a750bbf34a159d923cba49ecf40 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 24 May 2021 10:31:46 +0200 Subject: [PATCH 115/158] Ok scrolling elenco causali guasto --- MP.Stats/Components/ChartScarti.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MP.Stats/Components/ChartScarti.razor b/MP.Stats/Components/ChartScarti.razor index 6b772be2..5370931e 100644 --- a/MP.Stats/Components/ChartScarti.razor +++ b/MP.Stats/Components/ChartScarti.razor @@ -1,7 +1,7 @@ @using MP.Stats.Data
                    -
                    +
                      @foreach (var item in @ParetoData) { From 4026142b120786088449d4b7dab05868a39c9c12 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 24 May 2021 11:12:03 +0200 Subject: [PATCH 116/158] Eliminazione errore doppio plot (check null list) --- MP.Stats/Components/ChartScarti.razor | 47 +++--- MP.Stats/Components/ChartScarti.razor.cs | 188 ++++++++++++----------- 2 files changed, 126 insertions(+), 109 deletions(-) diff --git a/MP.Stats/Components/ChartScarti.razor b/MP.Stats/Components/ChartScarti.razor index 5370931e..d64d42bb 100644 --- a/MP.Stats/Components/ChartScarti.razor +++ b/MP.Stats/Components/ChartScarti.razor @@ -1,25 +1,34 @@ @using MP.Stats.Data
                      -
                      -
                        - @foreach (var item in @ParetoData) - { -
                      • - @item.label - @item.value -
                        • - } -
                      -
                      -
                      -
                      -
                      - -
                      -
                      - + @if (ListScarti == null || ListScarti.Count == 0) + { +
                      +
                      No Chart Data
                      +
                      + } + else + { +
                      +
                        + @foreach (var item in @ParetoData) + { +
                      • + @item.label + @item.value +
                        • + } +
                      +
                      +
                      +
                      +
                      + +
                      +
                      + +
                      -
                      + }
                      \ No newline at end of file diff --git a/MP.Stats/Components/ChartScarti.razor.cs b/MP.Stats/Components/ChartScarti.razor.cs index 3a431c10..f67e7626 100644 --- a/MP.Stats/Components/ChartScarti.razor.cs +++ b/MP.Stats/Components/ChartScarti.razor.cs @@ -10,42 +10,10 @@ namespace MP.Stats.Components { public partial class ChartScarti { - [Inject] - protected MessageService MessageService { get; set; } - [Inject] - protected MpStatsService StatService { get; set; } - - protected SelectData _currFilter { get; set; } = new SelectData(); - - protected List _listScarti { get; set; } = new List(); - - [Parameter] - public List ListScarti - { - get => _listScarti; - set - { - // salvo valori - _listScarti = value; - // ricalcolo charting data - recalcData(); - var dataReload = Task.Run(async () => - { - await HandleRedraw(); - }); - } - } - - protected BarChart ParetoGuasti; - protected LineChart NumGuasti; + #region Protected Fields protected object barChartOptions = new { - //Title = new - //{ - // Display = true, - // Text = "Causali Scarto" - //}, Scales = new { XAxes = new object[] @@ -74,22 +42,12 @@ namespace MP.Stats.Components Mode = "nearest", Intersect = false }, - //Legend = new - //{ - // Display = true, - // FullWidth = true - //}, Animation = false, AspectRatio = 2.5 }; protected object lineChartOptions = new { - //Title = new - //{ - // Display = true, - // Text = "Causali Scarto" - //}, Scales = new { XAxes = new object[] @@ -119,51 +77,61 @@ namespace MP.Stats.Components Mode = "nearest", Intersect = false }, - //Legend = new - //{ - // Display = true, - // FullWidth = true - //}, Animation = false, AspectRatio = 2.5 }; + protected LineChart NumGuasti; + + protected BarChart ParetoGuasti; + + #endregion Protected Fields + + #region Protected Properties + + protected SelectData _currFilter { get; set; } = new SelectData(); + + protected List _listScarti { get; set; } = new List(); + + [Inject] + protected MessageService MessageService { get; set; } + protected List ParetoData { get; set; } = new List(); + + [Inject] + protected MpStatsService StatService { get; set; } + protected List TSData { get; set; } = new List(); - //protected override async Task OnAfterRenderAsync(bool firstRender) - //{ - // if (firstRender) - // { - // await HandleRedraw(); - // } - //} - protected async Task HandleRedraw() + #endregion Protected Properties + + #region Public Properties + + [Parameter] + public List ListScarti { - if (ParetoGuasti != null) + get => _listScarti; + set { - await ParetoGuasti.Clear(); - await ParetoGuasti.AddLabelsDatasetsAndUpdate(GetBarChartLabels(), GetBarChartDataset()); - } - if (NumGuasti != null) - { - await NumGuasti.Clear(); - await NumGuasti.AddLabelsDatasetsAndUpdate(GetLineChartLabels(), GetLineChartDataset()); + // salvo valori + _listScarti = value; + if (value != null) + { + // ricalcolo charting data + recalcData(); + var dataReload = Task.Run(async () => + { + await HandleRedraw(); + }); + } } } - List GetBarChartLabels() - { - var answ = ParetoData.Select(x => x.label).ToList(); - return answ; - } - List GetLineChartLabels() - { - var answ = TSData.Select(x => x.TLabel.ToString("ddd dd.MM")).ToList(); - return answ; - } + #endregion Public Properties - BarChartDataset GetBarChartDataset() + #region Private Methods + + private BarChartDataset GetBarChartDataset() { var answ = new BarChartDataset { @@ -175,7 +143,14 @@ namespace MP.Stats.Components }; return answ; } - LineChartDataset GetLineChartDataset() + + private List GetBarChartLabels() + { + var answ = ParetoData.Select(x => x.label).ToList(); + return answ; + } + + private LineChartDataset GetLineChartDataset() { var answ = new LineChartDataset { @@ -190,6 +165,34 @@ namespace MP.Stats.Components return answ; } + private List GetLineChartLabels() + { + var answ = TSData.Select(x => x.TLabel.ToString("ddd dd.MM")).ToList(); + return answ; + } + + private void recalcData() + { + if (ListScarti != null) + { + ParetoData = ListScarti + .GroupBy(x => x.Causale) + .Select(y => new ChartKV() { label = y.First().Descrizione, value = y.Sum(c => c.Qta) }) + .OrderByDescending(x => x.value) + .ToList(); + + TSData = ListScarti + .GroupBy(x => x.DataOraRif.Date) + .Select(y => new ChartTS() { TLabel = y.First().DataOraRif.Date, Value = y.Sum(c => c.Qta) }) + .OrderBy(x => x.TLabel) + .ToList(); + } + } + + #endregion Private Methods + + #region Protected Methods + /// /// Genera colori sfondo 33% rosso / arancione / giallo /// @@ -216,22 +219,27 @@ namespace MP.Stats.Components return answ; } - private void recalcData() + //protected override async Task OnAfterRenderAsync(bool firstRender) + //{ + // if (firstRender) + // { + // await HandleRedraw(); + // } + //} + protected async Task HandleRedraw() { - if (ListScarti != null) + if (ParetoGuasti != null) { - ParetoData = ListScarti - .GroupBy(x => x.Causale) - .Select(y => new ChartKV() { label = y.First().Descrizione, value = y.Sum(c => c.Qta) }) - .OrderByDescending(x => x.value) - .ToList(); - - TSData = ListScarti - .GroupBy(x => x.DataOraRif.Date) - .Select(y => new ChartTS() { TLabel = y.First().DataOraRif.Date, Value = y.Sum(c => c.Qta) }) - .OrderBy(x => x.TLabel) - .ToList(); + await ParetoGuasti.Clear(); + await ParetoGuasti.AddLabelsDatasetsAndUpdate(GetBarChartLabels(), GetBarChartDataset()); + } + if (NumGuasti != null) + { + await NumGuasti.Clear(); + await NumGuasti.AddLabelsDatasetsAndUpdate(GetLineChartLabels(), GetLineChartDataset()); } } + + #endregion Protected Methods } -} +} \ No newline at end of file From 360da3b6580673ca20c9a23ea9945033dd2fd945 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 24 May 2021 12:03:12 +0200 Subject: [PATCH 117/158] MOdifica puntamento DataPager con parametri --- MP.Stats/Components/ChartScarti.razor | 44 ++--- MP.Stats/Components/ChartScarti.razor.cs | 9 +- MP.Stats/Components/DataPager.razor | 237 +++++------------------ MP.Stats/Components/DataPager.razor.cs | 186 ++++++++++++++++++ MP.Stats/Pages/Controlli.razor | 2 +- MP.Stats/Pages/Diario.razor | 2 +- MP.Stats/Pages/Oee.razor | 2 +- MP.Stats/Pages/UserLog.razor | 2 +- 8 files changed, 256 insertions(+), 228 deletions(-) create mode 100644 MP.Stats/Components/DataPager.razor.cs diff --git a/MP.Stats/Components/ChartScarti.razor b/MP.Stats/Components/ChartScarti.razor index d64d42bb..5dd6b477 100644 --- a/MP.Stats/Components/ChartScarti.razor +++ b/MP.Stats/Components/ChartScarti.razor @@ -1,34 +1,32 @@ -@using MP.Stats.Data - -
                      +
                      @if (ListScarti == null || ListScarti.Count == 0) { -
                      -
                      No Chart Data
                      -
                      +
                      +
                      No Chart Data
                      +
                      } else { -
                      -
                        - @foreach (var item in @ParetoData) +
                        +
                          + @foreach (var item in @ParetoData) { -
                        • - @item.label - @item.value -
                          • +
                        • + @item.label + @item.value +
                          • } -
                        -
                        -
                        -
                        -
                        - -
                        -
                        - -
                        +
                      +
                      +
                      +
                      +
                      + +
                      +
                      +
                      +
                      }
                      \ No newline at end of file diff --git a/MP.Stats/Components/ChartScarti.razor.cs b/MP.Stats/Components/ChartScarti.razor.cs index f67e7626..f865fae6 100644 --- a/MP.Stats/Components/ChartScarti.razor.cs +++ b/MP.Stats/Components/ChartScarti.razor.cs @@ -156,7 +156,7 @@ namespace MP.Stats.Components { Label = "Numero Scarti Periodo", Data = TSData.Select(x => x.Value).ToList(), - BackgroundColor = backgroundColors(1), + BorderColor = backgroundColors(1), Fill = true, PointRadius = 2, SteppedLine = true, @@ -219,13 +219,6 @@ namespace MP.Stats.Components return answ; } - //protected override async Task OnAfterRenderAsync(bool firstRender) - //{ - // if (firstRender) - // { - // await HandleRedraw(); - // } - //} protected async Task HandleRedraw() { if (ParetoGuasti != null) diff --git a/MP.Stats/Components/DataPager.razor b/MP.Stats/Components/DataPager.razor index 424d7640..22928184 100644 --- a/MP.Stats/Components/DataPager.razor +++ b/MP.Stats/Components/DataPager.razor @@ -1,48 +1,46 @@ -@inject Services.BlazorTimer Timer - -
                      +
                      @if (totalCount > 0) { - - - - - - - - - - - - @for (int i = @startPage; i <= endPage; ++i) + + + + + + + + + + + + @for (int i = @startPage; i <= endPage; ++i) { var pageNum = i; - - - @pageNum - - + + + @pageNum + + } - - - - - - - - - - - + + + + + + + + + + + }
                      @if (!showLoading) { - @totalCount records + @totalCount records }
                      @@ -50,9 +48,9 @@
                      @if (showLoading) { - - - + + + }
                      @@ -60,163 +58,16 @@
                      @if (totalCount > 0) { -
                      - row/pag:  - -
                      +
                      + row/pag:  + +
                      }
                      -
                      - -@code { - - void HandlePaginationItemClick(string page) - { - currPage = int.Parse(page); - reportChangePage(); - } - - private int numPages { get; set; } = 10; - - // calcola un set 1..numPOages centrato sulla pagina corrente... - private int startPage - { - get - { - int answ = (int)(currPage / numPages) * numPages; - answ = answ > 0 ? answ : 1; - return answ; - } - } - private int endPage - { - get - { - int answ = (int)(currPage / numPages) * numPages + numPages; - answ = answ < LastPage ? answ : LastPage; - return answ; - } - } - - private int prevBlock - { - get - { - int answ = currPage - numPages; - answ = answ > 0 ? answ : 1; - return answ; - } - } - private int nextBlock - { - get - { - int answ = currPage + numPages; - answ = answ < LastPage ? answ : LastPage; - return answ; - } - } - - private int LastPage - { - get - { - return Math.Max((int)Math.Ceiling(totalCount / (double)PageSize), 1); - } - } - - protected override Task OnInitializedAsync() - { - showLoading = false; - return base.OnInitializedAsync(); - } - - protected int percLoading { get; set; } = 0; - - protected bool _showLoading = false; - - [Parameter] - public bool showLoading - { - get - { - return _showLoading; - } - set - { - if (value) - { - Random random = new Random(); - percLoading = random.Next(30, 90); - } - else - { - percLoading = 5; - } - _showLoading = value; - } - } - - [Parameter] - public int totalCount { get; set; } = 0; - - protected int _numRecord { get; set; } = 10; - protected int _numPage { get; set; } = 1; - - [Parameter] - public int PageSize - { - get - { - return _numRecord; - } - set - { - bool doReport = !_numRecord.Equals(value); - if (doReport) - { - _numRecord = value; - reportChange(); - } - } - } - - [Parameter] - public int currPage - { - get - { - return _numPage; - } - set - { - bool doReport = !_numPage.Equals(value); - if (doReport) - { - _numPage = value; - reportChangePage(); - } - } - } - - [Parameter] - public EventCallback numRecordChanged { get; set; } - [Parameter] - public EventCallback numPageChanged { get; set; } - - private void reportChange() - { - numRecordChanged.InvokeAsync(PageSize); - } - private void reportChangePage() - { - numPageChanged.InvokeAsync(currPage); - } - -} \ No newline at end of file +
                      \ No newline at end of file diff --git a/MP.Stats/Components/DataPager.razor.cs b/MP.Stats/Components/DataPager.razor.cs new file mode 100644 index 00000000..ba72a2ff --- /dev/null +++ b/MP.Stats/Components/DataPager.razor.cs @@ -0,0 +1,186 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Components; +using MP.Stats.Components; +using MP.Stats.Data; + +namespace MP.Stats.Components +{ + public partial class DataPager + { + #region Protected Fields + + protected bool _showLoading = false; + + #endregion Protected Fields + + #region Private Properties + + private int endPage + { + get + { + int answ = (int)(currPage / numPages) * numPages + numPages; + answ = answ < LastPage ? answ : LastPage; + return answ; + } + } + + private int LastPage + { + get + { + return Math.Max((int)Math.Ceiling(totalCount / (double)PageSize), 1); + } + } + + private int nextBlock + { + get + { + int answ = currPage + numPages; + answ = answ < LastPage ? answ : LastPage; + return answ; + } + } + + private int numPages { get; set; } = 10; + + private int prevBlock + { + get + { + int answ = currPage - numPages; + answ = answ > 0 ? answ : 1; + return answ; + } + } + + // calcola un set 1..numPOages centrato sulla pagina corrente... + private int startPage + { + get + { + int answ = (int)(currPage / numPages) * numPages; + answ = answ > 0 ? answ : 1; + return answ; + } + } + + [Inject] + private Services.BlazorTimer Timer { get; set; } + + #endregion Private Properties + + #region Protected Properties + + protected int _numPage { get; set; } = 1; + + protected int _numRecord { get; set; } = 10; + + protected int percLoading { get; set; } = 0; + + #endregion Protected Properties + + #region Public Properties + + [Parameter] + public int currPage + { + get + { + return _numPage; + } + set + { + bool doReport = !_numPage.Equals(value); + if (doReport) + { + _numPage = value; + reportChangePage(); + } + } + } + + [Parameter] + public EventCallback numPageChanged { get; set; } + + [Parameter] + public EventCallback numRecordChanged { get; set; } + + [Parameter] + public int PageSize + { + get + { + return _numRecord; + } + set + { + bool doReport = !_numRecord.Equals(value); + if (doReport) + { + _numRecord = value; + reportChange(); + } + } + } + + [Parameter] + public bool showLoading + { + get + { + return _showLoading; + } + set + { + if (value) + { + Random random = new Random(); + percLoading = random.Next(30, 90); + } + else + { + percLoading = 5; + } + _showLoading = value; + } + } + + [Parameter] + public int totalCount { get; set; } = 0; + + #endregion Public Properties + + #region Private Methods + + private void reportChange() + { + numRecordChanged.InvokeAsync(PageSize); + } + + private void reportChangePage() + { + numPageChanged.InvokeAsync(currPage); + } + + #endregion Private Methods + + #region Protected Methods + + protected void HandlePaginationItemClick(string page) + { + currPage = int.Parse(page); + } + + protected override async Task OnInitializedAsync() + { + await Task.Run(() => showLoading = false); + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor index 4afbf04a..86af993f 100644 --- a/MP.Stats/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -54,6 +54,6 @@ }
                      - +
                      \ No newline at end of file diff --git a/MP.Stats/Pages/Diario.razor b/MP.Stats/Pages/Diario.razor index ac381528..3077ef42 100644 --- a/MP.Stats/Pages/Diario.razor +++ b/MP.Stats/Pages/Diario.razor @@ -57,6 +57,6 @@ }
                      - +
                    \ No newline at end of file diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor index 2beb55a2..e38e8080 100644 --- a/MP.Stats/Pages/Oee.razor +++ b/MP.Stats/Pages/Oee.razor @@ -64,6 +64,6 @@ }
                    - +
                    \ No newline at end of file diff --git a/MP.Stats/Pages/UserLog.razor b/MP.Stats/Pages/UserLog.razor index 4dc6b64b..32416756 100644 --- a/MP.Stats/Pages/UserLog.razor +++ b/MP.Stats/Pages/UserLog.razor @@ -67,6 +67,6 @@ }
                    - +
                    \ No newline at end of file From caf77e316b0a7aba53debe5de8e4367770e2a3fe Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 24 May 2021 12:23:27 +0200 Subject: [PATCH 118/158] Correzione invio multiplo dati sul cambio pagina --- MP.Stats/Pages/ReportODL.razor | 2 +- MP.Stats/Pages/Scarti.razor | 2 +- MP.Stats/Pages/Scarti.razor.cs | 41 +++++++++++++++++++++++++++++----- 3 files changed, 37 insertions(+), 8 deletions(-) diff --git a/MP.Stats/Pages/ReportODL.razor b/MP.Stats/Pages/ReportODL.razor index 536804d6..72312222 100644 --- a/MP.Stats/Pages/ReportODL.razor +++ b/MP.Stats/Pages/ReportODL.razor @@ -57,6 +57,6 @@ }
                    - +
                    \ No newline at end of file diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index 2cbadff3..32d80ce7 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -67,6 +67,6 @@ }
                    - +
                    \ No newline at end of file diff --git a/MP.Stats/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs index bcd6b211..f5d3baa3 100644 --- a/MP.Stats/Pages/Scarti.razor.cs +++ b/MP.Stats/Pages/Scarti.razor.cs @@ -21,6 +21,10 @@ namespace MP.Stats.Pages #region Private Properties + private int _currPage { get; set; } = 1; + + private int _numRecord { get; set; } = 10; + private SelectData currFilter { get @@ -33,9 +37,36 @@ namespace MP.Stats.Pages } } - private int currPage { get; set; } = 1; + private int currPage + { + get => _currPage; + set + { + if (_currPage != value) + { + _currPage = value; + var pUpd = Task.Run(async () => await reloadData()); + pUpd.Wait(); + } + } + } + private bool isLoading { get; set; } = false; - private int numRecord { get; set; } = 10; + + private int numRecord + { + get => _numRecord; + set + { + if (_numRecord != value) + { + _numRecord = value; + var pUpd = Task.Run(async () => await reloadData()); + pUpd.Wait(); + } + } + } + private bool ShowCharts { get; set; } = false; #endregion Private Properties @@ -91,16 +122,14 @@ namespace MP.Stats.Pages await reloadData(); } - protected async Task ForceReload(int newNum) + protected void ForceReload(int newNum) { numRecord = newNum; - await reloadData(); } - protected async Task ForceReloadPage(int newNum) + protected void ForceReloadPage(int newNum) { currPage = newNum; - await reloadData(); } protected override async Task OnInitializedAsync() From 886d0a0135bd35953c263ae43b7880904a7434d8 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 24 May 2021 12:28:28 +0200 Subject: [PATCH 119/158] Ok display chart x registro scarti, continuo... --- MP.Stats/Components/ChartScarti.razor | 40 ++++++++++++------------ MP.Stats/Components/ChartScarti.razor.cs | 4 +-- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/MP.Stats/Components/ChartScarti.razor b/MP.Stats/Components/ChartScarti.razor index 5dd6b477..1b0b8cac 100644 --- a/MP.Stats/Components/ChartScarti.razor +++ b/MP.Stats/Components/ChartScarti.razor @@ -1,32 +1,32 @@ 
                    @if (ListScarti == null || ListScarti.Count == 0) { -
                    -
                    No Chart Data
                    -
                    +
                    +
                    No Chart Data
                    +
                    } else { -
                    -
                      - @foreach (var item in @ParetoData) +
                      +
                        + @foreach (var item in @ParetoData) { -
                      • - @item.label - @item.value -
                        • +
                      • + @item.label + @item.value +
                        • } -
                      -
                      -
                      -
                      -
                      - -
                      -
                      - +
                    +
                    +
                    +
                    +
                    + +
                    +
                    + +
                    -
                    }
                    \ No newline at end of file diff --git a/MP.Stats/Components/ChartScarti.razor.cs b/MP.Stats/Components/ChartScarti.razor.cs index f865fae6..ec6ff6e6 100644 --- a/MP.Stats/Components/ChartScarti.razor.cs +++ b/MP.Stats/Components/ChartScarti.razor.cs @@ -43,7 +43,7 @@ namespace MP.Stats.Components Intersect = false }, Animation = false, - AspectRatio = 2.5 + AspectRatio = 3.5 }; protected object lineChartOptions = new @@ -78,7 +78,7 @@ namespace MP.Stats.Components Intersect = false }, Animation = false, - AspectRatio = 2.5 + AspectRatio = 3.5 }; protected LineChart NumGuasti; From 4271f611b616fc3fc09e370cf6e0bbdd627c550a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 24 May 2021 16:35:39 +0200 Subject: [PATCH 120/158] Fix naming dati chart scarti --- MP.Stats/Components/ChartScarti.razor | 2 +- MP.Stats/Components/ChartScarti.razor.cs | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MP.Stats/Components/ChartScarti.razor b/MP.Stats/Components/ChartScarti.razor index 1b0b8cac..25dfe00a 100644 --- a/MP.Stats/Components/ChartScarti.razor +++ b/MP.Stats/Components/ChartScarti.razor @@ -1,5 +1,5 @@ 
                    - @if (ListScarti == null || ListScarti.Count == 0) + @if (RawData == null || RawData.Count == 0) {
                    No Chart Data
                    diff --git a/MP.Stats/Components/ChartScarti.razor.cs b/MP.Stats/Components/ChartScarti.razor.cs index ec6ff6e6..d8ca52b9 100644 --- a/MP.Stats/Components/ChartScarti.razor.cs +++ b/MP.Stats/Components/ChartScarti.razor.cs @@ -91,7 +91,7 @@ namespace MP.Stats.Components protected SelectData _currFilter { get; set; } = new SelectData(); - protected List _listScarti { get; set; } = new List(); + protected List _rawData { get; set; } = new List(); [Inject] protected MessageService MessageService { get; set; } @@ -108,13 +108,13 @@ namespace MP.Stats.Components #region Public Properties [Parameter] - public List ListScarti + public List RawData { - get => _listScarti; + get => _rawData; set { // salvo valori - _listScarti = value; + _rawData = value; if (value != null) { // ricalcolo charting data @@ -173,15 +173,15 @@ namespace MP.Stats.Components private void recalcData() { - if (ListScarti != null) + if (RawData != null) { - ParetoData = ListScarti + ParetoData = RawData .GroupBy(x => x.Causale) .Select(y => new ChartKV() { label = y.First().Descrizione, value = y.Sum(c => c.Qta) }) .OrderByDescending(x => x.value) .ToList(); - TSData = ListScarti + TSData = RawData .GroupBy(x => x.DataOraRif.Date) .Select(y => new ChartTS() { TLabel = y.First().DataOraRif.Date, Value = y.Sum(c => c.Qta) }) .OrderBy(x => x.TLabel) From d67744eccde5378548d1657bd1f5c8ac2a574d8e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 24 May 2021 16:35:50 +0200 Subject: [PATCH 121/158] ancora fix scarti --- MP.Stats/Pages/Scarti.razor | 5 +++-- MP.Stats/Pages/Scarti.razor.cs | 35 +++++++++++++++++++--------------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index 32d80ce7..580a6bf9 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -1,4 +1,5 @@ @page "/scarti" +@*@page "/scarti/{IdxMacchina}"*@ @using MP.Stats.Components @@ -9,7 +10,7 @@
                    @if (ShowCharts == true) { - + } @if (ListRecords == null) { @@ -67,6 +68,6 @@ }
                    - +
                    \ No newline at end of file diff --git a/MP.Stats/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs index f5d3baa3..359e7c04 100644 --- a/MP.Stats/Pages/Scarti.razor.cs +++ b/MP.Stats/Pages/Scarti.razor.cs @@ -25,18 +25,6 @@ namespace MP.Stats.Pages private int _numRecord { get; set; } = 10; - private SelectData currFilter - { - get - { - return MessageService.DetailFilter; - } - set - { - MessageService.DetailFilter = value; - } - } - private int currPage { get => _currPage; @@ -100,6 +88,23 @@ namespace MP.Stats.Pages #endregion Protected Properties + #region Public Properties + + [Parameter] + public SelectData currFilter + { + get + { + return MessageService.DetailFilter; + } + set + { + MessageService.DetailFilter = value; + } + } + + #endregion Public Properties + #region Private Methods private async Task reloadData() @@ -196,11 +201,11 @@ namespace MP.Stats.Pages MessageService.EA_SearchUpdated -= OnSeachUpdated; } - public void OnSeachUpdated() + public async void OnSeachUpdated() { - InvokeAsync(() => + await InvokeAsync(() => { - UpdateData(); + Task task = UpdateData(); StateHasChanged(); }); } From cfe3edda0abe7e9d8243bb2618c91296ede8d505 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 24 May 2021 16:46:05 +0200 Subject: [PATCH 122/158] OK, charting controlli --- MP.Stats/Components/ChartControlli.razor | 32 +++ MP.Stats/Components/ChartControlli.razor.cs | 253 ++++++++++++++++++++ MP.Stats/Pages/Controlli.razor | 8 +- MP.Stats/Pages/Controlli.razor.cs | 52 +++- 4 files changed, 333 insertions(+), 12 deletions(-) create mode 100644 MP.Stats/Components/ChartControlli.razor create mode 100644 MP.Stats/Components/ChartControlli.razor.cs diff --git a/MP.Stats/Components/ChartControlli.razor b/MP.Stats/Components/ChartControlli.razor new file mode 100644 index 00000000..40f2a97c --- /dev/null +++ b/MP.Stats/Components/ChartControlli.razor @@ -0,0 +1,32 @@ +
                    + @if (RawData == null || RawData.Count == 0) + { +
                    +
                    No Chart Data
                    +
                    + } + else + { +
                    +
                      + @foreach (var item in @ParetoData) + { +
                    • + @item.label + @item.value +
                      • + } +
                    +
                    +
                    +
                    +
                    + +
                    +
                    + +
                    +
                    +
                    + } +
                    \ No newline at end of file diff --git a/MP.Stats/Components/ChartControlli.razor.cs b/MP.Stats/Components/ChartControlli.razor.cs new file mode 100644 index 00000000..2a354c9b --- /dev/null +++ b/MP.Stats/Components/ChartControlli.razor.cs @@ -0,0 +1,253 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Blazorise.Charts; +using Microsoft.AspNetCore.Components; +using MP.Stats.Data; + +namespace MP.Stats.Components +{ + public partial class ChartControlli + { + #region Protected Fields + + protected const string EsitoKO = "Esito: Non Passato"; + + protected const string EsitoOK = "Esito: OK"; + + protected object lineChartOptions = new + { + Scales = new + { + XAxes = new object[] + { + new { + Display = true + } + }, + YAxes = new object[] + { + new { + Display = true, + ticks= new { + suggestedMin = 0 + } + } + } + }, + Tooltips = new + { + Mode = "nearest", + Intersect = false + }, + Hover = new + { + Mode = "nearest", + Intersect = false + }, + Animation = false, + AspectRatio = 4.9 + }; + + protected object pieChartOptions = new + { + Scales = new + { + XAxes = new object[] + { + new { + Display = false + } + }, + YAxes = new object[] + { + new { + Display = false + } + } + }, + Legend = new + { + Display = false + }, + Tooltips = new + { + Mode = "nearest", + Intersect = false + }, + Hover = new + { + Mode = "nearest", + Intersect = false + }, + Animation = false, + AspectRatio = 1 + }; + + protected PieChart PieVC; + protected LineChart TimeSerieVC; + + #endregion Protected Fields + + #region Protected Properties + + protected SelectData _currFilter { get; set; } = new SelectData(); + + protected List _rawData { get; set; } = new List(); + + [Inject] + protected MessageService MessageService { get; set; } + + protected List ParetoData { get; set; } = new List(); + + [Inject] + protected MpStatsService StatService { get; set; } + + protected List TSData { get; set; } = new List(); + + #endregion Protected Properties + + #region Public Properties + + [Parameter] + public List RawData + { + get => _rawData; + set + { + // salvo valori + _rawData = value; + if (value != null) + { + // ricalcolo charting data + recalcData(); + var dataReload = Task.Run(async () => + { + await HandleRedraw(); + }); + } + } + } + + #endregion Public Properties + + #region Private Methods + + private PieChartDataset GetBarChartDataset() + { + var answ = new PieChartDataset + { + Label = "Numero Controlli", + Data = ParetoData.Select(x => x.value).ToList(), + BackgroundColor = getPieColors(0.4f), + BorderColor = getPieColors(1f), + HoverBorderWidth = 3 + }; + return answ; + } + + private List GetBarChartLabels() + { + var answ = ParetoData.Select(x => x.label).ToList(); + return answ; + } + + /// + /// Elenco 2 linee x controli KO /KO + /// + /// + private LineChartDataset GetLineChartDataset() + { + var answ = new LineChartDataset + { + Label = "Numero controlli", + Data = TSData.Select(x => x.Value).ToList(), + BorderColor = getLineColors(1f), + Fill = true, + PointRadius = 2, + LineTension = 0, + BorderDash = new List { } + }; + return answ; + } + + private List GetLineChartLabels() + { + var answ = TSData.Select(x => x.TLabel.ToString("ddd dd.MM")).ToList(); + return answ; + } + + private void recalcData() + { + if (RawData != null) + { + ParetoData = RawData + .GroupBy(p => p.EsitoOk) + .Select(y => new ChartKV() { label = y.First().EsitoOk ? EsitoOK : EsitoKO, value = y.Count() }) + .OrderByDescending(x => x.value) + .ToList(); + + TSData = RawData + .GroupBy(x => x.DataOra.Date) + .Select(y => new ChartTS() { TLabel = y.First().DataOra.Date, Value = y.Count() }) + .OrderBy(x => x.TLabel) + .ToList(); + } + } + + #endregion Private Methods + + #region Protected Methods + + /// + /// Genera colori sfondo 33% rosso / arancione / giallo + /// + /// + /// + protected List getLineColors(float alpha) + { + List answ = new List(); + answ.Add(ChartColor.FromRgba(54, 82, 254, alpha)); + return answ; + } + + /// + /// Genera colori sfondo 33% rosso / arancione / giallo + /// + /// + /// + protected List getPieColors(float alpha) + { + List answ = new List(); + foreach (var item in ParetoData) + { + if (item.label == EsitoOK) + { + answ.Add(ChartColor.FromRgba(54, 254, 82, alpha)); + } + else + { + answ.Add(ChartColor.FromRgba(254, 82, 65, alpha)); + } + } + return answ; + } + + protected async Task HandleRedraw() + { + if (PieVC != null) + { + await PieVC.Clear(); + await PieVC.AddLabelsDatasetsAndUpdate(GetBarChartLabels(), GetBarChartDataset()); + } + if (TimeSerieVC != null) + { + await TimeSerieVC.Clear(); + await TimeSerieVC.AddLabelsDatasetsAndUpdate(GetLineChartLabels(), GetLineChartDataset()); + } + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor index 86af993f..325b283f 100644 --- a/MP.Stats/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -5,9 +5,13 @@
                    - +
                    + @if (ShowCharts == true) + { + + } @if (ListRecords == null) { @@ -23,7 +27,6 @@ - @**@ @@ -37,7 +40,6 @@ @foreach (var record in ListRecords) { - @**@ diff --git a/MP.Stats/Pages/Controlli.razor.cs b/MP.Stats/Pages/Controlli.razor.cs index 86463196..8ff26086 100644 --- a/MP.Stats/Pages/Controlli.razor.cs +++ b/MP.Stats/Pages/Controlli.razor.cs @@ -21,11 +21,41 @@ namespace MP.Stats.Pages #region Private Properties - private int currPage { get; set; } = 1; + private int _currPage { get; set; } = 1; + + private int _numRecord { get; set; } = 10; + + private int currPage + { + get => _currPage; + set + { + if (_currPage != value) + { + _currPage = value; + var pUpd = Task.Run(async () => await reloadData()); + pUpd.Wait(); + } + } + } private bool isLoading { get; set; } = false; - private int numRecord { get; set; } = 10; + private int numRecord + { + get => _numRecord; + set + { + if (_numRecord != value) + { + _numRecord = value; + var pUpd = Task.Run(async () => await reloadData()); + pUpd.Wait(); + } + } + } + + private bool ShowCharts { get; set; } = false; #endregion Private Properties @@ -73,9 +103,6 @@ namespace MP.Stats.Pages } } - [Parameter] - public string IdxMacchina { get; set; } = ""; - #endregion Public Properties #region Private Methods @@ -100,16 +127,14 @@ namespace MP.Stats.Pages await reloadData(); } - protected async Task ForceReload(int newNum) + protected void ForceReload(int newNum) { numRecord = newNum; - await reloadData(); } - protected async Task ForceReloadPage(int newNum) + protected void ForceReloadPage(int newNum) { currPage = newNum; - await reloadData(); } protected override async Task OnInitializedAsync() @@ -137,6 +162,15 @@ namespace MP.Stats.Pages await reloadData(); } + protected async Task ToggleChart(bool doShow) + { + ShowCharts = !ShowCharts; + if (ShowCharts) + { + await reloadData(); + } + } + protected async Task UpdateData() { currRecord = null; From 62055c60bd9d6206035f140947acad9a7fe56752 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 24 May 2021 18:03:10 +0200 Subject: [PATCH 123/158] Fix comportamento button Charts --- MP.Stats/Components/SelectionFilter.razor | 2 +- MP.Stats/Components/SelectionFilter.razor.cs | 15 +++++++++++++-- MP.Stats/Pages/Controlli.razor | 2 +- MP.Stats/Pages/Scarti.razor | 2 +- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/MP.Stats/Components/SelectionFilter.razor b/MP.Stats/Components/SelectionFilter.razor index 186d369e..8272017d 100644 --- a/MP.Stats/Components/SelectionFilter.razor +++ b/MP.Stats/Components/SelectionFilter.razor @@ -6,7 +6,7 @@

                    -
                    Macchina Data ODL/Commessa
                     @record.IdxMacchina @record.DataOra @record.IdxOdl
                    - - - @**@ - - - - - - - - - - - @foreach (var record in ListRecords) +
                    +
                    +
                    DataTurnoMacchinaArticoloDurataPezziOEE %
                    + + + @**@ + + + + + + + + + + + @foreach (var record in ListRecords) { - + - @**@ - - - - - - - - + @**@ + + + + + + + + } - -
                    DataTurnoMacchinaArticoloDurataPezziOEE %
                    -
                    @record.DataRif.ToString("yyyy.MM.dd")
                    -
                    @record.DataRif.ToString("dddd")
                    -                     		@record.Turno -
                    @record.CodMacchina
                    -
                    @record.IdxMacchina
                    -                     		@record.CodArticolo@record.TotPeriodo.ToString("N2")@record.TotPz@record.OEE.ToString("P2")
                    +
                    @record.DataRif.ToString("yyyy.MM.dd")
                    +
                    @record.DataRif.ToString("dddd")
                    +                     		@record.Turno +
                    @record.CodMacchina
                    +
                    @record.IdxMacchina
                    +                     		@record.CodArticolo@record.TotPeriodo.ToString("N2")@record.TotPz@record.OEE.ToString("P2")
                    + + +
                    -
                    }
                    From 251e98afbf1a0aa9c48074cd813d2bb65a53e963 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 24 May 2021 18:32:49 +0200 Subject: [PATCH 129/158] Inizio customizzaizone grafici OEE --- MP.Stats/Components/ChartOEE.razor | 32 ++++ MP.Stats/Components/ChartOEE.razor.cs | 238 ++++++++++++++++++++++++++ MP.Stats/Pages/Oee.razor | 6 +- MP.Stats/Pages/Oee.razor.cs | 62 ++++++- 4 files changed, 328 insertions(+), 10 deletions(-) create mode 100644 MP.Stats/Components/ChartOEE.razor create mode 100644 MP.Stats/Components/ChartOEE.razor.cs diff --git a/MP.Stats/Components/ChartOEE.razor b/MP.Stats/Components/ChartOEE.razor new file mode 100644 index 00000000..25dfe00a --- /dev/null +++ b/MP.Stats/Components/ChartOEE.razor @@ -0,0 +1,32 @@ +
                    + @if (RawData == null || RawData.Count == 0) + { +
                    +
                    No Chart Data
                    +
                    + } + else + { +
                    +
                      + @foreach (var item in @ParetoData) + { +
                    • + @item.label + @item.value +
                      • + } +
                    +
                    +
                    +
                    +
                    + +
                    +
                    + +
                    +
                    +
                    + } +
                    \ No newline at end of file diff --git a/MP.Stats/Components/ChartOEE.razor.cs b/MP.Stats/Components/ChartOEE.razor.cs new file mode 100644 index 00000000..9f6babd2 --- /dev/null +++ b/MP.Stats/Components/ChartOEE.razor.cs @@ -0,0 +1,238 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Blazorise.Charts; +using Microsoft.AspNetCore.Components; +using MP.Stats.Data; + +namespace MP.Stats.Components +{ + public partial class ChartOEE + { + #region Protected Fields + + protected object barChartOptions = new + { + Scales = new + { + XAxes = new object[] + { + new { + Display = false + } + }, + YAxes = new object[] + { + new { + Display = true, + ticks= new { + suggestedMin = 0 + } + } + } + }, + Tooltips = new + { + Mode = "nearest", + Intersect = false + }, + Hover = new + { + Mode = "nearest", + Intersect = false + }, + Animation = false, + AspectRatio = 3.5 + }; + + protected object lineChartOptions = new + { + Scales = new + { + XAxes = new object[] + { + new { + Display = true, + //type = "time" + } + }, + YAxes = new object[] + { + new { + Display = true, + ticks= new { + suggestedMin = 0 + } + } + } + }, + Tooltips = new + { + Mode = "nearest", + Intersect = false + }, + Hover = new + { + Mode = "nearest", + Intersect = false + }, + Animation = false, + AspectRatio = 3.5 + }; + + protected LineChart NumGuasti; + + protected BarChart ParetoGuasti; + + #endregion Protected Fields + + #region Protected Properties + + protected SelectData _currFilter { get; set; } = new SelectData(); + + protected List _rawData { get; set; } = new List(); + + [Inject] + protected MessageService MessageService { get; set; } + + protected List ParetoData { get; set; } = new List(); + + [Inject] + protected MpStatsService StatService { get; set; } + + protected List TSData { get; set; } = new List(); + + #endregion Protected Properties + + #region Public Properties + + [Parameter] + public List RawData + { + get => _rawData; + set + { + // salvo valori + _rawData = value; + if (value != null) + { + // ricalcolo charting data + recalcData(); + var dataReload = Task.Run(async () => + { + await HandleRedraw(); + }); + } + } + } + + #endregion Public Properties + + #region Private Methods + + private BarChartDataset GetBarChartDataset() + { + var answ = new BarChartDataset + { + Label = "Pareto Causali Scarto", + Data = ParetoData.Select(x => x.value).ToList(), + BackgroundColor = backgroundColors(ParetoData.Count, 0.4f), + BorderColor = backgroundColors(ParetoData.Count, 1f), + HoverBorderWidth = 5 + }; + return answ; + } + + private List GetBarChartLabels() + { + var answ = ParetoData.Select(x => x.label).ToList(); + return answ; + } + + private LineChartDataset GetLineChartDataset() + { + var answ = new LineChartDataset + { + Label = "Numero Scarti Periodo", + Data = TSData.Select(x => x.Value).ToList(), + BorderColor = backgroundColors(1, 1f), + Fill = true, + PointRadius = 2, + SteppedLine = true, + BorderDash = new List { } + }; + return answ; + } + + private List GetLineChartLabels() + { + var answ = TSData.Select(x => x.TLabel.ToString("ddd dd.MM")).ToList(); + return answ; + } + + private void recalcData() + { + if (RawData != null) + { + ParetoData = RawData + .GroupBy(x => x.Causale) + .Select(y => new ChartKV() { label = y.First().Descrizione, value = y.Sum(c => c.Qta) }) + .OrderByDescending(x => x.value) + .ToList(); + + TSData = RawData + .GroupBy(x => x.DataOraRif.Date) + .Select(y => new ChartTS() { TLabel = y.First().DataOraRif.Date, Value = y.Sum(c => c.Qta) }) + .OrderBy(x => x.TLabel) + .ToList(); + } + } + + #endregion Private Methods + + #region Protected Methods + + /// + /// Genera colori sfondo 33% rosso / arancione / giallo + /// + /// + /// + protected List backgroundColors(int numRecords, float alpha) + { + List answ = new List(); + // rosso... + for (int i = 0; i < numRecords / 3; i++) + { + answ.Add(ChartColor.FromRgba(255, 99, 132, alpha)); + } + // arancione + for (int i = 0; i < numRecords / 3; i++) + { + answ.Add(ChartColor.FromRgba(255, 206, 86, alpha)); + } + while (answ.Count < numRecords) + { + answ.Add(ChartColor.FromRgba(54, 82, 235, alpha)); + } + + return answ; + } + + protected async Task HandleRedraw() + { + if (ParetoGuasti != null) + { + await ParetoGuasti.Clear(); + await ParetoGuasti.AddLabelsDatasetsAndUpdate(GetBarChartLabels(), GetBarChartDataset()); + } + if (NumGuasti != null) + { + await NumGuasti.Clear(); + await NumGuasti.AddLabelsDatasetsAndUpdate(GetLineChartLabels(), GetLineChartDataset()); + } + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor index 60dee9ab..09a0e6c8 100644 --- a/MP.Stats/Pages/Oee.razor +++ b/MP.Stats/Pages/Oee.razor @@ -4,9 +4,13 @@
                    - +
                    + @if (ShowCharts == true) + { + + } @if (currRecord != null) { diff --git a/MP.Stats/Pages/Oee.razor.cs b/MP.Stats/Pages/Oee.razor.cs index 5b260e77..69a1f8c6 100644 --- a/MP.Stats/Pages/Oee.razor.cs +++ b/MP.Stats/Pages/Oee.razor.cs @@ -34,9 +34,39 @@ namespace MP.Stats.Pages } } - private int currPage { get; set; } = 1; + private int _currPage { get; set; } = 1; + + private int _numRecord { get; set; } = 10; + + private int currPage + { + get => _currPage; + set + { + if (_currPage != value) + { + _currPage = value; + var pUpd = Task.Run(async () => await reloadData()); + pUpd.Wait(); + } + } + } private bool isLoading { get; set; } = false; - private int numRecord { get; set; } = 10; + private int numRecord + { + get => _numRecord; + set + { + if (_numRecord != value) + { + _numRecord = value; + var pUpd = Task.Run(async () => await reloadData()); + pUpd.Wait(); + } + } + } + + private bool ShowCharts { get; set; } = false; #endregion Private Properties @@ -92,16 +122,14 @@ namespace MP.Stats.Pages await reloadData(); } - protected async Task ForceReload(int newNum) + protected void ForceReload(int newNum) { numRecord = newNum; - await reloadData(); } - protected async Task ForceReloadPage(int newNum) + protected void ForceReloadPage(int newNum) { currPage = newNum; - await reloadData(); } protected override async Task OnInitializedAsync() @@ -135,6 +163,14 @@ namespace MP.Stats.Pages currRecord = selRecord; } + protected async Task ToggleChart(bool doShow) + { + ShowCharts = !ShowCharts; + if (ShowCharts) + { + await reloadData(); + } + } protected async Task UpdateData() { currRecord = null; @@ -165,11 +201,19 @@ namespace MP.Stats.Pages MessageService.EA_SearchUpdated -= OnSeachUpdated; } - public void OnSeachUpdated() + // public void OnSeachUpdated() + // { + // InvokeAsync(() => + // { + // UpdateData(); + // StateHasChanged(); + // }); + // } + public async void OnSeachUpdated() { - InvokeAsync(() => + await InvokeAsync(() => { - UpdateData(); + Task task = UpdateData(); StateHasChanged(); }); } From 74af622b880ed3c52b507783e5651a6041a44e69 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 24 May 2021 18:44:31 +0200 Subject: [PATCH 130/158] Aggiunto grafico OEE --- MP.Stats/Components/ChartOEE.razor | 2 +- MP.Stats/Components/ChartOEE.razor.cs | 24 ++++++++++++------------ MP.Stats/Pages/Oee.razor.cs | 11 +++++++---- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/MP.Stats/Components/ChartOEE.razor b/MP.Stats/Components/ChartOEE.razor index 25dfe00a..dfd64fad 100644 --- a/MP.Stats/Components/ChartOEE.razor +++ b/MP.Stats/Components/ChartOEE.razor @@ -13,7 +13,7 @@ {
                  • @item.label - @item.value + @item.value.ToString("P1")
                    • }
                  diff --git a/MP.Stats/Components/ChartOEE.razor.cs b/MP.Stats/Components/ChartOEE.razor.cs index 9f6babd2..a705d25f 100644 --- a/MP.Stats/Components/ChartOEE.razor.cs +++ b/MP.Stats/Components/ChartOEE.razor.cs @@ -91,7 +91,7 @@ namespace MP.Stats.Components protected SelectData _currFilter { get; set; } = new SelectData(); - protected List _rawData { get; set; } = new List(); + protected List _rawData { get; set; } = new List(); [Inject] protected MessageService MessageService { get; set; } @@ -108,7 +108,7 @@ namespace MP.Stats.Components #region Public Properties [Parameter] - public List RawData + public List RawData { get => _rawData; set @@ -135,7 +135,7 @@ namespace MP.Stats.Components { var answ = new BarChartDataset { - Label = "Pareto Causali Scarto", + Label = "Pareto OEE Macchine", Data = ParetoData.Select(x => x.value).ToList(), BackgroundColor = backgroundColors(ParetoData.Count, 0.4f), BorderColor = backgroundColors(ParetoData.Count, 1f), @@ -154,12 +154,12 @@ namespace MP.Stats.Components { var answ = new LineChartDataset { - Label = "Numero Scarti Periodo", + Label = "TRS/OEE Periodo", Data = TSData.Select(x => x.Value).ToList(), BorderColor = backgroundColors(1, 1f), Fill = true, PointRadius = 2, - SteppedLine = true, + LineTension = 0, BorderDash = new List { } }; return answ; @@ -176,14 +176,14 @@ namespace MP.Stats.Components if (RawData != null) { ParetoData = RawData - .GroupBy(x => x.Causale) - .Select(y => new ChartKV() { label = y.First().Descrizione, value = y.Sum(c => c.Qta) }) + .GroupBy(x => x.IdxMacchina) + .Select(y => new ChartKV() { label = y.First().IdxMacchina, value = y.Average(c => c.OEE) }) .OrderByDescending(x => x.value) .ToList(); TSData = RawData - .GroupBy(x => x.DataOraRif.Date) - .Select(y => new ChartTS() { TLabel = y.First().DataOraRif.Date, Value = y.Sum(c => c.Qta) }) + .GroupBy(x => x.DataRif.Date) + .Select(y => new ChartTS() { TLabel = y.First().DataRif.Date, Value = y.Average(c => c.OEE) }) .OrderBy(x => x.TLabel) .ToList(); } @@ -201,10 +201,10 @@ namespace MP.Stats.Components protected List backgroundColors(int numRecords, float alpha) { List answ = new List(); - // rosso... + // verde... for (int i = 0; i < numRecords / 3; i++) { - answ.Add(ChartColor.FromRgba(255, 99, 132, alpha)); + answ.Add(ChartColor.FromRgba(54, 235, 82, alpha)); } // arancione for (int i = 0; i < numRecords / 3; i++) @@ -213,7 +213,7 @@ namespace MP.Stats.Components } while (answ.Count < numRecords) { - answ.Add(ChartColor.FromRgba(54, 82, 235, alpha)); + answ.Add(ChartColor.FromRgba(255, 99, 132, alpha)); } return answ; diff --git a/MP.Stats/Pages/Oee.razor.cs b/MP.Stats/Pages/Oee.razor.cs index 69a1f8c6..364c4fae 100644 --- a/MP.Stats/Pages/Oee.razor.cs +++ b/MP.Stats/Pages/Oee.razor.cs @@ -22,6 +22,10 @@ namespace MP.Stats.Pages #region Private Properties + private int _currPage { get; set; } = 1; + + private int _numRecord { get; set; } = 10; + private SelectData currFilter { get @@ -34,10 +38,6 @@ namespace MP.Stats.Pages } } - private int _currPage { get; set; } = 1; - - private int _numRecord { get; set; } = 10; - private int currPage { get => _currPage; @@ -51,7 +51,9 @@ namespace MP.Stats.Pages } } } + private bool isLoading { get; set; } = false; + private int numRecord { get => _numRecord; @@ -171,6 +173,7 @@ namespace MP.Stats.Pages await reloadData(); } } + protected async Task UpdateData() { currRecord = null; From 53d7de1ec8e892f2651fc2d77c51deaa0fb5cb46 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 25 May 2021 12:22:05 +0200 Subject: [PATCH 131/158] bozza script installazione --- AppDeploy.ps1 | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 AppDeploy.ps1 diff --git a/AppDeploy.ps1 b/AppDeploy.ps1 new file mode 100644 index 00000000..b7b16fde --- /dev/null +++ b/AppDeploy.ps1 @@ -0,0 +1,79 @@ +#------------------------------------------------------------------- +# Egalware 2021.05.25 +# +# AppDeploy -AppPool MP.STATS -SourceDir c:\Steamware\installers\MP.STATS -ZipFile MP.STATS.zip -DestDir c:\inetpub\wwwroot\MP\STATS +# +# Powershell script per deploy applicazione Blazor / dotnet core +# +# requisito: modulo powershell x 7zip: +# Set-ExecutionPolicy Bypass -Scope CurrentUser -Force +# Install-Module -Name 7Zip4Powershell +#------------------------------------------------------------------- + +# step 0: lettura variabili +param ( + [Parameter(Mandatory=$true)] + [ValidateNotNull()] + [string]$AppPool = "MP.STATS", + + [Parameter(Mandatory=$true)] + [ValidateNotNull()] + [string]$SourceDir, + + [Parameter(Mandatory=$true)] + [ValidateNotNull()] + [string]$ZipFile, + + [Parameter(Mandatory=$true)] + [ValidateNotNull()] + [string]$DestDir +) + +# recupera timestamp x logging +function Get-TimeStamp +{ + return "[{0:MM/dd/yy} {0:HH:mm:ss}]" -f (Get-Date) +} +# registra log! +function DoLog($txt2log) +{ + Write-Output "$(Get-TimeStamp) $txt2log" | Out-File $filelog -Append +} +# esegue e registra log +function ExecuteLog($txt2log) +{ + Write-Output "-------------------------------------------------------------------------------------------------------------------------------------------------" | Out-File -FilePath "$filelog" -Append + Write-Output "$(Get-TimeStamp) $txt2log" | Out-File -FilePath "$filelog" -Append + Invoke-Expression "$txt2log 2>&1 | Out-File -FilePath $filelog -Append" + if( $LASTEXITCODE -ne 0) + { + Write-Host "Error during cmmand: $txt2log" -ForegroundColor Red ; + Write-Host "Exit...." -ForegroundColor Red ; + Set-Location $PSScriptRoot + exit + } +} +# conf x logging +$filelog = "c:\Steamware\tmp\Script.log" +$utilDir = "c:\Steamware\tmp\" + +Write-Output "-------------------------------- START script --------------------------------" | Out-File $filelog +$StopWatch = New-Object System.Diagnostics.Stopwatch +$StopWatch.Start() + + +# step 1 : stop del pool applicazioni IIS +Write-Host "Stop AppPool" +ExecuteLog "Stop-WebAppPool -Name '$AppPool'" + +# step 2 : unzip +ExecuteLog "Expand-7Zip -ArchiveFileName '$SourceDir\$ZipFile' -TargetPath '$utilDir'" + +# step 3 : replica applicazione +Write-Host "START copy step" +ExecuteLog "robocopy '$utilDir\publish\net5.0\' '$DestDir' /MIR /Z /LOG:C:\tmp\ViewMirror.log /XF logs/*.txt logs/*.log" +Write-Host "END copy step" + +# step 4 : riavvio pool +Write-Host "Start AppPool" +ExecuteLog "Start-WebAppPool -Name '$AppPool'" From a88a06bbcf194b55ab316e2a3fb2bb6a568ae6ee Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 25 May 2021 12:22:18 +0200 Subject: [PATCH 132/158] Conf script x staging e prod (da testare) --- MP.Stats/appsettings.Production.json | 6 ++++-- MP.Stats/appsettings.Staging.json | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/MP.Stats/appsettings.Production.json b/MP.Stats/appsettings.Production.json index 298577c1..305d1b92 100644 --- a/MP.Stats/appsettings.Production.json +++ b/MP.Stats/appsettings.Production.json @@ -8,6 +8,8 @@ } }, "AllowedHosts": "*", - "SherpaBBM": "Data Source=SQL2012DEV;Initial Catalog=SHERPA.BBM;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=Sherpa.BBM;", - "SherpaFatt": "Data Source=SQL2012DEV;Initial Catalog=SHERPA.Fatt;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=Sherpa.BBM;" + "ConnectionStrings": { + "DefaultConnection": "Server=SQL2016DEV;Database=MoonPro_STATS;Trusted_Connection=True;MultipleActiveResultSets=true", + "Mp.Stats": "Server=SQL2016DEV;Database=MoonPro_STATS;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.STATS;" + } } \ No newline at end of file diff --git a/MP.Stats/appsettings.Staging.json b/MP.Stats/appsettings.Staging.json index 298577c1..5b26a9ce 100644 --- a/MP.Stats/appsettings.Staging.json +++ b/MP.Stats/appsettings.Staging.json @@ -1,5 +1,4 @@ { - "DetailedErrors": true, "Logging": { "LogLevel": { "Default": "Trace", @@ -8,6 +7,8 @@ } }, "AllowedHosts": "*", - "SherpaBBM": "Data Source=SQL2012DEV;Initial Catalog=SHERPA.BBM;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=Sherpa.BBM;", - "SherpaFatt": "Data Source=SQL2012DEV;Initial Catalog=SHERPA.Fatt;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=Sherpa.BBM;" + "ConnectionStrings": { + "DefaultConnection": "Server=SQL2016DEV;Database=MoonPro_STATS;Trusted_Connection=True;MultipleActiveResultSets=true", + "Mp.Stats": "Server=SQL2016DEV;Database=MoonPro_STATS;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.STATS;" + } } \ No newline at end of file From 5eb9192a417ce74dec980df05881f56b46373e57 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 25 May 2021 13:05:46 +0200 Subject: [PATCH 133/158] update deploy script --- AppDeploy.ps1 | 49 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/AppDeploy.ps1 b/AppDeploy.ps1 index b7b16fde..871b4322 100644 --- a/AppDeploy.ps1 +++ b/AppDeploy.ps1 @@ -1,7 +1,7 @@ #------------------------------------------------------------------- # Egalware 2021.05.25 # -# AppDeploy -AppPool MP.STATS -SourceDir c:\Steamware\installers\MP.STATS -ZipFile MP.STATS.zip -DestDir c:\inetpub\wwwroot\MP\STATS +# .\AppDeploy.ps1 -AppPool MP.STATS -SourceDir c:\Steamware\installers\MP\STATS -ZipFile MP.STATS.zip -DestDir c:\inetpub\wwwroot\MP\STATS2 # # Powershell script per deploy applicazione Blazor / dotnet core # @@ -29,6 +29,13 @@ param ( [string]$DestDir ) +# conf x logging +$logDir = "c:\Steamware\tmp" +$logFile = "$logDir\Script.log" +$logMirror = "$logDir\Mirror.log" +$utilDir = "c:\Steamware\tmp" +$installDir = "c:\Steamware\installers\" + # recupera timestamp x logging function Get-TimeStamp { @@ -37,14 +44,14 @@ function Get-TimeStamp # registra log! function DoLog($txt2log) { - Write-Output "$(Get-TimeStamp) $txt2log" | Out-File $filelog -Append + Write-Output "$(Get-TimeStamp) $txt2log" | Out-File $logFile -Append } # esegue e registra log function ExecuteLog($txt2log) { - Write-Output "-------------------------------------------------------------------------------------------------------------------------------------------------" | Out-File -FilePath "$filelog" -Append - Write-Output "$(Get-TimeStamp) $txt2log" | Out-File -FilePath "$filelog" -Append - Invoke-Expression "$txt2log 2>&1 | Out-File -FilePath $filelog -Append" + Write-Output "-------------------------------------------------------------------------------------------------------------------------------------------------" | Out-File -FilePath "$logFile" -Append + Write-Output "$(Get-TimeStamp) $txt2log" | Out-File -FilePath "$logFile" -Append + Invoke-Expression "$txt2log 2>&1 | Out-File -FilePath $logFile -Append" if( $LASTEXITCODE -ne 0) { Write-Host "Error during cmmand: $txt2log" -ForegroundColor Red ; @@ -53,27 +60,41 @@ function ExecuteLog($txt2log) exit } } -# conf x logging -$filelog = "c:\Steamware\tmp\Script.log" -$utilDir = "c:\Steamware\tmp\" -Write-Output "-------------------------------- START script --------------------------------" | Out-File $filelog +# fix cartelle... +If (!(test-path $logFile)) +{ + New-Item -ItemType Directory -Force -Path $logDir + New-Item -ItemType File -Force -Path $logFile + New-Item -ItemType File -Force -Path $logMirror +} + +Write-Output "-------------------------------- START script --------------------------------" | Out-File $logFile $StopWatch = New-Object System.Diagnostics.Stopwatch $StopWatch.Start() # step 1 : stop del pool applicazioni IIS -Write-Host "Stop AppPool" -ExecuteLog "Stop-WebAppPool -Name '$AppPool'" +$currState = Get-WebAppPoolState -Name $AppPool +if($currState.value -eq "Started") +{ + Write-Host "Stop AppPool" + ExecuteLog "Stop-WebAppPool -Name '$AppPool'" +} -# step 2 : unzip -ExecuteLog "Expand-7Zip -ArchiveFileName '$SourceDir\$ZipFile' -TargetPath '$utilDir'" +# step 2 : cambio dir + unzip +Write-Host "Unzip" +cd $utilDir +ExecuteLog "7z x ""$SourceDir\$ZipFile"" " # step 3 : replica applicazione Write-Host "START copy step" -ExecuteLog "robocopy '$utilDir\publish\net5.0\' '$DestDir' /MIR /Z /LOG:C:\tmp\ViewMirror.log /XF logs/*.txt logs/*.log" +ExecuteLog "robocopy '$utilDir\publish\net5.0\' '$DestDir' /MIR /Z /LOG:'$logMirror'" Write-Host "END copy step" # step 4 : riavvio pool Write-Host "Start AppPool" ExecuteLog "Start-WebAppPool -Name '$AppPool'" + +# step 5 : fix dir originale +cd $installDir \ No newline at end of file From e32bcca1ce3ecdd99b37e74296b3892423ea8025 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 25 May 2021 16:41:42 +0200 Subject: [PATCH 134/158] Aggiunta profili compilazione --- .../PublishProfiles/FolderProfile.pubxml | 16 ++++++++++++++ .../PublishProfiles/FolderProfile.pubxml.user | 10 +++++++++ .../PublishProfiles/IIS01.pubxml.user | 12 +++++++++++ .../PublishProfiles/IIS02.pubxml.user | 11 ++++++++++ .../PublishProfiles/IISProfile.pubxml | 21 +++++++++++++++++++ .../PublishProfiles/IISProfile.pubxml.user | 11 ++++++++++ .../W2019-IIS-DEVProfile.pubxml.user | 12 +++++++++++ 7 files changed, 93 insertions(+) create mode 100644 MP.Stats/Properties/PublishProfiles/FolderProfile.pubxml create mode 100644 MP.Stats/Properties/PublishProfiles/FolderProfile.pubxml.user create mode 100644 MP.Stats/Properties/PublishProfiles/IIS01.pubxml.user create mode 100644 MP.Stats/Properties/PublishProfiles/IIS02.pubxml.user create mode 100644 MP.Stats/Properties/PublishProfiles/IISProfile.pubxml create mode 100644 MP.Stats/Properties/PublishProfiles/IISProfile.pubxml.user create mode 100644 MP.Stats/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml.user diff --git a/MP.Stats/Properties/PublishProfiles/FolderProfile.pubxml b/MP.Stats/Properties/PublishProfiles/FolderProfile.pubxml new file mode 100644 index 00000000..cb2062ae --- /dev/null +++ b/MP.Stats/Properties/PublishProfiles/FolderProfile.pubxml @@ -0,0 +1,16 @@ + + + + + False + False + True + Release + Any CPU + FileSystem + bin\publish\net5.0\ + FileSystem + + \ No newline at end of file diff --git a/MP.Stats/Properties/PublishProfiles/FolderProfile.pubxml.user b/MP.Stats/Properties/PublishProfiles/FolderProfile.pubxml.user new file mode 100644 index 00000000..a8c8c11f --- /dev/null +++ b/MP.Stats/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -0,0 +1,10 @@ + + + + + <_PublishTargetUrl>C:\Users\samuele\source\repos\MAPO-CORE\MP.Stats\bin\publish\net5.0\ + True|2021-05-25T06:38:44.6280246Z; + + \ No newline at end of file diff --git a/MP.Stats/Properties/PublishProfiles/IIS01.pubxml.user b/MP.Stats/Properties/PublishProfiles/IIS01.pubxml.user new file mode 100644 index 00000000..7c96d8bb --- /dev/null +++ b/MP.Stats/Properties/PublishProfiles/IIS01.pubxml.user @@ -0,0 +1,12 @@ + + + + + + AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA+11nhJeDSkeTlSej+COD3AAAAAACAAAAAAADZgAAwAAAABAAAACFCXZ0UR7Czo59aaRCHU5QAAAAAASAAACgAAAAEAAAACYlKt9E6s77uEikpKwyhdQYAAAAUwae989LovFbsfjRp69HCVpyUQZbqLyYFAAAAMW8mLSAxWmKaOvB4nkDgUpS27/b + True|2021-05-25T14:26:34.1426996Z;True|2021-05-25T16:14:28.2842402+02:00;True|2021-05-25T15:02:11.7131495+02:00; + + \ No newline at end of file diff --git a/MP.Stats/Properties/PublishProfiles/IIS02.pubxml.user b/MP.Stats/Properties/PublishProfiles/IIS02.pubxml.user new file mode 100644 index 00000000..8d468c51 --- /dev/null +++ b/MP.Stats/Properties/PublishProfiles/IIS02.pubxml.user @@ -0,0 +1,11 @@ + + + + + + AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA+11nhJeDSkeTlSej+COD3AAAAAACAAAAAAADZgAAwAAAABAAAAB3zVMW24A4himhWJ5CNqgeAAAAAASAAACgAAAAEAAAAA7IL1n8zHn2/ljDNL4/zlsYAAAAgAEg9RYKHV0xl3wnafZiN9Q954GOBAvdFAAAACSBJkwDndNTiIrUuk7zJls84fN1 + + \ No newline at end of file diff --git a/MP.Stats/Properties/PublishProfiles/IISProfile.pubxml b/MP.Stats/Properties/PublishProfiles/IISProfile.pubxml new file mode 100644 index 00000000..7159a5db --- /dev/null +++ b/MP.Stats/Properties/PublishProfiles/IISProfile.pubxml @@ -0,0 +1,21 @@ + + + + + Package + Release + Any CPU + + True + False + d9901b50-e61c-400c-b62c-fa060cf72c29 + bin\publish\MP.Stats.zip + true + Default Web Site/MP/STATS + net5.0 + false + + \ No newline at end of file diff --git a/MP.Stats/Properties/PublishProfiles/IISProfile.pubxml.user b/MP.Stats/Properties/PublishProfiles/IISProfile.pubxml.user new file mode 100644 index 00000000..fee355b9 --- /dev/null +++ b/MP.Stats/Properties/PublishProfiles/IISProfile.pubxml.user @@ -0,0 +1,11 @@ + + + + + + True|2021-05-25T14:38:26.4142377Z; + + \ No newline at end of file diff --git a/MP.Stats/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml.user b/MP.Stats/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml.user new file mode 100644 index 00000000..409c9155 --- /dev/null +++ b/MP.Stats/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml.user @@ -0,0 +1,12 @@ + + + + + + AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA+11nhJeDSkeTlSej+COD3AAAAAACAAAAAAADZgAAwAAAABAAAADHiGtCyOetOyeT2xaFL+NDAAAAAASAAACgAAAAEAAAAAuYw1PbVDVdZhloQ7eVuTsYAAAAfA8iFmY49U48HUeRwWwQNsvZg5FRMf9SFAAAACB+0njgnTZ+1teEqoJcNV16idHL + True|2021-05-24T16:44:45.5388713Z;True|2021-05-24T18:23:50.6056375+02:00;True|2021-05-24T18:01:51.1166144+02:00;True|2021-05-24T17:07:21.6348703+02:00;True|2021-05-24T17:07:10.8304877+02:00;True|2021-05-24T11:12:19.8440009+02:00;True|2021-05-24T11:12:08.1362921+02:00;True|2021-05-22T12:03:42.2864462+02:00;True|2021-05-21T19:54:05.6348108+02:00;False|2021-05-21T19:53:46.2134560+02:00;True|2021-05-21T08:11:55.5022811+02:00;True|2021-05-20T19:40:34.2462833+02:00;True|2021-05-20T19:40:10.3931366+02:00;True|2021-05-20T17:27:02.9543079+02:00;True|2021-05-20T16:59:12.4323448+02:00;True|2021-05-20T16:58:55.5021812+02:00;False|2021-05-20T16:58:03.5161910+02:00;True|2021-05-19T19:28:03.8104716+02:00;True|2021-05-18T19:48:52.9083044+02:00;True|2021-05-18T18:15:50.2374168+02:00;True|2021-05-18T18:06:20.0997789+02:00;True|2021-05-18T14:56:33.7479984+02:00;True|2021-05-17T17:03:39.9822588+02:00;True|2021-05-17T16:33:53.4419457+02:00;True|2021-05-17T16:33:10.5405414+02:00;False|2021-05-17T16:30:04.8648550+02:00;False|2021-05-17T16:29:49.5085445+02:00; + + \ No newline at end of file From 0938c77d39725312df5dc8775cf5f25cad864e7c Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 25 May 2021 16:41:51 +0200 Subject: [PATCH 135/158] update profilo IIS01 x testing --- MP.Stats/Properties/PublishProfiles/IIS01.pubxml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MP.Stats/Properties/PublishProfiles/IIS01.pubxml b/MP.Stats/Properties/PublishProfiles/IIS01.pubxml index ac3c88c6..1c99fe68 100644 --- a/MP.Stats/Properties/PublishProfiles/IIS01.pubxml +++ b/MP.Stats/Properties/PublishProfiles/IIS01.pubxml @@ -15,7 +15,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt d9901b50-e61c-400c-b62c-fa060cf72c29 false https://IIS01:8172/MsDeploy.axd - Default Web Site/MP/STATS + Default Web Site/MP/STATS4 False WMSVC From b7cba4236c405b1bc454daa68883370f1a00cd1d Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 25 May 2021 16:42:04 +0200 Subject: [PATCH 136/158] fix async diario --- MP.Stats/Pages/Diario.razor.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MP.Stats/Pages/Diario.razor.cs b/MP.Stats/Pages/Diario.razor.cs index aff832fd..7d658435 100644 --- a/MP.Stats/Pages/Diario.razor.cs +++ b/MP.Stats/Pages/Diario.razor.cs @@ -158,11 +158,11 @@ namespace MP.Stats.Pages MessageService.EA_SearchUpdated -= OnSeachUpdated; } - public void OnSeachUpdated() + public async void OnSeachUpdated() { - InvokeAsync(() => + await InvokeAsync(() => { - UpdateData(); + Task task = UpdateData(); StateHasChanged(); }); } From 95914aa9f7ae2d6133ee481187a6812f1253b755 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 25 May 2021 16:42:13 +0200 Subject: [PATCH 137/158] Aggiunta elmah nel progetto (in RAM) --- MP.Stats/MP.Stats.csproj | 3 +++ MP.Stats/Startup.cs | 15 +++++++++++++++ MP.Stats/appsettings.Production.json | 4 ++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index b775dfbc..a9dd7834 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -35,6 +35,9 @@ + + + diff --git a/MP.Stats/Startup.cs b/MP.Stats/Startup.cs index ce61a417..4de03884 100644 --- a/MP.Stats/Startup.cs +++ b/MP.Stats/Startup.cs @@ -1,3 +1,5 @@ +using ElmahCore.Mvc; +using ElmahCore.Sql; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Hosting; @@ -62,6 +64,11 @@ namespace MP.Stats FallBackToParentCultures = false }); CultureInfo.DefaultThreadCurrentCulture = CultureInfo.CreateSpecificCulture("it-IT"); + + // Registrazione Elmah: + // https://github.com/ElmahCore/ElmahCore + app.UseElmah(); + app.UseHttpsRedirection(); app.UseStaticFiles(); @@ -85,6 +92,14 @@ namespace MP.Stats .AddBootstrapProviders() .AddFontAwesomeIcons(); + // Elmah + services.AddElmah(); + //string elmaConn = "Data Source=SQL2016DEV;Initial Catalog=Elmah;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=SHERPA.BBM;"; + //services.AddElmah(options => + //{ + // options.ConnectionString = elmaConn; + //}); + services.AddStackExchangeRedisCache(options => { options.Configuration = "localhost:6379"; diff --git a/MP.Stats/appsettings.Production.json b/MP.Stats/appsettings.Production.json index 305d1b92..a3a64aa0 100644 --- a/MP.Stats/appsettings.Production.json +++ b/MP.Stats/appsettings.Production.json @@ -9,7 +9,7 @@ }, "AllowedHosts": "*", "ConnectionStrings": { - "DefaultConnection": "Server=SQL2016DEV;Database=MoonPro_STATS;Trusted_Connection=True;MultipleActiveResultSets=true", - "Mp.Stats": "Server=SQL2016DEV;Database=MoonPro_STATS;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.STATS;" + "DefaultConnection": "Server=localhost\\SQLEXPRESS;Database=MoonPro_STATS;Trusted_Connection=True;MultipleActiveResultSets=true", + "Mp.Stats": "Server=localhost\\SQLEXPRESS;Database=MoonPro_STATS;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.STATS;" } } \ No newline at end of file From 3491974cb7305a96ffc39da9552755e1c5baed16 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 25 May 2021 18:12:32 +0200 Subject: [PATCH 138/158] Update config, funziona... --- MP.Stats/Properties/PublishProfiles/IIS01.pubxml | 2 +- MP.Stats/Properties/PublishProfiles/IIS01.pubxml.user | 2 +- .../Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml.user | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MP.Stats/Properties/PublishProfiles/IIS01.pubxml b/MP.Stats/Properties/PublishProfiles/IIS01.pubxml index 1c99fe68..ac3c88c6 100644 --- a/MP.Stats/Properties/PublishProfiles/IIS01.pubxml +++ b/MP.Stats/Properties/PublishProfiles/IIS01.pubxml @@ -15,7 +15,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt d9901b50-e61c-400c-b62c-fa060cf72c29 false https://IIS01:8172/MsDeploy.axd - Default Web Site/MP/STATS4 + Default Web Site/MP/STATS False WMSVC diff --git a/MP.Stats/Properties/PublishProfiles/IIS01.pubxml.user b/MP.Stats/Properties/PublishProfiles/IIS01.pubxml.user index 7c96d8bb..8ebe8fe3 100644 --- a/MP.Stats/Properties/PublishProfiles/IIS01.pubxml.user +++ b/MP.Stats/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+sBAAAA+11nhJeDSkeTlSej+COD3AAAAAACAAAAAAADZgAAwAAAABAAAACFCXZ0UR7Czo59aaRCHU5QAAAAAASAAACgAAAAEAAAACYlKt9E6s77uEikpKwyhdQYAAAAUwae989LovFbsfjRp69HCVpyUQZbqLyYFAAAAMW8mLSAxWmKaOvB4nkDgUpS27/b - True|2021-05-25T14:26:34.1426996Z;True|2021-05-25T16:14:28.2842402+02:00;True|2021-05-25T15:02:11.7131495+02:00; + True|2021-05-25T15:48:33.3901785Z;True|2021-05-25T17:46:09.2063020+02:00;True|2021-05-25T17:42:47.8167539+02:00;True|2021-05-25T17:22:03.1877438+02:00;True|2021-05-25T17:21:05.1565775+02:00;True|2021-05-25T16:26:34.1426996+02:00;True|2021-05-25T16:14:28.2842402+02:00;True|2021-05-25T15:02:11.7131495+02:00; \ No newline at end of file diff --git a/MP.Stats/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml.user b/MP.Stats/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml.user index 409c9155..0ee5e6ce 100644 --- a/MP.Stats/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml.user +++ b/MP.Stats/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml.user @@ -7,6 +7,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA+11nhJeDSkeTlSej+COD3AAAAAACAAAAAAADZgAAwAAAABAAAADHiGtCyOetOyeT2xaFL+NDAAAAAASAAACgAAAAEAAAAAuYw1PbVDVdZhloQ7eVuTsYAAAAfA8iFmY49U48HUeRwWwQNsvZg5FRMf9SFAAAACB+0njgnTZ+1teEqoJcNV16idHL - True|2021-05-24T16:44:45.5388713Z;True|2021-05-24T18:23:50.6056375+02:00;True|2021-05-24T18:01:51.1166144+02:00;True|2021-05-24T17:07:21.6348703+02:00;True|2021-05-24T17:07:10.8304877+02:00;True|2021-05-24T11:12:19.8440009+02:00;True|2021-05-24T11:12:08.1362921+02:00;True|2021-05-22T12:03:42.2864462+02:00;True|2021-05-21T19:54:05.6348108+02:00;False|2021-05-21T19:53:46.2134560+02:00;True|2021-05-21T08:11:55.5022811+02:00;True|2021-05-20T19:40:34.2462833+02:00;True|2021-05-20T19:40:10.3931366+02:00;True|2021-05-20T17:27:02.9543079+02:00;True|2021-05-20T16:59:12.4323448+02:00;True|2021-05-20T16:58:55.5021812+02:00;False|2021-05-20T16:58:03.5161910+02:00;True|2021-05-19T19:28:03.8104716+02:00;True|2021-05-18T19:48:52.9083044+02:00;True|2021-05-18T18:15:50.2374168+02:00;True|2021-05-18T18:06:20.0997789+02:00;True|2021-05-18T14:56:33.7479984+02:00;True|2021-05-17T17:03:39.9822588+02:00;True|2021-05-17T16:33:53.4419457+02:00;True|2021-05-17T16:33:10.5405414+02:00;False|2021-05-17T16:30:04.8648550+02:00;False|2021-05-17T16:29:49.5085445+02:00; + True|2021-05-25T14:56:57.0194126Z;True|2021-05-24T18:44:45.5388713+02:00;True|2021-05-24T18:23:50.6056375+02:00;True|2021-05-24T18:01:51.1166144+02:00;True|2021-05-24T17:07:21.6348703+02:00;True|2021-05-24T17:07:10.8304877+02:00;True|2021-05-24T11:12:19.8440009+02:00;True|2021-05-24T11:12:08.1362921+02:00;True|2021-05-22T12:03:42.2864462+02:00;True|2021-05-21T19:54:05.6348108+02:00;False|2021-05-21T19:53:46.2134560+02:00;True|2021-05-21T08:11:55.5022811+02:00;True|2021-05-20T19:40:34.2462833+02:00;True|2021-05-20T19:40:10.3931366+02:00;True|2021-05-20T17:27:02.9543079+02:00;True|2021-05-20T16:59:12.4323448+02:00;True|2021-05-20T16:58:55.5021812+02:00;False|2021-05-20T16:58:03.5161910+02:00;True|2021-05-19T19:28:03.8104716+02:00;True|2021-05-18T19:48:52.9083044+02:00;True|2021-05-18T18:15:50.2374168+02:00;True|2021-05-18T18:06:20.0997789+02:00;True|2021-05-18T14:56:33.7479984+02:00;True|2021-05-17T17:03:39.9822588+02:00;True|2021-05-17T16:33:53.4419457+02:00;True|2021-05-17T16:33:10.5405414+02:00;False|2021-05-17T16:30:04.8648550+02:00;False|2021-05-17T16:29:49.5085445+02:00; \ No newline at end of file From 56a02fe574396094a4bd94096e1c5d3ebe8c2782 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 25 May 2021 18:22:02 +0200 Subject: [PATCH 139/158] primo commit CI-CD --- .gitlab-ci.yml | 237 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 237 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..fb6da2a2 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,237 @@ +variables: + NUGET_PATH: 'C:\Tools\nuget.exe' +# MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe' +# ASPNET_MERGE_PATH: 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools' + EXE_RELEASE_FOLDER: 'c:\Projetcs\Compiled\GPW\Release' + DEPLOY_FOLDER: 'c:\Projects\Deploy\GPW\Builds' + VERS_MAIN: '1.0' + NEW_REL: '' + +# helper x fix pacchetti nuget da repo locale nexus.steamware.net +.nuget-fix: &nuget-fix + - | + $hasSource = C:\Tools\nuget.exe sources list | find "`"Steamware Nexus`"" /C + if ($hasSource -eq 0) { + C:\Tools\nuget.exe sources Add -Name "`"Steamware Nexus`"" -Source http://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`"" + } else { + C:\Tools\nuget.exe sources Update -Name "`"Steamware Nexus`"" -Source http://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`"" + } + echo $hasSource + +# helper x fix version number +.version-fix: &version-fix + - | + $env:NEW_REL = $env:VERS_MAIN+"."+(get-date –format yyMM)+"."+$CI_PIPELINE_IID + echo "Set vers: $env:NEW_REL" + $contenuto = Get-Content -path 'VersGen\GPW.cs' -Raw + $newContenuto = $contenuto -replace '0.0.0.0', $env:NEW_REL + $newContenuto | Set-Content -Path 'VersGen\GPW.cs' + +stages: + - build + - test + - release + +build: + stage: build + script: + - dotnet build + +# test: +# stage: test +# script: +# - dotnet test + +# release: +# stage: release +# only: +# - master +# artifacts: +# paths: +# - publish/ +# script: +# - dotnet publish -c Release -o ../publish MyApp/MyApp.csproj + + + +# stages: +# - build +# - staging +# - deploy +# - installer + + +# AC:build: +# stage: build +# before_script: +# - *nuget-fix +# - '& "$env:NUGET_PATH" restore GPW.sln' # path alla solution corrente +# - *version-fix +# script: +# - '& "$env:MSBUILD_PATH" GPW_Admin/GPW_Admin.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' + +# - '& "$env:MSBUILD_PATH" GPW_Commesse/GPW_Commesse.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' +# # \ cache: +# # #key: ${CI_COMMIT_REF_SLUG} +# # # key: ${CI_JOB_NAME} +# # key: GPW-pack +# # paths: +# # - packages/ +# # artifacts: +# # expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on +# # paths: +# # # - '$env:EXE_RELEASE_FOLDER\YourApp.exe' # saving exe to copy to deploy folder +# # # - '$env:MSI_RELEASE_FOLDER\YourApp Setup.msi' # saving msi to copy to deploy folder +# # # - '$env:TEST_FOLDER\' # saving entire Test project so NUnit can run tests +# # - '$env:EXE_RELEASE_FOLDER\GPW_Barcode\' # saving entire Test project so NUnit can run tests +# # - '$env:DEPLOY_FOLDER\GPW_Barcode\' # saving entire Test project so NUnit can run tests + +# BHS:build: +# stage: build +# before_script: +# - *nuget-fix +# - '& "$env:NUGET_PATH" restore GPW.sln' +# - *version-fix +# script: +# - '& "$env:MSBUILD_PATH" GPW_Barcode/GPW_Barcode.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' +# - '& "$env:MSBUILD_PATH" HOME/HOME.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' +# - '& "$env:MSBUILD_PATH" GPW_Smart/GPW_Smart.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' + + +# # test_job: +# # stage: test +# # only: +# # - tags +# # script: +# # - '& "$env:NUNIT_PATH" ".\$env:TEST_FOLDER\Tests.dll"' # running NUnit tests +# # artifacts: +# # when: always # save test results even when the task fails +# # expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on +# # paths: +# # - '.\TestResult.xml' # saving NUnit results to copy to deploy folder +# # dependencies: +# # - build_job + + +# AC:staging: +# stage: staging +# rules: +# - if: '$CI_COMMIT_BRANCH == "develop"' +# before_script: +# - *nuget-fix +# - '& "$env:NUGET_PATH" restore GPW.sln' +# - *version-fix +# script: +# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Admin/GPW_Admin.csproj' +# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Commesse/GPW_Commesse.csproj' +# # cache: +# # #key: ${CI_COMMIT_REF_SLUG} +# # # key: ${CI_JOB_NAME} +# # key: GPW-pack +# # paths: +# # - packages/ +# # policy: pull +# needs: ["AC:build"] +# # when: +# # manual + +# BHS:staging: +# stage: staging +# rules: +# - if: '$CI_COMMIT_BRANCH == "develop"' +# before_script: +# - *nuget-fix +# - '& "$env:NUGET_PATH" restore GPW.sln' +# - *version-fix +# script: +# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Barcode/GPW_Barcode.csproj' +# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal HOME/HOME.csproj' +# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Smart/GPW_Smart.csproj' +# needs: ["BHS:build"] + + +# AC:deploy: +# stage: deploy +# rules: +# - if: '$CI_COMMIT_BRANCH == "master"' +# before_script: +# - *nuget-fix +# - '& "$env:NUGET_PATH" restore GPW.sln' +# - *version-fix +# script: +# # ----ADMIN ---- +# # IIS 02 +# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Admin/GPW_Admin.csproj' +# # IIS DEV +# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IISDEV.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Admin/GPW_Admin.csproj' +# # ----Commesse ---- +# # IIS 02 +# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Commesse/GPW_Commesse.csproj' +# # IIS DEV +# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IISDEV.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Commesse/GPW_Commesse.csproj' +# needs: ["AC:build"] +# # when: +# # manual + +# BHS:deploy: +# stage: deploy +# rules: +# - if: '$CI_COMMIT_BRANCH == "master"' +# before_script: +# - *nuget-fix +# - '& "$env:NUGET_PATH" restore GPW.sln' +# - *version-fix +# script: +# # ----BCode ---- +# # IIS 02 +# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Barcode/GPW_Barcode.csproj' +# # IIS DEV +# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IISDEV.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Barcode/GPW_Barcode.csproj' +# # ---- HOME ---- +# # IIS 02 +# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal HOME/HOME.csproj' +# # IIS DEV +# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IISDEV.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal HOME/HOME.csproj' +# # ---- SMART ---- +# # IIS 02 +# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Smart/GPW_Smart.csproj' +# # IIS DEV +# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IISDEV.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Smart/GPW_Smart.csproj' +# needs: ["BHS:build"] + +# AC:install: +# stage: installer +# rules: +# - if: '$CI_COMMIT_BRANCH == "master"' +# when: manual +# # only: +# # - tags # the build process will only be started by git tag commits +# before_script: +# - *nuget-fix +# - '& "$env:NUGET_PATH" restore GPW.sln' +# - *version-fix +# script: +# # Admin ZIP package +# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$env:NEW_REL/GPW_Admin.zip /p:DeployIisAppPath="Default Web Site/GPW/ADMIN" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GPW_Admin/GPW_Admin.csproj' +# # Commesse ZIP package +# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$env:NEW_REL/GPW_Commesse.zip /p:DeployIisAppPath="Default Web Site/GPW/ADMIN" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GPW_Commesse/GPW_Commesse.csproj' +# needs: ["AC:build"] + + +# BHS:install: +# stage: installer +# rules: +# - if: '$CI_COMMIT_BRANCH == "master"' +# when: manual +# before_script: +# - *nuget-fix +# - '& "$env:NUGET_PATH" restore GPW.sln' +# - *version-fix +# script: +# # BCode ZIP package +# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$env:NEW_REL/GPW_Barcode.zip /p:DeployIisAppPath="Default Web Site/GPW/ADMIN" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GPW_Barcode/GPW_Barcode.csproj' +# # HOME ZIP package +# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$env:NEW_REL/HOME.zip /p:DeployIisAppPath="Default Web Site/GPW/ADMIN" /p:PackageAsSingleFile=True /p:OutputPath=bin/ HOME/HOME.csproj' +# # ZIP package +# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$env:NEW_REL/GPW_Smart.zip /p:DeployIisAppPath="Default Web Site/GPW/ADMIN" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GPW_Smart/GPW_Smart.csproj' +# needs: ["BHS:build"] From 43d5069f421720b32ad95afc0634bd7a3b42db35 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 25 May 2021 18:38:25 +0200 Subject: [PATCH 140/158] Aggiunta fase test x CI/CD --- .gitlab-ci.yml | 8 ++++---- README.md | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb6da2a2..6fcc244c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,10 +37,10 @@ build: script: - dotnet build -# test: -# stage: test -# script: -# - dotnet test +test: + stage: test + script: + - dotnet test # release: # stage: release diff --git a/README.md b/README.md index 3b441b0c..56279eb3 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ # MAPO-CORE -MAPO dotNet Core Web Project, repository progetti next gen su Blazor & co \ No newline at end of file +MAPO dotNet Core Web Project, repository progetti next gen su Blazor & co + +Applicazione multipiattaforma (gira su win, mac, linux), tramite IIS o altro. + +## Installazione + +Vedere pagina wiki x blazor: https://wiki.steamware.net/doku.php?id=blazor \ No newline at end of file From aa94b5904ab4b8d60d8411c22d87cc10ceb7fe0a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 25 May 2021 18:41:51 +0200 Subject: [PATCH 141/158] Aggiunta fase di release (test preliminare) --- .gitlab-ci.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6fcc244c..5dd9da90 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,15 +42,16 @@ test: script: - dotnet test -# release: -# stage: release -# only: -# - master -# artifacts: -# paths: -# - publish/ -# script: -# - dotnet publish -c Release -o ../publish MyApp/MyApp.csproj +release: + stage: release + only: + - Deploy_CI_CD + # - master + artifacts: + paths: + - publish/ + script: + - dotnet publish -c Release -o ../publish MP.Stats/MP.Stats.csproj From c6fcebcd75d937f173fc0d3afa84f36d30d9e486 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 25 May 2021 18:44:46 +0200 Subject: [PATCH 142/158] correzione ramo x release --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5dd9da90..3174b4d3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,7 +45,7 @@ test: release: stage: release only: - - Deploy_CI_CD + - feature/Deploy_CI_CD # - master artifacts: paths: From e786a10511a3bc75b5b51b281ec81eda89cfaaf2 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 25 May 2021 18:53:41 +0200 Subject: [PATCH 143/158] modifica posizione pubblicazione file --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3174b4d3..c04bec27 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,6 +39,8 @@ build: test: stage: test + only: + - develop script: - dotnet test @@ -51,7 +53,7 @@ release: paths: - publish/ script: - - dotnet publish -c Release -o ../publish MP.Stats/MP.Stats.csproj + - dotnet publish -c Release -o ./publish MP.Stats/MP.Stats.csproj From 4b526ad4d8df919f5d567dbc2521e0180a93b8f0 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 25 May 2021 19:37:28 +0200 Subject: [PATCH 144/158] Update script versione --- .gitlab-ci.yml | 38 +++++++++++++++++---------------- MP.Stats/MP.Stats.csproj | 8 +++++-- MP.Stats/Pages/_Host.cshtml.bak | 35 ------------------------------ 3 files changed, 26 insertions(+), 55 deletions(-) delete mode 100644 MP.Stats/Pages/_Host.cshtml.bak diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c04bec27..4d139c8a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,9 @@ variables: - NUGET_PATH: 'C:\Tools\nuget.exe' +# NUGET_PATH: 'C:\Tools\nuget.exe' # MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe' # ASPNET_MERGE_PATH: 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools' - EXE_RELEASE_FOLDER: 'c:\Projetcs\Compiled\GPW\Release' - DEPLOY_FOLDER: 'c:\Projects\Deploy\GPW\Builds' +# EXE_RELEASE_FOLDER: 'c:\Projetcs\Compiled\GPW\Release' +# DEPLOY_FOLDER: 'c:\Projects\Deploy\GPW\Builds' VERS_MAIN: '1.0' NEW_REL: '' @@ -18,21 +18,29 @@ variables: } echo $hasSource -# helper x fix version number -.version-fix: &version-fix - - | - $env:NEW_REL = $env:VERS_MAIN+"."+(get-date –format yyMM)+"."+$CI_PIPELINE_IID - echo "Set vers: $env:NEW_REL" - $contenuto = Get-Content -path 'VersGen\GPW.cs' -Raw - $newContenuto = $contenuto -replace '0.0.0.0', $env:NEW_REL - $newContenuto | Set-Content -Path 'VersGen\GPW.cs' +# # helper x fix version number +# .version-fix: &version-fix +# - | +# $env:NEW_REL = $env:VERS_MAIN+"."+(get-date –format yyMM)+"."+$CI_PIPELINE_IID +# echo "Set vers: $env:NEW_REL" +# $contenuto = Get-Content -path 'VersGen\GPW.cs' -Raw +# $newContenuto = $contenuto -replace '0.0.0.0', $env:NEW_REL +# $newContenuto | Set-Content -Path 'VersGen\GPW.cs' stages: - build - test - release +# - staging +# - deploy +# - installer build: + stage: build + before_script: + - *nuget-fix + - dotnet restore + # - *version-fix stage: build script: - dotnet build @@ -48,7 +56,7 @@ release: stage: release only: - feature/Deploy_CI_CD - # - master + - master artifacts: paths: - publish/ @@ -57,12 +65,6 @@ release: -# stages: -# - build -# - staging -# - deploy -# - installer - # AC:build: # stage: build diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index a9dd7834..bd8ec4ec 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -1,9 +1,10 @@ - + net5.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 + 1.0.0.0 @@ -46,4 +47,7 @@ PreserveNewest - \ No newline at end of file + + + + diff --git a/MP.Stats/Pages/_Host.cshtml.bak b/MP.Stats/Pages/_Host.cshtml.bak deleted file mode 100644 index 8c6accba..00000000 --- a/MP.Stats/Pages/_Host.cshtml.bak +++ /dev/null @@ -1,35 +0,0 @@ -@page "/" -@namespace MP.Stats.Pages -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers -@{ - Layout = null; -} - - - - - - - MP-STATS - - - - - - - - -
                  - - An error has occurred. This application may no longer respond until reloaded. - - - An unhandled exception has occurred. See browser dev tools for details. - - Reload - 🗙 -
                  - - - - From c32240653b6548d782c290643a5100870c264595 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 25 May 2021 19:42:20 +0200 Subject: [PATCH 145/158] fix yml indent --- .gitlab-ci.yml | 16 +++------------- MP.Stats/MP.Stats.csproj | 2 +- MP.Stats/post-build.ps1 | 2 +- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4d139c8a..426917e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,14 +18,6 @@ variables: } echo $hasSource -# # helper x fix version number -# .version-fix: &version-fix -# - | -# $env:NEW_REL = $env:VERS_MAIN+"."+(get-date –format yyMM)+"."+$CI_PIPELINE_IID -# echo "Set vers: $env:NEW_REL" -# $contenuto = Get-Content -path 'VersGen\GPW.cs' -Raw -# $newContenuto = $contenuto -replace '0.0.0.0', $env:NEW_REL -# $newContenuto | Set-Content -Path 'VersGen\GPW.cs' stages: - build @@ -36,12 +28,10 @@ stages: # - installer build: - stage: build - before_script: - - *nuget-fix - - dotnet restore - # - *version-fix stage: build + before_script: + - *nuget-fix + - dotnet restore script: - dotnet build diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index bd8ec4ec..dd1c46ad 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -4,7 +4,7 @@ net5.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 - 1.0.0.0 + 1.0.2105.2519 diff --git a/MP.Stats/post-build.ps1 b/MP.Stats/post-build.ps1 index 625f16ba..dc0fc8e1 100644 --- a/MP.Stats/post-build.ps1 +++ b/MP.Stats/post-build.ps1 @@ -2,7 +2,7 @@ $MajMin="1.0." $currentDate = get-date -format yyMM; -$currentTime = get-date -format HHmm; +$currentTime = get-date -format ddHH; $find = "(.|\n)*?"; $replace = "" + $MajMin + $currentDate +"." + $currentTime + ""; $csproj = Get-Content $ProjectPath From 7139e722ca35eb2c74dc2f693b1cf3c1afe39008 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 25 May 2021 19:45:35 +0200 Subject: [PATCH 146/158] Aggiunto stage needs x precedenze --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 426917e5..f859d85d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,6 +39,7 @@ test: stage: test only: - develop + needs: ["build"] script: - dotnet test @@ -47,6 +48,7 @@ release: only: - feature/Deploy_CI_CD - master + needs: ["build"] artifacts: paths: - publish/ From 84672fbd7d507cae59ba34b86f6113848c2f4eea Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 26 May 2021 19:43:08 +0200 Subject: [PATCH 147/158] Aggiunto logging e misura tempi recupero dati --- MP.Data/Controllers/MpStatsController.cs | 8 ++++- MP.Stats/Data/MpStatsService.cs | 40 ++++++++++++++++++++- MP.Stats/MP.Stats.csproj | 3 +- MP.Stats/NLog.config | 46 ++++++++++++++++++++++++ MP.Stats/Program.cs | 40 +++++++++++++++++---- MP.Stats/Startup.cs | 15 +++----- 6 files changed, 132 insertions(+), 20 deletions(-) create mode 100644 MP.Stats/NLog.config diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index 8a01f41f..d02a1c02 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -27,7 +27,7 @@ namespace MP.Data.Controllers { _configuration = configuration; dbCtx = new MoonPro_STATSContext(configuration); - Log.Info("Avviata classe MpStatsController.MpStatsController"); + Log.Info("Avviata classe MpStatsController"); } #endregion Public Constructors @@ -111,6 +111,12 @@ namespace MP.Data.Controllers return dbResult; } + public void ResetController() + { + dbCtx = new MoonPro_STATSContext(_configuration); + Log.Info("Effettuato reset MpStatsController"); + } + /// /// Annulla modifiche su una specifica entity (cancel update) /// diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 659d7a45..123f1a8f 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -10,6 +10,8 @@ using MP.Data; using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Caching.Memory; using Newtonsoft.Json; +using System.Diagnostics; +using NLog; namespace MP.Stats.Data { @@ -21,6 +23,7 @@ namespace MP.Stats.Data private static ILogger _logger; private static List ActionsList = new List(); + private static NLog.Logger Log = LogManager.GetCurrentClassLogger(); private readonly IDistributedCache distributedCache; private readonly IMemoryCache memoryCache; @@ -31,7 +34,7 @@ namespace MP.Stats.Data /// /// Durata della cache in modalità inattiva (non acceduta) prima di venire rimossa - /// NON estende oltre il tempo massimo di validità Abs della cache + /// NON estende oltre il tempo massimo di validità della cache (chAbsExp) /// private int chSliExp = 5; @@ -116,10 +119,15 @@ namespace MP.Stats.Data } else { + Stopwatch stopWatch = new Stopwatch(); + stopWatch.Start(); dbResult = dbController.ActionsGetAll(); rawData = JsonConvert.SerializeObject(dbResult); redisDataList = Encoding.UTF8.GetBytes(rawData); await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt); + stopWatch.Stop(); + TimeSpan ts = stopWatch.Elapsed; + Log.Info($"Effettuata lettura da DB + caching per AzioniUL: {ts.TotalMilliseconds} ms"); } return await Task.FromResult(dbResult); } @@ -187,10 +195,15 @@ namespace MP.Stats.Data } else { + Stopwatch stopWatch = new Stopwatch(); + stopWatch.Start(); dbResult = dbController.StatControlliGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo); rawData = JsonConvert.SerializeObject(dbResult); redisDataList = Encoding.UTF8.GetBytes(rawData); await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt); + stopWatch.Stop(); + TimeSpan ts = stopWatch.Elapsed; + Log.Info($"Effettuata lettura da DB + caching per ResControlli: {ts.TotalMilliseconds} ms"); } return await Task.FromResult(dbResult); } @@ -209,10 +222,15 @@ namespace MP.Stats.Data } else { + Stopwatch stopWatch = new Stopwatch(); + stopWatch.Start(); dbResult = dbController.StatDdbGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo); rawData = JsonConvert.SerializeObject(dbResult); redisDataList = Encoding.UTF8.GetBytes(rawData); await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt); + stopWatch.Stop(); + TimeSpan ts = stopWatch.Elapsed; + Log.Info($"Effettuata lettura da DB + caching per DdbTurni: {ts.TotalMilliseconds} ms"); } return await Task.FromResult(dbResult); } @@ -231,10 +249,15 @@ namespace MP.Stats.Data } else { + Stopwatch stopWatch = new Stopwatch(); + stopWatch.Start(); dbResult = dbController.StatOdlGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo); rawData = JsonConvert.SerializeObject(dbResult); redisDataList = Encoding.UTF8.GetBytes(rawData); await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt); + stopWatch.Stop(); + TimeSpan ts = stopWatch.Elapsed; + Log.Info($"Effettuata lettura da DB + caching per ODL: {ts.TotalMilliseconds} ms"); } return await Task.FromResult(dbResult); } @@ -253,10 +276,15 @@ namespace MP.Stats.Data } else { + Stopwatch stopWatch = new Stopwatch(); + stopWatch.Start(); dbResult = dbController.StatScartiGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo); rawData = JsonConvert.SerializeObject(dbResult); redisDataList = Encoding.UTF8.GetBytes(rawData); await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt); + stopWatch.Stop(); + TimeSpan ts = stopWatch.Elapsed; + Log.Info($"Effettuata lettura da DB + caching per ResScarti: {ts.TotalMilliseconds} ms"); } return await Task.FromResult(dbResult); } @@ -279,10 +307,15 @@ namespace MP.Stats.Data } else { + Stopwatch stopWatch = new Stopwatch(); + stopWatch.Start(); dbResult = dbController.StatTurniOeeGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo); rawData = JsonConvert.SerializeObject(dbResult); redisDataList = Encoding.UTF8.GetBytes(rawData); await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt); + stopWatch.Stop(); + TimeSpan ts = stopWatch.Elapsed; + Log.Info($"Effettuata lettura da DB + caching per TurniOee: {ts.TotalMilliseconds} ms"); } return await Task.FromResult(dbResult); } @@ -301,10 +334,15 @@ namespace MP.Stats.Data } else { + Stopwatch stopWatch = new Stopwatch(); + stopWatch.Start(); dbResult = dbController.StatUserLogGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo); rawData = JsonConvert.SerializeObject(dbResult); redisDataList = Encoding.UTF8.GetBytes(rawData); await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt); + stopWatch.Stop(); + TimeSpan ts = stopWatch.Elapsed; + Log.Info($"Effettuata lettura da DB + caching per UserActionLog: {ts.TotalMilliseconds} ms"); } return await Task.FromResult(dbResult); } diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index dd1c46ad..c373b569 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -4,7 +4,7 @@ net5.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 - 1.0.2105.2519 + 1.0.2105.2619 @@ -40,6 +40,7 @@ + diff --git a/MP.Stats/NLog.config b/MP.Stats/NLog.config new file mode 100644 index 00000000..b98c52ca --- /dev/null +++ b/MP.Stats/NLog.config @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MP.Stats/Program.cs b/MP.Stats/Program.cs index f159f7fc..1726dc14 100644 --- a/MP.Stats/Program.cs +++ b/MP.Stats/Program.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; +using NLog.Web; using System; using System.Collections.Generic; using System.Linq; @@ -11,16 +12,43 @@ namespace MP.Stats { public class Program { - public static void Main(string[] args) - { - CreateHostBuilder(args).Build().Run(); - } + #region Public Methods public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); - }); + }) + .ConfigureLogging(logging => + { + logging.ClearProviders(); + logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace); + }) + .UseNLog(); + + public static void Main(string[] args) + { + // inclusione NLog: + // https://github.com/NLog/NLog/wiki/Getting-started-with-ASP.NET-Core-5 + // https://codewithmukesh.com/blog/logging-with-nlog-in-aspnet-core/ + var logger = NLog.Web.NLogBuilder.ConfigureNLog("NLog.config").GetCurrentClassLogger(); + try + { + logger.Info("MP.STATS Application Starting Up"); + CreateHostBuilder(args).Build().Run(); + } + catch (Exception exception) + { + logger.Error(exception, "Stopped MP.STATS program because of exception"); + throw; + } + finally + { + NLog.LogManager.Shutdown(); + } + } + + #endregion Public Methods } -} +} \ No newline at end of file diff --git a/MP.Stats/Startup.cs b/MP.Stats/Startup.cs index 4de03884..b835f23a 100644 --- a/MP.Stats/Startup.cs +++ b/MP.Stats/Startup.cs @@ -1,22 +1,15 @@ +using Blazorise; +using Blazorise.Bootstrap; +using Blazorise.Icons.FontAwesome; using ElmahCore.Mvc; -using ElmahCore.Sql; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.HttpsPolicy; +using Microsoft.AspNetCore.Localization; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using MP.Stats.Data; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Localization; using System.Globalization; -using Blazorise; -using Blazorise.Bootstrap; -using Blazorise.Icons.FontAwesome; namespace MP.Stats { From bb08548f7c8e6e24b3678d0965cc7f32f42a65fb Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 26 May 2021 19:43:12 +0200 Subject: [PATCH 148/158] pulizia --- MP.Stats/appsettings.json.bak | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 MP.Stats/appsettings.json.bak diff --git a/MP.Stats/appsettings.json.bak b/MP.Stats/appsettings.json.bak deleted file mode 100644 index d9d9a9bf..00000000 --- a/MP.Stats/appsettings.json.bak +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - }, - "AllowedHosts": "*" -} From bdca17ebf067daad3d3f3434051b43b24732a1ee Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 26 May 2021 19:47:29 +0200 Subject: [PATCH 149/158] Fix padding grafici --- MP.Stats/Components/ChartControlli.razor | 2 +- MP.Stats/Components/ChartOEE.razor | 2 +- MP.Stats/Components/ChartScarti.razor | 2 +- MP.Stats/Components/ChartUserLog.razor | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MP.Stats/Components/ChartControlli.razor b/MP.Stats/Components/ChartControlli.razor index 40f2a97c..2f870d3d 100644 --- a/MP.Stats/Components/ChartControlli.razor +++ b/MP.Stats/Components/ChartControlli.razor @@ -7,7 +7,7 @@ } else { -
                  +
                    @foreach (var item in @ParetoData) { diff --git a/MP.Stats/Components/ChartOEE.razor b/MP.Stats/Components/ChartOEE.razor index dfd64fad..977b55c0 100644 --- a/MP.Stats/Components/ChartOEE.razor +++ b/MP.Stats/Components/ChartOEE.razor @@ -7,7 +7,7 @@ } else { -
                    +
                      @foreach (var item in @ParetoData) { diff --git a/MP.Stats/Components/ChartScarti.razor b/MP.Stats/Components/ChartScarti.razor index 25dfe00a..bfc68ed0 100644 --- a/MP.Stats/Components/ChartScarti.razor +++ b/MP.Stats/Components/ChartScarti.razor @@ -7,7 +7,7 @@ } else { -
                      +
                        @foreach (var item in @ParetoData) { diff --git a/MP.Stats/Components/ChartUserLog.razor b/MP.Stats/Components/ChartUserLog.razor index 40f2a97c..2f870d3d 100644 --- a/MP.Stats/Components/ChartUserLog.razor +++ b/MP.Stats/Components/ChartUserLog.razor @@ -7,7 +7,7 @@ } else { -
                        +
                          @foreach (var item in @ParetoData) { From 774ef6a68bc0b2bbad7d50054acee8d4b5de998d Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 26 May 2021 20:18:44 +0200 Subject: [PATCH 150/158] refresh + test yml x staging build --- .gitlab-ci.yml | 86 +++---------------- .../PublishProfiles/IIS01.pubxml.user | 2 +- .../PublishProfiles/IIS02.pubxml.user | 1 + .../PublishProfiles/IISProfile.pubxml.user | 2 +- .../W2019-IIS-DEVProfile.pubxml.user | 2 +- 5 files changed, 16 insertions(+), 77 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f859d85d..d0269f53 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,9 +22,9 @@ variables: stages: - build - test - - release -# - staging + - staging # - deploy + - release # - installer build: @@ -58,79 +58,17 @@ release: -# AC:build: -# stage: build -# before_script: -# - *nuget-fix -# - '& "$env:NUGET_PATH" restore GPW.sln' # path alla solution corrente -# - *version-fix -# script: -# - '& "$env:MSBUILD_PATH" GPW_Admin/GPW_Admin.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' -# - '& "$env:MSBUILD_PATH" GPW_Commesse/GPW_Commesse.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' -# # \ cache: -# # #key: ${CI_COMMIT_REF_SLUG} -# # # key: ${CI_JOB_NAME} -# # key: GPW-pack -# # paths: -# # - packages/ -# # artifacts: -# # expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on -# # paths: -# # # - '$env:EXE_RELEASE_FOLDER\YourApp.exe' # saving exe to copy to deploy folder -# # # - '$env:MSI_RELEASE_FOLDER\YourApp Setup.msi' # saving msi to copy to deploy folder -# # # - '$env:TEST_FOLDER\' # saving entire Test project so NUnit can run tests -# # - '$env:EXE_RELEASE_FOLDER\GPW_Barcode\' # saving entire Test project so NUnit can run tests -# # - '$env:DEPLOY_FOLDER\GPW_Barcode\' # saving entire Test project so NUnit can run tests - -# BHS:build: -# stage: build -# before_script: -# - *nuget-fix -# - '& "$env:NUGET_PATH" restore GPW.sln' -# - *version-fix -# script: -# - '& "$env:MSBUILD_PATH" GPW_Barcode/GPW_Barcode.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' -# - '& "$env:MSBUILD_PATH" HOME/HOME.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' -# - '& "$env:MSBUILD_PATH" GPW_Smart/GPW_Smart.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' - - -# # test_job: -# # stage: test -# # only: -# # - tags -# # script: -# # - '& "$env:NUNIT_PATH" ".\$env:TEST_FOLDER\Tests.dll"' # running NUnit tests -# # artifacts: -# # when: always # save test results even when the task fails -# # expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on -# # paths: -# # - '.\TestResult.xml' # saving NUnit results to copy to deploy folder -# # dependencies: -# # - build_job - - -# AC:staging: -# stage: staging -# rules: -# - if: '$CI_COMMIT_BRANCH == "develop"' -# before_script: -# - *nuget-fix -# - '& "$env:NUGET_PATH" restore GPW.sln' -# - *version-fix -# script: -# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Admin/GPW_Admin.csproj' -# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Commesse/GPW_Commesse.csproj' -# # cache: -# # #key: ${CI_COMMIT_REF_SLUG} -# # # key: ${CI_JOB_NAME} -# # key: GPW-pack -# # paths: -# # - packages/ -# # policy: pull -# needs: ["AC:build"] -# # when: -# # manual +staging: + stage: staging + only: + - develop + needs: ["build"] + before_script: + - *nuget-fix + - dotnet restore + script: + - dotnet publish -p:PublishReadyToRun=true -p:m=8 -p:DeployOnBuild=true -p:Targets=Publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:OutputPath=bin/ -verbosity:minimal MP.Stats/MP.Stats.csproj # BHS:staging: # stage: staging diff --git a/MP.Stats/Properties/PublishProfiles/IIS01.pubxml.user b/MP.Stats/Properties/PublishProfiles/IIS01.pubxml.user index 8ebe8fe3..15ec3170 100644 --- a/MP.Stats/Properties/PublishProfiles/IIS01.pubxml.user +++ b/MP.Stats/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+sBAAAA+11nhJeDSkeTlSej+COD3AAAAAACAAAAAAADZgAAwAAAABAAAACFCXZ0UR7Czo59aaRCHU5QAAAAAASAAACgAAAAEAAAACYlKt9E6s77uEikpKwyhdQYAAAAUwae989LovFbsfjRp69HCVpyUQZbqLyYFAAAAMW8mLSAxWmKaOvB4nkDgUpS27/b - True|2021-05-25T15:48:33.3901785Z;True|2021-05-25T17:46:09.2063020+02:00;True|2021-05-25T17:42:47.8167539+02:00;True|2021-05-25T17:22:03.1877438+02:00;True|2021-05-25T17:21:05.1565775+02:00;True|2021-05-25T16:26:34.1426996+02:00;True|2021-05-25T16:14:28.2842402+02:00;True|2021-05-25T15:02:11.7131495+02:00; + True|2021-05-26T17:49:30.0427896Z;False|2021-05-26T19:49:14.9065510+02:00;True|2021-05-25T17:48:33.3901785+02:00;True|2021-05-25T17:46:09.2063020+02:00;True|2021-05-25T17:42:47.8167539+02:00;True|2021-05-25T17:22:03.1877438+02:00;True|2021-05-25T17:21:05.1565775+02:00;True|2021-05-25T16:26:34.1426996+02:00;True|2021-05-25T16:14:28.2842402+02:00;True|2021-05-25T15:02:11.7131495+02:00; \ No newline at end of file diff --git a/MP.Stats/Properties/PublishProfiles/IIS02.pubxml.user b/MP.Stats/Properties/PublishProfiles/IIS02.pubxml.user index 8d468c51..4572facb 100644 --- a/MP.Stats/Properties/PublishProfiles/IIS02.pubxml.user +++ b/MP.Stats/Properties/PublishProfiles/IIS02.pubxml.user @@ -7,5 +7,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA+11nhJeDSkeTlSej+COD3AAAAAACAAAAAAADZgAAwAAAABAAAAB3zVMW24A4himhWJ5CNqgeAAAAAASAAACgAAAAEAAAAA7IL1n8zHn2/ljDNL4/zlsYAAAAgAEg9RYKHV0xl3wnafZiN9Q954GOBAvdFAAAACSBJkwDndNTiIrUuk7zJls84fN1 + True|2021-05-26T17:49:44.3836006Z; \ No newline at end of file diff --git a/MP.Stats/Properties/PublishProfiles/IISProfile.pubxml.user b/MP.Stats/Properties/PublishProfiles/IISProfile.pubxml.user index fee355b9..2a7c708a 100644 --- a/MP.Stats/Properties/PublishProfiles/IISProfile.pubxml.user +++ b/MP.Stats/Properties/PublishProfiles/IISProfile.pubxml.user @@ -6,6 +6,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt - True|2021-05-25T14:38:26.4142377Z; + True|2021-05-26T17:51:13.5051479Z;True|2021-05-26T19:51:04.9283608+02:00;True|2021-05-25T16:38:26.4142377+02:00; \ No newline at end of file diff --git a/MP.Stats/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml.user b/MP.Stats/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml.user index 0ee5e6ce..5d77153d 100644 --- a/MP.Stats/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml.user +++ b/MP.Stats/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml.user @@ -7,6 +7,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA+11nhJeDSkeTlSej+COD3AAAAAACAAAAAAADZgAAwAAAABAAAADHiGtCyOetOyeT2xaFL+NDAAAAAASAAACgAAAAEAAAAAuYw1PbVDVdZhloQ7eVuTsYAAAAfA8iFmY49U48HUeRwWwQNsvZg5FRMf9SFAAAACB+0njgnTZ+1teEqoJcNV16idHL - True|2021-05-25T14:56:57.0194126Z;True|2021-05-24T18:44:45.5388713+02:00;True|2021-05-24T18:23:50.6056375+02:00;True|2021-05-24T18:01:51.1166144+02:00;True|2021-05-24T17:07:21.6348703+02:00;True|2021-05-24T17:07:10.8304877+02:00;True|2021-05-24T11:12:19.8440009+02:00;True|2021-05-24T11:12:08.1362921+02:00;True|2021-05-22T12:03:42.2864462+02:00;True|2021-05-21T19:54:05.6348108+02:00;False|2021-05-21T19:53:46.2134560+02:00;True|2021-05-21T08:11:55.5022811+02:00;True|2021-05-20T19:40:34.2462833+02:00;True|2021-05-20T19:40:10.3931366+02:00;True|2021-05-20T17:27:02.9543079+02:00;True|2021-05-20T16:59:12.4323448+02:00;True|2021-05-20T16:58:55.5021812+02:00;False|2021-05-20T16:58:03.5161910+02:00;True|2021-05-19T19:28:03.8104716+02:00;True|2021-05-18T19:48:52.9083044+02:00;True|2021-05-18T18:15:50.2374168+02:00;True|2021-05-18T18:06:20.0997789+02:00;True|2021-05-18T14:56:33.7479984+02:00;True|2021-05-17T17:03:39.9822588+02:00;True|2021-05-17T16:33:53.4419457+02:00;True|2021-05-17T16:33:10.5405414+02:00;False|2021-05-17T16:30:04.8648550+02:00;False|2021-05-17T16:29:49.5085445+02:00; + True|2021-05-26T17:49:56.4831784Z;True|2021-05-25T16:56:57.0194126+02:00;True|2021-05-24T18:44:45.5388713+02:00;True|2021-05-24T18:23:50.6056375+02:00;True|2021-05-24T18:01:51.1166144+02:00;True|2021-05-24T17:07:21.6348703+02:00;True|2021-05-24T17:07:10.8304877+02:00;True|2021-05-24T11:12:19.8440009+02:00;True|2021-05-24T11:12:08.1362921+02:00;True|2021-05-22T12:03:42.2864462+02:00;True|2021-05-21T19:54:05.6348108+02:00;False|2021-05-21T19:53:46.2134560+02:00;True|2021-05-21T08:11:55.5022811+02:00;True|2021-05-20T19:40:34.2462833+02:00;True|2021-05-20T19:40:10.3931366+02:00;True|2021-05-20T17:27:02.9543079+02:00;True|2021-05-20T16:59:12.4323448+02:00;True|2021-05-20T16:58:55.5021812+02:00;False|2021-05-20T16:58:03.5161910+02:00;True|2021-05-19T19:28:03.8104716+02:00;True|2021-05-18T19:48:52.9083044+02:00;True|2021-05-18T18:15:50.2374168+02:00;True|2021-05-18T18:06:20.0997789+02:00;True|2021-05-18T14:56:33.7479984+02:00;True|2021-05-17T17:03:39.9822588+02:00;True|2021-05-17T16:33:53.4419457+02:00;True|2021-05-17T16:33:10.5405414+02:00;False|2021-05-17T16:30:04.8648550+02:00;False|2021-05-17T16:29:49.5085445+02:00; \ No newline at end of file From f391c7abd8de7126486ef85de7f1ae57eb2338ad Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 26 May 2021 20:19:11 +0200 Subject: [PATCH 151/158] cambio dipendenze compilazione --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d0269f53..05f9c6cc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,8 +61,8 @@ release: staging: stage: staging - only: - - develop + # only: + # - develop needs: ["build"] before_script: - *nuget-fix From cd98fb6a7ede5072ba22330bd81a842b79b9eae9 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 26 May 2021 20:20:42 +0200 Subject: [PATCH 152/158] update syntax yml --- .gitlab-ci.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 05f9c6cc..a17cae42 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,6 +43,19 @@ test: script: - dotnet test + + +staging: + stage: staging + # only: + # - develop + needs: ["build"] + before_script: + - *nuget-fix + - dotnet restore + script: + - dotnet publish -p:PublishReadyToRun=true -p:m=8 -p:DeployOnBuild=true -p:Targets=Publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:OutputPath=bin/ -verbosity:minimal MP.Stats/MP.Stats.csproj + release: stage: release only: @@ -58,18 +71,6 @@ release: - -staging: - stage: staging - # only: - # - develop - needs: ["build"] - before_script: - - *nuget-fix - - dotnet restore - script: - - dotnet publish -p:PublishReadyToRun=true -p:m=8 -p:DeployOnBuild=true -p:Targets=Publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:OutputPath=bin/ -verbosity:minimal MP.Stats/MP.Stats.csproj - # BHS:staging: # stage: staging # rules: From 02c16b71e2cc557587c9397ec436731887995a69 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 26 May 2021 20:25:00 +0200 Subject: [PATCH 153/158] cambio sintassi pubblicazione --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a17cae42..12360450 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,12 +54,12 @@ staging: - *nuget-fix - dotnet restore script: - - dotnet publish -p:PublishReadyToRun=true -p:m=8 -p:DeployOnBuild=true -p:Targets=Publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:OutputPath=bin/ -verbosity:minimal MP.Stats/MP.Stats.csproj + - dotnet publish -p:PublishReadyToRun=true -p:m=8 -p:DeployOnBuild=true -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:OutputPath=bin/ -verbosity:minimal MP.Stats/MP.Stats.csproj release: stage: release only: - - feature/Deploy_CI_CD + #- feature/Deploy_CI_CD - master needs: ["build"] artifacts: From 8ac1fbb721a84f0e7e9498c5a8e3179ef23a5f81 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 26 May 2021 20:26:14 +0200 Subject: [PATCH 154/158] refresh launch json --- .vscode/launch.json | 36 ++++++++++++++++++++++++++++++++++++ .vscode/tasks.json | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 .vscode/launch.json create mode 100644 .vscode/tasks.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..fbfcb92d --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,36 @@ +{ + "version": "0.2.0", + "configurations": [ + { + // Use IntelliSense to find out which attributes exist for C# debugging + // Use hover for the description of the existing attributes + // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md + "name": ".NET Core Launch (web)", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build", + // If you have changed target frameworks, make sure to update the program path. + "program": "${workspaceFolder}/MP.Stats/bin/Debug/net5.0/MP.Stats.dll", + "args": [], + "cwd": "${workspaceFolder}/MP.Stats", + "stopAtEntry": false, + // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser + "serverReadyAction": { + "action": "openExternally", + "pattern": "\\bNow listening on:\\s+(https?://\\S+)" + }, + "env": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "sourceFileMap": { + "/Views": "${workspaceFolder}/Views" + } + }, + { + "name": ".NET Core Attach", + "type": "coreclr", + "request": "attach", + "processId": "${command:pickProcess}" + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 00000000..3d710101 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,42 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/MP.Stats/MP.Stats.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "publish", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "${workspaceFolder}/MP.Stats/MP.Stats.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "watch", + "command": "dotnet", + "type": "process", + "args": [ + "watch", + "run", + "${workspaceFolder}/MP.Stats/MP.Stats.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + } + ] +} \ No newline at end of file From 9aef411c5b61c7643e546ae787d554efd3f61f52 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 26 May 2021 20:28:01 +0200 Subject: [PATCH 155/158] ancora modifiche comando pubblicazione --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 12360450..4b4cadf5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,7 +54,7 @@ staging: - *nuget-fix - dotnet restore script: - - dotnet publish -p:PublishReadyToRun=true -p:m=8 -p:DeployOnBuild=true -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:OutputPath=bin/ -verbosity:minimal MP.Stats/MP.Stats.csproj + - dotnet publish -p:PublishReadyToRun=true -p:m=8 -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:OutputPath=bin/ MP.Stats/MP.Stats.csproj release: stage: release From f512067457df8a798ffb58c97152498efb02bc27 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 26 May 2021 20:30:37 +0200 Subject: [PATCH 156/158] ancora test x deploy --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4b4cadf5..5731f348 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,7 +54,8 @@ staging: - *nuget-fix - dotnet restore script: - - dotnet publish -p:PublishReadyToRun=true -p:m=8 -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:OutputPath=bin/ MP.Stats/MP.Stats.csproj + - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj + # - dotnet publish -p:PublishReadyToRun=true -p:m=8 -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:OutputPath=bin/ MP.Stats/MP.Stats.csproj release: stage: release From f6d4880308587f92cd484b7072dd6de2b97eb664 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 26 May 2021 20:33:09 +0200 Subject: [PATCH 157/158] update vers number x test deploy --- MP.Stats/MP.Stats.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index c373b569..e9250fe8 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -4,7 +4,7 @@ net5.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 - 1.0.2105.2619 + 1.0.2105.2620 From cc6659b0a86d01064a3e0137acd42e3d102a1373 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 26 May 2021 20:42:34 +0200 Subject: [PATCH 158/158] aggiunta steps installaizone --- .gitlab-ci.yml | 112 +++++++++---------------------------------------- 1 file changed, 20 insertions(+), 92 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5731f348..591fdf87 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,9 +23,9 @@ stages: - build - test - staging -# - deploy + - deploy - release -# - installer + - installer build: stage: build @@ -43,19 +43,29 @@ test: script: - dotnet test +staging: + stage: staging + only: + - develop + needs: ["build"] + # before_script: + # - *nuget-fix + # - dotnet restore + script: + - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj staging: - stage: staging - # only: - # - develop + stage: deploy + only: + - master needs: ["build"] - before_script: - - *nuget-fix - - dotnet restore + # before_script: + # - *nuget-fix + # - dotnet restore script: - - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj - # - dotnet publish -p:PublishReadyToRun=true -p:m=8 -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:OutputPath=bin/ MP.Stats/MP.Stats.csproj + - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj + - dotnet publish -p:PublishProfile=W2019-IIS-DEVProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj release: stage: release @@ -71,71 +81,6 @@ release: - -# BHS:staging: -# stage: staging -# rules: -# - if: '$CI_COMMIT_BRANCH == "develop"' -# before_script: -# - *nuget-fix -# - '& "$env:NUGET_PATH" restore GPW.sln' -# - *version-fix -# script: -# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Barcode/GPW_Barcode.csproj' -# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal HOME/HOME.csproj' -# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Smart/GPW_Smart.csproj' -# needs: ["BHS:build"] - - -# AC:deploy: -# stage: deploy -# rules: -# - if: '$CI_COMMIT_BRANCH == "master"' -# before_script: -# - *nuget-fix -# - '& "$env:NUGET_PATH" restore GPW.sln' -# - *version-fix -# script: -# # ----ADMIN ---- -# # IIS 02 -# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Admin/GPW_Admin.csproj' -# # IIS DEV -# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IISDEV.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Admin/GPW_Admin.csproj' -# # ----Commesse ---- -# # IIS 02 -# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Commesse/GPW_Commesse.csproj' -# # IIS DEV -# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IISDEV.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Commesse/GPW_Commesse.csproj' -# needs: ["AC:build"] -# # when: -# # manual - -# BHS:deploy: -# stage: deploy -# rules: -# - if: '$CI_COMMIT_BRANCH == "master"' -# before_script: -# - *nuget-fix -# - '& "$env:NUGET_PATH" restore GPW.sln' -# - *version-fix -# script: -# # ----BCode ---- -# # IIS 02 -# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Barcode/GPW_Barcode.csproj' -# # IIS DEV -# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IISDEV.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Barcode/GPW_Barcode.csproj' -# # ---- HOME ---- -# # IIS 02 -# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal HOME/HOME.csproj' -# # IIS DEV -# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IISDEV.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal HOME/HOME.csproj' -# # ---- SMART ---- -# # IIS 02 -# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Smart/GPW_Smart.csproj' -# # IIS DEV -# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IISDEV.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Smart/GPW_Smart.csproj' -# needs: ["BHS:build"] - # AC:install: # stage: installer # rules: @@ -155,20 +100,3 @@ release: # needs: ["AC:build"] -# BHS:install: -# stage: installer -# rules: -# - if: '$CI_COMMIT_BRANCH == "master"' -# when: manual -# before_script: -# - *nuget-fix -# - '& "$env:NUGET_PATH" restore GPW.sln' -# - *version-fix -# script: -# # BCode ZIP package -# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$env:NEW_REL/GPW_Barcode.zip /p:DeployIisAppPath="Default Web Site/GPW/ADMIN" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GPW_Barcode/GPW_Barcode.csproj' -# # HOME ZIP package -# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$env:NEW_REL/HOME.zip /p:DeployIisAppPath="Default Web Site/GPW/ADMIN" /p:PackageAsSingleFile=True /p:OutputPath=bin/ HOME/HOME.csproj' -# # ZIP package -# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$env:NEW_REL/GPW_Smart.zip /p:DeployIisAppPath="Default Web Site/GPW/ADMIN" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GPW_Smart/GPW_Smart.csproj' -# needs: ["BHS:build"]