diff --git a/EgwProxy.MagMan/DTO/AliasDTO.cs b/EgwProxy.MagMan/DTO/AliasDTO.cs index 6f02d74..f3466e4 100644 --- a/EgwProxy.MagMan/DTO/AliasDTO.cs +++ b/EgwProxy.MagMan/DTO/AliasDTO.cs @@ -17,5 +17,10 @@ namespace EgwProxy.MagMan.DTO /// Codice Alias in cui viene convertito /// public string ValAlias { get; set; } = ""; + + /// + /// Indica se il record sia attivo/valido (per cancellazione logica online e fisica in remoto) + /// + public bool IsActive { get; set; } = true; } } diff --git a/MagMan.Core/DTO/AliasDTO.cs b/MagMan.Core/DTO/AliasDTO.cs index 7beb761..81be54c 100644 --- a/MagMan.Core/DTO/AliasDTO.cs +++ b/MagMan.Core/DTO/AliasDTO.cs @@ -17,5 +17,10 @@ namespace MagMan.Core.DTO /// Codice Alias in cui viene convertito /// public string ValAlias { get; set; } = ""; + + /// + /// Indica se il record sia attivo/valido (per cancellazione logica online e fisica in remoto) + /// + public bool IsActive { get; set; } = true; } } diff --git a/MagMan.Data.Tenant/Controllers/TenantController.cs b/MagMan.Data.Tenant/Controllers/TenantController.cs index b6b463f..96f5bbb 100644 --- a/MagMan.Data.Tenant/Controllers/TenantController.cs +++ b/MagMan.Data.Tenant/Controllers/TenantController.cs @@ -47,9 +47,12 @@ namespace MagMan.Data.Tenant.Controllers .FirstOrDefault(); if (currData != null) { - dbCtx - .DbSetAlias - .Remove(currData); + // 2024.04.04: cancellazione logica al posto di delete! + //dbCtx + // .DbSetAlias + // .Remove(currData); + currData.IsActive = false; + dbCtx.Entry(currData).State = EntityState.Modified; dbCtx.SaveChanges(); done = true; @@ -105,11 +108,9 @@ namespace MagMan.Data.Tenant.Controllers .FirstOrDefault(); if (currData != null) { - if (currData.ValueAlias != rec2upd.ValueAlias) - { - currData.ValueAlias = rec2upd.ValueAlias; - dbCtx.Entry(currData).State = EntityState.Modified; - } + currData.ValueAlias = rec2upd.ValueAlias; + currData.IsActive = rec2upd.IsActive; + dbCtx.Entry(currData).State = EntityState.Modified; } else { diff --git a/MagMan.Data.Tenant/DbModels/AliasModel.cs b/MagMan.Data.Tenant/DbModels/AliasModel.cs index ffdcdd4..2574b53 100644 --- a/MagMan.Data.Tenant/DbModels/AliasModel.cs +++ b/MagMan.Data.Tenant/DbModels/AliasModel.cs @@ -30,6 +30,11 @@ namespace MagMan.Data.Tenant.DbModels /// public string ValueAlias { get; set; } = ""; + /// + /// Indica se il record sia attivo/valido (per cancellazione logica online e fisica in remoto) + /// + public bool IsActive { get; set; } = true; + public override bool Equals(object? obj) { if (obj == null) diff --git a/MagMan.Data.Tenant/MagManContext.cs b/MagMan.Data.Tenant/MagManContext.cs index 869a381..1eab0c9 100644 --- a/MagMan.Data.Tenant/MagManContext.cs +++ b/MagMan.Data.Tenant/MagManContext.cs @@ -67,6 +67,9 @@ namespace MagMan.Data.Tenant { if (!optionsBuilder.IsConfigured) { +#if DEBUG + connString = "Server=localhost;port=3306;database=MagMan_000470;uid=MagMan_DbUser;pwd=viad@nte16!;sslmode=None;"; +#endif var serverVersion = ServerVersion.AutoDetect(connString); optionsBuilder.UseMySql(connString, serverVersion); } diff --git a/MagMan.Data.Tenant/Migrations/20240404092207_AddAliasLogicalDelete.Designer.cs b/MagMan.Data.Tenant/Migrations/20240404092207_AddAliasLogicalDelete.Designer.cs new file mode 100644 index 0000000..659d27f --- /dev/null +++ b/MagMan.Data.Tenant/Migrations/20240404092207_AddAliasLogicalDelete.Designer.cs @@ -0,0 +1,351 @@ +// +using System; +using MagMan.Data.Tenant; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace MagMan.Data.Tenant.Migrations +{ + [DbContext(typeof(MagManContext))] + [Migration("20240404092207_AddAliasLogicalDelete")] + partial class AddAliasLogicalDelete + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.25") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("MagMan.Data.Tenant.DbModels.AliasModel", b => + { + b.Property("Family") + .HasColumnType("varchar(255)"); + + b.Property("ValueOriginal") + .HasColumnType("varchar(255)"); + + b.Property("IsActive") + .HasColumnType("tinyint(1)"); + + b.Property("ValueAlias") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Family", "ValueOriginal"); + + b.ToTable("AliasList"); + }); + + modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ConfigModel", b => + { + b.Property("KeyName") + .HasMaxLength(50) + .HasColumnType("varchar(50)") + .HasColumnOrder(0); + + b.Property("Note") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("varchar(250)") + .HasColumnOrder(3); + + b.Property("Val") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("varchar(50)") + .HasColumnOrder(1); + + b.Property("ValStd") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("varchar(50)") + .HasColumnOrder(2) + .HasComment("Valore di default/riferimento per la variabile"); + + b.HasKey("KeyName"); + + b.ToTable("Config"); + }); + + modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MaterialModel", b => + { + b.Property("MatId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("HMm") + .HasColumnType("decimal(65,30)"); + + b.Property("LMm") + .HasColumnType("decimal(65,30)"); + + b.Property("MatCode") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("MatDesc") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("WMm") + .HasColumnType("decimal(65,30)"); + + b.HasKey("MatId"); + + b.ToTable("MaterialsList"); + }); + + modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b => + { + b.Property("MovID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("DtRec") + .HasColumnType("datetime(6)"); + + b.Property("Note") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("QtyRec") + .HasColumnType("int"); + + b.Property("RawItemId") + .HasColumnType("int"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("MovID"); + + b.HasIndex("RawItemId"); + + b.ToTable("MovMag"); + }); + + modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ProjModel", b => + { + b.Property("ProjDbId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BTLFileName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("DtCreated") + .HasColumnType("datetime(6)"); + + b.Property("DtLastAction") + .HasColumnType("datetime(6)"); + + b.Property("DtSchedule") + .HasColumnType("datetime(6)"); + + b.Property("DtStartProd") + .HasColumnType("datetime(6)"); + + b.Property("IsActive") + .HasColumnType("tinyint(1)"); + + b.Property("IsArchived") + .HasColumnType("tinyint(1)"); + + b.Property("KeyNum") + .HasColumnType("int"); + + b.Property("ListName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Machine") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("MachineID") + .HasColumnType("int"); + + b.Property("PType") + .HasColumnType("int"); + + b.Property("ProcTimeEst") + .HasColumnType("double"); + + b.Property("ProcTimeReal") + .HasColumnType("double"); + + b.Property("ProjDescription") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ProjExtDbId") + .HasColumnType("int"); + + b.Property("ProjExtId") + .HasColumnType("int"); + + b.HasKey("ProjDbId"); + + b.HasIndex("IsActive"); + + b.HasIndex("IsArchived"); + + b.HasIndex("KeyNum"); + + b.HasIndex("MachineID"); + + b.HasIndex("ProjExtDbId"); + + b.ToTable("ProjList"); + }); + + modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b => + { + b.Property("RawItemId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("HMm") + .HasColumnType("decimal(65,30)"); + + b.Property("IsActive") + .HasColumnType("tinyint(1)"); + + b.Property("IsRemn") + .HasColumnType("tinyint(1)"); + + b.Property("LMm") + .HasColumnType("decimal(65,30)"); + + b.Property("Location") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("MatId") + .HasColumnType("int"); + + b.Property("Note") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("QtyAvail") + .HasColumnType("int"); + + b.Property("WMm") + .HasColumnType("decimal(65,30)"); + + b.HasKey("RawItemId"); + + b.HasIndex("MatId"); + + b.ToTable("RawItemList"); + }); + + modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RequestPlanModel", b => + { + b.Property("RequestId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("DtRequest") + .HasColumnType("datetime(6)"); + + b.Property("IsActive") + .HasColumnType("tinyint(1)"); + + b.Property("ProjDbId") + .HasColumnType("int"); + + b.Property("ReqState") + .HasColumnType("int"); + + b.HasKey("RequestId"); + + b.ToTable("RequestPlan"); + }); + + modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ResourceModel", b => + { + b.Property("ResourceId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Qty") + .HasColumnType("int"); + + b.Property("RawItemId") + .HasColumnType("int"); + + b.Property("RequestId") + .HasColumnType("int"); + + b.HasKey("ResourceId"); + + b.HasIndex("RawItemId"); + + b.HasIndex("RequestId"); + + b.ToTable("ResourceList"); + }); + + modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b => + { + b.HasOne("MagMan.Data.Tenant.DbModels.RawItemModel", "ItemNav") + .WithMany() + .HasForeignKey("RawItemId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("ItemNav"); + }); + + modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b => + { + b.HasOne("MagMan.Data.Tenant.DbModels.MaterialModel", "MaterialNav") + .WithMany("RawItemList") + .HasForeignKey("MatId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("MaterialNav"); + }); + + modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ResourceModel", b => + { + b.HasOne("MagMan.Data.Tenant.DbModels.RawItemModel", "ItemNav") + .WithMany() + .HasForeignKey("RawItemId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("MagMan.Data.Tenant.DbModels.RequestPlanModel", "RequestNav") + .WithMany("ResourcesList") + .HasForeignKey("RequestId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("ItemNav"); + + b.Navigation("RequestNav"); + }); + + modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MaterialModel", b => + { + b.Navigation("RawItemList"); + }); + + modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RequestPlanModel", b => + { + b.Navigation("ResourcesList"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/MagMan.Data.Tenant/Migrations/20240404092207_AddAliasLogicalDelete.cs b/MagMan.Data.Tenant/Migrations/20240404092207_AddAliasLogicalDelete.cs new file mode 100644 index 0000000..e88bbea --- /dev/null +++ b/MagMan.Data.Tenant/Migrations/20240404092207_AddAliasLogicalDelete.cs @@ -0,0 +1,26 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace MagMan.Data.Tenant.Migrations +{ + public partial class AddAliasLogicalDelete : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "IsActive", + table: "AliasList", + type: "tinyint(1)", + nullable: false, + defaultValue: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "IsActive", + table: "AliasList"); + } + } +} diff --git a/MagMan.Data.Tenant/Migrations/MagManContextModelSnapshot.cs b/MagMan.Data.Tenant/Migrations/MagManContextModelSnapshot.cs index 4c449bc..3aed6b0 100644 --- a/MagMan.Data.Tenant/Migrations/MagManContextModelSnapshot.cs +++ b/MagMan.Data.Tenant/Migrations/MagManContextModelSnapshot.cs @@ -27,6 +27,9 @@ namespace MagMan.Data.Tenant.Migrations b.Property("ValueOriginal") .HasColumnType("varchar(255)"); + b.Property("IsActive") + .HasColumnType("tinyint(1)"); + b.Property("ValueAlias") .IsRequired() .HasColumnType("longtext"); diff --git a/MagMan.Data.Tenant/Services/TenantService.cs b/MagMan.Data.Tenant/Services/TenantService.cs index 2ea8ecd..8a9aa0a 100644 --- a/MagMan.Data.Tenant/Services/TenantService.cs +++ b/MagMan.Data.Tenant/Services/TenantService.cs @@ -93,7 +93,8 @@ namespace MagMan.Data.Tenant.Services { Family = family, ValueOriginal = origItem.ValOrig, - ValueAlias = origItem.ValAlias + ValueAlias = origItem.ValAlias, + IsActive = origItem.IsActive }; return answ; } diff --git a/MagMan.UI/Components/AliasEdit.razor b/MagMan.UI/Components/AliasEdit.razor index f541eea..bb2cc09 100644 --- a/MagMan.UI/Components/AliasEdit.razor +++ b/MagMan.UI/Components/AliasEdit.razor @@ -11,7 +11,17 @@ - +
+
+
+ + + +
+
+ +
+ diff --git a/MagMan.UI/Components/AliasEdit.razor.cs b/MagMan.UI/Components/AliasEdit.razor.cs index 26a425d..bddfec8 100644 --- a/MagMan.UI/Components/AliasEdit.razor.cs +++ b/MagMan.UI/Components/AliasEdit.razor.cs @@ -36,6 +36,19 @@ namespace MagMan.UI.Components await EC_update.InvokeAsync(true); } + protected string textActive + { + get + { + string answ = "ND"; + if (CurrRecord != null) + { + answ = CurrRecord.IsActive ? "Attivo" : "Eliminato"; + } + return answ; + } + } + protected async Task DoSave() { bool fatto = false; diff --git a/MagMan.UI/Components/AliasMan.razor b/MagMan.UI/Components/AliasMan.razor index 3f93d7a..0af6dcd 100644 --- a/MagMan.UI/Components/AliasMan.razor +++ b/MagMan.UI/Components/AliasMan.razor @@ -50,11 +50,10 @@ @foreach (var item in ListRecords) { - + @if (CurrItem == null) { - @* *@ } else @@ -72,7 +71,14 @@ - + @if(item.IsActive) + { + + } + else + { + + } diff --git a/MagMan.UI/Components/AliasMan.razor.cs b/MagMan.UI/Components/AliasMan.razor.cs index 9fb6ebf..a68dc18 100644 --- a/MagMan.UI/Components/AliasMan.razor.cs +++ b/MagMan.UI/Components/AliasMan.razor.cs @@ -52,9 +52,14 @@ namespace MagMan.UI.Components #region Protected Methods - protected string CheckSel(AliasModel curItem) + protected string rowCss(AliasModel curItem) { string answ = curItem.Equals(CurrItem) ? "table-info" : ""; + // verifico se attivo... + if(!curItem.IsActive) + { + answ += " text-strike"; + } return answ; } diff --git a/MagMan.UI/Components/AuthKeyEdit.razor b/MagMan.UI/Components/AuthKeyEdit.razor index c43fa85..93ad504 100644 --- a/MagMan.UI/Components/AuthKeyEdit.razor +++ b/MagMan.UI/Components/AuthKeyEdit.razor @@ -22,7 +22,9 @@
- +
+ +
diff --git a/MagMan.UI/Controllers/AliasController.cs b/MagMan.UI/Controllers/AliasController.cs index ac3c6b8..6789d7d 100644 --- a/MagMan.UI/Controllers/AliasController.cs +++ b/MagMan.UI/Controllers/AliasController.cs @@ -74,7 +74,7 @@ namespace MagMan.UI.Controllers var rawData = await TService.AliasGetFilt(nKey, "MatCode"); if (rawData != null && rawData.Count > 0) { - ListDto = rawData.Select(x => new AliasDTO() { ValOrig = x.ValueOriginal, ValAlias = x.ValueAlias }).ToList(); + ListDto = rawData.Select(x => new AliasDTO() { ValOrig = x.ValueOriginal, ValAlias = x.ValueAlias, IsActive = x.IsActive }).ToList(); } return ListDto; } diff --git a/MagMan.UI/MagMan.UI.csproj b/MagMan.UI/MagMan.UI.csproj index 3c1b363..4d01294 100644 --- a/MagMan.UI/MagMan.UI.csproj +++ b/MagMan.UI/MagMan.UI.csproj @@ -2,7 +2,7 @@ net6.0 - 1.0.2403.0108 + 1.0.2404.0412 enable enable true diff --git a/MagMan.UI/Shared/MainLayout.razor b/MagMan.UI/Shared/MainLayout.razor index 08bccea..733662b 100644 --- a/MagMan.UI/Shared/MainLayout.razor +++ b/MagMan.UI/Shared/MainLayout.razor @@ -15,7 +15,6 @@
- @*
*@
@Body
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index b2b4199..aa07019 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MagMan - Wood Warehouse Management System -

Versione: 1.0.2403.0108

+

Versione: 1.0.2404.0412


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 911ec41..6a79875 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.0.2403.0108 +1.0.2404.0412 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index a67346f..facc4bb 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.0.2403.0108 + 1.0.2404.0412 http://nexus.steamware.net/repository/SWS/MagMan/stable/0/MagMan.UI.zip http://nexus.steamware.net/repository/SWS/MagMan/stable/0/ChangeLog.html false diff --git a/TestConsoleApp/Program.cs b/TestConsoleApp/Program.cs index cbe1ed7..c6d8226 100644 --- a/TestConsoleApp/Program.cs +++ b/TestConsoleApp/Program.cs @@ -178,14 +178,14 @@ namespace DemoApp Console.WriteLine(sep); foreach (var itemAlias in listAlias) { - Console.WriteLine($"{itemAlias.ValOrig} --> {itemAlias.ValAlias}"); + Console.WriteLine($"{itemAlias.ValOrig} --> {itemAlias.ValAlias} | active: {itemAlias.IsActive} "); } Console.WriteLine(sep); } List alias2send = new List(); - alias2send.Add(new AliasDTO() { ValOrig = "Item01", ValAlias = "Gl24h" }); - alias2send.Add(new AliasDTO() { ValOrig = "Item02", ValAlias = "Gl24h" }); + alias2send.Add(new AliasDTO() { ValOrig = "Item01", ValAlias = "Gl24h", IsActive = true }); + alias2send.Add(new AliasDTO() { ValOrig = "Item02", ValAlias = "Gl24h", IsActive = true }); var resAliasSend = commLib.AliasSend(alias2send); Console.WriteLine("Enter to close");