diff --git a/EgwProxy.DataLayer/DbModel/ProdModel.cs b/EgwProxy.DataLayer/DbModel/ProdModel.cs index 11b1da2..faf0785 100644 --- a/EgwProxy.DataLayer/DbModel/ProdModel.cs +++ b/EgwProxy.DataLayer/DbModel/ProdModel.cs @@ -92,7 +92,7 @@ namespace EgwProxy.DataLayer.DbModel /// Record attivo (se false == cancellazione logica) /// [Index] - [Column("IsActive")] + [Column("IsDeleted")] public bool IsActive { get; set; } = true; /// diff --git a/EgwProxy.DataLayer/DbModel/ProjModel.cs b/EgwProxy.DataLayer/DbModel/ProjModel.cs index 1d05c5f..24b7216 100644 --- a/EgwProxy.DataLayer/DbModel/ProjModel.cs +++ b/EgwProxy.DataLayer/DbModel/ProjModel.cs @@ -102,7 +102,7 @@ namespace EgwProxy.DataLayer.DbModel /// Record attivo (se false == cancellazione logica) /// [Index] - [Column("IsActive")] + [Column("IsDeleted")] public bool IsActive { get; set; } = true; /// /// Descrizione progetto (copiata da BTLFileName inizialmente) diff --git a/EgwProxy.MagMan/DTO/ItemDTO.cs b/EgwProxy.MagMan/DTO/ItemDTO.cs index 52c0157..ac56eae 100644 --- a/EgwProxy.MagMan/DTO/ItemDTO.cs +++ b/EgwProxy.MagMan/DTO/ItemDTO.cs @@ -26,9 +26,9 @@ public int RawItemLocalId { get; set; } = 0; /// - /// Active, for logical delete on PC... + /// Boolean for logical delete /// - public bool IsActive { get; set; } = false; + public bool IsDeleted { get; set; } = false; /// /// Check if is a Remnant diff --git a/EgwProxy.MagMan/DTO/ResourceExpDTO.cs b/EgwProxy.MagMan/DTO/ResourceExpDTO.cs index c34b154..ac319ab 100644 --- a/EgwProxy.MagMan/DTO/ResourceExpDTO.cs +++ b/EgwProxy.MagMan/DTO/ResourceExpDTO.cs @@ -68,8 +68,8 @@ namespace EgwProxy.MagMan.DTO public DateTime DtRequest { get; set; } /// - /// Record attivo (se false == NON è il piano scelto per i casi "previsionali" = ReqState >0 ) + /// record richiesto (me lo aspetto sempre a false se viene inviato/registrato...) /// - public bool IsActive { get; set; } = true; + public bool IsDeleted { get; set; } = false; } } diff --git a/MagMan.Core/DTO/ItemDTO.cs b/MagMan.Core/DTO/ItemDTO.cs index fe169c6..1dbe92c 100644 --- a/MagMan.Core/DTO/ItemDTO.cs +++ b/MagMan.Core/DTO/ItemDTO.cs @@ -33,9 +33,9 @@ namespace MagMan.Core.DTO public int RawItemLocalId { get; set; } = 0; /// - /// Active, for logical delete on PC... + /// Boolean for logical delete /// - public bool IsActive { get; set; } = false; + public bool IsDeleted { get; set; } = false; /// /// Check if is a Remnant diff --git a/MagMan.Core/DTO/ResourceExpDTO.cs b/MagMan.Core/DTO/ResourceExpDTO.cs index 40fb767..d3c4ab1 100644 --- a/MagMan.Core/DTO/ResourceExpDTO.cs +++ b/MagMan.Core/DTO/ResourceExpDTO.cs @@ -66,8 +66,8 @@ public DateTime DtRequest { get; set; } /// - /// Richiesta attiva (se false == NON è il piano scelto per i casi "previsionali" = ReqState >0 ) + /// record richiesto (me lo aspetto sempre a false se viene inviato/registrato...) /// - public bool IsActive { get; set; } = true; + public bool IsDeleted { get; set; } = false; } } diff --git a/MagMan.Data.Tenant/Controllers/TenantController.cs b/MagMan.Data.Tenant/Controllers/TenantController.cs index f96484d..2485f27 100644 --- a/MagMan.Data.Tenant/Controllers/TenantController.cs +++ b/MagMan.Data.Tenant/Controllers/TenantController.cs @@ -219,8 +219,8 @@ namespace MagMan.Data.Tenant.Controllers // .DbSetItems // .Remove(currData); - // non vera eliminazione ma logica... - currData.IsActive = false; + // eliminazione logica... + currData.IsDeleted = true; // registro modifica RawItem dbCtx.Entry(currData).State = EntityState.Modified; @@ -247,7 +247,7 @@ namespace MagMan.Data.Tenant.Controllers RawItemModel answ = new RawItemModel() { MatId = origItem.MatCloudId, - IsActive = origItem.IsActive, + IsDeleted = origItem.IsDeleted, IsRemn = origItem.IsRemn, Location = origItem.Location, QtyAvail = origItem.QtyAvail, @@ -273,7 +273,7 @@ namespace MagMan.Data.Tenant.Controllers { dbResult = dbCtx .DbSetItems - .Where(x => x.IsActive || !onlyActive) + .Where(x => !x.IsDeleted || !onlyActive) .Include(c => c.MaterialNav) .OrderBy(x => x.MatId) .ToList(); @@ -295,7 +295,7 @@ namespace MagMan.Data.Tenant.Controllers { dbResult = dbCtx .DbSetItems - .Where(x => (matID == 0 || x.MatId == matID) && (x.IsActive || !onlyActive)) + .Where(x => (matID == 0 || x.MatId == matID) && (!x.IsDeleted || !onlyActive)) .Include(c => c.MaterialNav) .OrderBy(x => x.WMm) .ThenBy(x => x.HMm) @@ -407,7 +407,7 @@ namespace MagMan.Data.Tenant.Controllers if (currData != null) { // riattivazione logica... - currData.IsActive = true; + currData.IsDeleted = false; // registro modifica RawItem dbCtx.Entry(currData).State = EntityState.Modified; @@ -445,7 +445,7 @@ namespace MagMan.Data.Tenant.Controllers { MatCloudId = origItem.MatId, RawItemCloudId = origItem.RawItemId, - IsActive=origItem.IsActive, + IsDeleted = origItem.IsDeleted, IsRemn = origItem.IsRemn, Location = origItem.Location, QtyAvail = origItem.QtyAvail, @@ -511,7 +511,7 @@ namespace MagMan.Data.Tenant.Controllers // sistemo record... currData.MatId = rec2upd.MatId; - currData.IsActive = rec2upd.IsActive; + currData.IsDeleted = rec2upd.IsDeleted; if (!ignoreRemn) { currData.IsRemn = rec2upd.IsRemn; @@ -730,8 +730,8 @@ namespace MagMan.Data.Tenant.Controllers HMm = x.HMm, LMm = x.LMm, WMm = x.WMm, - SizeNum = x.RawItemList == null ? 0 : x.RawItemList.Where(x => x.IsActive).Count(), - QtyTot = x.RawItemList == null ? 0 : calcQty(x.IsBeam, x.RawItemList.Where(x => x.IsActive && (withRemn || !x.IsRemn)).ToList()), + SizeNum = x.RawItemList == null ? 0 : x.RawItemList.Where(x => !x.IsDeleted).Count(), + QtyTot = x.RawItemList == null ? 0 : calcQty(x.IsBeam, x.RawItemList.Where(x => !x.IsDeleted && (withRemn || !x.IsRemn)).ToList()), MatDtmx = x.MatDtmx, IsBeam = x.IsBeam, IsWall = x.IsWall, @@ -1391,7 +1391,7 @@ namespace MagMan.Data.Tenant.Controllers HMm = x.ItemNav.HMm, LMm = x.ItemNav.LMm, WMm = x.ItemNav.WMm, - IsActive = x.ItemNav.IsActive, + IsDeleted = x.ItemNav.IsDeleted, IsRemn = x.ItemNav.IsRemn, MatCloudId = x.ItemNav.MatId, RequestId = x.RequestId diff --git a/MagMan.Data.Tenant/DbModels/RawItemModel.cs b/MagMan.Data.Tenant/DbModels/RawItemModel.cs index a2327a0..250c6b5 100644 --- a/MagMan.Data.Tenant/DbModels/RawItemModel.cs +++ b/MagMan.Data.Tenant/DbModels/RawItemModel.cs @@ -32,9 +32,9 @@ namespace MagMan.Data.Tenant.DbModels public int QtyAvail { get; set; } = 0; /// - /// Active, for logical delete on PC... + /// Bool for logical delete (clound and on PC...) /// - public bool IsActive { get; set; } = false; + public bool IsDeleted { get; set; } = false; /// /// Check if is a Remnant diff --git a/MagMan.Data.Tenant/MagManContext.cs b/MagMan.Data.Tenant/MagManContext.cs index 860fbb7..3ced5cf 100644 --- a/MagMan.Data.Tenant/MagManContext.cs +++ b/MagMan.Data.Tenant/MagManContext.cs @@ -74,7 +74,7 @@ namespace MagMan.Data.Tenant { // commentato x test su cluster in ufficio #if DEBUG - //connString = "Server=localhost;port=3306;database=MagMan_000470;uid=MagMan_DbUser;pwd=viad@nte16!;sslmode=None;"; + connString = "Server=localhost;port=3306;database=MagMan_000470;uid=MagMan_DbUser;pwd=viad@nte16!;sslmode=None;"; ////connString = "Server=mdb03.ufficio;port=3306;database=MagMan_000470;uid=MagMan_DbUser;pwd=viad@nte16!;sslmode=None;"; #endif var serverVersion = DbConfig.MysqlServerVersion(connString); diff --git a/MagMan.Data.Tenant/Migrations/20240805122833_RawItemRenActiveToDelete.Designer.cs b/MagMan.Data.Tenant/Migrations/20240805122833_RawItemRenActiveToDelete.Designer.cs new file mode 100644 index 0000000..d4be300 --- /dev/null +++ b/MagMan.Data.Tenant/Migrations/20240805122833_RawItemRenActiveToDelete.Designer.cs @@ -0,0 +1,561 @@ +// +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("20240805122833_RawItemRenActiveToDelete")] + partial class RawItemRenActiveToDelete + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.28") + .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.DayStatModel", b => + { + b.Property("DayId") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasColumnName("DayId"); + + b.Property("DtRif") + .HasColumnType("datetime(6)"); + + b.Property("MachineID") + .HasColumnType("int"); + + b.Property("OreDis") + .HasColumnType("double"); + + b.Property("OreLav") + .HasColumnType("double"); + + b.HasKey("DayId"); + + b.ToTable("DayStat"); + }); + + modelBuilder.Entity("MagMan.Data.Tenant.DbModels.EventModel", b => + { + b.Property("IdxEv") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Azione") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CssClass") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("EventoTablet") + .HasColumnType("tinyint(1)"); + + b.Property("Icon") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("KeyEvento") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Nome") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NoteEvento") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("TabAzione") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("IdxEv"); + + b.ToTable("AnagEventi"); + }); + + modelBuilder.Entity("MagMan.Data.Tenant.DbModels.LogMachineModel", b => + { + b.Property("LogDbId") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasColumnName("DbId"); + + b.Property("DtEvent") + .HasColumnType("datetime(6)") + .HasColumnName("DtEvent"); + + b.Property("EvType") + .HasColumnType("int") + .HasColumnName("EvType"); + + b.Property("KeyNum") + .HasColumnType("int"); + + b.Property("MachineID") + .HasColumnType("int"); + + b.Property("ProjDbId") + .HasColumnType("int"); + + b.Property("SupervId") + .IsRequired() + .HasColumnType("longtext") + .HasColumnName("SupervId"); + + b.Property("VarValue") + .IsRequired() + .HasColumnType("longtext") + .HasColumnName("VarValue"); + + b.HasKey("LogDbId"); + + b.HasIndex("KeyNum"); + + b.HasIndex("MachineID"); + + b.ToTable("LogMachine"); + }); + + modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MachGroupModel", b => + { + b.Property("MachGroupDbId") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasColumnName("DbId"); + + b.Property("DtEnd") + .HasColumnType("datetime(6)") + .HasColumnName("DtEnd"); + + b.Property("DtStart") + .HasColumnType("datetime(6)") + .HasColumnName("DtStart"); + + b.Property("MachGroupId") + .HasColumnType("int") + .HasColumnName("MachGroupId"); + + b.Property("ProjDbId") + .HasColumnType("int"); + + b.HasKey("MachGroupDbId"); + + b.ToTable("MachGroupList"); + }); + + 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.PartModel", b => + { + b.Property("PartDbId") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasColumnName("DbId"); + + b.Property("DtEnd") + .HasColumnType("datetime(6)") + .HasColumnName("DtEnd"); + + b.Property("DtStart") + .HasColumnType("datetime(6)") + .HasColumnName("DtStart"); + + b.Property("MachGroupId") + .HasColumnType("int") + .HasColumnName("MachGroupId"); + + b.Property("PartId") + .HasColumnType("int") + .HasColumnName("PartId"); + + b.Property("ProjDbId") + .HasColumnType("int"); + + b.HasKey("PartDbId"); + + b.ToTable("PartList"); + }); + + 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.Property("ValAct") + .HasColumnType("double"); + + b.Property("ValMax") + .HasColumnType("double"); + + 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("IsDeleted") + .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.StatusModel", b => + { + b.Property("IdxStato") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ClasseTempo") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Descrizione") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("KeyStato") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NoteStato") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Priorita") + .HasColumnType("int"); + + b.Property("Semaforo") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ShowArticolo") + .HasColumnType("tinyint(1)"); + + b.HasKey("IdxStato"); + + b.ToTable("AnagStati"); + }); + + 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/20240805122833_RawItemRenActiveToDelete.cs b/MagMan.Data.Tenant/Migrations/20240805122833_RawItemRenActiveToDelete.cs new file mode 100644 index 0000000..56222e0 --- /dev/null +++ b/MagMan.Data.Tenant/Migrations/20240805122833_RawItemRenActiveToDelete.cs @@ -0,0 +1,25 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace MagMan.Data.Tenant.Migrations +{ + public partial class RawItemRenActiveToDelete : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.RenameColumn( + name: "IsActive", + table: "RawItemList", + newName: "IsDeleted"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.RenameColumn( + name: "IsDeleted", + table: "RawItemList", + newName: "IsActive"); + } + } +} diff --git a/MagMan.Data.Tenant/Migrations/MagManContextModelSnapshot.cs b/MagMan.Data.Tenant/Migrations/MagManContextModelSnapshot.cs index 206f175..15ab18f 100644 --- a/MagMan.Data.Tenant/Migrations/MagManContextModelSnapshot.cs +++ b/MagMan.Data.Tenant/Migrations/MagManContextModelSnapshot.cs @@ -386,7 +386,7 @@ namespace MagMan.Data.Tenant.Migrations b.Property("HMm") .HasColumnType("decimal(65,30)"); - b.Property("IsActive") + b.Property("IsDeleted") .HasColumnType("tinyint(1)"); b.Property("IsRemn") diff --git a/MagMan.Data.Tenant/Services/TenantService.cs b/MagMan.Data.Tenant/Services/TenantService.cs index 8e52e95..db1ad4d 100644 --- a/MagMan.Data.Tenant/Services/TenantService.cs +++ b/MagMan.Data.Tenant/Services/TenantService.cs @@ -269,7 +269,7 @@ namespace MagMan.Data.Tenant.Services LMm = origItem.LMm, WMm = origItem.WMm, HMm = origItem.HMm, - IsActive = origItem.IsActive, + IsDeleted = origItem.IsDeleted, IsRemn = origItem.IsRemn, Location = origItem.Location, QtyAvail = origItem.QtyAvail diff --git a/MagMan.UI/Components/ItemMan.razor b/MagMan.UI/Components/ItemMan.razor index 2600b2b..6f6eb1f 100644 --- a/MagMan.UI/Components/ItemMan.razor +++ b/MagMan.UI/Components/ItemMan.razor @@ -79,47 +79,45 @@ @foreach (var item in ListRecords) { - string cssRow = item.IsActive ? "" : "text-strike"; + string cssRow = item.IsDeleted ? "text-strike" : ""; - @if (item.IsActive) + @if (item.IsDeleted) { - + } else { - + } @item.QtyAvail - @if (item.IsActive) - { - - - - } - else + @if (item.IsDeleted) { } + else + { + + + + }  @item.RawItemId - @if(item.IsRemn) + @if (item.IsRemn) { - @* *@ } else { - @* *@ } @@ -154,7 +152,7 @@ - @if (item.QtyAvail <= 0 && item.IsActive) + @if (item.QtyAvail <= 0 && !item.IsDeleted) { } diff --git a/MagMan.UI/Components/ItemMan.razor.cs b/MagMan.UI/Components/ItemMan.razor.cs index cd35289..345f18d 100644 --- a/MagMan.UI/Components/ItemMan.razor.cs +++ b/MagMan.UI/Components/ItemMan.razor.cs @@ -160,7 +160,7 @@ namespace MagMan.UI.Components Location = "nd", Note = matNote, QtyAvail = 0, - IsActive = true, + IsDeleted = false, IsRemn = false, MaterialNav = MaterialSel, HMm = MaterialSel.HMm, @@ -386,14 +386,14 @@ namespace MagMan.UI.Components } break; - case "IsActive": + case "IsDeleted": if (sortAsc) { - SearchRecords = SearchRecords.OrderBy(x => x.IsActive).ToList(); + SearchRecords = SearchRecords.OrderBy(x => x.IsDeleted).ToList(); } else { - SearchRecords = SearchRecords.OrderByDescending(x => x.IsActive).ToList(); + SearchRecords = SearchRecords.OrderByDescending(x => x.IsDeleted).ToList(); } break; diff --git a/MagMan.UI/MagMan.UI.csproj b/MagMan.UI/MagMan.UI.csproj index 93e9804..9882068 100644 --- a/MagMan.UI/MagMan.UI.csproj +++ b/MagMan.UI/MagMan.UI.csproj @@ -2,7 +2,7 @@ net6.0 - 1.0.2408.0513 + 1.0.2408.0514 enable enable true diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 0817a75..09e014a 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MagMan - Wood Warehouse Management System -

Versione: 1.0.2408.0513

+

Versione: 1.0.2408.0514


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index e82cbc1..90aa26e 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.0.2408.0513 +1.0.2408.0514 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 3f65d29..46f097c 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.0.2408.0513 + 1.0.2408.0514 http://nexus.steamware.net/repository/SWS/MagMan/stable/0/MagMan.UI.zip http://nexus.steamware.net/repository/SWS/MagMan/stable/0/ChangeLog.html false