Egalware/magman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into SDK

Browse Source
This commit is contained in:
Samuele Locatelli
2024-08-05 14:29:04 +02:00
parent f5f0a790ee cc3b7ccfe6
commit 101f36bcd4
19 changed files with 633 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgwProxy.DataLayer/DbModel/ProdModel.cs
+1 -1
View File
@@ -92,7 +92,7 @@ namespace EgwProxy.DataLayer.DbModel
/// Record attivo (se false == cancellazione logica)
/// </summary>
[Index]
[Column("IsActive")]
[Column("IsDeleted")]
public bool IsActive { get; set; } = true;
/// <summary>
EgwProxy.DataLayer/DbModel/ProjModel.cs
+1 -1
View File
@@ -102,7 +102,7 @@ namespace EgwProxy.DataLayer.DbModel
/// Record attivo (se false == cancellazione logica)
/// </summary>
[Index]
[Column("IsActive")]
[Column("IsDeleted")]
public bool IsActive { get; set; } = true;
/// <summary>
/// Descrizione progetto (copiata da BTLFileName inizialmente)
EgwProxy.MagMan/DTO/ItemDTO.cs
+2 -2
View File
@@ -26,9 +26,9 @@
public int RawItemLocalId { get; set; } = 0;
/// <summary>
/// Active, for logical delete on PC...
/// Boolean for logical delete
/// </summary>
public bool IsActive { get; set; } = false;
public bool IsDeleted { get; set; } = false;
/// <summary>
/// Check if is a Remnant
EgwProxy.MagMan/DTO/ResourceExpDTO.cs
+2 -2
View File
@@ -68,8 +68,8 @@ namespace EgwProxy.MagMan.DTO
public DateTime DtRequest { get; set; }
/// <summary>
/// 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...)
/// </summary>
public bool IsActive { get; set; } = true;
public bool IsDeleted { get; set; } = false;
}
}
MagMan.Core/DTO/ItemDTO.cs
+2 -2
View File
@@ -33,9 +33,9 @@ namespace MagMan.Core.DTO
public int RawItemLocalId { get; set; } = 0;
/// <summary>
/// Active, for logical delete on PC...
/// Boolean for logical delete
/// </summary>
public bool IsActive { get; set; } = false;
public bool IsDeleted { get; set; } = false;
/// <summary>
/// Check if is a Remnant
MagMan.Core/DTO/ResourceExpDTO.cs
+2 -2
View File
@@ -66,8 +66,8 @@
public DateTime DtRequest { get; set; }
/// <summary>
/// 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...)
/// </summary>
public bool IsActive { get; set; } = true;
public bool IsDeleted { get; set; } = false;
}
}
MagMan.Data.Tenant/Controllers/TenantController.cs
+11 -11
View File
@@ -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
MagMan.Data.Tenant/DbModels/RawItemModel.cs
+2 -2
View File
@@ -32,9 +32,9 @@ namespace MagMan.Data.Tenant.DbModels
public int QtyAvail { get; set; } = 0;
/// <summary>
/// Active, for logical delete on PC...
/// Bool for logical delete (clound and on PC...)
/// </summary>
public bool IsActive { get; set; } = false;
public bool IsDeleted { get; set; } = false;
/// <summary>
/// Check if is a Remnant
MagMan.Data.Tenant/MagManContext.cs
+1 -1
View File
@@ -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);
MagMan.Data.Tenant/Migrations/20240805122833_RawItemRenActiveToDelete.Designer.cs
Generated
+561
View File
@@ -0,0 +1,561 @@
// <auto-generated />
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<string>("Family")
.HasColumnType("varchar(255)");
b.Property<string>("ValueOriginal")
.HasColumnType("varchar(255)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<string>("ValueAlias")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("Family", "ValueOriginal");
b.ToTable("AliasList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ConfigModel", b =>
{
b.Property<string>("KeyName")
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasColumnOrder(0);
b.Property<string>("Note")
.IsRequired()
.HasMaxLength(250)
.HasColumnType("varchar(250)")
.HasColumnOrder(3);
b.Property<string>("Val")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasColumnOrder(1);
b.Property<string>("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<int>("DayId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DayId");
b.Property<DateTime>("DtRif")
.HasColumnType("datetime(6)");
b.Property<int>("MachineID")
.HasColumnType("int");
b.Property<double>("OreDis")
.HasColumnType("double");
b.Property<double>("OreLav")
.HasColumnType("double");
b.HasKey("DayId");
b.ToTable("DayStat");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.EventModel", b =>
{
b.Property<int>("IdxEv")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("Azione")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("CssClass")
.IsRequired()
.HasColumnType("longtext");
b.Property<bool>("EventoTablet")
.HasColumnType("tinyint(1)");
b.Property<string>("Icon")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("KeyEvento")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Nome")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("NoteEvento")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("TabAzione")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("IdxEv");
b.ToTable("AnagEventi");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.LogMachineModel", b =>
{
b.Property<int>("LogDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DbId");
b.Property<DateTime>("DtEvent")
.HasColumnType("datetime(6)")
.HasColumnName("DtEvent");
b.Property<int>("EvType")
.HasColumnType("int")
.HasColumnName("EvType");
b.Property<int>("KeyNum")
.HasColumnType("int");
b.Property<int>("MachineID")
.HasColumnType("int");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.Property<string>("SupervId")
.IsRequired()
.HasColumnType("longtext")
.HasColumnName("SupervId");
b.Property<string>("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<int>("MachGroupDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DbId");
b.Property<DateTime>("DtEnd")
.HasColumnType("datetime(6)")
.HasColumnName("DtEnd");
b.Property<DateTime>("DtStart")
.HasColumnType("datetime(6)")
.HasColumnName("DtStart");
b.Property<int>("MachGroupId")
.HasColumnType("int")
.HasColumnName("MachGroupId");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.HasKey("MachGroupDbId");
b.ToTable("MachGroupList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MaterialModel", b =>
{
b.Property<int>("MatId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<decimal>("HMm")
.HasColumnType("decimal(65,30)");
b.Property<decimal>("LMm")
.HasColumnType("decimal(65,30)");
b.Property<string>("MatCode")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("MatDesc")
.IsRequired()
.HasColumnType("longtext");
b.Property<decimal>("WMm")
.HasColumnType("decimal(65,30)");
b.HasKey("MatId");
b.ToTable("MaterialsList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
{
b.Property<int>("MovID")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<DateTime>("DtRec")
.HasColumnType("datetime(6)");
b.Property<string>("Note")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("QtyRec")
.HasColumnType("int");
b.Property<int>("RawItemId")
.HasColumnType("int");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("MovID");
b.HasIndex("RawItemId");
b.ToTable("MovMag");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.PartModel", b =>
{
b.Property<int>("PartDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DbId");
b.Property<DateTime>("DtEnd")
.HasColumnType("datetime(6)")
.HasColumnName("DtEnd");
b.Property<DateTime>("DtStart")
.HasColumnType("datetime(6)")
.HasColumnName("DtStart");
b.Property<int>("MachGroupId")
.HasColumnType("int")
.HasColumnName("MachGroupId");
b.Property<int>("PartId")
.HasColumnType("int")
.HasColumnName("PartId");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.HasKey("PartDbId");
b.ToTable("PartList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ProjModel", b =>
{
b.Property<int>("ProjDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("BTLFileName")
.IsRequired()
.HasColumnType("longtext");
b.Property<DateTime>("DtCreated")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtLastAction")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtSchedule")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtStartProd")
.HasColumnType("datetime(6)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsArchived")
.HasColumnType("tinyint(1)");
b.Property<int>("KeyNum")
.HasColumnType("int");
b.Property<string>("ListName")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Machine")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("MachineID")
.HasColumnType("int");
b.Property<int>("PType")
.HasColumnType("int");
b.Property<double>("ProcTimeEst")
.HasColumnType("double");
b.Property<double>("ProcTimeReal")
.HasColumnType("double");
b.Property<string>("ProjDescription")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("ProjExtDbId")
.HasColumnType("int");
b.Property<int>("ProjExtId")
.HasColumnType("int");
b.Property<double>("ValAct")
.HasColumnType("double");
b.Property<double>("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<int>("RawItemId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<decimal>("HMm")
.HasColumnType("decimal(65,30)");
b.Property<bool>("IsDeleted")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsRemn")
.HasColumnType("tinyint(1)");
b.Property<decimal>("LMm")
.HasColumnType("decimal(65,30)");
b.Property<string>("Location")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("MatId")
.HasColumnType("int");
b.Property<string>("Note")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("QtyAvail")
.HasColumnType("int");
b.Property<decimal>("WMm")
.HasColumnType("decimal(65,30)");
b.HasKey("RawItemId");
b.HasIndex("MatId");
b.ToTable("RawItemList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RequestPlanModel", b =>
{
b.Property<int>("RequestId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<DateTime>("DtRequest")
.HasColumnType("datetime(6)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.Property<int>("ReqState")
.HasColumnType("int");
b.HasKey("RequestId");
b.ToTable("RequestPlan");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ResourceModel", b =>
{
b.Property<int>("ResourceId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<int>("Qty")
.HasColumnType("int");
b.Property<int>("RawItemId")
.HasColumnType("int");
b.Property<int>("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<int>("IdxStato")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("ClasseTempo")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Descrizione")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("KeyStato")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("NoteStato")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("Priorita")
.HasColumnType("int");
b.Property<string>("Semaforo")
.IsRequired()
.HasColumnType("longtext");
b.Property<bool>("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
}
}
}
MagMan.Data.Tenant/Migrations/20240805122833_RawItemRenActiveToDelete.cs
+25
View File
@@ -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");
}
}
}
MagMan.Data.Tenant/Migrations/MagManContextModelSnapshot.cs
+1 -1
View File
@@ -386,7 +386,7 @@ namespace MagMan.Data.Tenant.Migrations
b.Property<decimal>("HMm")
.HasColumnType("decimal(65,30)");
b.Property<bool>("IsActive")
b.Property<bool>("IsDeleted")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsRemn")
MagMan.Data.Tenant/Services/TenantService.cs
+1 -1
View File
@@ -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
MagMan.UI/Components/ItemMan.razor
+13 -15
View File
@@ -79,47 +79,45 @@
<tbody>
@foreach (var item in ListRecords)
{
string cssRow = item.IsActive ? "" : "text-strike";
string cssRow = item.IsDeleted ? "text-strike" : "";
<tr class="align-middle @CheckSel(item) @cssRow">
<td>
<button class="btn btn-info btn-sm" @onclick="() => DoSelect(item)"><i class="fa-solid fa-search"></i></button>
@if (item.IsActive)
@if (item.IsDeleted)
{
<button class="btn btn-primary btn-sm" @onclick="() => DoEdit(item)"><i class="fa-solid fa-edit"></i></button>
<button class="btn btn-warning btn-sm" @onclick="() => ReactivRecord(item)" title="Riattivazione Record"><i class="fa-regular fa-thumbs-up"></i></button>
}
else
{
<button class="btn btn-warning btn-sm" @onclick="() => ReactivRecord(item)" title="Riattivazione Record"><i class="fa-regular fa-thumbs-up"></i></button>
<button class="btn btn-primary btn-sm" @onclick="() => DoEdit(item)"><i class="fa-solid fa-edit"></i></button>
}
</td>
<td class="text-end fs-5">
<b>@item.QtyAvail</b>
</td>
<td>
@if (item.IsActive)
{
<span class="border border-primary rounded px-1">
<i class="fa-regular fa-thumbs-up"></i>
</span>
}
else
@if (item.IsDeleted)
{
<span class="border border-info rounded px-1">
<i class="fa-regular fa-thumbs-down"></i>
</span>
}
else
{
<span class="border border-primary rounded px-1">
<i class="fa-regular fa-thumbs-up"></i>
</span>
}
&nbsp;@item.RawItemId
</td>
<td>
@if(item.IsRemn)
@if (item.IsRemn)
{
<i class="fas fa-not-equal" title="Spezzone"></i>
@* <i class="fas fa-cut"></i> *@
}
else
{
<i class="fas fa-equals" title="Acquisto"></i>
@* <i class="fas fa-shopping-cart"></i> *@
}
</td>
<td>
@@ -154,7 +152,7 @@
<AuthorizeView Roles="SuperAdmin, Admin, SuperUser">
<Authorized>
<td class="text-end">
@if (item.QtyAvail <= 0 && item.IsActive)
@if (item.QtyAvail <= 0 && !item.IsDeleted)
{
<button class="btn btn-danger btn-sm" @onclick="() => DeleteRecord(item)"><i class="fa-solid fa-trash"></i></button>
}
MagMan.UI/Components/ItemMan.razor.cs
+4 -4
View File
@@ -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;
MagMan.UI/MagMan.UI.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>1.0.2408.0513</Version>
<Version>1.0.2408.0514</Version>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MagMan - Wood Warehouse Management System</i>
<h4>Versione: 1.0.2408.0513</h4>
<h4>Versione: 1.0.2408.0514</h4>
<br /> Note di rilascio:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.0.2408.0513
1.0.2408.0514
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.0.2408.0513</version>
<version>1.0.2408.0514</version>
<url>http://nexus.steamware.net/repository/SWS/MagMan/stable/0/MagMan.UI.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MagMan/stable/0/ChangeLog.html</changelog>
<mandatory>false</mandatory>