diff --git a/NevaevaLibrary/AccountContracts/BindingModels/AccountBindingModel.cs b/NevaevaLibrary/AccountContracts/BindingModels/AccountBindingModel.cs index f9f2b08..2541da3 100644 --- a/NevaevaLibrary/AccountContracts/BindingModels/AccountBindingModel.cs +++ b/NevaevaLibrary/AccountContracts/BindingModels/AccountBindingModel.cs @@ -12,7 +12,7 @@ namespace AccountContracts.BindingModels public int Id { get; set; } public string Login { get; set; } = string.Empty; public string? Warnings { get; set; } = string.Empty; - public float? Rating { get; set; } + public float? Rating { get; set; } = null; public int RoleId { get; set; } } } diff --git a/NevaevaLibrary/AccountDatabaseImplement/Models/Account.cs b/NevaevaLibrary/AccountDatabaseImplement/Models/Account.cs index bc65bfe..4e16235 100644 --- a/NevaevaLibrary/AccountDatabaseImplement/Models/Account.cs +++ b/NevaevaLibrary/AccountDatabaseImplement/Models/Account.cs @@ -16,8 +16,9 @@ namespace AccountDatabaseImplement.Models public int Id { get; private set; } [Required] public string Login { get; set; } - public string? Warnings { get; set; } - public float? Rating { get; set; } + + public string? Warnings { get; set; } = null; + public float? Rating { get; set; } = null; [Required] public int RoleId { get; set; } public virtual Role Role { get; set; } = new(); diff --git a/NevaevaLibrary/AccountsView/FormAccount.cs b/NevaevaLibrary/AccountsView/FormAccount.cs index 15139c1..f4fd046 100644 --- a/NevaevaLibrary/AccountsView/FormAccount.cs +++ b/NevaevaLibrary/AccountsView/FormAccount.cs @@ -82,7 +82,7 @@ namespace AccountsView Id = _id ?? 0, Login = textBoxLogin.Text, Warnings = textBoxWarnings.Text, - Rating = (float)controlInputRating.Value, + Rating = controlInputRating.Value.HasValue ? (float)controlInputRating.Value.GetValueOrDefault() : null, RoleId = _roles.First(x => x.RoleName == comboBoxControlRole.SelectedValue).Id, }; var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); diff --git a/NevaevaLibrary/AccountsView/FormMain.cs b/NevaevaLibrary/AccountsView/FormMain.cs index dcf76eb..f365ee8 100644 --- a/NevaevaLibrary/AccountsView/FormMain.cs +++ b/NevaevaLibrary/AccountsView/FormMain.cs @@ -20,7 +20,7 @@ namespace AccountsView { InitializeComponent(); _logic = logic; - abazovTreeView.setHierarchy(new List<(string, bool)> { ("RoleName", false), ("Rating", true), ("Id", true), ("Login", true) }); + abazovTreeView.setHierarchy(new List<(string, bool)> { ("RoleName", false), ("Rating", false), ("Id", true), ("Login", true) }); } private void ролиToolStripMenuItem_Click(object sender, EventArgs e) @@ -43,6 +43,13 @@ namespace AccountsView var accounts = _logic.ReadList(null); if (accounts != null) { + foreach (var account in accounts) + { + if (!account.Rating.HasValue) + { + account.Rating = 0; + } + } abazovTreeView.addItems(accounts); } }