diff --git a/OrdersManagement/Components/Pages/EdiCustomerOrder.razor b/OrdersManagement/Components/Pages/EdiCustomerOrder.razor index 37ddce4..2a885f0 100644 --- a/OrdersManagement/Components/Pages/EdiCustomerOrder.razor +++ b/OrdersManagement/Components/Pages/EdiCustomerOrder.razor @@ -68,35 +68,32 @@ AllowFiltering="true" Responsive="true" AllowPaging="true" - PageSize="20" + PageSize="10" AllowSelection="true" AllowRowClick="true" SelectionMode="GridSelectionMode.Single" SelectedItemsChanged="SelectedEdiCustomerOrderLineChanged"> - + @context.CustomerOrderLine - + @context.Item - + @context.CustomerItemNumber - + @context.BlanketQty - - @context.Address + + @context.Uom - - @context.BoxType + + @context.ContPrice - - @context.FinalDestination - - - @context.QtyPerBox + + @context.Status diff --git a/SytelineSaAppEfDataModel/Dtos/DtoBase.cs b/SytelineSaAppEfDataModel/Dtos/DtoBase.cs index fc0407d..b233e31 100644 --- a/SytelineSaAppEfDataModel/Dtos/DtoBase.cs +++ b/SytelineSaAppEfDataModel/Dtos/DtoBase.cs @@ -2,5 +2,16 @@ { public class DtoBase { + protected static string TranslateStatus(string status) + { + return status switch + { + "O" => "Zamówione", + "S" => "Zatrzymane", + "P" => "Planowane", + "C" => "Zakończone", + _ => status + }; + } } } diff --git a/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderDto.cs b/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderDto.cs index 3e70d30..61e9464 100644 --- a/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderDto.cs +++ b/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderDto.cs @@ -106,17 +106,5 @@ namespace SytelineSaAppEfDataModel.Dtos public IEnumerable EdiCustomerOrderLines { get; set; } = new List(); public IEnumerable EdiCustomerOrderTranslates { get; set; } = new List(); - - private static string TranslateStatus(string status) - { - return status switch - { - "O" => "Zamówione", - "S" => "Zatrzymane", - "P" => "Planowane", - "C" => "Zakończone", - _ => status - }; - } } } diff --git a/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderLineDto.cs b/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderLineDto.cs index dbd1e3b..1d1088e 100644 --- a/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderLineDto.cs +++ b/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderLineDto.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace SytelineSaAppEfDataModel.Dtos { - public class EdiCustomerOrderLineDto + public class EdiCustomerOrderLineDto : DtoBase { public string CustomerOrderNumber { get; set; } public int CustomerOrderLine { get; set; } @@ -38,6 +38,8 @@ namespace SytelineSaAppEfDataModel.Dtos public string Address { get; set; } public string FinalDestination { get; set; } public int? QtyPerBox { get; set; } + + public string TranslatedStatus => TranslateStatus(Status); public IEnumerable EdiCustomerOrderLineItems { get; set; } } diff --git a/SytelineSaAppEfDataModel/Dtos/UserNameDto.cs b/SytelineSaAppEfDataModel/Dtos/UserNameDto.cs new file mode 100644 index 0000000..b91609e --- /dev/null +++ b/SytelineSaAppEfDataModel/Dtos/UserNameDto.cs @@ -0,0 +1,42 @@ +namespace SytelineSaAppEfDataModel.Dtos; + +public class UserNameDto +{ + public long UserId { get; set; } + public string Username { get; set; } + public short EditLevel { get; set; } + public bool SuperUserFlag { get; set; } + public string UserPassword { get; set; } + public string SQLServerLogin { get; set; } + public string SQLServerPassword { get; set; } + public string UserDesc { get; set; } + public string WorkstationLogin { get; set; } + public bool NoteExistsFlag { get; set; } + public string CreatedBy { get; set; } + public string UpdatedBy { get; set; } + public DateTime CreateDate { get; set; } + public DateTime RecordDate { get; set; } + public Guid RowPointer { get; set; } + public short ConcurrentSessions { get; set; } + public string ConcurrentSessionsSpec { get; set; } + public bool InWorkflow { get; set; } + public short Status { get; set; } + public DateTime? PasswordExpirationDate { get; set; } + public short LoginFailures { get; set; } + public DateTime? UnlockDate { get; set; } + public bool PasswordNeverExpires { get; set; } + public DateTime? EventMessagesLastCheckedTime { get; set; } + public bool SendEmailPrompts { get; set; } + public string LanguageCode { get; set; } + public string MobileDefaultForm { get; set; } + public bool SendEmailNotifications { get; set; } + public string EmailPromptsEmailType { get; set; } + public string EmailNotificationsEmailType { get; set; } + public string PrimaryEmailType { get; set; } + public string SourceControlUsername { get; set; } + public string SourceControlPassword { get; set; } + public string RfqProfile { get; set; } + public string RfqFaxNum { get; set; } + public string Uf_ZPL_EmpNum { get; set; } + public string Uf_PLT_EmpNum { get; set; } +} \ No newline at end of file diff --git a/SytelineSaAppEfDataModel/Entities/UserName.cs b/SytelineSaAppEfDataModel/Entities/UserName.cs new file mode 100644 index 0000000..d27579b --- /dev/null +++ b/SytelineSaAppEfDataModel/Entities/UserName.cs @@ -0,0 +1,42 @@ +namespace SytelineSaAppEfDataModel.Entities; + +public class UserName +{ + public long UserId { get; set; } + public string Username { get; set; } + public short EditLevel { get; set; } + public bool SuperUserFlag { get; set; } + public string UserPassword { get; set; } + public string SQLServerLogin { get; set; } + public string SQLServerPassword { get; set; } + public string UserDesc { get; set; } + public string WorkstationLogin { get; set; } + public bool NoteExistsFlag { get; set; } + public string CreatedBy { get; set; } + public string UpdatedBy { get; set; } + public DateTime CreateDate { get; set; } + public DateTime RecordDate { get; set; } + public Guid RowPointer { get; set; } + public short ConcurrentSessions { get; set; } + public string ConcurrentSessionsSpec { get; set; } + public bool InWorkflow { get; set; } + public short Status { get; set; } + public DateTime? PasswordExpirationDate { get; set; } + public short LoginFailures { get; set; } + public DateTime? UnlockDate { get; set; } + public bool PasswordNeverExpires { get; set; } + public DateTime? EventMessagesLastCheckedTime { get; set; } + public bool SendEmailPrompts { get; set; } + public string LanguageCode { get; set; } + public string MobileDefaultForm { get; set; } + public bool SendEmailNotifications { get; set; } + public string EmailPromptsEmailType { get; set; } + public string EmailNotificationsEmailType { get; set; } + public string PrimaryEmailType { get; set; } + public string SourceControlUsername { get; set; } + public string SourceControlPassword { get; set; } + public string RfqProfile { get; set; } + public string RfqFaxNum { get; set; } + public string Uf_ZPL_EmpNum { get; set; } + public string Uf_PLT_EmpNum { get; set; } +} \ No newline at end of file diff --git a/SytelineSaAppEfDataModel/MappingProfile.cs b/SytelineSaAppEfDataModel/MappingProfile.cs index 9978b22..f68242e 100644 --- a/SytelineSaAppEfDataModel/MappingProfile.cs +++ b/SytelineSaAppEfDataModel/MappingProfile.cs @@ -22,6 +22,7 @@ namespace SytelineSaAppEfDataModel CreateMap().ReverseMap(); CreateMap().ReverseMap(); CreateMap().ReverseMap(); + CreateMap().ReverseMap(); } } } diff --git a/SytelineSaAppEfDataModel/SytelineSaAppDbContext.cs b/SytelineSaAppEfDataModel/SytelineSaAppDbContext.cs index f1cbce0..695de46 100644 --- a/SytelineSaAppEfDataModel/SytelineSaAppDbContext.cs +++ b/SytelineSaAppEfDataModel/SytelineSaAppDbContext.cs @@ -16,6 +16,8 @@ namespace SytelineSaAppEfDataModel public DbSet CustomerOrders { get; set; } public DbSet CustomerOrderLines { get; set; } public DbSet CustomerOrderLineItems { get; set; } + + public DbSet UserNames { get; set; } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { @@ -621,6 +623,51 @@ namespace SytelineSaAppEfDataModel entity.Property(e => e.Uf_Status).HasColumnName("Uf_Status").HasMaxLength(50).IsRequired(false); entity.Property(e => e.Uf_FKR_EDI_ITEM_PalletCode).HasColumnName("Uf_FKR_EDI_ITEM_PalletCode").HasMaxLength(50).IsRequired(false); }); + + modelBuilder.Entity(entity => + { + entity.ToTable("UserNames"); + + entity.HasKey(e => e.UserId); + + entity.Property(e => e.UserId).HasColumnName("UserId").ValueGeneratedOnAdd(); + entity.Property(e => e.Username).HasColumnName("Username").HasMaxLength(60).IsRequired(); + entity.Property(e => e.EditLevel).HasColumnName("EditLevel").HasColumnType("smallint").HasDefaultValueSql("0"); + entity.Property(e => e.SuperUserFlag).HasColumnName("SuperUserFlag").HasColumnType("tinyint").HasDefaultValueSql("0"); + entity.Property(e => e.UserPassword).HasColumnName("UserPassword").HasMaxLength(300).HasDefaultValueSql("'287C0C4DB105827AC41D11555D199265966ECF1FC527B37B6740FF6491427E54EA80'"); + entity.Property(e => e.SQLServerLogin).HasColumnName("SQLServerLogin").HasMaxLength(60).IsRequired(false); + entity.Property(e => e.SQLServerPassword).HasColumnName("SQLServerPassword").HasMaxLength(140).IsRequired(false); + entity.Property(e => e.UserDesc).HasColumnName("UserDesc").HasMaxLength(510).IsRequired(false); + entity.Property(e => e.WorkstationLogin).HasColumnName("WorkstationLogin").HasMaxLength(144).IsRequired(false); + entity.Property(e => e.NoteExistsFlag).HasColumnName("NoteExistsFlag").HasColumnType("tinyint").HasDefaultValueSql("0"); + entity.Property(e => e.CreatedBy).HasColumnName("CreatedBy").HasMaxLength(60).HasDefaultValueSql("suser_sname()"); + entity.Property(e => e.UpdatedBy).HasColumnName("UpdatedBy").HasMaxLength(60).HasDefaultValueSql("suser_sname()"); + entity.Property(e => e.CreateDate).HasColumnName("CreateDate").HasDefaultValueSql("getdate()"); + entity.Property(e => e.RecordDate).HasColumnName("RecordDate").HasDefaultValueSql("getdate()"); + entity.Property(e => e.RowPointer).HasColumnName("RowPointer").HasColumnType("uniqueidentifier").HasDefaultValueSql("newid()"); + entity.Property(e => e.ConcurrentSessions).HasColumnName("ConcurrentSessions").HasColumnType("smallint").HasDefaultValueSql("1"); + entity.Property(e => e.ConcurrentSessionsSpec).HasColumnName("ConcurrentSessionsSpec").HasMaxLength(2000).IsRequired(false); + entity.Property(e => e.InWorkflow).HasColumnName("InWorkflow").HasColumnType("tinyint").HasDefaultValueSql("0"); + entity.Property(e => e.Status).HasColumnName("Status").HasColumnType("smallint").HasDefaultValueSql("0"); + entity.Property(e => e.PasswordExpirationDate).HasColumnName("PasswordExpirationDate").IsRequired(false); + entity.Property(e => e.LoginFailures).HasColumnName("LoginFailures").HasColumnType("smallint").HasDefaultValueSql("0"); + entity.Property(e => e.UnlockDate).HasColumnName("UnlockDate").IsRequired(false); + entity.Property(e => e.PasswordNeverExpires).HasColumnName("PasswordNeverExpires").HasColumnType("tinyint").HasDefaultValueSql("0"); + entity.Property(e => e.EventMessagesLastCheckedTime).HasColumnName("EventMessagesLastCheckedTime").IsRequired(false); + entity.Property(e => e.SendEmailPrompts).HasColumnName("SendEmailPrompts").HasColumnType("tinyint").HasDefaultValueSql("0"); + entity.Property(e => e.LanguageCode).HasColumnName("LanguageCode").HasMaxLength(6).IsRequired(false); + entity.Property(e => e.MobileDefaultForm).HasColumnName("MobileDefaultForm").HasMaxLength(100).IsRequired(false); + entity.Property(e => e.SendEmailNotifications).HasColumnName("SendEmailNotifications").HasColumnType("tinyint").HasDefaultValueSql("0"); + entity.Property(e => e.EmailPromptsEmailType).HasColumnName("EmailPromptsEmailType").HasMaxLength(60).IsRequired(false); + entity.Property(e => e.EmailNotificationsEmailType).HasColumnName("EmailNotificationsEmailType").HasMaxLength(60).IsRequired(false); + entity.Property(e => e.PrimaryEmailType).HasColumnName("PrimaryEmailType").HasMaxLength(60).IsRequired(false); + entity.Property(e => e.SourceControlUsername).HasColumnName("SourceControlUsername").HasMaxLength(60).IsRequired(false); + entity.Property(e => e.SourceControlPassword).HasColumnName("SourceControlPassword").HasMaxLength(300).IsRequired(false); + entity.Property(e => e.RfqProfile).HasColumnName("rfq_profile").HasMaxLength(80).IsRequired(false); + entity.Property(e => e.RfqFaxNum).HasColumnName("rfq_fax_num").HasMaxLength(50).IsRequired(false); + entity.Property(e => e.Uf_ZPL_EmpNum).HasColumnName("uf_ZPL_emp_num").HasMaxLength(7).IsRequired(false); + entity.Property(e => e.Uf_PLT_EmpNum).HasColumnName("uf_PLT_emp_num").HasMaxLength(14).IsRequired(false); + }); } } }