From 693b5d0eba4612b735381d978090d43f648d8ed0 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 25 Nov 2021 09:55:49 +0100 Subject: [PATCH 01/10] fix pub profiles xml --- .../Properties/PublishProfiles/IIS01.pubxml | 23 ++++++++++++++++ .../Properties/PublishProfiles/IIS02.pubxml | 27 +++++++++++++++++++ .../PublishProfiles/W2019-IIS-Dev.pubxml | 27 +++++++++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 REMAN/REMAN/Properties/PublishProfiles/IIS01.pubxml create mode 100644 REMAN/REMAN/Properties/PublishProfiles/IIS02.pubxml create mode 100644 REMAN/REMAN/Properties/PublishProfiles/W2019-IIS-Dev.pubxml diff --git a/REMAN/REMAN/Properties/PublishProfiles/IIS01.pubxml b/REMAN/REMAN/Properties/PublishProfiles/IIS01.pubxml new file mode 100644 index 0000000..57aa0c4 --- /dev/null +++ b/REMAN/REMAN/Properties/PublishProfiles/IIS01.pubxml @@ -0,0 +1,23 @@ + + + + MSDeploy + Release + Any CPU + https://IIS01.egalware.com/REMAN + True + False + net6.0 + 9e15e9ea-0511-4d7e-9391-a7d1c3cc7922 + false + https://IIS01:8172/MsDeploy.axd + Default Web Site/REMAN + + True + WMSVC + False + True + jenkins + <_SavePWD>True + + \ No newline at end of file diff --git a/REMAN/REMAN/Properties/PublishProfiles/IIS02.pubxml b/REMAN/REMAN/Properties/PublishProfiles/IIS02.pubxml new file mode 100644 index 0000000..f160250 --- /dev/null +++ b/REMAN/REMAN/Properties/PublishProfiles/IIS02.pubxml @@ -0,0 +1,27 @@ + + + + + MSDeploy + True + Release + Any CPU + https://IIS02.egalware.com/REMAN + False + 9e15e9ea-0511-4d7e-9391-a7d1c3cc7922 + false + https://IIS02:8172/MsDeploy.axd + Default Web Site/REMAN + + False + WMSVC + True + True + jenkins + <_SavePWD>True + net6.0 + + \ No newline at end of file diff --git a/REMAN/REMAN/Properties/PublishProfiles/W2019-IIS-Dev.pubxml b/REMAN/REMAN/Properties/PublishProfiles/W2019-IIS-Dev.pubxml new file mode 100644 index 0000000..05c7238 --- /dev/null +++ b/REMAN/REMAN/Properties/PublishProfiles/W2019-IIS-Dev.pubxml @@ -0,0 +1,27 @@ + + + + + MSDeploy + True + Release + Any CPU + https://w2019-iis-dev/REMAN + False + 9e15e9ea-0511-4d7e-9391-a7d1c3cc7922 + false + https://w2019-iis-dev:8172/MsDeploy.axd + Default Web Site/REMAN + + False + WMSVC + True + True + jenkins + <_SavePWD>True + net6.0 + + \ No newline at end of file From cae78daefd876c496701eed98960f9173fab04fe Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 25 Nov 2021 09:56:01 +0100 Subject: [PATCH 02/10] Spostamento progetto NKC Data --- NKC.Data/Controllers/NKCController.cs | 295 ++++++++++++++++++ NKC.Data/DTO/MaterialDTO.cs | 47 +++ NKC.Data/DTO/RemnantDTO.cs | 12 + NKC.Data/DbModels/MaterialModel.cs | 33 ++ NKC.Data/DbModels/MovMagModel.cs | 48 +++ NKC.Data/DbModels/PrintJobQueue.cs | 23 ++ NKC.Data/DbModels/RemnantsModel.cs | 105 +++++++ NKC.Data/Enum.cs | 28 ++ .../20211118172800_InitDb.Designer.cs | 80 +++++ NKC.Data/Migrations/20211118172800_InitDb.cs | 44 +++ ...0211118173720_AddRemnantsTable.Designer.cs | 132 ++++++++ .../20211118173720_AddRemnantsTable.cs | 50 +++ .../20211119182450_AddMovMagTable.Designer.cs | 172 ++++++++++ .../20211119182450_AddMovMagTable.cs | 47 +++ ...20211120074650_MovMagAddUserId.Designer.cs | 176 +++++++++++ .../20211120074650_MovMagAddUserId.cs | 29 ++ .../Migrations/NKCContextModelSnapshot.cs | 174 +++++++++++ NKC.Data/NKC.Data.csproj | 24 ++ NKC.Data/NKCContext.cs | 164 ++++++++++ 19 files changed, 1683 insertions(+) create mode 100644 NKC.Data/Controllers/NKCController.cs create mode 100644 NKC.Data/DTO/MaterialDTO.cs create mode 100644 NKC.Data/DTO/RemnantDTO.cs create mode 100644 NKC.Data/DbModels/MaterialModel.cs create mode 100644 NKC.Data/DbModels/MovMagModel.cs create mode 100644 NKC.Data/DbModels/PrintJobQueue.cs create mode 100644 NKC.Data/DbModels/RemnantsModel.cs create mode 100644 NKC.Data/Enum.cs create mode 100644 NKC.Data/Migrations/20211118172800_InitDb.Designer.cs create mode 100644 NKC.Data/Migrations/20211118172800_InitDb.cs create mode 100644 NKC.Data/Migrations/20211118173720_AddRemnantsTable.Designer.cs create mode 100644 NKC.Data/Migrations/20211118173720_AddRemnantsTable.cs create mode 100644 NKC.Data/Migrations/20211119182450_AddMovMagTable.Designer.cs create mode 100644 NKC.Data/Migrations/20211119182450_AddMovMagTable.cs create mode 100644 NKC.Data/Migrations/20211120074650_MovMagAddUserId.Designer.cs create mode 100644 NKC.Data/Migrations/20211120074650_MovMagAddUserId.cs create mode 100644 NKC.Data/Migrations/NKCContextModelSnapshot.cs create mode 100644 NKC.Data/NKC.Data.csproj create mode 100644 NKC.Data/NKCContext.cs diff --git a/NKC.Data/Controllers/NKCController.cs b/NKC.Data/Controllers/NKCController.cs new file mode 100644 index 0000000..983868d --- /dev/null +++ b/NKC.Data/Controllers/NKCController.cs @@ -0,0 +1,295 @@ +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Configuration; +using NKC.Data.DbModels; +using NKC.Data.DTO; +using NLog; + +namespace NKC.Data.Controllers +{ + public class NKCController : IDisposable + { + #region Private Fields + + private static IConfiguration _configuration = null!; + private static NLog.Logger Log = LogManager.GetCurrentClassLogger(); + + #endregion Private Fields + + #region Public Constructors + + public NKCController(IConfiguration configuration) + { + _configuration = configuration; + } + + #endregion Public Constructors + + #region Public Methods + + public bool DbForceMigrate() + { + bool answ = false; + using (NKCContext localDbCtx = new NKCContext(_configuration)) + { + try + { + localDbCtx.DbForceMigrate(); + answ = true; + } + catch (Exception exc) + { + Log.Error($"Eccezione in DbForceMigrate{Environment.NewLine}{exc}"); + } + } + return answ; + } + + public void Dispose() + { + Log.Info("Dispose di NKCController"); + } + + public List MaterialsGetAll() + { + List dbResult = new List(); + using (NKCContext localDbCtx = new NKCContext(_configuration)) + { + dbResult = localDbCtx + .DbSetMaterials + .Where(x => x.MatID > 0) + .Select(x => new MaterialDTO() + { + MatID = x.MatID, + MatExtCode = x.MatExtCode, + MatDesc = x.MatDesc, + LMm = x.LMm, + WMm = x.WMm, + TMm = x.TMm, + ApprovUser = x.ApprovUser, + ApprovDate = x.ApprovDate, + NumSize = x.RemnantNav== null?0: x.RemnantNav.Count, + TotQty = x.RemnantNav == null ? 0 : x.RemnantNav.Sum(r => r.QtyAvail) + } + ) + .ToList(); + } + return dbResult; + } + + public List MovMagGetFilt(int RemnId, int numShow) + { + List dbResult = new List(); + using (NKCContext localDbCtx = new NKCContext(_configuration)) + { + dbResult = localDbCtx + .DbSetMovMag + .Where(x => x.RemnID == RemnId) + .OrderByDescending(o => o.DtRec) + //.Include(m => m.RemnantNav) + .Take(numShow) + .ToList(); + } + return dbResult; + } + + public bool AddPrintJob(string tipoReport, string keyParam, string prtName) + { + bool done = false; + using (NKCContext localDbCtx = new NKCContext(_configuration)) + { + try + { + DateTime adesso = DateTime.Now; + PrintJobQueue newRec = new PrintJobQueue() + { + TipoReport = tipoReport, + KeyParam = keyParam, + PrtName = prtName, + Stato = 0, + DtStart = adesso, + DtLastTry = adesso + }; + + localDbCtx.DbSetPrintJobQueues.Add(newRec); + + localDbCtx.SaveChanges(); + done = true; + } + catch (Exception exc) + { + Log.Error($"Eccezione in AddPrintJob:{Environment.NewLine}{exc}"); + } + } + return done; + } + + public List RemnantsGetAll() + { + List dbResult = new List(); + using (NKCContext localDbCtx = new NKCContext(_configuration)) + { + dbResult = localDbCtx + .DbSetRemnants + .ToList(); + } + return dbResult; + } + public RemnantsModel RemnantGetByid(int RemnId) + { + RemnantsModel? dbResult = new RemnantsModel(); + using (NKCContext localDbCtx = new NKCContext(_configuration)) + { + dbResult = localDbCtx + .DbSetRemnants + .Where(x => x.RemnID == RemnId) + .Include(m => m.MaterialNav) + .FirstOrDefault(); + } + if (dbResult == null) + { + dbResult = new RemnantsModel(); + } + return dbResult; + } + + public List RemnantsGetFilt(int matId, int minQty) + { + List dbResult = new List(); + using (NKCContext localDbCtx = new NKCContext(_configuration)) + { + dbResult = localDbCtx + .DbSetRemnants + .Where(x => (x.MatID == matId || matId == 0) && (x.QtyAvail >= minQty || minQty == 0)) + //.OrderBy(o => o.Area) + .Include(m => m.MaterialNav) + .ToList(); + } + return dbResult; + } + + public RemnantsModel RemnantGetByQr(string QrCode) + { + RemnantsModel? dbResult = new RemnantsModel(); + using (NKCContext localDbCtx = new NKCContext(_configuration)) + { + var rawList = localDbCtx + .DbSetRemnants + .Include(m => m.MaterialNav) + .ToList(); + + dbResult = rawList + .Where(x => x.RemDtmx == QrCode) + .FirstOrDefault(); + } + if (dbResult == null) + { + dbResult = new RemnantsModel(); + } + return dbResult; + } + + public bool RemnantsUpsert(RemnantsModel updItem, string userId) + { + bool done = false; + using (NKCContext localDbCtx = new NKCContext(_configuration)) + { + + try + { + RemnantsModel? currData = localDbCtx + .DbSetRemnants + .Where(x => x.RemnID == updItem.RemnID) + .FirstOrDefault(); + if (currData != null) + { + // aggiungo record variazione quantità... + int delta = updItem.QtyAvail - currData.QtyAvail; + if (delta != 0) + { + MovMagModel recMovMag = new MovMagModel() + { + DtRec = DateTime.Now, + RemnID = updItem.RemnID, + QtyRec = delta, + UserId = userId + }; + localDbCtx.DbSetMovMag.Add(recMovMag); + } + + // aggiorno valori + currData.MatID = updItem.MatID; + currData.DtMod = updItem.DtMod; + currData.Location = updItem.Location; + currData.Note = updItem.Note; + currData.QtyAvail = updItem.QtyAvail; + currData.LMm = updItem.LMm; + currData.WMm = updItem.WMm; + currData.TMm = updItem.TMm; + localDbCtx.Entry(currData).State = EntityState.Modified; + } + else + { + // aggiungo record variazione quantità... + MovMagModel recMovMag = new MovMagModel() + { + DtRec = DateTime.Now, + RemnID = updItem.RemnID, + QtyRec = updItem.QtyAvail + }; + localDbCtx.DbSetMovMag.Add(recMovMag); + + // aggiungo record puntuale + currData = new RemnantsModel() + { + MatID = updItem.MatID, + DtMod = updItem.DtMod, + Location = updItem.Location, + Note = updItem.Note, + QtyAvail = updItem.QtyAvail, + LMm = updItem.LMm, + WMm = updItem.WMm, + TMm = updItem.TMm + }; + localDbCtx + .DbSetRemnants + .Add(currData); + } + localDbCtx.SaveChanges(); + done = true; + } + catch (Exception exc) + { + Log.Error($"Eccezione in PlantUpdate:{Environment.NewLine}{exc}"); + } + } + return done; + } + + /// + /// Annulla modifiche su una specifica entity (cancel update) + /// + /// + /// + public bool rollBackEntity(object item) + { + bool answ = false; + using (NKCContext localDbCtx = new NKCContext(_configuration)) + { + try + { + if (localDbCtx.Entry(item).State == EntityState.Deleted || localDbCtx.Entry(item).State == EntityState.Modified) + { + localDbCtx.Entry(item).Reload(); + } + } + catch (Exception exc) + { + Log.Error($"Eccezione in rollBackEntity{Environment.NewLine}{exc}"); + } + } + return answ; + } + + #endregion Public Methods + } +} \ No newline at end of file diff --git a/NKC.Data/DTO/MaterialDTO.cs b/NKC.Data/DTO/MaterialDTO.cs new file mode 100644 index 0000000..869c627 --- /dev/null +++ b/NKC.Data/DTO/MaterialDTO.cs @@ -0,0 +1,47 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace NKC.Data.DTO +{ + + // + // This is here so CodeMaid doesn't reorganize this document + // + public class MaterialDTO + + { + public int MatID { get; set; } + + public int MatExtCode { get; set; } = 0; + public string MatDesc { get; set; } = ""; + public DateTime ApprovDate { get; set; } = DateTime.Now.AddYears(10); + public string ApprovUser { get; set; } = ""; + public decimal LMm { get; set; } = 0; + public decimal WMm { get; set; } = 0; + public decimal TMm { get; set; } = 0; + + public string MatDtmx + { + get => $"MT{MatExtCode:00000000}"; + } + + public decimal LIn + { + get => Math.Round(LMm / (decimal)25.4, 3); + } + public decimal WIn + { + get => Math.Round(WMm / (decimal)25.4, 3); + } + public decimal TIn + { + get => Math.Round(TMm / (decimal)25.4, 3); + } + + public int NumSize { get; set; } = 0; + public int TotQty { get; set; } = 0; + } +} diff --git a/NKC.Data/DTO/RemnantDTO.cs b/NKC.Data/DTO/RemnantDTO.cs new file mode 100644 index 0000000..90ba0b1 --- /dev/null +++ b/NKC.Data/DTO/RemnantDTO.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace NKC.Data.DTO +{ + public class RemnantDTO + { + } +} diff --git a/NKC.Data/DbModels/MaterialModel.cs b/NKC.Data/DbModels/MaterialModel.cs new file mode 100644 index 0000000..e1a64e4 --- /dev/null +++ b/NKC.Data/DbModels/MaterialModel.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace NKC.Data.DbModels +{ + // + // This is here so CodeMaid doesn't reorganize this document + // + [Table("Materials")] + public partial class MaterialModel + { + [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public int MatID { get; set; } + + public int MatExtCode { get; set; } = 0; + public string MatDesc { get; set; } = ""; + public DateTime ApprovDate { get; set; } = DateTime.Now.AddYears(10); + public string ApprovUser { get; set; } = ""; + public decimal LMm { get; set; } = 0; + public decimal WMm { get; set; }=0; + public decimal TMm { get; set; }=0; + + [NotMapped] + public string MatDtmx { + get => $"MT{MatExtCode:00000000}"; + } + + + public virtual ICollection? RemnantNav { get; set; } + } +} diff --git a/NKC.Data/DbModels/MovMagModel.cs b/NKC.Data/DbModels/MovMagModel.cs new file mode 100644 index 0000000..54037aa --- /dev/null +++ b/NKC.Data/DbModels/MovMagModel.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace NKC.Data.DbModels +{ + // + // This is here so CodeMaid doesn't reorganize this document + // + //[Index(nameof(Installazione), nameof(Active), nameof(DiskStatus))] + [Table("MovMag")] + public partial class MovMagModel + { + /// + /// Primary Key AUTO + /// + [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public int MovID { get; set; } + + /// + /// DateTime record + /// + public DateTime DtRec { get; set; } = DateTime.Now; + + /// + /// Ext ref for Remnants + /// + public int RemnID { get; set; } + + /// + /// Qty recorded (delta +/-) + /// + public int QtyRec { get; set; } = 0; + + /// + /// User modificatore + /// + public string UserId { get; set; } = ""; + + /// + /// Navigation property to Remnant + /// + [ForeignKey("RemnID")] + public virtual RemnantsModel? RemnantNav { get; set; } + + } +} diff --git a/NKC.Data/DbModels/PrintJobQueue.cs b/NKC.Data/DbModels/PrintJobQueue.cs new file mode 100644 index 0000000..e5f2182 --- /dev/null +++ b/NKC.Data/DbModels/PrintJobQueue.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; + +namespace NKC.Data.DbModels +{ + + // + // This is here so CodeMaid doesn't reorganize this document + // + [Table("PrintJobQueue")] + public partial class PrintJobQueue + { + public int IdxPrintJob { get; set; } + public string TipoReport { get; set; } = null!; + public string KeyParam { get; set; } = null!; + public string PrtName { get; set; } = null!; + public DateTime DtStart { get; set; } + public DateTime? DtEnd { get; set; } + public int Stato { get; set; } + public DateTime? DtLastTry { get; set; } + } +} diff --git a/NKC.Data/DbModels/RemnantsModel.cs b/NKC.Data/DbModels/RemnantsModel.cs new file mode 100644 index 0000000..e233aa4 --- /dev/null +++ b/NKC.Data/DbModels/RemnantsModel.cs @@ -0,0 +1,105 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace NKC.Data.DbModels +{ + // + // This is here so CodeMaid doesn't reorganize this document + // + //[Index(nameof(Installazione), nameof(Active), nameof(DiskStatus))] + [Table("RemnantsList")] + public partial class RemnantsModel + { + /// + /// Primary Key AUTO + /// + [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public int RemnID { get; set; } + + /// + /// Ext ref for Material + /// + public int MatID { get; set; } + + /// + /// Location + /// + public string Location { get; set; } = ""; + /// + /// Qty available on wharehouse + /// + public int QtyAvail { get; set; } = 0; + + /// + /// DateTime last modification + /// + public DateTime DtMod { get; set; } = DateTime.Now.AddYears(10); + + /// + /// Remnant's Lenght + /// + public decimal LMm { get; set; } = 0; + + /// + /// Remnant's Width + /// + public decimal WMm { get; set; } = 0; + + /// + /// Remnant's Thikness + /// + public decimal TMm { get; set; } = 0; + + [NotMapped] + public decimal LIn + { + get => Math.Round(LMm / (decimal)25.4, 3); + } + [NotMapped] + public decimal WIn + { + get => Math.Round(WMm / (decimal)25.4, 3); + } + [NotMapped] + public decimal TIn + { + get => Math.Round(TMm / (decimal)25.4, 3); + } + + + /// + /// Note (optional) + /// + public string Note { get; set; } = ""; + + [NotMapped] + public decimal Area + { + get => LMm * WMm; + } + + + [NotMapped] + public string RemDtmx + { + get + { + string answ = $"MT99999999-{LMm * 1000:00000000}"; + if (MaterialNav != null) + { + answ = $"MT{MaterialNav.MatExtCode:00000000}-{LMm * 1000:00000000}"; + } + return answ; + } + } + + /// + /// Navigation property to Material + /// + [ForeignKey("MatID")] + public virtual MaterialModel MaterialNav { get; set; } = null!; + + } +} diff --git a/NKC.Data/Enum.cs b/NKC.Data/Enum.cs new file mode 100644 index 0000000..727d26d --- /dev/null +++ b/NKC.Data/Enum.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace NKC.Data +{ + public class Enum + { + #region Public Enums + + public enum RemnState + { + /// + /// Non definito + /// + ND = 0, + + /// + /// Selezionato x operazioni (veto interfaccia ad altri usi) + /// + Selected + } + + #endregion Public Enums + } +} \ No newline at end of file diff --git a/NKC.Data/Migrations/20211118172800_InitDb.Designer.cs b/NKC.Data/Migrations/20211118172800_InitDb.Designer.cs new file mode 100644 index 0000000..7724cd5 --- /dev/null +++ b/NKC.Data/Migrations/20211118172800_InitDb.Designer.cs @@ -0,0 +1,80 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using NKC.Data; + +#nullable disable + +namespace NKC.Data.Migrations +{ + [DbContext(typeof(NKCContext))] + [Migration("20211118172800_InitDb")] + partial class InitDb + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.0") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); + + modelBuilder.Entity("NKC.Data.DbModels.MaterialModel", b => + { + b.Property("MatID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("MatID"), 1L, 1); + + b.Property("ApprovDate") + .ValueGeneratedOnAdd() + .HasColumnType("datetime") + .HasDefaultValueSql("(getdate())"); + + b.Property("ApprovUser") + .IsRequired() + .ValueGeneratedOnAdd() + .HasMaxLength(50) + .HasColumnType("nvarchar(50)") + .HasDefaultValueSql("('')"); + + b.Property("LMm") + .HasColumnType("decimal(18,3)") + .HasColumnName("L_mm"); + + b.Property("MatDesc") + .IsRequired() + .ValueGeneratedOnAdd() + .HasMaxLength(500) + .HasColumnType("nvarchar(500)") + .HasDefaultValueSql("('')") + .HasComment("Description"); + + b.Property("MatExtCode") + .HasColumnType("int"); + + b.Property("TMm") + .HasColumnType("decimal(18,3)") + .HasColumnName("T_mm"); + + b.Property("WMm") + .HasColumnType("decimal(18,3)") + .HasColumnName("W_mm"); + + b.HasKey("MatID"); + + b.HasIndex(new[] { "MatExtCode" }, "Idx_Materials_MatExtCode_Unique") + .IsUnique(); + + b.ToTable("Materials"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/NKC.Data/Migrations/20211118172800_InitDb.cs b/NKC.Data/Migrations/20211118172800_InitDb.cs new file mode 100644 index 0000000..01d1b6c --- /dev/null +++ b/NKC.Data/Migrations/20211118172800_InitDb.cs @@ -0,0 +1,44 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace NKC.Data.Migrations +{ + public partial class InitDb : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "Materials", + columns: table => new + { + MatID = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + MatExtCode = table.Column(type: "int", nullable: false), + MatDesc = table.Column(type: "nvarchar(500)", maxLength: 500, nullable: false, defaultValueSql: "('')", comment: "Description"), + ApprovDate = table.Column(type: "datetime", nullable: false, defaultValueSql: "(getdate())"), + ApprovUser = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: false, defaultValueSql: "('')"), + L_mm = table.Column(type: "decimal(18,3)", nullable: false), + W_mm = table.Column(type: "decimal(18,3)", nullable: false), + T_mm = table.Column(type: "decimal(18,3)", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Materials", x => x.MatID); + }); + + migrationBuilder.CreateIndex( + name: "Idx_Materials_MatExtCode_Unique", + table: "Materials", + column: "MatExtCode", + unique: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "Materials"); + } + } +} diff --git a/NKC.Data/Migrations/20211118173720_AddRemnantsTable.Designer.cs b/NKC.Data/Migrations/20211118173720_AddRemnantsTable.Designer.cs new file mode 100644 index 0000000..085ca6f --- /dev/null +++ b/NKC.Data/Migrations/20211118173720_AddRemnantsTable.Designer.cs @@ -0,0 +1,132 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using NKC.Data; + +#nullable disable + +namespace NKC.Data.Migrations +{ + [DbContext(typeof(NKCContext))] + [Migration("20211118173720_AddRemnantsTable")] + partial class AddRemnantsTable + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.0") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); + + modelBuilder.Entity("NKC.Data.DbModels.MaterialModel", b => + { + b.Property("MatID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("MatID"), 1L, 1); + + b.Property("ApprovDate") + .ValueGeneratedOnAdd() + .HasColumnType("datetime") + .HasDefaultValueSql("(getdate())"); + + b.Property("ApprovUser") + .IsRequired() + .ValueGeneratedOnAdd() + .HasMaxLength(50) + .HasColumnType("nvarchar(50)") + .HasDefaultValueSql("('')"); + + b.Property("LMm") + .HasColumnType("decimal(18,3)") + .HasColumnName("L_mm"); + + b.Property("MatDesc") + .IsRequired() + .ValueGeneratedOnAdd() + .HasMaxLength(500) + .HasColumnType("nvarchar(500)") + .HasDefaultValueSql("('')") + .HasComment("Description"); + + b.Property("MatExtCode") + .HasColumnType("int"); + + b.Property("TMm") + .HasColumnType("decimal(18,3)") + .HasColumnName("T_mm"); + + b.Property("WMm") + .HasColumnType("decimal(18,3)") + .HasColumnName("W_mm"); + + b.HasKey("MatID"); + + b.HasIndex(new[] { "MatExtCode" }, "Idx_Materials_MatExtCode_Unique") + .IsUnique(); + + b.ToTable("Materials"); + }); + + modelBuilder.Entity("NKC.Data.DbModels.RemnantsModel", b => + { + b.Property("RemnID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("RemnID"), 1L, 1); + + b.Property("DtMod") + .HasColumnType("datetime2"); + + b.Property("LMm") + .HasColumnType("decimal(18,3)"); + + b.Property("Location") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("MatID") + .HasColumnType("int"); + + b.Property("Note") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("QtyAvail") + .HasColumnType("int"); + + b.Property("TMm") + .HasColumnType("decimal(18,3)"); + + b.Property("WMm") + .HasColumnType("decimal(18,3)"); + + b.HasKey("RemnID"); + + b.HasIndex("MatID"); + + b.ToTable("RemnantsList"); + }); + + modelBuilder.Entity("NKC.Data.DbModels.RemnantsModel", b => + { + b.HasOne("NKC.Data.DbModels.MaterialModel", "MaterialNav") + .WithMany() + .HasForeignKey("MatID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MaterialNav"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/NKC.Data/Migrations/20211118173720_AddRemnantsTable.cs b/NKC.Data/Migrations/20211118173720_AddRemnantsTable.cs new file mode 100644 index 0000000..7c129a8 --- /dev/null +++ b/NKC.Data/Migrations/20211118173720_AddRemnantsTable.cs @@ -0,0 +1,50 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace NKC.Data.Migrations +{ + public partial class AddRemnantsTable : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "RemnantsList", + columns: table => new + { + RemnID = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + MatID = table.Column(type: "int", nullable: false), + Location = table.Column(type: "nvarchar(max)", nullable: false), + QtyAvail = table.Column(type: "int", nullable: false), + DtMod = table.Column(type: "datetime2", nullable: false), + LMm = table.Column(type: "decimal(18,3)", nullable: false), + WMm = table.Column(type: "decimal(18,3)", nullable: false), + TMm = table.Column(type: "decimal(18,3)", nullable: false), + Note = table.Column(type: "nvarchar(max)", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_RemnantsList", x => x.RemnID); + table.ForeignKey( + name: "FK_RemnantsList_Materials_MatID", + column: x => x.MatID, + principalTable: "Materials", + principalColumn: "MatID", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_RemnantsList_MatID", + table: "RemnantsList", + column: "MatID"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "RemnantsList"); + } + } +} diff --git a/NKC.Data/Migrations/20211119182450_AddMovMagTable.Designer.cs b/NKC.Data/Migrations/20211119182450_AddMovMagTable.Designer.cs new file mode 100644 index 0000000..9d52d4b --- /dev/null +++ b/NKC.Data/Migrations/20211119182450_AddMovMagTable.Designer.cs @@ -0,0 +1,172 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using NKC.Data; + +#nullable disable + +namespace NKC.Data.Migrations +{ + [DbContext(typeof(NKCContext))] + [Migration("20211119182450_AddMovMagTable")] + partial class AddMovMagTable + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.0") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); + + modelBuilder.Entity("NKC.Data.DbModels.MaterialModel", b => + { + b.Property("MatID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("MatID"), 1L, 1); + + b.Property("ApprovDate") + .ValueGeneratedOnAdd() + .HasColumnType("datetime") + .HasDefaultValueSql("(getdate())"); + + b.Property("ApprovUser") + .IsRequired() + .ValueGeneratedOnAdd() + .HasMaxLength(50) + .HasColumnType("nvarchar(50)") + .HasDefaultValueSql("('')"); + + b.Property("LMm") + .HasColumnType("decimal(18,3)") + .HasColumnName("L_mm"); + + b.Property("MatDesc") + .IsRequired() + .ValueGeneratedOnAdd() + .HasMaxLength(500) + .HasColumnType("nvarchar(500)") + .HasDefaultValueSql("('')") + .HasComment("Description"); + + b.Property("MatExtCode") + .HasColumnType("int"); + + b.Property("TMm") + .HasColumnType("decimal(18,3)") + .HasColumnName("T_mm"); + + b.Property("WMm") + .HasColumnType("decimal(18,3)") + .HasColumnName("W_mm"); + + b.HasKey("MatID"); + + b.HasIndex(new[] { "MatExtCode" }, "Idx_Materials_MatExtCode_Unique") + .IsUnique(); + + b.ToTable("Materials"); + }); + + modelBuilder.Entity("NKC.Data.DbModels.MovMagModel", b => + { + b.Property("MovID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("MovID"), 1L, 1); + + b.Property("DtRec") + .HasColumnType("datetime2"); + + b.Property("QtyRec") + .HasColumnType("int"); + + b.Property("RemnID") + .HasColumnType("int"); + + b.HasKey("MovID"); + + b.HasIndex("RemnID"); + + b.ToTable("MovMag"); + }); + + modelBuilder.Entity("NKC.Data.DbModels.RemnantsModel", b => + { + b.Property("RemnID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("RemnID"), 1L, 1); + + b.Property("DtMod") + .HasColumnType("datetime2"); + + b.Property("LMm") + .HasColumnType("decimal(18,3)"); + + b.Property("Location") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("MatID") + .HasColumnType("int"); + + b.Property("Note") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("QtyAvail") + .HasColumnType("int"); + + b.Property("TMm") + .HasColumnType("decimal(18,3)"); + + b.Property("WMm") + .HasColumnType("decimal(18,3)"); + + b.HasKey("RemnID"); + + b.HasIndex("MatID"); + + b.ToTable("RemnantsList"); + }); + + modelBuilder.Entity("NKC.Data.DbModels.MovMagModel", b => + { + b.HasOne("NKC.Data.DbModels.RemnantsModel", "RemnantNav") + .WithMany() + .HasForeignKey("RemnID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("RemnantNav"); + }); + + modelBuilder.Entity("NKC.Data.DbModels.RemnantsModel", b => + { + b.HasOne("NKC.Data.DbModels.MaterialModel", "MaterialNav") + .WithMany("RemnantNav") + .HasForeignKey("MatID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MaterialNav"); + }); + + modelBuilder.Entity("NKC.Data.DbModels.MaterialModel", b => + { + b.Navigation("RemnantNav"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/NKC.Data/Migrations/20211119182450_AddMovMagTable.cs b/NKC.Data/Migrations/20211119182450_AddMovMagTable.cs new file mode 100644 index 0000000..77c5b39 --- /dev/null +++ b/NKC.Data/Migrations/20211119182450_AddMovMagTable.cs @@ -0,0 +1,47 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace NKC.Data.Migrations +{ + public partial class AddMovMagTable : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + + migrationBuilder.CreateTable( + name: "MovMag", + columns: table => new + { + MovID = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + DtRec = table.Column(type: "datetime2", nullable: false), + RemnID = table.Column(type: "int", nullable: false), + QtyRec = table.Column(type: "int", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_MovMag", x => x.MovID); + table.ForeignKey( + name: "FK_MovMag_RemnantsList_RemnID", + column: x => x.RemnID, + principalTable: "RemnantsList", + principalColumn: "RemnID", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_MovMag_RemnID", + table: "MovMag", + column: "RemnID"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "MovMag"); + + } + } +} diff --git a/NKC.Data/Migrations/20211120074650_MovMagAddUserId.Designer.cs b/NKC.Data/Migrations/20211120074650_MovMagAddUserId.Designer.cs new file mode 100644 index 0000000..e2d2ab1 --- /dev/null +++ b/NKC.Data/Migrations/20211120074650_MovMagAddUserId.Designer.cs @@ -0,0 +1,176 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using NKC.Data; + +#nullable disable + +namespace NKC.Data.Migrations +{ + [DbContext(typeof(NKCContext))] + [Migration("20211120074650_MovMagAddUserId")] + partial class MovMagAddUserId + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.0") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); + + modelBuilder.Entity("NKC.Data.DbModels.MaterialModel", b => + { + b.Property("MatID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("MatID"), 1L, 1); + + b.Property("ApprovDate") + .ValueGeneratedOnAdd() + .HasColumnType("datetime") + .HasDefaultValueSql("(getdate())"); + + b.Property("ApprovUser") + .IsRequired() + .ValueGeneratedOnAdd() + .HasMaxLength(50) + .HasColumnType("nvarchar(50)") + .HasDefaultValueSql("('')"); + + b.Property("LMm") + .HasColumnType("decimal(18,3)") + .HasColumnName("L_mm"); + + b.Property("MatDesc") + .IsRequired() + .ValueGeneratedOnAdd() + .HasMaxLength(500) + .HasColumnType("nvarchar(500)") + .HasDefaultValueSql("('')") + .HasComment("Description"); + + b.Property("MatExtCode") + .HasColumnType("int"); + + b.Property("TMm") + .HasColumnType("decimal(18,3)") + .HasColumnName("T_mm"); + + b.Property("WMm") + .HasColumnType("decimal(18,3)") + .HasColumnName("W_mm"); + + b.HasKey("MatID"); + + b.HasIndex(new[] { "MatExtCode" }, "Idx_Materials_MatExtCode_Unique") + .IsUnique(); + + b.ToTable("Materials"); + }); + + modelBuilder.Entity("NKC.Data.DbModels.MovMagModel", b => + { + b.Property("MovID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("MovID"), 1L, 1); + + b.Property("DtRec") + .HasColumnType("datetime2"); + + b.Property("QtyRec") + .HasColumnType("int"); + + b.Property("RemnID") + .HasColumnType("int"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("MovID"); + + b.HasIndex("RemnID"); + + b.ToTable("MovMag"); + }); + + modelBuilder.Entity("NKC.Data.DbModels.RemnantsModel", b => + { + b.Property("RemnID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("RemnID"), 1L, 1); + + b.Property("DtMod") + .HasColumnType("datetime2"); + + b.Property("LMm") + .HasColumnType("decimal(18,3)"); + + b.Property("Location") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("MatID") + .HasColumnType("int"); + + b.Property("Note") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("QtyAvail") + .HasColumnType("int"); + + b.Property("TMm") + .HasColumnType("decimal(18,3)"); + + b.Property("WMm") + .HasColumnType("decimal(18,3)"); + + b.HasKey("RemnID"); + + b.HasIndex("MatID"); + + b.ToTable("RemnantsList"); + }); + + modelBuilder.Entity("NKC.Data.DbModels.MovMagModel", b => + { + b.HasOne("NKC.Data.DbModels.RemnantsModel", "RemnantNav") + .WithMany() + .HasForeignKey("RemnID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("RemnantNav"); + }); + + modelBuilder.Entity("NKC.Data.DbModels.RemnantsModel", b => + { + b.HasOne("NKC.Data.DbModels.MaterialModel", "MaterialNav") + .WithMany("RemnantNav") + .HasForeignKey("MatID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MaterialNav"); + }); + + modelBuilder.Entity("NKC.Data.DbModels.MaterialModel", b => + { + b.Navigation("RemnantNav"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/NKC.Data/Migrations/20211120074650_MovMagAddUserId.cs b/NKC.Data/Migrations/20211120074650_MovMagAddUserId.cs new file mode 100644 index 0000000..0e34722 --- /dev/null +++ b/NKC.Data/Migrations/20211120074650_MovMagAddUserId.cs @@ -0,0 +1,29 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace NKC.Data.Migrations +{ + public partial class MovMagAddUserId : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + + + migrationBuilder.AddColumn( + name: "UserId", + table: "MovMag", + type: "nvarchar(max)", + nullable: false, + defaultValue: ""); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "UserId", + table: "MovMag"); + + } + } +} diff --git a/NKC.Data/Migrations/NKCContextModelSnapshot.cs b/NKC.Data/Migrations/NKCContextModelSnapshot.cs new file mode 100644 index 0000000..eac940b --- /dev/null +++ b/NKC.Data/Migrations/NKCContextModelSnapshot.cs @@ -0,0 +1,174 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using NKC.Data; + +#nullable disable + +namespace NKC.Data.Migrations +{ + [DbContext(typeof(NKCContext))] + partial class NKCContextModelSnapshot : ModelSnapshot + { + protected override void BuildModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.0") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); + + modelBuilder.Entity("NKC.Data.DbModels.MaterialModel", b => + { + b.Property("MatID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("MatID"), 1L, 1); + + b.Property("ApprovDate") + .ValueGeneratedOnAdd() + .HasColumnType("datetime") + .HasDefaultValueSql("(getdate())"); + + b.Property("ApprovUser") + .IsRequired() + .ValueGeneratedOnAdd() + .HasMaxLength(50) + .HasColumnType("nvarchar(50)") + .HasDefaultValueSql("('')"); + + b.Property("LMm") + .HasColumnType("decimal(18,3)") + .HasColumnName("L_mm"); + + b.Property("MatDesc") + .IsRequired() + .ValueGeneratedOnAdd() + .HasMaxLength(500) + .HasColumnType("nvarchar(500)") + .HasDefaultValueSql("('')") + .HasComment("Description"); + + b.Property("MatExtCode") + .HasColumnType("int"); + + b.Property("TMm") + .HasColumnType("decimal(18,3)") + .HasColumnName("T_mm"); + + b.Property("WMm") + .HasColumnType("decimal(18,3)") + .HasColumnName("W_mm"); + + b.HasKey("MatID"); + + b.HasIndex(new[] { "MatExtCode" }, "Idx_Materials_MatExtCode_Unique") + .IsUnique(); + + b.ToTable("Materials"); + }); + + modelBuilder.Entity("NKC.Data.DbModels.MovMagModel", b => + { + b.Property("MovID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("MovID"), 1L, 1); + + b.Property("DtRec") + .HasColumnType("datetime2"); + + b.Property("QtyRec") + .HasColumnType("int"); + + b.Property("RemnID") + .HasColumnType("int"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("MovID"); + + b.HasIndex("RemnID"); + + b.ToTable("MovMag"); + }); + + modelBuilder.Entity("NKC.Data.DbModels.RemnantsModel", b => + { + b.Property("RemnID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("RemnID"), 1L, 1); + + b.Property("DtMod") + .HasColumnType("datetime2"); + + b.Property("LMm") + .HasColumnType("decimal(18,3)"); + + b.Property("Location") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("MatID") + .HasColumnType("int"); + + b.Property("Note") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("QtyAvail") + .HasColumnType("int"); + + b.Property("TMm") + .HasColumnType("decimal(18,3)"); + + b.Property("WMm") + .HasColumnType("decimal(18,3)"); + + b.HasKey("RemnID"); + + b.HasIndex("MatID"); + + b.ToTable("RemnantsList"); + }); + + modelBuilder.Entity("NKC.Data.DbModels.MovMagModel", b => + { + b.HasOne("NKC.Data.DbModels.RemnantsModel", "RemnantNav") + .WithMany() + .HasForeignKey("RemnID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("RemnantNav"); + }); + + modelBuilder.Entity("NKC.Data.DbModels.RemnantsModel", b => + { + b.HasOne("NKC.Data.DbModels.MaterialModel", "MaterialNav") + .WithMany("RemnantNav") + .HasForeignKey("MatID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MaterialNav"); + }); + + modelBuilder.Entity("NKC.Data.DbModels.MaterialModel", b => + { + b.Navigation("RemnantNav"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/NKC.Data/NKC.Data.csproj b/NKC.Data/NKC.Data.csproj new file mode 100644 index 0000000..47f615d --- /dev/null +++ b/NKC.Data/NKC.Data.csproj @@ -0,0 +1,24 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + diff --git a/NKC.Data/NKCContext.cs b/NKC.Data/NKCContext.cs new file mode 100644 index 0000000..f437ed7 --- /dev/null +++ b/NKC.Data/NKCContext.cs @@ -0,0 +1,164 @@ +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Configuration; +using NKC.Data.DbModels; +using NLog; + +namespace NKC.Data +{ + public partial class NKCContext : DbContext + { + #region Private Fields + + private static NLog.Logger Log = LogManager.GetCurrentClassLogger(); + + private IConfiguration _configuration = null!; + + #endregion Private Fields + + #region Public Constructors + + [Obsolete("This constructor should never be used directly, and is only needed to generate entityframework stuff. Connection string can be adapted as pleased.")] + public NKCContext() + { + } + + public NKCContext(IConfiguration configuration) + { + _configuration = configuration; + } + + public NKCContext(DbContextOptions options) : base(options) + { + try + { + // se non ci fosse... crea o migra! + Database.Migrate(); + } + catch (Exception exc) + { + Log.Error(exc, "Exception during context initialization 02"); + } + } + + #endregion Public Constructors + + #region Public Properties + + public virtual DbSet DbSetMaterials { get; set; } = null!; + public virtual DbSet DbSetRemnants { get; set; } = null!; + public virtual DbSet DbSetMovMag { get; set; } = null!; + public virtual DbSet DbSetPrintJobQueues { get; set; } = null!; + + #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("NKC.DB"); + if (!string.IsNullOrEmpty(connString)) + { + optionsBuilder.UseSqlServer(connString); + } + else + { + optionsBuilder.UseSqlServer("Server=SQL2016DEV;Database=Sauder_NKC;Trusted_Connection=True;"); + } + } + } + + protected override void OnModelCreating(ModelBuilder modelBuilder) + { + modelBuilder.Entity(entity => + { + + entity.HasIndex(e => e.MatExtCode, "Idx_Materials_MatExtCode_Unique") + .IsUnique(); + + entity.Property(e => e.ApprovDate) + .HasColumnType("datetime") + .HasDefaultValueSql("(getdate())"); + + entity.Property(e => e.ApprovUser) + .HasMaxLength(50) + .HasDefaultValueSql("('')"); + + entity.Property(e => e.LMm) + .HasColumnType("decimal(18, 3)") + .HasColumnName("L_mm"); + + entity.Property(e => e.MatDesc) + .HasMaxLength(500) + .HasDefaultValueSql("('')") + .HasComment("Description"); + + entity.Property(e => e.TMm) + .HasColumnType("decimal(18, 3)") + .HasColumnName("T_mm"); + + entity.Property(e => e.WMm) + .HasColumnType("decimal(18, 3)") + .HasColumnName("W_mm"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.IdxPrintJob); + + entity.ToTable("PrintJobQueue"); + + entity.Property(e => e.DtEnd) + .HasColumnType("datetime") + .HasColumnName("dtEnd"); + + entity.Property(e => e.DtLastTry) + .HasColumnType("datetime") + .HasColumnName("dtLastTry"); + + entity.Property(e => e.DtStart) + .HasColumnType("datetime") + .HasColumnName("dtStart"); + + entity.Property(e => e.KeyParam).HasMaxLength(50); + + entity.Property(e => e.PrtName) + .HasMaxLength(500) + .HasColumnName("prtName"); + + entity.Property(e => e.Stato).HasColumnName("stato"); + + entity.Property(e => e.TipoReport).HasMaxLength(250); + }); + + OnModelCreatingPartial(modelBuilder); + } + + #endregion Protected Methods + + #region Public Methods + + public void DbForceMigrate() + { + try + { + // se non ci fosse... crea o migra! + Database.Migrate(); + Log.Info("DbForceMigrate: done!"); + } + catch (Exception exc) + { + Log.Error(exc, "DbForceMigrate: Exception during context initialization 01"); + } + } + + #endregion Public Methods + } +} \ No newline at end of file From 7f3b0a3adf336f7653e67cbcd303f1ff71514053 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 25 Nov 2021 09:56:11 +0100 Subject: [PATCH 03/10] Spostamento progetto REMAN --- REMAN/{REMAN => }/.config/dotnet-tools.json | 0 REMAN/{REMAN => }/App.razor | 0 REMAN/{REMAN => }/Components/CmpFooter.razor | 0 REMAN/{REMAN => }/Components/CodeReader.razor | 0 .../Components/CodeReader.razor.cs | 0 REMAN/{REMAN => }/Components/DataPager.razor | 0 .../{REMAN => }/Components/DataPager.razor.cs | 0 .../{REMAN => }/Components/LoadingData.razor | 0 .../{REMAN => }/Components/MovMagDetail.razor | 0 .../Components/MovMagDetail.razor.cs | 0 .../{REMAN => }/Components/RemnantEdit.razor | 0 .../Components/RemnantEdit.razor.cs | 0 REMAN/{REMAN => }/Data/MessageService.cs | 0 REMAN/{REMAN => }/Data/RDataService.cs | 0 REMAN/{REMAN => }/JsFunctions.cs | 0 REMAN/NKC.Data/Controllers/NKCController.cs | 295 ------------------ REMAN/NKC.Data/DTO/MaterialDTO.cs | 47 --- REMAN/NKC.Data/DTO/RemnantDTO.cs | 12 - REMAN/NKC.Data/DbModels/MaterialModel.cs | 33 -- REMAN/NKC.Data/DbModels/MovMagModel.cs | 48 --- REMAN/NKC.Data/DbModels/PrintJobQueue.cs | 23 -- REMAN/NKC.Data/DbModels/RemnantsModel.cs | 105 ------- REMAN/NKC.Data/Enum.cs | 28 -- .../20211118172800_InitDb.Designer.cs | 80 ----- .../Migrations/20211118172800_InitDb.cs | 44 --- ...0211118173720_AddRemnantsTable.Designer.cs | 132 -------- .../20211118173720_AddRemnantsTable.cs | 50 --- .../20211119182450_AddMovMagTable.Designer.cs | 172 ---------- .../20211119182450_AddMovMagTable.cs | 47 --- ...20211120074650_MovMagAddUserId.Designer.cs | 176 ----------- .../20211120074650_MovMagAddUserId.cs | 29 -- .../Migrations/NKCContextModelSnapshot.cs | 174 ----------- REMAN/NKC.Data/NKC.Data.csproj | 24 -- REMAN/NKC.Data/NKCContext.cs | 164 ---------- REMAN/{REMAN => }/Pages/Counter.razor | 0 REMAN/{REMAN => }/Pages/Deposit.razor | 0 REMAN/{REMAN => }/Pages/Error.cshtml | 0 REMAN/{REMAN => }/Pages/Error.cshtml.cs | 0 REMAN/{REMAN => }/Pages/Index.razor | 0 REMAN/{REMAN => }/Pages/Materials.razor | 0 REMAN/{REMAN => }/Pages/Materials.razor.cs | 0 REMAN/{REMAN => }/Pages/PickUp.razor | 0 REMAN/{REMAN => }/Pages/Remnants.razor | 0 REMAN/{REMAN => }/Pages/Remnants.razor.cs | 0 REMAN/{REMAN => }/Pages/Search.razor | 0 REMAN/{REMAN => }/Pages/_Host.cshtml | 0 REMAN/{REMAN => }/Pages/_Layout.cshtml | 0 REMAN/{REMAN => }/Program.cs | 0 .../Properties/launchSettings.json | 0 REMAN/{REMAN => }/REMAN.csproj | 6 +- REMAN/REMAN.sln | 31 -- .../Properties/PublishProfiles/IIS01.pubxml | 23 -- .../PublishProfiles/IIS01Profile.pubxml | 23 -- .../Properties/PublishProfiles/IIS02.pubxml | 27 -- .../PublishProfiles/IIS02Profile.pubxml | 27 -- .../PublishProfiles/IISProfile.pubxml | 24 -- .../PublishProfiles/W2019-IIS-Dev.pubxml | 27 -- .../W2019-IIS-DevProfile.pubxml | 27 -- REMAN/{REMAN => }/Shared/LoginDisplay.razor | 0 REMAN/{REMAN => }/Shared/MainLayout.razor | 0 REMAN/{REMAN => }/Shared/MainLayout.razor.css | 0 REMAN/{REMAN => }/Shared/NavMenu.razor | 0 REMAN/{REMAN => }/Shared/NavMenu.razor.css | 0 REMAN/{REMAN => }/_Imports.razor | 0 .../{REMAN => }/appsettings.Development.json | 0 REMAN/{REMAN => }/appsettings.json | 0 REMAN/{REMAN => }/libman.json | 0 .../wwwroot/css/bootstrap/bootstrap.min.css | 0 .../css/bootstrap/bootstrap.min.css.map | 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 .../open-iconic/font/fonts/open-iconic.eot | Bin .../open-iconic/font/fonts/open-iconic.otf | Bin .../open-iconic/font/fonts/open-iconic.svg | 0 .../open-iconic/font/fonts/open-iconic.ttf | Bin .../open-iconic/font/fonts/open-iconic.woff | Bin REMAN/{REMAN => }/wwwroot/css/site.css | 0 REMAN/{REMAN => }/wwwroot/favicon.ico | Bin REMAN/{REMAN => }/wwwroot/img/LogoBlu.svg | 0 REMAN/{REMAN => }/wwwroot/js/blazorSupport.js | 0 .../lib/bootstrap/css/bootstrap-grid.css | 0 .../lib/bootstrap/css/bootstrap-grid.css.map | 0 .../lib/bootstrap/css/bootstrap-grid.min.css | 0 .../bootstrap/css/bootstrap-grid.min.css.map | 0 .../lib/bootstrap/css/bootstrap-reboot.css | 0 .../bootstrap/css/bootstrap-reboot.css.map | 0 .../bootstrap/css/bootstrap-reboot.min.css | 0 .../css/bootstrap-reboot.min.css.map | 0 .../wwwroot/lib/bootstrap/css/bootstrap.css | 0 .../lib/bootstrap/css/bootstrap.css.map | 0 .../lib/bootstrap/css/bootstrap.min.css | 0 .../lib/bootstrap/css/bootstrap.min.css.map | 0 .../lib/bootstrap/js/bootstrap.bundle.js | 0 .../lib/bootstrap/js/bootstrap.bundle.js.map | 0 .../lib/bootstrap/js/bootstrap.bundle.min.js | 0 .../bootstrap/js/bootstrap.bundle.min.js.map | 0 .../wwwroot/lib/bootstrap/js/bootstrap.js | 0 .../wwwroot/lib/bootstrap/js/bootstrap.js.map | 0 .../wwwroot/lib/bootstrap/js/bootstrap.min.js | 0 .../lib/bootstrap/js/bootstrap.min.js.map | 0 .../wwwroot/lib/bootstrap/scss/_alert.scss | 0 .../wwwroot/lib/bootstrap/scss/_badge.scss | 0 .../lib/bootstrap/scss/_breadcrumb.scss | 0 .../lib/bootstrap/scss/_button-group.scss | 0 .../wwwroot/lib/bootstrap/scss/_buttons.scss | 0 .../wwwroot/lib/bootstrap/scss/_card.scss | 0 .../wwwroot/lib/bootstrap/scss/_carousel.scss | 0 .../wwwroot/lib/bootstrap/scss/_close.scss | 0 .../wwwroot/lib/bootstrap/scss/_code.scss | 0 .../lib/bootstrap/scss/_custom-forms.scss | 0 .../wwwroot/lib/bootstrap/scss/_dropdown.scss | 0 .../wwwroot/lib/bootstrap/scss/_forms.scss | 0 .../lib/bootstrap/scss/_functions.scss | 0 .../wwwroot/lib/bootstrap/scss/_grid.scss | 0 .../wwwroot/lib/bootstrap/scss/_images.scss | 0 .../lib/bootstrap/scss/_input-group.scss | 0 .../lib/bootstrap/scss/_jumbotron.scss | 0 .../lib/bootstrap/scss/_list-group.scss | 0 .../wwwroot/lib/bootstrap/scss/_media.scss | 0 .../wwwroot/lib/bootstrap/scss/_mixins.scss | 0 .../wwwroot/lib/bootstrap/scss/_modal.scss | 0 .../wwwroot/lib/bootstrap/scss/_nav.scss | 0 .../wwwroot/lib/bootstrap/scss/_navbar.scss | 0 .../lib/bootstrap/scss/_pagination.scss | 0 .../wwwroot/lib/bootstrap/scss/_popover.scss | 0 .../wwwroot/lib/bootstrap/scss/_print.scss | 0 .../wwwroot/lib/bootstrap/scss/_progress.scss | 0 .../wwwroot/lib/bootstrap/scss/_reboot.scss | 0 .../wwwroot/lib/bootstrap/scss/_root.scss | 0 .../wwwroot/lib/bootstrap/scss/_spinners.scss | 0 .../wwwroot/lib/bootstrap/scss/_tables.scss | 0 .../wwwroot/lib/bootstrap/scss/_toasts.scss | 0 .../wwwroot/lib/bootstrap/scss/_tooltip.scss | 0 .../lib/bootstrap/scss/_transitions.scss | 0 .../wwwroot/lib/bootstrap/scss/_type.scss | 0 .../lib/bootstrap/scss/_utilities.scss | 0 .../lib/bootstrap/scss/_variables.scss | 0 .../lib/bootstrap/scss/bootstrap-grid.scss | 0 .../lib/bootstrap/scss/bootstrap-reboot.scss | 0 .../wwwroot/lib/bootstrap/scss/bootstrap.scss | 0 .../lib/bootstrap/scss/mixins/_alert.scss | 0 .../scss/mixins/_background-variant.scss | 0 .../lib/bootstrap/scss/mixins/_badge.scss | 0 .../bootstrap/scss/mixins/_border-radius.scss | 0 .../bootstrap/scss/mixins/_box-shadow.scss | 0 .../bootstrap/scss/mixins/_breakpoints.scss | 0 .../lib/bootstrap/scss/mixins/_buttons.scss | 0 .../lib/bootstrap/scss/mixins/_caret.scss | 0 .../lib/bootstrap/scss/mixins/_clearfix.scss | 0 .../lib/bootstrap/scss/mixins/_deprecate.scss | 0 .../lib/bootstrap/scss/mixins/_float.scss | 0 .../lib/bootstrap/scss/mixins/_forms.scss | 0 .../lib/bootstrap/scss/mixins/_gradients.scss | 0 .../scss/mixins/_grid-framework.scss | 0 .../lib/bootstrap/scss/mixins/_grid.scss | 0 .../lib/bootstrap/scss/mixins/_hover.scss | 0 .../lib/bootstrap/scss/mixins/_image.scss | 0 .../bootstrap/scss/mixins/_list-group.scss | 0 .../lib/bootstrap/scss/mixins/_lists.scss | 0 .../bootstrap/scss/mixins/_nav-divider.scss | 0 .../bootstrap/scss/mixins/_pagination.scss | 0 .../bootstrap/scss/mixins/_reset-text.scss | 0 .../lib/bootstrap/scss/mixins/_resize.scss | 0 .../bootstrap/scss/mixins/_screen-reader.scss | 0 .../lib/bootstrap/scss/mixins/_size.scss | 0 .../lib/bootstrap/scss/mixins/_table-row.scss | 0 .../bootstrap/scss/mixins/_text-emphasis.scss | 0 .../lib/bootstrap/scss/mixins/_text-hide.scss | 0 .../bootstrap/scss/mixins/_text-truncate.scss | 0 .../bootstrap/scss/mixins/_transition.scss | 0 .../bootstrap/scss/mixins/_visibility.scss | 0 .../lib/bootstrap/scss/utilities/_align.scss | 0 .../bootstrap/scss/utilities/_background.scss | 0 .../bootstrap/scss/utilities/_borders.scss | 0 .../bootstrap/scss/utilities/_clearfix.scss | 0 .../bootstrap/scss/utilities/_display.scss | 0 .../lib/bootstrap/scss/utilities/_embed.scss | 0 .../lib/bootstrap/scss/utilities/_flex.scss | 0 .../lib/bootstrap/scss/utilities/_float.scss | 0 .../scss/utilities/_interactions.scss | 0 .../bootstrap/scss/utilities/_overflow.scss | 0 .../bootstrap/scss/utilities/_position.scss | 0 .../scss/utilities/_screenreaders.scss | 0 .../bootstrap/scss/utilities/_shadows.scss | 0 .../lib/bootstrap/scss/utilities/_sizing.scss | 0 .../bootstrap/scss/utilities/_spacing.scss | 0 .../scss/utilities/_stretched-link.scss | 0 .../lib/bootstrap/scss/utilities/_text.scss | 0 .../bootstrap/scss/utilities/_visibility.scss | 0 .../lib/bootstrap/scss/vendor/_rfs.scss | 0 .../wwwroot/lib/font-awesome/css/all.css | 0 .../wwwroot/lib/font-awesome/css/all.min.css | 0 .../wwwroot/lib/font-awesome/css/brands.css | 0 .../lib/font-awesome/css/brands.min.css | 0 .../lib/font-awesome/css/fontawesome.css | 0 .../lib/font-awesome/css/fontawesome.min.css | 0 .../wwwroot/lib/font-awesome/css/regular.css | 0 .../lib/font-awesome/css/regular.min.css | 0 .../wwwroot/lib/font-awesome/css/solid.css | 0 .../lib/font-awesome/css/solid.min.css | 0 .../lib/font-awesome/css/svg-with-js.css | 0 .../lib/font-awesome/css/svg-with-js.min.css | 0 .../wwwroot/lib/font-awesome/css/v4-shims.css | 0 .../lib/font-awesome/css/v4-shims.min.css | 0 .../wwwroot/lib/font-awesome/js/all.js | 0 .../wwwroot/lib/font-awesome/js/all.min.js | 0 .../wwwroot/lib/font-awesome/js/brands.js | 0 .../wwwroot/lib/font-awesome/js/brands.min.js | 0 .../lib/font-awesome/js/conflict-detection.js | 0 .../font-awesome/js/conflict-detection.min.js | 0 .../lib/font-awesome/js/fontawesome.js | 0 .../lib/font-awesome/js/fontawesome.min.js | 0 .../wwwroot/lib/font-awesome/js/regular.js | 0 .../lib/font-awesome/js/regular.min.js | 0 .../wwwroot/lib/font-awesome/js/solid.js | 0 .../wwwroot/lib/font-awesome/js/solid.min.js | 0 .../wwwroot/lib/font-awesome/js/v4-shims.js | 0 .../lib/font-awesome/js/v4-shims.min.js | 0 .../lib/font-awesome/sprites/brands.svg | 0 .../lib/font-awesome/sprites/regular.svg | 0 .../lib/font-awesome/sprites/solid.svg | 0 .../font-awesome/webfonts/fa-brands-400.eot | Bin .../font-awesome/webfonts/fa-brands-400.svg | 0 .../font-awesome/webfonts/fa-brands-400.ttf | Bin .../font-awesome/webfonts/fa-brands-400.woff | Bin .../font-awesome/webfonts/fa-brands-400.woff2 | Bin .../font-awesome/webfonts/fa-regular-400.eot | Bin .../font-awesome/webfonts/fa-regular-400.svg | 0 .../font-awesome/webfonts/fa-regular-400.ttf | Bin .../font-awesome/webfonts/fa-regular-400.woff | Bin .../webfonts/fa-regular-400.woff2 | Bin .../font-awesome/webfonts/fa-solid-900.eot | Bin .../font-awesome/webfonts/fa-solid-900.svg | 0 .../font-awesome/webfonts/fa-solid-900.ttf | Bin .../font-awesome/webfonts/fa-solid-900.woff | Bin .../font-awesome/webfonts/fa-solid-900.woff2 | Bin 238 files changed, 3 insertions(+), 1895 deletions(-) rename REMAN/{REMAN => }/.config/dotnet-tools.json (100%) rename REMAN/{REMAN => }/App.razor (100%) rename REMAN/{REMAN => }/Components/CmpFooter.razor (100%) rename REMAN/{REMAN => }/Components/CodeReader.razor (100%) rename REMAN/{REMAN => }/Components/CodeReader.razor.cs (100%) rename REMAN/{REMAN => }/Components/DataPager.razor (100%) rename REMAN/{REMAN => }/Components/DataPager.razor.cs (100%) rename REMAN/{REMAN => }/Components/LoadingData.razor (100%) rename REMAN/{REMAN => }/Components/MovMagDetail.razor (100%) rename REMAN/{REMAN => }/Components/MovMagDetail.razor.cs (100%) rename REMAN/{REMAN => }/Components/RemnantEdit.razor (100%) rename REMAN/{REMAN => }/Components/RemnantEdit.razor.cs (100%) rename REMAN/{REMAN => }/Data/MessageService.cs (100%) rename REMAN/{REMAN => }/Data/RDataService.cs (100%) rename REMAN/{REMAN => }/JsFunctions.cs (100%) delete mode 100644 REMAN/NKC.Data/Controllers/NKCController.cs delete mode 100644 REMAN/NKC.Data/DTO/MaterialDTO.cs delete mode 100644 REMAN/NKC.Data/DTO/RemnantDTO.cs delete mode 100644 REMAN/NKC.Data/DbModels/MaterialModel.cs delete mode 100644 REMAN/NKC.Data/DbModels/MovMagModel.cs delete mode 100644 REMAN/NKC.Data/DbModels/PrintJobQueue.cs delete mode 100644 REMAN/NKC.Data/DbModels/RemnantsModel.cs delete mode 100644 REMAN/NKC.Data/Enum.cs delete mode 100644 REMAN/NKC.Data/Migrations/20211118172800_InitDb.Designer.cs delete mode 100644 REMAN/NKC.Data/Migrations/20211118172800_InitDb.cs delete mode 100644 REMAN/NKC.Data/Migrations/20211118173720_AddRemnantsTable.Designer.cs delete mode 100644 REMAN/NKC.Data/Migrations/20211118173720_AddRemnantsTable.cs delete mode 100644 REMAN/NKC.Data/Migrations/20211119182450_AddMovMagTable.Designer.cs delete mode 100644 REMAN/NKC.Data/Migrations/20211119182450_AddMovMagTable.cs delete mode 100644 REMAN/NKC.Data/Migrations/20211120074650_MovMagAddUserId.Designer.cs delete mode 100644 REMAN/NKC.Data/Migrations/20211120074650_MovMagAddUserId.cs delete mode 100644 REMAN/NKC.Data/Migrations/NKCContextModelSnapshot.cs delete mode 100644 REMAN/NKC.Data/NKC.Data.csproj delete mode 100644 REMAN/NKC.Data/NKCContext.cs rename REMAN/{REMAN => }/Pages/Counter.razor (100%) rename REMAN/{REMAN => }/Pages/Deposit.razor (100%) rename REMAN/{REMAN => }/Pages/Error.cshtml (100%) rename REMAN/{REMAN => }/Pages/Error.cshtml.cs (100%) rename REMAN/{REMAN => }/Pages/Index.razor (100%) rename REMAN/{REMAN => }/Pages/Materials.razor (100%) rename REMAN/{REMAN => }/Pages/Materials.razor.cs (100%) rename REMAN/{REMAN => }/Pages/PickUp.razor (100%) rename REMAN/{REMAN => }/Pages/Remnants.razor (100%) rename REMAN/{REMAN => }/Pages/Remnants.razor.cs (100%) rename REMAN/{REMAN => }/Pages/Search.razor (100%) rename REMAN/{REMAN => }/Pages/_Host.cshtml (100%) rename REMAN/{REMAN => }/Pages/_Layout.cshtml (100%) rename REMAN/{REMAN => }/Program.cs (100%) rename REMAN/{REMAN => }/Properties/launchSettings.json (100%) rename REMAN/{REMAN => }/REMAN.csproj (92%) delete mode 100644 REMAN/REMAN.sln delete mode 100644 REMAN/REMAN/Properties/PublishProfiles/IIS01.pubxml delete mode 100644 REMAN/REMAN/Properties/PublishProfiles/IIS01Profile.pubxml delete mode 100644 REMAN/REMAN/Properties/PublishProfiles/IIS02.pubxml delete mode 100644 REMAN/REMAN/Properties/PublishProfiles/IIS02Profile.pubxml delete mode 100644 REMAN/REMAN/Properties/PublishProfiles/IISProfile.pubxml delete mode 100644 REMAN/REMAN/Properties/PublishProfiles/W2019-IIS-Dev.pubxml delete mode 100644 REMAN/REMAN/Properties/PublishProfiles/W2019-IIS-DevProfile.pubxml rename REMAN/{REMAN => }/Shared/LoginDisplay.razor (100%) rename REMAN/{REMAN => }/Shared/MainLayout.razor (100%) rename REMAN/{REMAN => }/Shared/MainLayout.razor.css (100%) rename REMAN/{REMAN => }/Shared/NavMenu.razor (100%) rename REMAN/{REMAN => }/Shared/NavMenu.razor.css (100%) rename REMAN/{REMAN => }/_Imports.razor (100%) rename REMAN/{REMAN => }/appsettings.Development.json (100%) rename REMAN/{REMAN => }/appsettings.json (100%) rename REMAN/{REMAN => }/libman.json (100%) rename REMAN/{REMAN => }/wwwroot/css/bootstrap/bootstrap.min.css (100%) rename REMAN/{REMAN => }/wwwroot/css/bootstrap/bootstrap.min.css.map (100%) rename REMAN/{REMAN => }/wwwroot/css/open-iconic/FONT-LICENSE (100%) rename REMAN/{REMAN => }/wwwroot/css/open-iconic/ICON-LICENSE (100%) rename REMAN/{REMAN => }/wwwroot/css/open-iconic/README.md (100%) rename REMAN/{REMAN => }/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css (100%) rename REMAN/{REMAN => }/wwwroot/css/open-iconic/font/fonts/open-iconic.eot (100%) rename REMAN/{REMAN => }/wwwroot/css/open-iconic/font/fonts/open-iconic.otf (100%) rename REMAN/{REMAN => }/wwwroot/css/open-iconic/font/fonts/open-iconic.svg (100%) rename REMAN/{REMAN => }/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf (100%) rename REMAN/{REMAN => }/wwwroot/css/open-iconic/font/fonts/open-iconic.woff (100%) rename REMAN/{REMAN => }/wwwroot/css/site.css (100%) rename REMAN/{REMAN => }/wwwroot/favicon.ico (100%) rename REMAN/{REMAN => }/wwwroot/img/LogoBlu.svg (100%) rename REMAN/{REMAN => }/wwwroot/js/blazorSupport.js (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/css/bootstrap-grid.css (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/css/bootstrap-grid.css.map (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/css/bootstrap-grid.min.css (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/css/bootstrap-grid.min.css.map (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/css/bootstrap-reboot.css (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/css/bootstrap-reboot.css.map (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/css/bootstrap-reboot.min.css (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/css/bootstrap-reboot.min.css.map (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/css/bootstrap.css (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/css/bootstrap.css.map (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/css/bootstrap.min.css (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/css/bootstrap.min.css.map (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/js/bootstrap.bundle.js (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/js/bootstrap.bundle.js.map (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/js/bootstrap.bundle.min.js (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/js/bootstrap.bundle.min.js.map (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/js/bootstrap.js (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/js/bootstrap.js.map (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/js/bootstrap.min.js (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/js/bootstrap.min.js.map (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_alert.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_badge.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_breadcrumb.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_button-group.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_buttons.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_card.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_carousel.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_close.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_code.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_custom-forms.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_dropdown.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_forms.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_functions.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_grid.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_images.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_input-group.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_jumbotron.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_list-group.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_media.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_mixins.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_modal.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_nav.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_navbar.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_pagination.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_popover.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_print.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_progress.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_reboot.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_root.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_spinners.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_tables.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_toasts.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_tooltip.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_transitions.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_type.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_utilities.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/_variables.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/bootstrap-grid.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/bootstrap-reboot.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/bootstrap.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_alert.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_background-variant.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_badge.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_border-radius.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_box-shadow.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_breakpoints.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_buttons.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_caret.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_clearfix.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_deprecate.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_float.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_forms.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_gradients.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_grid-framework.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_grid.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_hover.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_image.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_list-group.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_lists.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_nav-divider.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_pagination.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_reset-text.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_resize.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_screen-reader.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_size.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_table-row.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_text-emphasis.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_text-hide.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_text-truncate.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_transition.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/mixins/_visibility.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/utilities/_align.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/utilities/_background.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/utilities/_borders.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/utilities/_clearfix.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/utilities/_display.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/utilities/_embed.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/utilities/_flex.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/utilities/_float.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/utilities/_interactions.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/utilities/_overflow.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/utilities/_position.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/utilities/_screenreaders.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/utilities/_shadows.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/utilities/_sizing.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/utilities/_spacing.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/utilities/_stretched-link.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/utilities/_text.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/utilities/_visibility.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/bootstrap/scss/vendor/_rfs.scss (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/css/all.css (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/css/all.min.css (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/css/brands.css (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/css/brands.min.css (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/css/fontawesome.css (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/css/fontawesome.min.css (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/css/regular.css (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/css/regular.min.css (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/css/solid.css (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/css/solid.min.css (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/css/svg-with-js.css (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/css/svg-with-js.min.css (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/css/v4-shims.css (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/css/v4-shims.min.css (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/js/all.js (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/js/all.min.js (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/js/brands.js (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/js/brands.min.js (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/js/conflict-detection.js (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/js/conflict-detection.min.js (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/js/fontawesome.js (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/js/fontawesome.min.js (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/js/regular.js (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/js/regular.min.js (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/js/solid.js (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/js/solid.min.js (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/js/v4-shims.js (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/js/v4-shims.min.js (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/sprites/brands.svg (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/sprites/regular.svg (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/sprites/solid.svg (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/webfonts/fa-brands-400.eot (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/webfonts/fa-brands-400.svg (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/webfonts/fa-brands-400.ttf (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/webfonts/fa-brands-400.woff (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/webfonts/fa-brands-400.woff2 (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/webfonts/fa-regular-400.eot (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/webfonts/fa-regular-400.svg (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/webfonts/fa-regular-400.ttf (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/webfonts/fa-regular-400.woff (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/webfonts/fa-regular-400.woff2 (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/webfonts/fa-solid-900.eot (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/webfonts/fa-solid-900.svg (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/webfonts/fa-solid-900.ttf (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/webfonts/fa-solid-900.woff (100%) rename REMAN/{REMAN => }/wwwroot/lib/font-awesome/webfonts/fa-solid-900.woff2 (100%) diff --git a/REMAN/REMAN/.config/dotnet-tools.json b/REMAN/.config/dotnet-tools.json similarity index 100% rename from REMAN/REMAN/.config/dotnet-tools.json rename to REMAN/.config/dotnet-tools.json diff --git a/REMAN/REMAN/App.razor b/REMAN/App.razor similarity index 100% rename from REMAN/REMAN/App.razor rename to REMAN/App.razor diff --git a/REMAN/REMAN/Components/CmpFooter.razor b/REMAN/Components/CmpFooter.razor similarity index 100% rename from REMAN/REMAN/Components/CmpFooter.razor rename to REMAN/Components/CmpFooter.razor diff --git a/REMAN/REMAN/Components/CodeReader.razor b/REMAN/Components/CodeReader.razor similarity index 100% rename from REMAN/REMAN/Components/CodeReader.razor rename to REMAN/Components/CodeReader.razor diff --git a/REMAN/REMAN/Components/CodeReader.razor.cs b/REMAN/Components/CodeReader.razor.cs similarity index 100% rename from REMAN/REMAN/Components/CodeReader.razor.cs rename to REMAN/Components/CodeReader.razor.cs diff --git a/REMAN/REMAN/Components/DataPager.razor b/REMAN/Components/DataPager.razor similarity index 100% rename from REMAN/REMAN/Components/DataPager.razor rename to REMAN/Components/DataPager.razor diff --git a/REMAN/REMAN/Components/DataPager.razor.cs b/REMAN/Components/DataPager.razor.cs similarity index 100% rename from REMAN/REMAN/Components/DataPager.razor.cs rename to REMAN/Components/DataPager.razor.cs diff --git a/REMAN/REMAN/Components/LoadingData.razor b/REMAN/Components/LoadingData.razor similarity index 100% rename from REMAN/REMAN/Components/LoadingData.razor rename to REMAN/Components/LoadingData.razor diff --git a/REMAN/REMAN/Components/MovMagDetail.razor b/REMAN/Components/MovMagDetail.razor similarity index 100% rename from REMAN/REMAN/Components/MovMagDetail.razor rename to REMAN/Components/MovMagDetail.razor diff --git a/REMAN/REMAN/Components/MovMagDetail.razor.cs b/REMAN/Components/MovMagDetail.razor.cs similarity index 100% rename from REMAN/REMAN/Components/MovMagDetail.razor.cs rename to REMAN/Components/MovMagDetail.razor.cs diff --git a/REMAN/REMAN/Components/RemnantEdit.razor b/REMAN/Components/RemnantEdit.razor similarity index 100% rename from REMAN/REMAN/Components/RemnantEdit.razor rename to REMAN/Components/RemnantEdit.razor diff --git a/REMAN/REMAN/Components/RemnantEdit.razor.cs b/REMAN/Components/RemnantEdit.razor.cs similarity index 100% rename from REMAN/REMAN/Components/RemnantEdit.razor.cs rename to REMAN/Components/RemnantEdit.razor.cs diff --git a/REMAN/REMAN/Data/MessageService.cs b/REMAN/Data/MessageService.cs similarity index 100% rename from REMAN/REMAN/Data/MessageService.cs rename to REMAN/Data/MessageService.cs diff --git a/REMAN/REMAN/Data/RDataService.cs b/REMAN/Data/RDataService.cs similarity index 100% rename from REMAN/REMAN/Data/RDataService.cs rename to REMAN/Data/RDataService.cs diff --git a/REMAN/REMAN/JsFunctions.cs b/REMAN/JsFunctions.cs similarity index 100% rename from REMAN/REMAN/JsFunctions.cs rename to REMAN/JsFunctions.cs diff --git a/REMAN/NKC.Data/Controllers/NKCController.cs b/REMAN/NKC.Data/Controllers/NKCController.cs deleted file mode 100644 index 983868d..0000000 --- a/REMAN/NKC.Data/Controllers/NKCController.cs +++ /dev/null @@ -1,295 +0,0 @@ -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Configuration; -using NKC.Data.DbModels; -using NKC.Data.DTO; -using NLog; - -namespace NKC.Data.Controllers -{ - public class NKCController : IDisposable - { - #region Private Fields - - private static IConfiguration _configuration = null!; - private static NLog.Logger Log = LogManager.GetCurrentClassLogger(); - - #endregion Private Fields - - #region Public Constructors - - public NKCController(IConfiguration configuration) - { - _configuration = configuration; - } - - #endregion Public Constructors - - #region Public Methods - - public bool DbForceMigrate() - { - bool answ = false; - using (NKCContext localDbCtx = new NKCContext(_configuration)) - { - try - { - localDbCtx.DbForceMigrate(); - answ = true; - } - catch (Exception exc) - { - Log.Error($"Eccezione in DbForceMigrate{Environment.NewLine}{exc}"); - } - } - return answ; - } - - public void Dispose() - { - Log.Info("Dispose di NKCController"); - } - - public List MaterialsGetAll() - { - List dbResult = new List(); - using (NKCContext localDbCtx = new NKCContext(_configuration)) - { - dbResult = localDbCtx - .DbSetMaterials - .Where(x => x.MatID > 0) - .Select(x => new MaterialDTO() - { - MatID = x.MatID, - MatExtCode = x.MatExtCode, - MatDesc = x.MatDesc, - LMm = x.LMm, - WMm = x.WMm, - TMm = x.TMm, - ApprovUser = x.ApprovUser, - ApprovDate = x.ApprovDate, - NumSize = x.RemnantNav== null?0: x.RemnantNav.Count, - TotQty = x.RemnantNav == null ? 0 : x.RemnantNav.Sum(r => r.QtyAvail) - } - ) - .ToList(); - } - return dbResult; - } - - public List MovMagGetFilt(int RemnId, int numShow) - { - List dbResult = new List(); - using (NKCContext localDbCtx = new NKCContext(_configuration)) - { - dbResult = localDbCtx - .DbSetMovMag - .Where(x => x.RemnID == RemnId) - .OrderByDescending(o => o.DtRec) - //.Include(m => m.RemnantNav) - .Take(numShow) - .ToList(); - } - return dbResult; - } - - public bool AddPrintJob(string tipoReport, string keyParam, string prtName) - { - bool done = false; - using (NKCContext localDbCtx = new NKCContext(_configuration)) - { - try - { - DateTime adesso = DateTime.Now; - PrintJobQueue newRec = new PrintJobQueue() - { - TipoReport = tipoReport, - KeyParam = keyParam, - PrtName = prtName, - Stato = 0, - DtStart = adesso, - DtLastTry = adesso - }; - - localDbCtx.DbSetPrintJobQueues.Add(newRec); - - localDbCtx.SaveChanges(); - done = true; - } - catch (Exception exc) - { - Log.Error($"Eccezione in AddPrintJob:{Environment.NewLine}{exc}"); - } - } - return done; - } - - public List RemnantsGetAll() - { - List dbResult = new List(); - using (NKCContext localDbCtx = new NKCContext(_configuration)) - { - dbResult = localDbCtx - .DbSetRemnants - .ToList(); - } - return dbResult; - } - public RemnantsModel RemnantGetByid(int RemnId) - { - RemnantsModel? dbResult = new RemnantsModel(); - using (NKCContext localDbCtx = new NKCContext(_configuration)) - { - dbResult = localDbCtx - .DbSetRemnants - .Where(x => x.RemnID == RemnId) - .Include(m => m.MaterialNav) - .FirstOrDefault(); - } - if (dbResult == null) - { - dbResult = new RemnantsModel(); - } - return dbResult; - } - - public List RemnantsGetFilt(int matId, int minQty) - { - List dbResult = new List(); - using (NKCContext localDbCtx = new NKCContext(_configuration)) - { - dbResult = localDbCtx - .DbSetRemnants - .Where(x => (x.MatID == matId || matId == 0) && (x.QtyAvail >= minQty || minQty == 0)) - //.OrderBy(o => o.Area) - .Include(m => m.MaterialNav) - .ToList(); - } - return dbResult; - } - - public RemnantsModel RemnantGetByQr(string QrCode) - { - RemnantsModel? dbResult = new RemnantsModel(); - using (NKCContext localDbCtx = new NKCContext(_configuration)) - { - var rawList = localDbCtx - .DbSetRemnants - .Include(m => m.MaterialNav) - .ToList(); - - dbResult = rawList - .Where(x => x.RemDtmx == QrCode) - .FirstOrDefault(); - } - if (dbResult == null) - { - dbResult = new RemnantsModel(); - } - return dbResult; - } - - public bool RemnantsUpsert(RemnantsModel updItem, string userId) - { - bool done = false; - using (NKCContext localDbCtx = new NKCContext(_configuration)) - { - - try - { - RemnantsModel? currData = localDbCtx - .DbSetRemnants - .Where(x => x.RemnID == updItem.RemnID) - .FirstOrDefault(); - if (currData != null) - { - // aggiungo record variazione quantità... - int delta = updItem.QtyAvail - currData.QtyAvail; - if (delta != 0) - { - MovMagModel recMovMag = new MovMagModel() - { - DtRec = DateTime.Now, - RemnID = updItem.RemnID, - QtyRec = delta, - UserId = userId - }; - localDbCtx.DbSetMovMag.Add(recMovMag); - } - - // aggiorno valori - currData.MatID = updItem.MatID; - currData.DtMod = updItem.DtMod; - currData.Location = updItem.Location; - currData.Note = updItem.Note; - currData.QtyAvail = updItem.QtyAvail; - currData.LMm = updItem.LMm; - currData.WMm = updItem.WMm; - currData.TMm = updItem.TMm; - localDbCtx.Entry(currData).State = EntityState.Modified; - } - else - { - // aggiungo record variazione quantità... - MovMagModel recMovMag = new MovMagModel() - { - DtRec = DateTime.Now, - RemnID = updItem.RemnID, - QtyRec = updItem.QtyAvail - }; - localDbCtx.DbSetMovMag.Add(recMovMag); - - // aggiungo record puntuale - currData = new RemnantsModel() - { - MatID = updItem.MatID, - DtMod = updItem.DtMod, - Location = updItem.Location, - Note = updItem.Note, - QtyAvail = updItem.QtyAvail, - LMm = updItem.LMm, - WMm = updItem.WMm, - TMm = updItem.TMm - }; - localDbCtx - .DbSetRemnants - .Add(currData); - } - localDbCtx.SaveChanges(); - done = true; - } - catch (Exception exc) - { - Log.Error($"Eccezione in PlantUpdate:{Environment.NewLine}{exc}"); - } - } - return done; - } - - /// - /// Annulla modifiche su una specifica entity (cancel update) - /// - /// - /// - public bool rollBackEntity(object item) - { - bool answ = false; - using (NKCContext localDbCtx = new NKCContext(_configuration)) - { - try - { - if (localDbCtx.Entry(item).State == EntityState.Deleted || localDbCtx.Entry(item).State == EntityState.Modified) - { - localDbCtx.Entry(item).Reload(); - } - } - catch (Exception exc) - { - Log.Error($"Eccezione in rollBackEntity{Environment.NewLine}{exc}"); - } - } - return answ; - } - - #endregion Public Methods - } -} \ No newline at end of file diff --git a/REMAN/NKC.Data/DTO/MaterialDTO.cs b/REMAN/NKC.Data/DTO/MaterialDTO.cs deleted file mode 100644 index 869c627..0000000 --- a/REMAN/NKC.Data/DTO/MaterialDTO.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace NKC.Data.DTO -{ - - // - // This is here so CodeMaid doesn't reorganize this document - // - public class MaterialDTO - - { - public int MatID { get; set; } - - public int MatExtCode { get; set; } = 0; - public string MatDesc { get; set; } = ""; - public DateTime ApprovDate { get; set; } = DateTime.Now.AddYears(10); - public string ApprovUser { get; set; } = ""; - public decimal LMm { get; set; } = 0; - public decimal WMm { get; set; } = 0; - public decimal TMm { get; set; } = 0; - - public string MatDtmx - { - get => $"MT{MatExtCode:00000000}"; - } - - public decimal LIn - { - get => Math.Round(LMm / (decimal)25.4, 3); - } - public decimal WIn - { - get => Math.Round(WMm / (decimal)25.4, 3); - } - public decimal TIn - { - get => Math.Round(TMm / (decimal)25.4, 3); - } - - public int NumSize { get; set; } = 0; - public int TotQty { get; set; } = 0; - } -} diff --git a/REMAN/NKC.Data/DTO/RemnantDTO.cs b/REMAN/NKC.Data/DTO/RemnantDTO.cs deleted file mode 100644 index 90ba0b1..0000000 --- a/REMAN/NKC.Data/DTO/RemnantDTO.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace NKC.Data.DTO -{ - public class RemnantDTO - { - } -} diff --git a/REMAN/NKC.Data/DbModels/MaterialModel.cs b/REMAN/NKC.Data/DbModels/MaterialModel.cs deleted file mode 100644 index e1a64e4..0000000 --- a/REMAN/NKC.Data/DbModels/MaterialModel.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace NKC.Data.DbModels -{ - // - // This is here so CodeMaid doesn't reorganize this document - // - [Table("Materials")] - public partial class MaterialModel - { - [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)] - public int MatID { get; set; } - - public int MatExtCode { get; set; } = 0; - public string MatDesc { get; set; } = ""; - public DateTime ApprovDate { get; set; } = DateTime.Now.AddYears(10); - public string ApprovUser { get; set; } = ""; - public decimal LMm { get; set; } = 0; - public decimal WMm { get; set; }=0; - public decimal TMm { get; set; }=0; - - [NotMapped] - public string MatDtmx { - get => $"MT{MatExtCode:00000000}"; - } - - - public virtual ICollection? RemnantNav { get; set; } - } -} diff --git a/REMAN/NKC.Data/DbModels/MovMagModel.cs b/REMAN/NKC.Data/DbModels/MovMagModel.cs deleted file mode 100644 index 54037aa..0000000 --- a/REMAN/NKC.Data/DbModels/MovMagModel.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace NKC.Data.DbModels -{ - // - // This is here so CodeMaid doesn't reorganize this document - // - //[Index(nameof(Installazione), nameof(Active), nameof(DiskStatus))] - [Table("MovMag")] - public partial class MovMagModel - { - /// - /// Primary Key AUTO - /// - [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)] - public int MovID { get; set; } - - /// - /// DateTime record - /// - public DateTime DtRec { get; set; } = DateTime.Now; - - /// - /// Ext ref for Remnants - /// - public int RemnID { get; set; } - - /// - /// Qty recorded (delta +/-) - /// - public int QtyRec { get; set; } = 0; - - /// - /// User modificatore - /// - public string UserId { get; set; } = ""; - - /// - /// Navigation property to Remnant - /// - [ForeignKey("RemnID")] - public virtual RemnantsModel? RemnantNav { get; set; } - - } -} diff --git a/REMAN/NKC.Data/DbModels/PrintJobQueue.cs b/REMAN/NKC.Data/DbModels/PrintJobQueue.cs deleted file mode 100644 index e5f2182..0000000 --- a/REMAN/NKC.Data/DbModels/PrintJobQueue.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; - -namespace NKC.Data.DbModels -{ - - // - // This is here so CodeMaid doesn't reorganize this document - // - [Table("PrintJobQueue")] - public partial class PrintJobQueue - { - public int IdxPrintJob { get; set; } - public string TipoReport { get; set; } = null!; - public string KeyParam { get; set; } = null!; - public string PrtName { get; set; } = null!; - public DateTime DtStart { get; set; } - public DateTime? DtEnd { get; set; } - public int Stato { get; set; } - public DateTime? DtLastTry { get; set; } - } -} diff --git a/REMAN/NKC.Data/DbModels/RemnantsModel.cs b/REMAN/NKC.Data/DbModels/RemnantsModel.cs deleted file mode 100644 index e233aa4..0000000 --- a/REMAN/NKC.Data/DbModels/RemnantsModel.cs +++ /dev/null @@ -1,105 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace NKC.Data.DbModels -{ - // - // This is here so CodeMaid doesn't reorganize this document - // - //[Index(nameof(Installazione), nameof(Active), nameof(DiskStatus))] - [Table("RemnantsList")] - public partial class RemnantsModel - { - /// - /// Primary Key AUTO - /// - [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)] - public int RemnID { get; set; } - - /// - /// Ext ref for Material - /// - public int MatID { get; set; } - - /// - /// Location - /// - public string Location { get; set; } = ""; - /// - /// Qty available on wharehouse - /// - public int QtyAvail { get; set; } = 0; - - /// - /// DateTime last modification - /// - public DateTime DtMod { get; set; } = DateTime.Now.AddYears(10); - - /// - /// Remnant's Lenght - /// - public decimal LMm { get; set; } = 0; - - /// - /// Remnant's Width - /// - public decimal WMm { get; set; } = 0; - - /// - /// Remnant's Thikness - /// - public decimal TMm { get; set; } = 0; - - [NotMapped] - public decimal LIn - { - get => Math.Round(LMm / (decimal)25.4, 3); - } - [NotMapped] - public decimal WIn - { - get => Math.Round(WMm / (decimal)25.4, 3); - } - [NotMapped] - public decimal TIn - { - get => Math.Round(TMm / (decimal)25.4, 3); - } - - - /// - /// Note (optional) - /// - public string Note { get; set; } = ""; - - [NotMapped] - public decimal Area - { - get => LMm * WMm; - } - - - [NotMapped] - public string RemDtmx - { - get - { - string answ = $"MT99999999-{LMm * 1000:00000000}"; - if (MaterialNav != null) - { - answ = $"MT{MaterialNav.MatExtCode:00000000}-{LMm * 1000:00000000}"; - } - return answ; - } - } - - /// - /// Navigation property to Material - /// - [ForeignKey("MatID")] - public virtual MaterialModel MaterialNav { get; set; } = null!; - - } -} diff --git a/REMAN/NKC.Data/Enum.cs b/REMAN/NKC.Data/Enum.cs deleted file mode 100644 index 727d26d..0000000 --- a/REMAN/NKC.Data/Enum.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace NKC.Data -{ - public class Enum - { - #region Public Enums - - public enum RemnState - { - /// - /// Non definito - /// - ND = 0, - - /// - /// Selezionato x operazioni (veto interfaccia ad altri usi) - /// - Selected - } - - #endregion Public Enums - } -} \ No newline at end of file diff --git a/REMAN/NKC.Data/Migrations/20211118172800_InitDb.Designer.cs b/REMAN/NKC.Data/Migrations/20211118172800_InitDb.Designer.cs deleted file mode 100644 index 7724cd5..0000000 --- a/REMAN/NKC.Data/Migrations/20211118172800_InitDb.Designer.cs +++ /dev/null @@ -1,80 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using NKC.Data; - -#nullable disable - -namespace NKC.Data.Migrations -{ - [DbContext(typeof(NKCContext))] - [Migration("20211118172800_InitDb")] - partial class InitDb - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "6.0.0") - .HasAnnotation("Relational:MaxIdentifierLength", 128); - - SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); - - modelBuilder.Entity("NKC.Data.DbModels.MaterialModel", b => - { - b.Property("MatID") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("MatID"), 1L, 1); - - b.Property("ApprovDate") - .ValueGeneratedOnAdd() - .HasColumnType("datetime") - .HasDefaultValueSql("(getdate())"); - - b.Property("ApprovUser") - .IsRequired() - .ValueGeneratedOnAdd() - .HasMaxLength(50) - .HasColumnType("nvarchar(50)") - .HasDefaultValueSql("('')"); - - b.Property("LMm") - .HasColumnType("decimal(18,3)") - .HasColumnName("L_mm"); - - b.Property("MatDesc") - .IsRequired() - .ValueGeneratedOnAdd() - .HasMaxLength(500) - .HasColumnType("nvarchar(500)") - .HasDefaultValueSql("('')") - .HasComment("Description"); - - b.Property("MatExtCode") - .HasColumnType("int"); - - b.Property("TMm") - .HasColumnType("decimal(18,3)") - .HasColumnName("T_mm"); - - b.Property("WMm") - .HasColumnType("decimal(18,3)") - .HasColumnName("W_mm"); - - b.HasKey("MatID"); - - b.HasIndex(new[] { "MatExtCode" }, "Idx_Materials_MatExtCode_Unique") - .IsUnique(); - - b.ToTable("Materials"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/REMAN/NKC.Data/Migrations/20211118172800_InitDb.cs b/REMAN/NKC.Data/Migrations/20211118172800_InitDb.cs deleted file mode 100644 index 01d1b6c..0000000 --- a/REMAN/NKC.Data/Migrations/20211118172800_InitDb.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace NKC.Data.Migrations -{ - public partial class InitDb : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "Materials", - columns: table => new - { - MatID = table.Column(type: "int", nullable: false) - .Annotation("SqlServer:Identity", "1, 1"), - MatExtCode = table.Column(type: "int", nullable: false), - MatDesc = table.Column(type: "nvarchar(500)", maxLength: 500, nullable: false, defaultValueSql: "('')", comment: "Description"), - ApprovDate = table.Column(type: "datetime", nullable: false, defaultValueSql: "(getdate())"), - ApprovUser = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: false, defaultValueSql: "('')"), - L_mm = table.Column(type: "decimal(18,3)", nullable: false), - W_mm = table.Column(type: "decimal(18,3)", nullable: false), - T_mm = table.Column(type: "decimal(18,3)", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_Materials", x => x.MatID); - }); - - migrationBuilder.CreateIndex( - name: "Idx_Materials_MatExtCode_Unique", - table: "Materials", - column: "MatExtCode", - unique: true); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "Materials"); - } - } -} diff --git a/REMAN/NKC.Data/Migrations/20211118173720_AddRemnantsTable.Designer.cs b/REMAN/NKC.Data/Migrations/20211118173720_AddRemnantsTable.Designer.cs deleted file mode 100644 index 085ca6f..0000000 --- a/REMAN/NKC.Data/Migrations/20211118173720_AddRemnantsTable.Designer.cs +++ /dev/null @@ -1,132 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using NKC.Data; - -#nullable disable - -namespace NKC.Data.Migrations -{ - [DbContext(typeof(NKCContext))] - [Migration("20211118173720_AddRemnantsTable")] - partial class AddRemnantsTable - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "6.0.0") - .HasAnnotation("Relational:MaxIdentifierLength", 128); - - SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); - - modelBuilder.Entity("NKC.Data.DbModels.MaterialModel", b => - { - b.Property("MatID") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("MatID"), 1L, 1); - - b.Property("ApprovDate") - .ValueGeneratedOnAdd() - .HasColumnType("datetime") - .HasDefaultValueSql("(getdate())"); - - b.Property("ApprovUser") - .IsRequired() - .ValueGeneratedOnAdd() - .HasMaxLength(50) - .HasColumnType("nvarchar(50)") - .HasDefaultValueSql("('')"); - - b.Property("LMm") - .HasColumnType("decimal(18,3)") - .HasColumnName("L_mm"); - - b.Property("MatDesc") - .IsRequired() - .ValueGeneratedOnAdd() - .HasMaxLength(500) - .HasColumnType("nvarchar(500)") - .HasDefaultValueSql("('')") - .HasComment("Description"); - - b.Property("MatExtCode") - .HasColumnType("int"); - - b.Property("TMm") - .HasColumnType("decimal(18,3)") - .HasColumnName("T_mm"); - - b.Property("WMm") - .HasColumnType("decimal(18,3)") - .HasColumnName("W_mm"); - - b.HasKey("MatID"); - - b.HasIndex(new[] { "MatExtCode" }, "Idx_Materials_MatExtCode_Unique") - .IsUnique(); - - b.ToTable("Materials"); - }); - - modelBuilder.Entity("NKC.Data.DbModels.RemnantsModel", b => - { - b.Property("RemnID") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("RemnID"), 1L, 1); - - b.Property("DtMod") - .HasColumnType("datetime2"); - - b.Property("LMm") - .HasColumnType("decimal(18,3)"); - - b.Property("Location") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("MatID") - .HasColumnType("int"); - - b.Property("Note") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("QtyAvail") - .HasColumnType("int"); - - b.Property("TMm") - .HasColumnType("decimal(18,3)"); - - b.Property("WMm") - .HasColumnType("decimal(18,3)"); - - b.HasKey("RemnID"); - - b.HasIndex("MatID"); - - b.ToTable("RemnantsList"); - }); - - modelBuilder.Entity("NKC.Data.DbModels.RemnantsModel", b => - { - b.HasOne("NKC.Data.DbModels.MaterialModel", "MaterialNav") - .WithMany() - .HasForeignKey("MatID") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("MaterialNav"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/REMAN/NKC.Data/Migrations/20211118173720_AddRemnantsTable.cs b/REMAN/NKC.Data/Migrations/20211118173720_AddRemnantsTable.cs deleted file mode 100644 index 7c129a8..0000000 --- a/REMAN/NKC.Data/Migrations/20211118173720_AddRemnantsTable.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace NKC.Data.Migrations -{ - public partial class AddRemnantsTable : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "RemnantsList", - columns: table => new - { - RemnID = table.Column(type: "int", nullable: false) - .Annotation("SqlServer:Identity", "1, 1"), - MatID = table.Column(type: "int", nullable: false), - Location = table.Column(type: "nvarchar(max)", nullable: false), - QtyAvail = table.Column(type: "int", nullable: false), - DtMod = table.Column(type: "datetime2", nullable: false), - LMm = table.Column(type: "decimal(18,3)", nullable: false), - WMm = table.Column(type: "decimal(18,3)", nullable: false), - TMm = table.Column(type: "decimal(18,3)", nullable: false), - Note = table.Column(type: "nvarchar(max)", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_RemnantsList", x => x.RemnID); - table.ForeignKey( - name: "FK_RemnantsList_Materials_MatID", - column: x => x.MatID, - principalTable: "Materials", - principalColumn: "MatID", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateIndex( - name: "IX_RemnantsList_MatID", - table: "RemnantsList", - column: "MatID"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "RemnantsList"); - } - } -} diff --git a/REMAN/NKC.Data/Migrations/20211119182450_AddMovMagTable.Designer.cs b/REMAN/NKC.Data/Migrations/20211119182450_AddMovMagTable.Designer.cs deleted file mode 100644 index 9d52d4b..0000000 --- a/REMAN/NKC.Data/Migrations/20211119182450_AddMovMagTable.Designer.cs +++ /dev/null @@ -1,172 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using NKC.Data; - -#nullable disable - -namespace NKC.Data.Migrations -{ - [DbContext(typeof(NKCContext))] - [Migration("20211119182450_AddMovMagTable")] - partial class AddMovMagTable - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "6.0.0") - .HasAnnotation("Relational:MaxIdentifierLength", 128); - - SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); - - modelBuilder.Entity("NKC.Data.DbModels.MaterialModel", b => - { - b.Property("MatID") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("MatID"), 1L, 1); - - b.Property("ApprovDate") - .ValueGeneratedOnAdd() - .HasColumnType("datetime") - .HasDefaultValueSql("(getdate())"); - - b.Property("ApprovUser") - .IsRequired() - .ValueGeneratedOnAdd() - .HasMaxLength(50) - .HasColumnType("nvarchar(50)") - .HasDefaultValueSql("('')"); - - b.Property("LMm") - .HasColumnType("decimal(18,3)") - .HasColumnName("L_mm"); - - b.Property("MatDesc") - .IsRequired() - .ValueGeneratedOnAdd() - .HasMaxLength(500) - .HasColumnType("nvarchar(500)") - .HasDefaultValueSql("('')") - .HasComment("Description"); - - b.Property("MatExtCode") - .HasColumnType("int"); - - b.Property("TMm") - .HasColumnType("decimal(18,3)") - .HasColumnName("T_mm"); - - b.Property("WMm") - .HasColumnType("decimal(18,3)") - .HasColumnName("W_mm"); - - b.HasKey("MatID"); - - b.HasIndex(new[] { "MatExtCode" }, "Idx_Materials_MatExtCode_Unique") - .IsUnique(); - - b.ToTable("Materials"); - }); - - modelBuilder.Entity("NKC.Data.DbModels.MovMagModel", b => - { - b.Property("MovID") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("MovID"), 1L, 1); - - b.Property("DtRec") - .HasColumnType("datetime2"); - - b.Property("QtyRec") - .HasColumnType("int"); - - b.Property("RemnID") - .HasColumnType("int"); - - b.HasKey("MovID"); - - b.HasIndex("RemnID"); - - b.ToTable("MovMag"); - }); - - modelBuilder.Entity("NKC.Data.DbModels.RemnantsModel", b => - { - b.Property("RemnID") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("RemnID"), 1L, 1); - - b.Property("DtMod") - .HasColumnType("datetime2"); - - b.Property("LMm") - .HasColumnType("decimal(18,3)"); - - b.Property("Location") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("MatID") - .HasColumnType("int"); - - b.Property("Note") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("QtyAvail") - .HasColumnType("int"); - - b.Property("TMm") - .HasColumnType("decimal(18,3)"); - - b.Property("WMm") - .HasColumnType("decimal(18,3)"); - - b.HasKey("RemnID"); - - b.HasIndex("MatID"); - - b.ToTable("RemnantsList"); - }); - - modelBuilder.Entity("NKC.Data.DbModels.MovMagModel", b => - { - b.HasOne("NKC.Data.DbModels.RemnantsModel", "RemnantNav") - .WithMany() - .HasForeignKey("RemnID") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("RemnantNav"); - }); - - modelBuilder.Entity("NKC.Data.DbModels.RemnantsModel", b => - { - b.HasOne("NKC.Data.DbModels.MaterialModel", "MaterialNav") - .WithMany("RemnantNav") - .HasForeignKey("MatID") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("MaterialNav"); - }); - - modelBuilder.Entity("NKC.Data.DbModels.MaterialModel", b => - { - b.Navigation("RemnantNav"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/REMAN/NKC.Data/Migrations/20211119182450_AddMovMagTable.cs b/REMAN/NKC.Data/Migrations/20211119182450_AddMovMagTable.cs deleted file mode 100644 index 77c5b39..0000000 --- a/REMAN/NKC.Data/Migrations/20211119182450_AddMovMagTable.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace NKC.Data.Migrations -{ - public partial class AddMovMagTable : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - - migrationBuilder.CreateTable( - name: "MovMag", - columns: table => new - { - MovID = table.Column(type: "int", nullable: false) - .Annotation("SqlServer:Identity", "1, 1"), - DtRec = table.Column(type: "datetime2", nullable: false), - RemnID = table.Column(type: "int", nullable: false), - QtyRec = table.Column(type: "int", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_MovMag", x => x.MovID); - table.ForeignKey( - name: "FK_MovMag_RemnantsList_RemnID", - column: x => x.RemnID, - principalTable: "RemnantsList", - principalColumn: "RemnID", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateIndex( - name: "IX_MovMag_RemnID", - table: "MovMag", - column: "RemnID"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "MovMag"); - - } - } -} diff --git a/REMAN/NKC.Data/Migrations/20211120074650_MovMagAddUserId.Designer.cs b/REMAN/NKC.Data/Migrations/20211120074650_MovMagAddUserId.Designer.cs deleted file mode 100644 index e2d2ab1..0000000 --- a/REMAN/NKC.Data/Migrations/20211120074650_MovMagAddUserId.Designer.cs +++ /dev/null @@ -1,176 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using NKC.Data; - -#nullable disable - -namespace NKC.Data.Migrations -{ - [DbContext(typeof(NKCContext))] - [Migration("20211120074650_MovMagAddUserId")] - partial class MovMagAddUserId - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "6.0.0") - .HasAnnotation("Relational:MaxIdentifierLength", 128); - - SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); - - modelBuilder.Entity("NKC.Data.DbModels.MaterialModel", b => - { - b.Property("MatID") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("MatID"), 1L, 1); - - b.Property("ApprovDate") - .ValueGeneratedOnAdd() - .HasColumnType("datetime") - .HasDefaultValueSql("(getdate())"); - - b.Property("ApprovUser") - .IsRequired() - .ValueGeneratedOnAdd() - .HasMaxLength(50) - .HasColumnType("nvarchar(50)") - .HasDefaultValueSql("('')"); - - b.Property("LMm") - .HasColumnType("decimal(18,3)") - .HasColumnName("L_mm"); - - b.Property("MatDesc") - .IsRequired() - .ValueGeneratedOnAdd() - .HasMaxLength(500) - .HasColumnType("nvarchar(500)") - .HasDefaultValueSql("('')") - .HasComment("Description"); - - b.Property("MatExtCode") - .HasColumnType("int"); - - b.Property("TMm") - .HasColumnType("decimal(18,3)") - .HasColumnName("T_mm"); - - b.Property("WMm") - .HasColumnType("decimal(18,3)") - .HasColumnName("W_mm"); - - b.HasKey("MatID"); - - b.HasIndex(new[] { "MatExtCode" }, "Idx_Materials_MatExtCode_Unique") - .IsUnique(); - - b.ToTable("Materials"); - }); - - modelBuilder.Entity("NKC.Data.DbModels.MovMagModel", b => - { - b.Property("MovID") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("MovID"), 1L, 1); - - b.Property("DtRec") - .HasColumnType("datetime2"); - - b.Property("QtyRec") - .HasColumnType("int"); - - b.Property("RemnID") - .HasColumnType("int"); - - b.Property("UserId") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.HasKey("MovID"); - - b.HasIndex("RemnID"); - - b.ToTable("MovMag"); - }); - - modelBuilder.Entity("NKC.Data.DbModels.RemnantsModel", b => - { - b.Property("RemnID") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("RemnID"), 1L, 1); - - b.Property("DtMod") - .HasColumnType("datetime2"); - - b.Property("LMm") - .HasColumnType("decimal(18,3)"); - - b.Property("Location") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("MatID") - .HasColumnType("int"); - - b.Property("Note") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("QtyAvail") - .HasColumnType("int"); - - b.Property("TMm") - .HasColumnType("decimal(18,3)"); - - b.Property("WMm") - .HasColumnType("decimal(18,3)"); - - b.HasKey("RemnID"); - - b.HasIndex("MatID"); - - b.ToTable("RemnantsList"); - }); - - modelBuilder.Entity("NKC.Data.DbModels.MovMagModel", b => - { - b.HasOne("NKC.Data.DbModels.RemnantsModel", "RemnantNav") - .WithMany() - .HasForeignKey("RemnID") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("RemnantNav"); - }); - - modelBuilder.Entity("NKC.Data.DbModels.RemnantsModel", b => - { - b.HasOne("NKC.Data.DbModels.MaterialModel", "MaterialNav") - .WithMany("RemnantNav") - .HasForeignKey("MatID") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("MaterialNav"); - }); - - modelBuilder.Entity("NKC.Data.DbModels.MaterialModel", b => - { - b.Navigation("RemnantNav"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/REMAN/NKC.Data/Migrations/20211120074650_MovMagAddUserId.cs b/REMAN/NKC.Data/Migrations/20211120074650_MovMagAddUserId.cs deleted file mode 100644 index 0e34722..0000000 --- a/REMAN/NKC.Data/Migrations/20211120074650_MovMagAddUserId.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace NKC.Data.Migrations -{ - public partial class MovMagAddUserId : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - - - migrationBuilder.AddColumn( - name: "UserId", - table: "MovMag", - type: "nvarchar(max)", - nullable: false, - defaultValue: ""); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "UserId", - table: "MovMag"); - - } - } -} diff --git a/REMAN/NKC.Data/Migrations/NKCContextModelSnapshot.cs b/REMAN/NKC.Data/Migrations/NKCContextModelSnapshot.cs deleted file mode 100644 index eac940b..0000000 --- a/REMAN/NKC.Data/Migrations/NKCContextModelSnapshot.cs +++ /dev/null @@ -1,174 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using NKC.Data; - -#nullable disable - -namespace NKC.Data.Migrations -{ - [DbContext(typeof(NKCContext))] - partial class NKCContextModelSnapshot : ModelSnapshot - { - protected override void BuildModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "6.0.0") - .HasAnnotation("Relational:MaxIdentifierLength", 128); - - SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); - - modelBuilder.Entity("NKC.Data.DbModels.MaterialModel", b => - { - b.Property("MatID") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("MatID"), 1L, 1); - - b.Property("ApprovDate") - .ValueGeneratedOnAdd() - .HasColumnType("datetime") - .HasDefaultValueSql("(getdate())"); - - b.Property("ApprovUser") - .IsRequired() - .ValueGeneratedOnAdd() - .HasMaxLength(50) - .HasColumnType("nvarchar(50)") - .HasDefaultValueSql("('')"); - - b.Property("LMm") - .HasColumnType("decimal(18,3)") - .HasColumnName("L_mm"); - - b.Property("MatDesc") - .IsRequired() - .ValueGeneratedOnAdd() - .HasMaxLength(500) - .HasColumnType("nvarchar(500)") - .HasDefaultValueSql("('')") - .HasComment("Description"); - - b.Property("MatExtCode") - .HasColumnType("int"); - - b.Property("TMm") - .HasColumnType("decimal(18,3)") - .HasColumnName("T_mm"); - - b.Property("WMm") - .HasColumnType("decimal(18,3)") - .HasColumnName("W_mm"); - - b.HasKey("MatID"); - - b.HasIndex(new[] { "MatExtCode" }, "Idx_Materials_MatExtCode_Unique") - .IsUnique(); - - b.ToTable("Materials"); - }); - - modelBuilder.Entity("NKC.Data.DbModels.MovMagModel", b => - { - b.Property("MovID") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("MovID"), 1L, 1); - - b.Property("DtRec") - .HasColumnType("datetime2"); - - b.Property("QtyRec") - .HasColumnType("int"); - - b.Property("RemnID") - .HasColumnType("int"); - - b.Property("UserId") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.HasKey("MovID"); - - b.HasIndex("RemnID"); - - b.ToTable("MovMag"); - }); - - modelBuilder.Entity("NKC.Data.DbModels.RemnantsModel", b => - { - b.Property("RemnID") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("RemnID"), 1L, 1); - - b.Property("DtMod") - .HasColumnType("datetime2"); - - b.Property("LMm") - .HasColumnType("decimal(18,3)"); - - b.Property("Location") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("MatID") - .HasColumnType("int"); - - b.Property("Note") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("QtyAvail") - .HasColumnType("int"); - - b.Property("TMm") - .HasColumnType("decimal(18,3)"); - - b.Property("WMm") - .HasColumnType("decimal(18,3)"); - - b.HasKey("RemnID"); - - b.HasIndex("MatID"); - - b.ToTable("RemnantsList"); - }); - - modelBuilder.Entity("NKC.Data.DbModels.MovMagModel", b => - { - b.HasOne("NKC.Data.DbModels.RemnantsModel", "RemnantNav") - .WithMany() - .HasForeignKey("RemnID") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("RemnantNav"); - }); - - modelBuilder.Entity("NKC.Data.DbModels.RemnantsModel", b => - { - b.HasOne("NKC.Data.DbModels.MaterialModel", "MaterialNav") - .WithMany("RemnantNav") - .HasForeignKey("MatID") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("MaterialNav"); - }); - - modelBuilder.Entity("NKC.Data.DbModels.MaterialModel", b => - { - b.Navigation("RemnantNav"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/REMAN/NKC.Data/NKC.Data.csproj b/REMAN/NKC.Data/NKC.Data.csproj deleted file mode 100644 index 47f615d..0000000 --- a/REMAN/NKC.Data/NKC.Data.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - net6.0 - enable - enable - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - diff --git a/REMAN/NKC.Data/NKCContext.cs b/REMAN/NKC.Data/NKCContext.cs deleted file mode 100644 index f437ed7..0000000 --- a/REMAN/NKC.Data/NKCContext.cs +++ /dev/null @@ -1,164 +0,0 @@ -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Configuration; -using NKC.Data.DbModels; -using NLog; - -namespace NKC.Data -{ - public partial class NKCContext : DbContext - { - #region Private Fields - - private static NLog.Logger Log = LogManager.GetCurrentClassLogger(); - - private IConfiguration _configuration = null!; - - #endregion Private Fields - - #region Public Constructors - - [Obsolete("This constructor should never be used directly, and is only needed to generate entityframework stuff. Connection string can be adapted as pleased.")] - public NKCContext() - { - } - - public NKCContext(IConfiguration configuration) - { - _configuration = configuration; - } - - public NKCContext(DbContextOptions options) : base(options) - { - try - { - // se non ci fosse... crea o migra! - Database.Migrate(); - } - catch (Exception exc) - { - Log.Error(exc, "Exception during context initialization 02"); - } - } - - #endregion Public Constructors - - #region Public Properties - - public virtual DbSet DbSetMaterials { get; set; } = null!; - public virtual DbSet DbSetRemnants { get; set; } = null!; - public virtual DbSet DbSetMovMag { get; set; } = null!; - public virtual DbSet DbSetPrintJobQueues { get; set; } = null!; - - #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("NKC.DB"); - if (!string.IsNullOrEmpty(connString)) - { - optionsBuilder.UseSqlServer(connString); - } - else - { - optionsBuilder.UseSqlServer("Server=SQL2016DEV;Database=Sauder_NKC;Trusted_Connection=True;"); - } - } - } - - protected override void OnModelCreating(ModelBuilder modelBuilder) - { - modelBuilder.Entity(entity => - { - - entity.HasIndex(e => e.MatExtCode, "Idx_Materials_MatExtCode_Unique") - .IsUnique(); - - entity.Property(e => e.ApprovDate) - .HasColumnType("datetime") - .HasDefaultValueSql("(getdate())"); - - entity.Property(e => e.ApprovUser) - .HasMaxLength(50) - .HasDefaultValueSql("('')"); - - entity.Property(e => e.LMm) - .HasColumnType("decimal(18, 3)") - .HasColumnName("L_mm"); - - entity.Property(e => e.MatDesc) - .HasMaxLength(500) - .HasDefaultValueSql("('')") - .HasComment("Description"); - - entity.Property(e => e.TMm) - .HasColumnType("decimal(18, 3)") - .HasColumnName("T_mm"); - - entity.Property(e => e.WMm) - .HasColumnType("decimal(18, 3)") - .HasColumnName("W_mm"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => e.IdxPrintJob); - - entity.ToTable("PrintJobQueue"); - - entity.Property(e => e.DtEnd) - .HasColumnType("datetime") - .HasColumnName("dtEnd"); - - entity.Property(e => e.DtLastTry) - .HasColumnType("datetime") - .HasColumnName("dtLastTry"); - - entity.Property(e => e.DtStart) - .HasColumnType("datetime") - .HasColumnName("dtStart"); - - entity.Property(e => e.KeyParam).HasMaxLength(50); - - entity.Property(e => e.PrtName) - .HasMaxLength(500) - .HasColumnName("prtName"); - - entity.Property(e => e.Stato).HasColumnName("stato"); - - entity.Property(e => e.TipoReport).HasMaxLength(250); - }); - - OnModelCreatingPartial(modelBuilder); - } - - #endregion Protected Methods - - #region Public Methods - - public void DbForceMigrate() - { - try - { - // se non ci fosse... crea o migra! - Database.Migrate(); - Log.Info("DbForceMigrate: done!"); - } - catch (Exception exc) - { - Log.Error(exc, "DbForceMigrate: Exception during context initialization 01"); - } - } - - #endregion Public Methods - } -} \ No newline at end of file diff --git a/REMAN/REMAN/Pages/Counter.razor b/REMAN/Pages/Counter.razor similarity index 100% rename from REMAN/REMAN/Pages/Counter.razor rename to REMAN/Pages/Counter.razor diff --git a/REMAN/REMAN/Pages/Deposit.razor b/REMAN/Pages/Deposit.razor similarity index 100% rename from REMAN/REMAN/Pages/Deposit.razor rename to REMAN/Pages/Deposit.razor diff --git a/REMAN/REMAN/Pages/Error.cshtml b/REMAN/Pages/Error.cshtml similarity index 100% rename from REMAN/REMAN/Pages/Error.cshtml rename to REMAN/Pages/Error.cshtml diff --git a/REMAN/REMAN/Pages/Error.cshtml.cs b/REMAN/Pages/Error.cshtml.cs similarity index 100% rename from REMAN/REMAN/Pages/Error.cshtml.cs rename to REMAN/Pages/Error.cshtml.cs diff --git a/REMAN/REMAN/Pages/Index.razor b/REMAN/Pages/Index.razor similarity index 100% rename from REMAN/REMAN/Pages/Index.razor rename to REMAN/Pages/Index.razor diff --git a/REMAN/REMAN/Pages/Materials.razor b/REMAN/Pages/Materials.razor similarity index 100% rename from REMAN/REMAN/Pages/Materials.razor rename to REMAN/Pages/Materials.razor diff --git a/REMAN/REMAN/Pages/Materials.razor.cs b/REMAN/Pages/Materials.razor.cs similarity index 100% rename from REMAN/REMAN/Pages/Materials.razor.cs rename to REMAN/Pages/Materials.razor.cs diff --git a/REMAN/REMAN/Pages/PickUp.razor b/REMAN/Pages/PickUp.razor similarity index 100% rename from REMAN/REMAN/Pages/PickUp.razor rename to REMAN/Pages/PickUp.razor diff --git a/REMAN/REMAN/Pages/Remnants.razor b/REMAN/Pages/Remnants.razor similarity index 100% rename from REMAN/REMAN/Pages/Remnants.razor rename to REMAN/Pages/Remnants.razor diff --git a/REMAN/REMAN/Pages/Remnants.razor.cs b/REMAN/Pages/Remnants.razor.cs similarity index 100% rename from REMAN/REMAN/Pages/Remnants.razor.cs rename to REMAN/Pages/Remnants.razor.cs diff --git a/REMAN/REMAN/Pages/Search.razor b/REMAN/Pages/Search.razor similarity index 100% rename from REMAN/REMAN/Pages/Search.razor rename to REMAN/Pages/Search.razor diff --git a/REMAN/REMAN/Pages/_Host.cshtml b/REMAN/Pages/_Host.cshtml similarity index 100% rename from REMAN/REMAN/Pages/_Host.cshtml rename to REMAN/Pages/_Host.cshtml diff --git a/REMAN/REMAN/Pages/_Layout.cshtml b/REMAN/Pages/_Layout.cshtml similarity index 100% rename from REMAN/REMAN/Pages/_Layout.cshtml rename to REMAN/Pages/_Layout.cshtml diff --git a/REMAN/REMAN/Program.cs b/REMAN/Program.cs similarity index 100% rename from REMAN/REMAN/Program.cs rename to REMAN/Program.cs diff --git a/REMAN/REMAN/Properties/launchSettings.json b/REMAN/Properties/launchSettings.json similarity index 100% rename from REMAN/REMAN/Properties/launchSettings.json rename to REMAN/Properties/launchSettings.json diff --git a/REMAN/REMAN/REMAN.csproj b/REMAN/REMAN.csproj similarity index 92% rename from REMAN/REMAN/REMAN.csproj rename to REMAN/REMAN.csproj index 27e0b15..515b4bb 100644 --- a/REMAN/REMAN/REMAN.csproj +++ b/REMAN/REMAN.csproj @@ -7,10 +7,10 @@ - <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS01Profile.pubxml" /> - <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS02Profile.pubxml" /> + <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS01.pubxml" /> + <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS02.pubxml" /> <_WebToolingArtifacts Remove="Properties\PublishProfiles\IISProfile.pubxml" /> - <_WebToolingArtifacts Remove="Properties\PublishProfiles\W2019-IIS-DevProfile.pubxml" /> + <_WebToolingArtifacts Remove="Properties\PublishProfiles\W2019-IIS-Dev.pubxml" /> diff --git a/REMAN/REMAN.sln b/REMAN/REMAN.sln deleted file mode 100644 index 8dca787..0000000 --- a/REMAN/REMAN.sln +++ /dev/null @@ -1,31 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "REMAN", "REMAN\REMAN.csproj", "{9E15E9EA-0511-4D7E-9391-A7D1C3CC7922}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NKC.Data", "NKC.Data\NKC.Data.csproj", "{B682FF27-5F53-45C1-B692-4613B28C045B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9E15E9EA-0511-4D7E-9391-A7D1C3CC7922}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E15E9EA-0511-4D7E-9391-A7D1C3CC7922}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E15E9EA-0511-4D7E-9391-A7D1C3CC7922}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E15E9EA-0511-4D7E-9391-A7D1C3CC7922}.Release|Any CPU.Build.0 = Release|Any CPU - {B682FF27-5F53-45C1-B692-4613B28C045B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B682FF27-5F53-45C1-B692-4613B28C045B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B682FF27-5F53-45C1-B692-4613B28C045B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B682FF27-5F53-45C1-B692-4613B28C045B}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {E3FA07F4-7CB0-44AA-AFAA-2839BD0B7AF1} - EndGlobalSection -EndGlobal diff --git a/REMAN/REMAN/Properties/PublishProfiles/IIS01.pubxml b/REMAN/REMAN/Properties/PublishProfiles/IIS01.pubxml deleted file mode 100644 index 57aa0c4..0000000 --- a/REMAN/REMAN/Properties/PublishProfiles/IIS01.pubxml +++ /dev/null @@ -1,23 +0,0 @@ - - - - MSDeploy - Release - Any CPU - https://IIS01.egalware.com/REMAN - True - False - net6.0 - 9e15e9ea-0511-4d7e-9391-a7d1c3cc7922 - false - https://IIS01:8172/MsDeploy.axd - Default Web Site/REMAN - - True - WMSVC - False - True - jenkins - <_SavePWD>True - - \ No newline at end of file diff --git a/REMAN/REMAN/Properties/PublishProfiles/IIS01Profile.pubxml b/REMAN/REMAN/Properties/PublishProfiles/IIS01Profile.pubxml deleted file mode 100644 index 57aa0c4..0000000 --- a/REMAN/REMAN/Properties/PublishProfiles/IIS01Profile.pubxml +++ /dev/null @@ -1,23 +0,0 @@ - - - - MSDeploy - Release - Any CPU - https://IIS01.egalware.com/REMAN - True - False - net6.0 - 9e15e9ea-0511-4d7e-9391-a7d1c3cc7922 - false - https://IIS01:8172/MsDeploy.axd - Default Web Site/REMAN - - True - WMSVC - False - True - jenkins - <_SavePWD>True - - \ No newline at end of file diff --git a/REMAN/REMAN/Properties/PublishProfiles/IIS02.pubxml b/REMAN/REMAN/Properties/PublishProfiles/IIS02.pubxml deleted file mode 100644 index f160250..0000000 --- a/REMAN/REMAN/Properties/PublishProfiles/IIS02.pubxml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - MSDeploy - True - Release - Any CPU - https://IIS02.egalware.com/REMAN - False - 9e15e9ea-0511-4d7e-9391-a7d1c3cc7922 - false - https://IIS02:8172/MsDeploy.axd - Default Web Site/REMAN - - False - WMSVC - True - True - jenkins - <_SavePWD>True - net6.0 - - \ No newline at end of file diff --git a/REMAN/REMAN/Properties/PublishProfiles/IIS02Profile.pubxml b/REMAN/REMAN/Properties/PublishProfiles/IIS02Profile.pubxml deleted file mode 100644 index f160250..0000000 --- a/REMAN/REMAN/Properties/PublishProfiles/IIS02Profile.pubxml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - MSDeploy - True - Release - Any CPU - https://IIS02.egalware.com/REMAN - False - 9e15e9ea-0511-4d7e-9391-a7d1c3cc7922 - false - https://IIS02:8172/MsDeploy.axd - Default Web Site/REMAN - - False - WMSVC - True - True - jenkins - <_SavePWD>True - net6.0 - - \ No newline at end of file diff --git a/REMAN/REMAN/Properties/PublishProfiles/IISProfile.pubxml b/REMAN/REMAN/Properties/PublishProfiles/IISProfile.pubxml deleted file mode 100644 index 7e51546..0000000 --- a/REMAN/REMAN/Properties/PublishProfiles/IISProfile.pubxml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - Package - Release - Any CPU - - True - False - net6.0 - 9e15e9ea-0511-4d7e-9391-a7d1c3cc7922 - false - bin\publish\REMAN.zip - true - Default Web Site/REMAN - - - - - \ No newline at end of file diff --git a/REMAN/REMAN/Properties/PublishProfiles/W2019-IIS-Dev.pubxml b/REMAN/REMAN/Properties/PublishProfiles/W2019-IIS-Dev.pubxml deleted file mode 100644 index 05c7238..0000000 --- a/REMAN/REMAN/Properties/PublishProfiles/W2019-IIS-Dev.pubxml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - MSDeploy - True - Release - Any CPU - https://w2019-iis-dev/REMAN - False - 9e15e9ea-0511-4d7e-9391-a7d1c3cc7922 - false - https://w2019-iis-dev:8172/MsDeploy.axd - Default Web Site/REMAN - - False - WMSVC - True - True - jenkins - <_SavePWD>True - net6.0 - - \ No newline at end of file diff --git a/REMAN/REMAN/Properties/PublishProfiles/W2019-IIS-DevProfile.pubxml b/REMAN/REMAN/Properties/PublishProfiles/W2019-IIS-DevProfile.pubxml deleted file mode 100644 index 05c7238..0000000 --- a/REMAN/REMAN/Properties/PublishProfiles/W2019-IIS-DevProfile.pubxml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - MSDeploy - True - Release - Any CPU - https://w2019-iis-dev/REMAN - False - 9e15e9ea-0511-4d7e-9391-a7d1c3cc7922 - false - https://w2019-iis-dev:8172/MsDeploy.axd - Default Web Site/REMAN - - False - WMSVC - True - True - jenkins - <_SavePWD>True - net6.0 - - \ No newline at end of file diff --git a/REMAN/REMAN/Shared/LoginDisplay.razor b/REMAN/Shared/LoginDisplay.razor similarity index 100% rename from REMAN/REMAN/Shared/LoginDisplay.razor rename to REMAN/Shared/LoginDisplay.razor diff --git a/REMAN/REMAN/Shared/MainLayout.razor b/REMAN/Shared/MainLayout.razor similarity index 100% rename from REMAN/REMAN/Shared/MainLayout.razor rename to REMAN/Shared/MainLayout.razor diff --git a/REMAN/REMAN/Shared/MainLayout.razor.css b/REMAN/Shared/MainLayout.razor.css similarity index 100% rename from REMAN/REMAN/Shared/MainLayout.razor.css rename to REMAN/Shared/MainLayout.razor.css diff --git a/REMAN/REMAN/Shared/NavMenu.razor b/REMAN/Shared/NavMenu.razor similarity index 100% rename from REMAN/REMAN/Shared/NavMenu.razor rename to REMAN/Shared/NavMenu.razor diff --git a/REMAN/REMAN/Shared/NavMenu.razor.css b/REMAN/Shared/NavMenu.razor.css similarity index 100% rename from REMAN/REMAN/Shared/NavMenu.razor.css rename to REMAN/Shared/NavMenu.razor.css diff --git a/REMAN/REMAN/_Imports.razor b/REMAN/_Imports.razor similarity index 100% rename from REMAN/REMAN/_Imports.razor rename to REMAN/_Imports.razor diff --git a/REMAN/REMAN/appsettings.Development.json b/REMAN/appsettings.Development.json similarity index 100% rename from REMAN/REMAN/appsettings.Development.json rename to REMAN/appsettings.Development.json diff --git a/REMAN/REMAN/appsettings.json b/REMAN/appsettings.json similarity index 100% rename from REMAN/REMAN/appsettings.json rename to REMAN/appsettings.json diff --git a/REMAN/REMAN/libman.json b/REMAN/libman.json similarity index 100% rename from REMAN/REMAN/libman.json rename to REMAN/libman.json diff --git a/REMAN/REMAN/wwwroot/css/bootstrap/bootstrap.min.css b/REMAN/wwwroot/css/bootstrap/bootstrap.min.css similarity index 100% rename from REMAN/REMAN/wwwroot/css/bootstrap/bootstrap.min.css rename to REMAN/wwwroot/css/bootstrap/bootstrap.min.css diff --git a/REMAN/REMAN/wwwroot/css/bootstrap/bootstrap.min.css.map b/REMAN/wwwroot/css/bootstrap/bootstrap.min.css.map similarity index 100% rename from REMAN/REMAN/wwwroot/css/bootstrap/bootstrap.min.css.map rename to REMAN/wwwroot/css/bootstrap/bootstrap.min.css.map diff --git a/REMAN/REMAN/wwwroot/css/open-iconic/FONT-LICENSE b/REMAN/wwwroot/css/open-iconic/FONT-LICENSE similarity index 100% rename from REMAN/REMAN/wwwroot/css/open-iconic/FONT-LICENSE rename to REMAN/wwwroot/css/open-iconic/FONT-LICENSE diff --git a/REMAN/REMAN/wwwroot/css/open-iconic/ICON-LICENSE b/REMAN/wwwroot/css/open-iconic/ICON-LICENSE similarity index 100% rename from REMAN/REMAN/wwwroot/css/open-iconic/ICON-LICENSE rename to REMAN/wwwroot/css/open-iconic/ICON-LICENSE diff --git a/REMAN/REMAN/wwwroot/css/open-iconic/README.md b/REMAN/wwwroot/css/open-iconic/README.md similarity index 100% rename from REMAN/REMAN/wwwroot/css/open-iconic/README.md rename to REMAN/wwwroot/css/open-iconic/README.md diff --git a/REMAN/REMAN/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css b/REMAN/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css similarity index 100% rename from REMAN/REMAN/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css rename to REMAN/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css diff --git a/REMAN/REMAN/wwwroot/css/open-iconic/font/fonts/open-iconic.eot b/REMAN/wwwroot/css/open-iconic/font/fonts/open-iconic.eot similarity index 100% rename from REMAN/REMAN/wwwroot/css/open-iconic/font/fonts/open-iconic.eot rename to REMAN/wwwroot/css/open-iconic/font/fonts/open-iconic.eot diff --git a/REMAN/REMAN/wwwroot/css/open-iconic/font/fonts/open-iconic.otf b/REMAN/wwwroot/css/open-iconic/font/fonts/open-iconic.otf similarity index 100% rename from REMAN/REMAN/wwwroot/css/open-iconic/font/fonts/open-iconic.otf rename to REMAN/wwwroot/css/open-iconic/font/fonts/open-iconic.otf diff --git a/REMAN/REMAN/wwwroot/css/open-iconic/font/fonts/open-iconic.svg b/REMAN/wwwroot/css/open-iconic/font/fonts/open-iconic.svg similarity index 100% rename from REMAN/REMAN/wwwroot/css/open-iconic/font/fonts/open-iconic.svg rename to REMAN/wwwroot/css/open-iconic/font/fonts/open-iconic.svg diff --git a/REMAN/REMAN/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf b/REMAN/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf similarity index 100% rename from REMAN/REMAN/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf rename to REMAN/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf diff --git a/REMAN/REMAN/wwwroot/css/open-iconic/font/fonts/open-iconic.woff b/REMAN/wwwroot/css/open-iconic/font/fonts/open-iconic.woff similarity index 100% rename from REMAN/REMAN/wwwroot/css/open-iconic/font/fonts/open-iconic.woff rename to REMAN/wwwroot/css/open-iconic/font/fonts/open-iconic.woff diff --git a/REMAN/REMAN/wwwroot/css/site.css b/REMAN/wwwroot/css/site.css similarity index 100% rename from REMAN/REMAN/wwwroot/css/site.css rename to REMAN/wwwroot/css/site.css diff --git a/REMAN/REMAN/wwwroot/favicon.ico b/REMAN/wwwroot/favicon.ico similarity index 100% rename from REMAN/REMAN/wwwroot/favicon.ico rename to REMAN/wwwroot/favicon.ico diff --git a/REMAN/REMAN/wwwroot/img/LogoBlu.svg b/REMAN/wwwroot/img/LogoBlu.svg similarity index 100% rename from REMAN/REMAN/wwwroot/img/LogoBlu.svg rename to REMAN/wwwroot/img/LogoBlu.svg diff --git a/REMAN/REMAN/wwwroot/js/blazorSupport.js b/REMAN/wwwroot/js/blazorSupport.js similarity index 100% rename from REMAN/REMAN/wwwroot/js/blazorSupport.js rename to REMAN/wwwroot/js/blazorSupport.js diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap-grid.css b/REMAN/wwwroot/lib/bootstrap/css/bootstrap-grid.css similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap-grid.css rename to REMAN/wwwroot/lib/bootstrap/css/bootstrap-grid.css diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap-grid.css.map b/REMAN/wwwroot/lib/bootstrap/css/bootstrap-grid.css.map similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap-grid.css.map rename to REMAN/wwwroot/lib/bootstrap/css/bootstrap-grid.css.map diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap-grid.min.css b/REMAN/wwwroot/lib/bootstrap/css/bootstrap-grid.min.css similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap-grid.min.css rename to REMAN/wwwroot/lib/bootstrap/css/bootstrap-grid.min.css diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap-grid.min.css.map b/REMAN/wwwroot/lib/bootstrap/css/bootstrap-grid.min.css.map similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap-grid.min.css.map rename to REMAN/wwwroot/lib/bootstrap/css/bootstrap-grid.min.css.map diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap-reboot.css b/REMAN/wwwroot/lib/bootstrap/css/bootstrap-reboot.css similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap-reboot.css rename to REMAN/wwwroot/lib/bootstrap/css/bootstrap-reboot.css diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap-reboot.css.map b/REMAN/wwwroot/lib/bootstrap/css/bootstrap-reboot.css.map similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap-reboot.css.map rename to REMAN/wwwroot/lib/bootstrap/css/bootstrap-reboot.css.map diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap-reboot.min.css b/REMAN/wwwroot/lib/bootstrap/css/bootstrap-reboot.min.css similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap-reboot.min.css rename to REMAN/wwwroot/lib/bootstrap/css/bootstrap-reboot.min.css diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap-reboot.min.css.map b/REMAN/wwwroot/lib/bootstrap/css/bootstrap-reboot.min.css.map similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap-reboot.min.css.map rename to REMAN/wwwroot/lib/bootstrap/css/bootstrap-reboot.min.css.map diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap.css b/REMAN/wwwroot/lib/bootstrap/css/bootstrap.css similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap.css rename to REMAN/wwwroot/lib/bootstrap/css/bootstrap.css diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap.css.map b/REMAN/wwwroot/lib/bootstrap/css/bootstrap.css.map similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap.css.map rename to REMAN/wwwroot/lib/bootstrap/css/bootstrap.css.map diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap.min.css b/REMAN/wwwroot/lib/bootstrap/css/bootstrap.min.css similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap.min.css rename to REMAN/wwwroot/lib/bootstrap/css/bootstrap.min.css diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap.min.css.map b/REMAN/wwwroot/lib/bootstrap/css/bootstrap.min.css.map similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/css/bootstrap.min.css.map rename to REMAN/wwwroot/lib/bootstrap/css/bootstrap.min.css.map diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/js/bootstrap.bundle.js b/REMAN/wwwroot/lib/bootstrap/js/bootstrap.bundle.js similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/js/bootstrap.bundle.js rename to REMAN/wwwroot/lib/bootstrap/js/bootstrap.bundle.js diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/js/bootstrap.bundle.js.map b/REMAN/wwwroot/lib/bootstrap/js/bootstrap.bundle.js.map similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/js/bootstrap.bundle.js.map rename to REMAN/wwwroot/lib/bootstrap/js/bootstrap.bundle.js.map diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/js/bootstrap.bundle.min.js b/REMAN/wwwroot/lib/bootstrap/js/bootstrap.bundle.min.js similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/js/bootstrap.bundle.min.js rename to REMAN/wwwroot/lib/bootstrap/js/bootstrap.bundle.min.js diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/js/bootstrap.bundle.min.js.map b/REMAN/wwwroot/lib/bootstrap/js/bootstrap.bundle.min.js.map similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/js/bootstrap.bundle.min.js.map rename to REMAN/wwwroot/lib/bootstrap/js/bootstrap.bundle.min.js.map diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/js/bootstrap.js b/REMAN/wwwroot/lib/bootstrap/js/bootstrap.js similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/js/bootstrap.js rename to REMAN/wwwroot/lib/bootstrap/js/bootstrap.js diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/js/bootstrap.js.map b/REMAN/wwwroot/lib/bootstrap/js/bootstrap.js.map similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/js/bootstrap.js.map rename to REMAN/wwwroot/lib/bootstrap/js/bootstrap.js.map diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/js/bootstrap.min.js b/REMAN/wwwroot/lib/bootstrap/js/bootstrap.min.js similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/js/bootstrap.min.js rename to REMAN/wwwroot/lib/bootstrap/js/bootstrap.min.js diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/js/bootstrap.min.js.map b/REMAN/wwwroot/lib/bootstrap/js/bootstrap.min.js.map similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/js/bootstrap.min.js.map rename to REMAN/wwwroot/lib/bootstrap/js/bootstrap.min.js.map diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_alert.scss b/REMAN/wwwroot/lib/bootstrap/scss/_alert.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_alert.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_alert.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_badge.scss b/REMAN/wwwroot/lib/bootstrap/scss/_badge.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_badge.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_badge.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_breadcrumb.scss b/REMAN/wwwroot/lib/bootstrap/scss/_breadcrumb.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_breadcrumb.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_breadcrumb.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_button-group.scss b/REMAN/wwwroot/lib/bootstrap/scss/_button-group.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_button-group.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_button-group.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_buttons.scss b/REMAN/wwwroot/lib/bootstrap/scss/_buttons.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_buttons.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_buttons.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_card.scss b/REMAN/wwwroot/lib/bootstrap/scss/_card.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_card.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_card.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_carousel.scss b/REMAN/wwwroot/lib/bootstrap/scss/_carousel.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_carousel.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_carousel.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_close.scss b/REMAN/wwwroot/lib/bootstrap/scss/_close.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_close.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_close.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_code.scss b/REMAN/wwwroot/lib/bootstrap/scss/_code.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_code.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_code.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_custom-forms.scss b/REMAN/wwwroot/lib/bootstrap/scss/_custom-forms.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_custom-forms.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_custom-forms.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_dropdown.scss b/REMAN/wwwroot/lib/bootstrap/scss/_dropdown.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_dropdown.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_dropdown.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_forms.scss b/REMAN/wwwroot/lib/bootstrap/scss/_forms.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_forms.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_forms.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_functions.scss b/REMAN/wwwroot/lib/bootstrap/scss/_functions.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_functions.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_functions.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_grid.scss b/REMAN/wwwroot/lib/bootstrap/scss/_grid.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_grid.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_grid.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_images.scss b/REMAN/wwwroot/lib/bootstrap/scss/_images.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_images.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_images.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_input-group.scss b/REMAN/wwwroot/lib/bootstrap/scss/_input-group.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_input-group.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_input-group.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_jumbotron.scss b/REMAN/wwwroot/lib/bootstrap/scss/_jumbotron.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_jumbotron.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_jumbotron.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_list-group.scss b/REMAN/wwwroot/lib/bootstrap/scss/_list-group.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_list-group.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_list-group.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_media.scss b/REMAN/wwwroot/lib/bootstrap/scss/_media.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_media.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_media.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_mixins.scss b/REMAN/wwwroot/lib/bootstrap/scss/_mixins.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_mixins.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_mixins.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_modal.scss b/REMAN/wwwroot/lib/bootstrap/scss/_modal.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_modal.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_modal.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_nav.scss b/REMAN/wwwroot/lib/bootstrap/scss/_nav.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_nav.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_nav.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_navbar.scss b/REMAN/wwwroot/lib/bootstrap/scss/_navbar.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_navbar.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_navbar.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_pagination.scss b/REMAN/wwwroot/lib/bootstrap/scss/_pagination.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_pagination.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_pagination.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_popover.scss b/REMAN/wwwroot/lib/bootstrap/scss/_popover.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_popover.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_popover.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_print.scss b/REMAN/wwwroot/lib/bootstrap/scss/_print.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_print.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_print.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_progress.scss b/REMAN/wwwroot/lib/bootstrap/scss/_progress.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_progress.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_progress.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_reboot.scss b/REMAN/wwwroot/lib/bootstrap/scss/_reboot.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_reboot.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_reboot.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_root.scss b/REMAN/wwwroot/lib/bootstrap/scss/_root.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_root.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_root.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_spinners.scss b/REMAN/wwwroot/lib/bootstrap/scss/_spinners.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_spinners.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_spinners.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_tables.scss b/REMAN/wwwroot/lib/bootstrap/scss/_tables.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_tables.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_tables.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_toasts.scss b/REMAN/wwwroot/lib/bootstrap/scss/_toasts.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_toasts.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_toasts.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_tooltip.scss b/REMAN/wwwroot/lib/bootstrap/scss/_tooltip.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_tooltip.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_tooltip.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_transitions.scss b/REMAN/wwwroot/lib/bootstrap/scss/_transitions.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_transitions.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_transitions.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_type.scss b/REMAN/wwwroot/lib/bootstrap/scss/_type.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_type.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_type.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_utilities.scss b/REMAN/wwwroot/lib/bootstrap/scss/_utilities.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_utilities.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_utilities.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/_variables.scss b/REMAN/wwwroot/lib/bootstrap/scss/_variables.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/_variables.scss rename to REMAN/wwwroot/lib/bootstrap/scss/_variables.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/bootstrap-grid.scss b/REMAN/wwwroot/lib/bootstrap/scss/bootstrap-grid.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/bootstrap-grid.scss rename to REMAN/wwwroot/lib/bootstrap/scss/bootstrap-grid.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/bootstrap-reboot.scss b/REMAN/wwwroot/lib/bootstrap/scss/bootstrap-reboot.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/bootstrap-reboot.scss rename to REMAN/wwwroot/lib/bootstrap/scss/bootstrap-reboot.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/bootstrap.scss b/REMAN/wwwroot/lib/bootstrap/scss/bootstrap.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/bootstrap.scss rename to REMAN/wwwroot/lib/bootstrap/scss/bootstrap.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_alert.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_alert.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_alert.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_alert.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_background-variant.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_background-variant.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_background-variant.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_background-variant.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_badge.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_badge.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_badge.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_badge.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_border-radius.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_border-radius.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_border-radius.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_border-radius.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_box-shadow.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_box-shadow.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_box-shadow.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_box-shadow.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_breakpoints.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_breakpoints.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_breakpoints.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_breakpoints.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_buttons.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_buttons.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_buttons.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_buttons.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_caret.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_caret.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_caret.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_caret.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_clearfix.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_clearfix.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_clearfix.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_clearfix.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_deprecate.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_deprecate.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_deprecate.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_deprecate.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_float.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_float.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_float.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_float.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_forms.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_forms.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_forms.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_forms.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_gradients.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_gradients.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_gradients.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_gradients.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_grid-framework.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_grid-framework.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_grid-framework.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_grid-framework.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_grid.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_grid.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_grid.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_grid.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_hover.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_hover.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_hover.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_hover.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_image.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_image.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_image.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_image.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_list-group.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_list-group.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_list-group.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_list-group.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_lists.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_lists.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_lists.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_lists.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_nav-divider.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_nav-divider.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_nav-divider.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_nav-divider.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_pagination.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_pagination.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_pagination.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_pagination.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_reset-text.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_reset-text.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_reset-text.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_reset-text.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_resize.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_resize.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_resize.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_resize.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_screen-reader.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_screen-reader.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_screen-reader.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_screen-reader.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_size.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_size.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_size.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_size.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_table-row.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_table-row.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_table-row.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_table-row.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_text-emphasis.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_text-emphasis.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_text-emphasis.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_text-emphasis.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_text-hide.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_text-hide.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_text-hide.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_text-hide.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_text-truncate.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_text-truncate.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_text-truncate.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_text-truncate.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_transition.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_transition.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_transition.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_transition.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_visibility.scss b/REMAN/wwwroot/lib/bootstrap/scss/mixins/_visibility.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/mixins/_visibility.scss rename to REMAN/wwwroot/lib/bootstrap/scss/mixins/_visibility.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_align.scss b/REMAN/wwwroot/lib/bootstrap/scss/utilities/_align.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_align.scss rename to REMAN/wwwroot/lib/bootstrap/scss/utilities/_align.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_background.scss b/REMAN/wwwroot/lib/bootstrap/scss/utilities/_background.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_background.scss rename to REMAN/wwwroot/lib/bootstrap/scss/utilities/_background.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_borders.scss b/REMAN/wwwroot/lib/bootstrap/scss/utilities/_borders.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_borders.scss rename to REMAN/wwwroot/lib/bootstrap/scss/utilities/_borders.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_clearfix.scss b/REMAN/wwwroot/lib/bootstrap/scss/utilities/_clearfix.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_clearfix.scss rename to REMAN/wwwroot/lib/bootstrap/scss/utilities/_clearfix.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_display.scss b/REMAN/wwwroot/lib/bootstrap/scss/utilities/_display.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_display.scss rename to REMAN/wwwroot/lib/bootstrap/scss/utilities/_display.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_embed.scss b/REMAN/wwwroot/lib/bootstrap/scss/utilities/_embed.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_embed.scss rename to REMAN/wwwroot/lib/bootstrap/scss/utilities/_embed.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_flex.scss b/REMAN/wwwroot/lib/bootstrap/scss/utilities/_flex.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_flex.scss rename to REMAN/wwwroot/lib/bootstrap/scss/utilities/_flex.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_float.scss b/REMAN/wwwroot/lib/bootstrap/scss/utilities/_float.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_float.scss rename to REMAN/wwwroot/lib/bootstrap/scss/utilities/_float.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_interactions.scss b/REMAN/wwwroot/lib/bootstrap/scss/utilities/_interactions.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_interactions.scss rename to REMAN/wwwroot/lib/bootstrap/scss/utilities/_interactions.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_overflow.scss b/REMAN/wwwroot/lib/bootstrap/scss/utilities/_overflow.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_overflow.scss rename to REMAN/wwwroot/lib/bootstrap/scss/utilities/_overflow.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_position.scss b/REMAN/wwwroot/lib/bootstrap/scss/utilities/_position.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_position.scss rename to REMAN/wwwroot/lib/bootstrap/scss/utilities/_position.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_screenreaders.scss b/REMAN/wwwroot/lib/bootstrap/scss/utilities/_screenreaders.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_screenreaders.scss rename to REMAN/wwwroot/lib/bootstrap/scss/utilities/_screenreaders.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_shadows.scss b/REMAN/wwwroot/lib/bootstrap/scss/utilities/_shadows.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_shadows.scss rename to REMAN/wwwroot/lib/bootstrap/scss/utilities/_shadows.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_sizing.scss b/REMAN/wwwroot/lib/bootstrap/scss/utilities/_sizing.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_sizing.scss rename to REMAN/wwwroot/lib/bootstrap/scss/utilities/_sizing.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_spacing.scss b/REMAN/wwwroot/lib/bootstrap/scss/utilities/_spacing.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_spacing.scss rename to REMAN/wwwroot/lib/bootstrap/scss/utilities/_spacing.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_stretched-link.scss b/REMAN/wwwroot/lib/bootstrap/scss/utilities/_stretched-link.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_stretched-link.scss rename to REMAN/wwwroot/lib/bootstrap/scss/utilities/_stretched-link.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_text.scss b/REMAN/wwwroot/lib/bootstrap/scss/utilities/_text.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_text.scss rename to REMAN/wwwroot/lib/bootstrap/scss/utilities/_text.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_visibility.scss b/REMAN/wwwroot/lib/bootstrap/scss/utilities/_visibility.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/utilities/_visibility.scss rename to REMAN/wwwroot/lib/bootstrap/scss/utilities/_visibility.scss diff --git a/REMAN/REMAN/wwwroot/lib/bootstrap/scss/vendor/_rfs.scss b/REMAN/wwwroot/lib/bootstrap/scss/vendor/_rfs.scss similarity index 100% rename from REMAN/REMAN/wwwroot/lib/bootstrap/scss/vendor/_rfs.scss rename to REMAN/wwwroot/lib/bootstrap/scss/vendor/_rfs.scss diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/css/all.css b/REMAN/wwwroot/lib/font-awesome/css/all.css similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/css/all.css rename to REMAN/wwwroot/lib/font-awesome/css/all.css diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/css/all.min.css b/REMAN/wwwroot/lib/font-awesome/css/all.min.css similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/css/all.min.css rename to REMAN/wwwroot/lib/font-awesome/css/all.min.css diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/css/brands.css b/REMAN/wwwroot/lib/font-awesome/css/brands.css similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/css/brands.css rename to REMAN/wwwroot/lib/font-awesome/css/brands.css diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/css/brands.min.css b/REMAN/wwwroot/lib/font-awesome/css/brands.min.css similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/css/brands.min.css rename to REMAN/wwwroot/lib/font-awesome/css/brands.min.css diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/css/fontawesome.css b/REMAN/wwwroot/lib/font-awesome/css/fontawesome.css similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/css/fontawesome.css rename to REMAN/wwwroot/lib/font-awesome/css/fontawesome.css diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/css/fontawesome.min.css b/REMAN/wwwroot/lib/font-awesome/css/fontawesome.min.css similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/css/fontawesome.min.css rename to REMAN/wwwroot/lib/font-awesome/css/fontawesome.min.css diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/css/regular.css b/REMAN/wwwroot/lib/font-awesome/css/regular.css similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/css/regular.css rename to REMAN/wwwroot/lib/font-awesome/css/regular.css diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/css/regular.min.css b/REMAN/wwwroot/lib/font-awesome/css/regular.min.css similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/css/regular.min.css rename to REMAN/wwwroot/lib/font-awesome/css/regular.min.css diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/css/solid.css b/REMAN/wwwroot/lib/font-awesome/css/solid.css similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/css/solid.css rename to REMAN/wwwroot/lib/font-awesome/css/solid.css diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/css/solid.min.css b/REMAN/wwwroot/lib/font-awesome/css/solid.min.css similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/css/solid.min.css rename to REMAN/wwwroot/lib/font-awesome/css/solid.min.css diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/css/svg-with-js.css b/REMAN/wwwroot/lib/font-awesome/css/svg-with-js.css similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/css/svg-with-js.css rename to REMAN/wwwroot/lib/font-awesome/css/svg-with-js.css diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/css/svg-with-js.min.css b/REMAN/wwwroot/lib/font-awesome/css/svg-with-js.min.css similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/css/svg-with-js.min.css rename to REMAN/wwwroot/lib/font-awesome/css/svg-with-js.min.css diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/css/v4-shims.css b/REMAN/wwwroot/lib/font-awesome/css/v4-shims.css similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/css/v4-shims.css rename to REMAN/wwwroot/lib/font-awesome/css/v4-shims.css diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/css/v4-shims.min.css b/REMAN/wwwroot/lib/font-awesome/css/v4-shims.min.css similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/css/v4-shims.min.css rename to REMAN/wwwroot/lib/font-awesome/css/v4-shims.min.css diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/js/all.js b/REMAN/wwwroot/lib/font-awesome/js/all.js similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/js/all.js rename to REMAN/wwwroot/lib/font-awesome/js/all.js diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/js/all.min.js b/REMAN/wwwroot/lib/font-awesome/js/all.min.js similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/js/all.min.js rename to REMAN/wwwroot/lib/font-awesome/js/all.min.js diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/js/brands.js b/REMAN/wwwroot/lib/font-awesome/js/brands.js similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/js/brands.js rename to REMAN/wwwroot/lib/font-awesome/js/brands.js diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/js/brands.min.js b/REMAN/wwwroot/lib/font-awesome/js/brands.min.js similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/js/brands.min.js rename to REMAN/wwwroot/lib/font-awesome/js/brands.min.js diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/js/conflict-detection.js b/REMAN/wwwroot/lib/font-awesome/js/conflict-detection.js similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/js/conflict-detection.js rename to REMAN/wwwroot/lib/font-awesome/js/conflict-detection.js diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/js/conflict-detection.min.js b/REMAN/wwwroot/lib/font-awesome/js/conflict-detection.min.js similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/js/conflict-detection.min.js rename to REMAN/wwwroot/lib/font-awesome/js/conflict-detection.min.js diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/js/fontawesome.js b/REMAN/wwwroot/lib/font-awesome/js/fontawesome.js similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/js/fontawesome.js rename to REMAN/wwwroot/lib/font-awesome/js/fontawesome.js diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/js/fontawesome.min.js b/REMAN/wwwroot/lib/font-awesome/js/fontawesome.min.js similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/js/fontawesome.min.js rename to REMAN/wwwroot/lib/font-awesome/js/fontawesome.min.js diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/js/regular.js b/REMAN/wwwroot/lib/font-awesome/js/regular.js similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/js/regular.js rename to REMAN/wwwroot/lib/font-awesome/js/regular.js diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/js/regular.min.js b/REMAN/wwwroot/lib/font-awesome/js/regular.min.js similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/js/regular.min.js rename to REMAN/wwwroot/lib/font-awesome/js/regular.min.js diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/js/solid.js b/REMAN/wwwroot/lib/font-awesome/js/solid.js similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/js/solid.js rename to REMAN/wwwroot/lib/font-awesome/js/solid.js diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/js/solid.min.js b/REMAN/wwwroot/lib/font-awesome/js/solid.min.js similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/js/solid.min.js rename to REMAN/wwwroot/lib/font-awesome/js/solid.min.js diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/js/v4-shims.js b/REMAN/wwwroot/lib/font-awesome/js/v4-shims.js similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/js/v4-shims.js rename to REMAN/wwwroot/lib/font-awesome/js/v4-shims.js diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/js/v4-shims.min.js b/REMAN/wwwroot/lib/font-awesome/js/v4-shims.min.js similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/js/v4-shims.min.js rename to REMAN/wwwroot/lib/font-awesome/js/v4-shims.min.js diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/sprites/brands.svg b/REMAN/wwwroot/lib/font-awesome/sprites/brands.svg similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/sprites/brands.svg rename to REMAN/wwwroot/lib/font-awesome/sprites/brands.svg diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/sprites/regular.svg b/REMAN/wwwroot/lib/font-awesome/sprites/regular.svg similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/sprites/regular.svg rename to REMAN/wwwroot/lib/font-awesome/sprites/regular.svg diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/sprites/solid.svg b/REMAN/wwwroot/lib/font-awesome/sprites/solid.svg similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/sprites/solid.svg rename to REMAN/wwwroot/lib/font-awesome/sprites/solid.svg diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-brands-400.eot b/REMAN/wwwroot/lib/font-awesome/webfonts/fa-brands-400.eot similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-brands-400.eot rename to REMAN/wwwroot/lib/font-awesome/webfonts/fa-brands-400.eot diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-brands-400.svg b/REMAN/wwwroot/lib/font-awesome/webfonts/fa-brands-400.svg similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-brands-400.svg rename to REMAN/wwwroot/lib/font-awesome/webfonts/fa-brands-400.svg diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-brands-400.ttf b/REMAN/wwwroot/lib/font-awesome/webfonts/fa-brands-400.ttf similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-brands-400.ttf rename to REMAN/wwwroot/lib/font-awesome/webfonts/fa-brands-400.ttf diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-brands-400.woff b/REMAN/wwwroot/lib/font-awesome/webfonts/fa-brands-400.woff similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-brands-400.woff rename to REMAN/wwwroot/lib/font-awesome/webfonts/fa-brands-400.woff diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-brands-400.woff2 b/REMAN/wwwroot/lib/font-awesome/webfonts/fa-brands-400.woff2 similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-brands-400.woff2 rename to REMAN/wwwroot/lib/font-awesome/webfonts/fa-brands-400.woff2 diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-regular-400.eot b/REMAN/wwwroot/lib/font-awesome/webfonts/fa-regular-400.eot similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-regular-400.eot rename to REMAN/wwwroot/lib/font-awesome/webfonts/fa-regular-400.eot diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-regular-400.svg b/REMAN/wwwroot/lib/font-awesome/webfonts/fa-regular-400.svg similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-regular-400.svg rename to REMAN/wwwroot/lib/font-awesome/webfonts/fa-regular-400.svg diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-regular-400.ttf b/REMAN/wwwroot/lib/font-awesome/webfonts/fa-regular-400.ttf similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-regular-400.ttf rename to REMAN/wwwroot/lib/font-awesome/webfonts/fa-regular-400.ttf diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-regular-400.woff b/REMAN/wwwroot/lib/font-awesome/webfonts/fa-regular-400.woff similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-regular-400.woff rename to REMAN/wwwroot/lib/font-awesome/webfonts/fa-regular-400.woff diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-regular-400.woff2 b/REMAN/wwwroot/lib/font-awesome/webfonts/fa-regular-400.woff2 similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-regular-400.woff2 rename to REMAN/wwwroot/lib/font-awesome/webfonts/fa-regular-400.woff2 diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-solid-900.eot b/REMAN/wwwroot/lib/font-awesome/webfonts/fa-solid-900.eot similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-solid-900.eot rename to REMAN/wwwroot/lib/font-awesome/webfonts/fa-solid-900.eot diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-solid-900.svg b/REMAN/wwwroot/lib/font-awesome/webfonts/fa-solid-900.svg similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-solid-900.svg rename to REMAN/wwwroot/lib/font-awesome/webfonts/fa-solid-900.svg diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-solid-900.ttf b/REMAN/wwwroot/lib/font-awesome/webfonts/fa-solid-900.ttf similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-solid-900.ttf rename to REMAN/wwwroot/lib/font-awesome/webfonts/fa-solid-900.ttf diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-solid-900.woff b/REMAN/wwwroot/lib/font-awesome/webfonts/fa-solid-900.woff similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-solid-900.woff rename to REMAN/wwwroot/lib/font-awesome/webfonts/fa-solid-900.woff diff --git a/REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-solid-900.woff2 b/REMAN/wwwroot/lib/font-awesome/webfonts/fa-solid-900.woff2 similarity index 100% rename from REMAN/REMAN/wwwroot/lib/font-awesome/webfonts/fa-solid-900.woff2 rename to REMAN/wwwroot/lib/font-awesome/webfonts/fa-solid-900.woff2 From 38be0c67acf221a3151dee43e99fcb50ddae7341 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 25 Nov 2021 09:56:19 +0100 Subject: [PATCH 04/10] Update solution REMAN --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8038428..9fd552f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -104,7 +104,7 @@ Core:build: - *nuget-fix - dotnet restore REMAN/REMAN.sln script: - - dotnet build REMAN/REMAN/REMAN.csproj + - dotnet build REMAN/REMAN.csproj Net:IIS01:deploy: stage: deploy @@ -142,7 +142,7 @@ Core:IIS01:deploy: - develop needs: ["Core:build"] script: - - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true REMAN/REMAN/REMAN.csproj + - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true REMAN/REMAN.csproj Core:IIS02:deploy: stage: deploy @@ -152,8 +152,8 @@ Core:IIS02:deploy: - master needs: ["Core:build"] script: - - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true REMAN/REMAN/REMAN.csproj - - dotnet publish -p:PublishProfile=W2019-IIS-DevProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true REMAN/REMAN/REMAN.csproj + - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true REMAN/REMAN.csproj + - dotnet publish -p:PublishProfile=W2019-IIS-Dev.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true REMAN/REMAN.csproj @@ -191,7 +191,7 @@ Core:install: # - *nuget-fix - dotnet restore REMAN/REMAN.sln script: - - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release REMAN/REMAN/REMAN.csproj -o:publish + - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release REMAN/REMAN.csproj -o:publish # qui il deploy su nexus... - *hashBuild - *nexusUpload From bf6d0f3159ae16dcc14b0231e50b5038482d13ec Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 25 Nov 2021 09:56:25 +0100 Subject: [PATCH 05/10] refresh --- REMAN.sln | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 REMAN.sln diff --git a/REMAN.sln b/REMAN.sln new file mode 100644 index 0000000..8dca787 --- /dev/null +++ b/REMAN.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31903.59 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "REMAN", "REMAN\REMAN.csproj", "{9E15E9EA-0511-4D7E-9391-A7D1C3CC7922}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NKC.Data", "NKC.Data\NKC.Data.csproj", "{B682FF27-5F53-45C1-B692-4613B28C045B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9E15E9EA-0511-4D7E-9391-A7D1C3CC7922}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9E15E9EA-0511-4D7E-9391-A7D1C3CC7922}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9E15E9EA-0511-4D7E-9391-A7D1C3CC7922}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9E15E9EA-0511-4D7E-9391-A7D1C3CC7922}.Release|Any CPU.Build.0 = Release|Any CPU + {B682FF27-5F53-45C1-B692-4613B28C045B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B682FF27-5F53-45C1-B692-4613B28C045B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B682FF27-5F53-45C1-B692-4613B28C045B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B682FF27-5F53-45C1-B692-4613B28C045B}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {E3FA07F4-7CB0-44AA-AFAA-2839BD0B7AF1} + EndGlobalSection +EndGlobal From fe9b7eb7300540072afd958b9a47f2b39c1c1072 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 25 Nov 2021 09:58:25 +0100 Subject: [PATCH 06/10] Fix reman solution in yaml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9fd552f..566f2cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -102,7 +102,7 @@ Core:build: - win before_script: - *nuget-fix - - dotnet restore REMAN/REMAN.sln + - dotnet restore REMAN.sln script: - dotnet build REMAN/REMAN.csproj @@ -189,7 +189,7 @@ Core:install: NEXUS_PATH: REMAN before_script: # - *nuget-fix - - dotnet restore REMAN/REMAN.sln + - dotnet restore REMAN.sln script: - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release REMAN/REMAN.csproj -o:publish # qui il deploy su nexus... From 728a985ec5adcb17ef61a4575fee2b959b5ee06b Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 25 Nov 2021 10:09:54 +0100 Subject: [PATCH 07/10] riaggiunta publish propfiles corretti --- REMAN/Properties/PublishProfiles/IIS01.pubxml | 23 ++++++++++++++++ REMAN/Properties/PublishProfiles/IIS02.pubxml | 27 +++++++++++++++++++ .../PublishProfiles/IISProfile.pubxml | 24 +++++++++++++++++ .../PublishProfiles/W2019-IIS-Dev.pubxml | 27 +++++++++++++++++++ 4 files changed, 101 insertions(+) create mode 100644 REMAN/Properties/PublishProfiles/IIS01.pubxml create mode 100644 REMAN/Properties/PublishProfiles/IIS02.pubxml create mode 100644 REMAN/Properties/PublishProfiles/IISProfile.pubxml create mode 100644 REMAN/Properties/PublishProfiles/W2019-IIS-Dev.pubxml diff --git a/REMAN/Properties/PublishProfiles/IIS01.pubxml b/REMAN/Properties/PublishProfiles/IIS01.pubxml new file mode 100644 index 0000000..57aa0c4 --- /dev/null +++ b/REMAN/Properties/PublishProfiles/IIS01.pubxml @@ -0,0 +1,23 @@ + + + + MSDeploy + Release + Any CPU + https://IIS01.egalware.com/REMAN + True + False + net6.0 + 9e15e9ea-0511-4d7e-9391-a7d1c3cc7922 + false + https://IIS01:8172/MsDeploy.axd + Default Web Site/REMAN + + True + WMSVC + False + True + jenkins + <_SavePWD>True + + \ No newline at end of file diff --git a/REMAN/Properties/PublishProfiles/IIS02.pubxml b/REMAN/Properties/PublishProfiles/IIS02.pubxml new file mode 100644 index 0000000..f160250 --- /dev/null +++ b/REMAN/Properties/PublishProfiles/IIS02.pubxml @@ -0,0 +1,27 @@ + + + + + MSDeploy + True + Release + Any CPU + https://IIS02.egalware.com/REMAN + False + 9e15e9ea-0511-4d7e-9391-a7d1c3cc7922 + false + https://IIS02:8172/MsDeploy.axd + Default Web Site/REMAN + + False + WMSVC + True + True + jenkins + <_SavePWD>True + net6.0 + + \ No newline at end of file diff --git a/REMAN/Properties/PublishProfiles/IISProfile.pubxml b/REMAN/Properties/PublishProfiles/IISProfile.pubxml new file mode 100644 index 0000000..7481d8d --- /dev/null +++ b/REMAN/Properties/PublishProfiles/IISProfile.pubxml @@ -0,0 +1,24 @@ + + + + + Package + Release + Any CPU + + True + False + net6.0 + 9e15e9ea-0511-4d7e-9391-a7d1c3cc7922 + false + Release\REMAN.zip + true + Default Web Site/REMAN + + + + + \ No newline at end of file diff --git a/REMAN/Properties/PublishProfiles/W2019-IIS-Dev.pubxml b/REMAN/Properties/PublishProfiles/W2019-IIS-Dev.pubxml new file mode 100644 index 0000000..05c7238 --- /dev/null +++ b/REMAN/Properties/PublishProfiles/W2019-IIS-Dev.pubxml @@ -0,0 +1,27 @@ + + + + + MSDeploy + True + Release + Any CPU + https://w2019-iis-dev/REMAN + False + 9e15e9ea-0511-4d7e-9391-a7d1c3cc7922 + false + https://w2019-iis-dev:8172/MsDeploy.axd + Default Web Site/REMAN + + False + WMSVC + True + True + jenkins + <_SavePWD>True + net6.0 + + \ No newline at end of file From c2c3b88f2dd3bec12dbe62e6bd8c6fea8070ca0f Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 25 Nov 2021 11:17:49 +0100 Subject: [PATCH 08/10] update postbuild x REMAN --- MajMin.vers | 1 + REMAN/REMAN.csproj | 12 +++++++++ REMAN/Resources/ChangeLog-original.html | 25 +++++++++++++++++ REMAN/Resources/ChangeLog.html | 25 +++++++++++++++++ REMAN/Resources/VersNum.txt | 1 + REMAN/Resources/logoSteamware.png | Bin 0 -> 3402 bytes REMAN/Resources/manifest-original.xml | 7 +++++ REMAN/Resources/manifest.xml | 7 +++++ REMAN/post-build.ps1 | 34 ++++++++++++++++++++++++ 9 files changed, 112 insertions(+) create mode 100644 MajMin.vers create mode 100644 REMAN/Resources/ChangeLog-original.html create mode 100644 REMAN/Resources/ChangeLog.html create mode 100644 REMAN/Resources/VersNum.txt create mode 100644 REMAN/Resources/logoSteamware.png create mode 100644 REMAN/Resources/manifest-original.xml create mode 100644 REMAN/Resources/manifest.xml create mode 100644 REMAN/post-build.ps1 diff --git a/MajMin.vers b/MajMin.vers new file mode 100644 index 0000000..28caf0b --- /dev/null +++ b/MajMin.vers @@ -0,0 +1 @@ +1.1. \ No newline at end of file diff --git a/REMAN/REMAN.csproj b/REMAN/REMAN.csproj index 515b4bb..2ea182c 100644 --- a/REMAN/REMAN.csproj +++ b/REMAN/REMAN.csproj @@ -23,4 +23,16 @@ + + + + + + + Always + + + + + diff --git a/REMAN/Resources/ChangeLog-original.html b/REMAN/Resources/ChangeLog-original.html new file mode 100644 index 0000000..a0c78bc --- /dev/null +++ b/REMAN/Resources/ChangeLog-original.html @@ -0,0 +1,25 @@ + + REMAN module for NKC +

Versione: {{CURRENT-REL}}

+
+ Release Note: +
    +
  • + v.1.* → +
      +
    • First release dotnet6
      • +
    • EFCore Integration
      • +
    • Materials + Remnant management
      • +
    • PickUp + Deposit + Search
      • +
    +
    • +
+ + \ No newline at end of file diff --git a/REMAN/Resources/ChangeLog.html b/REMAN/Resources/ChangeLog.html new file mode 100644 index 0000000..a0c1ea5 --- /dev/null +++ b/REMAN/Resources/ChangeLog.html @@ -0,0 +1,25 @@ + + REMAN module for NKC +

Versione: 1.1.2111.2511

+
+ Release Note: +
    +
  • + v.1.* → +
      +
    • First release dotnet6
      • +
    • EFCore Integration
      • +
    • Materials + Remnant management
      • +
    • PickUp + Deposit + Search
      • +
    +
    • +
+
+
+ +
+ +
+ diff --git a/REMAN/Resources/VersNum.txt b/REMAN/Resources/VersNum.txt new file mode 100644 index 0000000..3caf355 --- /dev/null +++ b/REMAN/Resources/VersNum.txt @@ -0,0 +1 @@ +1.1.2111.2511 diff --git a/REMAN/Resources/logoSteamware.png b/REMAN/Resources/logoSteamware.png new file mode 100644 index 0000000000000000000000000000000000000000..0958b50a1ee7f6a934e26cf55e2335d4cea6aa82 GIT binary patch literal 3402 zcmV-Q4Yl%#P)Kpl00004XF*Lt006O% z3;baP00009a7bBm000ia000ia0czHX2><{98FWQhbW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE;85dX+r=2497`CK~#8N?VEXYRMi>4lgUh$nd~9N?8#&%lgvKZ7a%JLgb=8< zJ+;y z?+!1~Kq%Ee{3ChaIrqG~eD}UL@B6*)`|g{Wuy0Bd19D`vPgk>EW=B z{upI=m_+%c`RJTNcSmx!oT+rHqRMcI3&>_bIUd#}ol(j`U6)j)3=b3Z<}?0@#w%?H z#_YW32Q(?Y!Ej|*6;;kkq)##e$!CL50nS0aZ)B+OVzHEO83M9f=aaHy{L*~p*BJb= z3YIEgNJ6(98R3HyIED%LNjMf>C*1JAO!fMiKO#~X!rN)hNTWX{LH_1E-X zIXbg97@xsWQBh^AOV-+8RFqe;>b(6{z|ad11Te>h=K`|cc)ygasGgOM{&1aFY5~S= zK)yfDTZW1Jo%2 z6=gF<&*Yd!aZn6GFSSS3qL-2okYmC+B@YnpB7t8GSZM%S8snD}Lks>7AulTh+BaD9 zDD(S)^XmL{vQ`;ZWi$yPuarFNC5+uinH%GiV*%!m)b|3|yd=LIF^;ea6ger~a#Td8 z6iFU7MempFF>sk?yS5Rm+gP-v$9GGl8Zy;3$FXBH&{ z&Y+OHrA7JVP7ziKn{VOeTrocB2G%?|2o?Q-#DJ8fOi^Vt%lIBygSToVq}_}+DgY1z z06YQ+$AId7U@`&AE5Owe>zBqU(}oH9<>^^)K|`P$how5o<%?;;mO_vDm@|3810uX!=sgjb@rQ6#lTPR?EzbO2Q=Ugslnp{IfBf?iASlW##s>=HMm z_nx08jT5gU0+LQ?sxlS@FZCD+_J5MPJl)`hgMRZ-;&(feibi-X1FLr(LCV8}Bi1mtf6&8A47ya>P|MPG8aY{omi9v_fra?E19 zf;sA2a#e;)YL6T@zE>`f^_|_l4GJEr1MhVPkFs~z0VPJVk=?)3GRU>`R0oUC0UU}%9ldiM>yf1^xJ*AP3Vq3Y*Qq*4Ra<42h z7cO+!9Ud_@p{hnx;&i7L8ViR12vC*LDZrF~Hwxubz_m{44oT7aV0cfBRJSE3bY<-UYc_C$0M!9rK;UwO9hJZYm9BJ70 zpB>?J%0^%lzw|6ty3dmp_udy#Y_>daDKH%>GMV#=&4p1Ohcl(r?J*P|lL+nY$!yQtiZu>Wa!lK(^u~Z8eouaYDCcT8qB9p)tFuz9FZv zu0E9e(M}cZDNW63*Up`%nK5m8?4V9lUA^Jb<|(?$vhpk*1iLxk=qPo0jHT|9p=+z3 zRA=BCj24sGQIMPG;B$mLFxMOHb~sI9PGxCX&dk=C7yO!QOv=O;2gIv`%_66woC2)7 zVlMF8^55LIA`+N3b2Iniu@W)((92E?pNrS}Gh-((!27_prOZ>Rt)Dn4#%*^jX6#kQ zb^ymK=*|H|9YBTy<^z@j^ESq|7aC1Ftc8|GSa-ZwlfG*xn<#Gr-9K34MXRM~Dc8_T z-%k48Wd7rByE6}fE2wW|?C(yi?I%;3Cr5D&t3;bMpQx>>NpsrlSD^D6eShPcCUYHk zvZgrqZmxL`^*7MHt*X2tp7Xf5)(+9fdG;{g2Y^jHEUCc!2oK0EF^BeR=-%vcx<>qO z<(QNSFC7to(|TEf>LgGt{qp;&bH!e4UBu1&n42Bo32rGaw1hkhPrspV!o)e;V2QrR zn(7*+;R&=D_&QU*aUb*MRhL&5VW>MW(qRldQOx71p8;U?lWJ~EE}xE?Fe-NpI#(%wROhqX>qj?mwhmzCXyZcx!birzuImX+hvO5cY9Ec8!M zP6Fdq&5h0KHwuHoPOp)j-x`fqS`izN%}V!(!p%$J#{QHWxsUPzPwHcUQzXU+FD{IA z(3F?ANVEwN3Fxi^hSeo*Pa5qc#%t-@NBC-QZJ7}ch+2S10s=Fj%wRo{tF?>y0xHU< zqAmnjS{Oe#p{hCr-Nf37(HQtWpz}_su8C&+Nnvo--_DwCtRtZKoa1p|zmo9{Vw^R4 zN?h(Ft|uS3r&7MhoE7LDQS@*8GE`jKN_0x?Mb>&?;`8Mn1L)iMEOpfTgbtt4Us+b6 zdMhEGjX_PkPfkzoku&TYga21BgCPO(1ozl-i^ z=A2~Rw`dFRCgzGcTPUIYZcK~#u8+`n8#}|@c&R?>*F|+nQOfW|g&f0xVV>b;?kB{h zoeLE={St2aRt&J2oZ~9OTLoUtgi$j%>aB%ERm?jKY)hOrTP`{d#zg+|wV)!5S~0l9 zIgg^ZhvNX(^AN{RX}?Vop=tmRRS#qp)Pt0hoWGOy?bHu*jtfFXJ~oT>LlE)VKHzh0 zq;D0UnmAVth`T7al2WV5Y;mw8qPK@|APxkMD<|&M@ z8LwrnsjSY&Q}qGLRzhhzV=Jf&PqSE@@2f&pT~VQB?Yq%CB@E9wH~&j|;>9CSBvE}{Dwz^d_n(7;c zr?rXe;u^djhg0Nr&vNd?^jWggGpwxLF6LF0S2l$fN6?8vrp9kk&HU@PK gb@ksMRAFKN1+dqwbM3SFTL1t607*qoM6N<$g3&)|djJ3c literal 0 HcmV?d00001 diff --git a/REMAN/Resources/manifest-original.xml b/REMAN/Resources/manifest-original.xml new file mode 100644 index 0000000..f95e076 --- /dev/null +++ b/REMAN/Resources/manifest-original.xml @@ -0,0 +1,7 @@ + + + 1.0.0.0 + https://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip + https://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/ChangeLog.html + false + diff --git a/REMAN/Resources/manifest.xml b/REMAN/Resources/manifest.xml new file mode 100644 index 0000000..23deb5b --- /dev/null +++ b/REMAN/Resources/manifest.xml @@ -0,0 +1,7 @@ + + + 1.1.2111.2511 + https://nexus.steamware.net/repository/SWS/REMAN/stable/LAST/REMAN.zip + https://nexus.steamware.net/repository/SWS/REMAN/stable/LAST/ChangeLog.html + false + diff --git a/REMAN/post-build.ps1 b/REMAN/post-build.ps1 new file mode 100644 index 0000000..89af862 --- /dev/null +++ b/REMAN/post-build.ps1 @@ -0,0 +1,34 @@ +param([string]$ProjectDir, [string]$ProjectPath); + +$FileMajMin = "..\MajMin.vers" +$FileVers = "Resources\VersNum.txt" +$FileManIn = "Resources\manifest-original.xml" +$FileManOut = "Resources\manifest.xml" +$FileCLogIn = "Resources\ChangeLog-original.html" +$FileCLogOut = "Resources\ChangeLog.html" +$MajMin = Get-Content $FileMajMin # "6.14." +$currentDate = get-date -format yyMM; +$currentTime = get-date -format ddHH; +$currentYear = get-date -format yyyy; +$find = "(.|\n)*?"; +$currRelNum = $MajMin + $currentDate +"." + $currentTime +$replace = "" + $MajMin + $currentDate +"." + $currentTime + ""; +$csproj = Get-Content $ProjectPath +$csprojUpdated = $csproj -replace $find, $replace + +Set-Content -Path $ProjectPath -Value $csprojUpdated +Set-Content -Path $FileVers -Value $currRelNum + +# replace x manifest +$manData = Get-Content $FileManIn +$manData = $manData -replace "1.0.0.0", $currRelNum +$manData = $manData -replace "{{DIRNAME}}", "REMAN" +$manData = $manData -replace "{{BRANCHNAME}}", "stable/LAST" +$manData = $manData -replace "{{PACKNAME}}", "REMAN" +Set-Content -Path $FileManOut -Value $manData + +# replace x ChangeLog +$clogData = Get-Content $FileCLogIn +$clogData = $clogData -replace "{{CURRENT-REL}}", $currRelNum +$clogData = $clogData -replace "{{YEAR}}", $currentYear +Set-Content -Path $FileCLogOut -Value $clogData From 86ce970e72d3fba97a6346dfd3f593b29ebcdf3f Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 25 Nov 2021 11:18:55 +0100 Subject: [PATCH 09/10] Fix vers num locale --- REMAN/REMAN.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/REMAN/REMAN.csproj b/REMAN/REMAN.csproj index 2ea182c..d8d6c0e 100644 --- a/REMAN/REMAN.csproj +++ b/REMAN/REMAN.csproj @@ -4,6 +4,7 @@ net6.0 enable enable + 1.1.2111.2511 From c5fd9d08c9257f1aea9d401e37d8185912fe8d2f Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 25 Nov 2021 11:27:47 +0100 Subject: [PATCH 10/10] test fix yaml --- .gitlab-ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 566f2cf..a1ec28a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,10 +35,10 @@ variables: .manifest-fix: &manifest-fix - | echo "Set manifest.xml for branch: $CI_COMMIT_BRANCH" - $contenuto = Get-Content -path 'NKC_WF\Resources\manifest.xml' -Raw + $contenuto = Get-Content -path '$env:PROJ_NAME\Resources\manifest.xml' -Raw $newContenuto = $contenuto -replace '{{BRANCHNAME}}', $CI_COMMIT_BRANCH $newContenuto = $newContenuto -replace '0.0.0.0', $env:NEW_REL - $newContenuto | Set-Content -Path 'NKC_WF\Resources\manifest.xml' + $newContenuto | Set-Content -Path '$env:PROJ_NAME\Resources\manifest.xml' # helper creazione hash files .hashBuild: &hashBuild @@ -164,6 +164,10 @@ Net:install: # rules: # - if: '$CI_COMMIT_BRANCH == "master"' # when: manual + variables: + APP_NAME: NKC + PROJ_NAME: NKC_WF + NEXUS_PATH: NKC before_script: - *nuget-fix - '& "$env:NUGET_PATH" restore NKC_WF.sln -Verbosity quiet' @@ -186,6 +190,7 @@ Core:install: needs: ["Core:build"] variables: APP_NAME: REMAN + PROJ_NAME: REMAN NEXUS_PATH: REMAN before_script: # - *nuget-fix