From c40b45aed26cbe3613682d01aaa9adebc7dd985a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 31 May 2021 17:34:06 +0200 Subject: [PATCH] Fix configurazione modelli --- GWMS.Data/DatabaseModels/AnKeyValModel.cs | 12 ++++++------ GWMS.Data/DatabaseModels/AuthModel.cs | 4 ++-- GWMS.Data/DatabaseModels/ConfigModel.cs | 10 +++++----- GWMS.Data/DatabaseModels/ItemModel.cs | 10 +++++----- GWMS.Data/DatabaseModels/ListValModel.cs | 8 ++++---- GWMS.Data/DatabaseModels/UserAuthModel.cs | 6 +++--- GWMS.Data/DatabaseModels/UserModel.cs | 20 ++++++++++---------- 7 files changed, 35 insertions(+), 35 deletions(-) diff --git a/GWMS.Data/DatabaseModels/AnKeyValModel.cs b/GWMS.Data/DatabaseModels/AnKeyValModel.cs index dba5ad9..bf27aca 100644 --- a/GWMS.Data/DatabaseModels/AnKeyValModel.cs +++ b/GWMS.Data/DatabaseModels/AnKeyValModel.cs @@ -16,19 +16,19 @@ namespace GWMS.Data.DatabaseModels { #region Public Properties - [Column("Descript", Order = 4), Comment("Descrizione dell'item")] + [Column(Order = 4), Comment("Descrizione dell'item"), MaxLength(250)] public string Descript { get; set; } = ""; - [Key, Column("Key", Order = 0), MaxLength(50)] - public string Key { get; set; } + [Key, Column(Order = 0), MaxLength(50)] + public string KeyName { get; set; } - [Column("ValFloat", Order = 2)] + [Column(Order = 2)] public int ValFloat { get; set; } = 0; - [Column("ValInt", Order = 1)] + [Column(Order = 1)] public int ValInt { get; set; } = 0; - [Column("ValString", Order = 3)] + [Column(Order = 3), MaxLength(250)] public string ValString { get; set; } = ""; #endregion Public Properties diff --git a/GWMS.Data/DatabaseModels/AuthModel.cs b/GWMS.Data/DatabaseModels/AuthModel.cs index e83b612..488e818 100644 --- a/GWMS.Data/DatabaseModels/AuthModel.cs +++ b/GWMS.Data/DatabaseModels/AuthModel.cs @@ -16,10 +16,10 @@ namespace GWMS.Data.DatabaseModels { #region Public Properties - [Key, Column("AuthRole", Order = 0)] + [Key, Column("AuthRole", Order = 0), MaxLength(50)] public string AuthRole { get; set; } = ""; - [Column("Description", Order = 1)] + [Column("Description", Order = 1), MaxLength(250)] public string Description { get; set; } = ""; #endregion Public Properties diff --git a/GWMS.Data/DatabaseModels/ConfigModel.cs b/GWMS.Data/DatabaseModels/ConfigModel.cs index f3b3826..32e6a57 100644 --- a/GWMS.Data/DatabaseModels/ConfigModel.cs +++ b/GWMS.Data/DatabaseModels/ConfigModel.cs @@ -15,16 +15,16 @@ namespace GWMS.Data.DatabaseModels { #region Public Properties - [Key, Column("Key", Order = 0), MaxLength(50)] - public string Key { get; set; } + [Key, Column(Order = 0), MaxLength(50)] + public string KeyName { get; set; } - [Column("Note", Order = 3)] + [Column(Order = 3), MaxLength(250)] public string Note { get; set; } = ""; - [Column("Val", Order = 1)] + [Column(Order = 1), MaxLength(50)] public string Val { get; set; } = ""; - [Column("ValStd", Order = 2)] + [Column(Order = 2), MaxLength(50)] public string ValStd { get; set; } = ""; #endregion Public Properties diff --git a/GWMS.Data/DatabaseModels/ItemModel.cs b/GWMS.Data/DatabaseModels/ItemModel.cs index c05cf98..17d4380 100644 --- a/GWMS.Data/DatabaseModels/ItemModel.cs +++ b/GWMS.Data/DatabaseModels/ItemModel.cs @@ -13,19 +13,19 @@ namespace GWMS.Data.DatabaseModels { #region Public Properties - [Column("ItemCode", Order = 1)] + [Column(Order = 1), MaxLength(100)] public string ItemCode { get; set; } = ""; - [Column("ItemDesc", Order = 2)] + [Column(Order = 2), MaxLength(250)] public string ItemDesc { get; set; } = ""; - [Key, Column("ItemId", Order = 0), DatabaseGenerated(DatabaseGeneratedOption.Identity)] + [Key, Column(Order = 0), DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int ItemId { get; set; } - [Column("ItemType", Order = 3)] + [Column(Order = 3), MaxLength(50)] public string ItemType { get; set; } = ""; - [Column("UM", Order = 4)] + [Column(Order = 4), MaxLength(50)] public string UM { get; set; } = ""; #endregion Public Properties diff --git a/GWMS.Data/DatabaseModels/ListValModel.cs b/GWMS.Data/DatabaseModels/ListValModel.cs index d5722fe..ad0e3cb 100644 --- a/GWMS.Data/DatabaseModels/ListValModel.cs +++ b/GWMS.Data/DatabaseModels/ListValModel.cs @@ -15,19 +15,19 @@ namespace GWMS.Data.DatabaseModels { #region Public Properties - [Column("Descript", Order = 3)] + [Column("Descript", Order = 3), MaxLength(250)] public string Descript { get; set; } = ""; - [Column("FieldName", Order = 1)] + [Column("FieldName", Order = 1), MaxLength(50)] public string FieldName { get; set; } = ""; [Column("Ordinal", Order = 4)] public int Ordinal { get; set; } = 1; - [Column("TabName", Order = 0)] + [Column("TabName", Order = 0), MaxLength(50)] public string TabName { get; set; } = ""; - [Column("Val", Order = 2)] + [Column("Val", Order = 2), MaxLength(50)] public string Val { get; set; } = ""; #endregion Public Properties diff --git a/GWMS.Data/DatabaseModels/UserAuthModel.cs b/GWMS.Data/DatabaseModels/UserAuthModel.cs index 43db6f7..18b0136 100644 --- a/GWMS.Data/DatabaseModels/UserAuthModel.cs +++ b/GWMS.Data/DatabaseModels/UserAuthModel.cs @@ -16,10 +16,10 @@ namespace GWMS.Data.DatabaseModels { #region Public Properties - [Column("AuthLevel", Order = 2)] + [Column(Order = 2)] public int AuthLevel { get; set; } = 0; - [Column("AuthRole", Order = 1)] + [Column(Order = 1)] public string AuthRole { get; set; } = ""; [ForeignKey("AuthRole")] @@ -28,7 +28,7 @@ namespace GWMS.Data.DatabaseModels [ForeignKey("UserId")] public virtual UserModel User { get; set; } - [Column("UserId", Order = 0)] + [Column(Order = 0)] public int UserId { get; set; } #endregion Public Properties diff --git a/GWMS.Data/DatabaseModels/UserModel.cs b/GWMS.Data/DatabaseModels/UserModel.cs index 4932d70..76097f9 100644 --- a/GWMS.Data/DatabaseModels/UserModel.cs +++ b/GWMS.Data/DatabaseModels/UserModel.cs @@ -16,34 +16,34 @@ namespace GWMS.Data.DatabaseModels { #region Public Properties - [Column("AuthKey", Order = 7)] + [Column(Order = 7), MaxLength(100)] public string AuthKey { get; set; } = ""; - [Column("Domain", Order = 1)] + [Column(Order = 1), MaxLength(50)] public string Domain { get; set; } = ""; - [Column("Email", Order = 5)] + [Column(Order = 5), MaxLength(250)] public string Email { get; set; } = ""; - [Column("ExtCode", Order = 9)] + [Column(Order = 9), MaxLength(50)] public string ExtCode { get; set; } = ""; - [Column("Firstname", Order = 4)] + [Column(Order = 4), MaxLength(50)] public string Firstname { get; set; } = ""; - [Column("IsActive", Order = 8)] + [Column(Order = 8)] public bool IsActive { get; set; } = true; - [Column("Lang", Order = 6)] + [Column(Order = 6), MaxLength(10)] public string Lang { get; set; } = "IT"; - [Column("Lastname", Order = 3)] + [Column(Order = 3), MaxLength(50)] public string Lastname { get; set; } = ""; - [Key, Column("UserId", Order = 0), DatabaseGenerated(DatabaseGeneratedOption.Identity)] + [Key, Column(Order = 0), DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int UserId { get; set; } - [Column("UserName", Order = 2)] + [Column(Order = 2), MaxLength(50)] public string UserName { get; set; } = ""; #endregion Public Properties