ksenia_nevaeva/PIbd-33_Nevaeva_KA_COP_28
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix nullable

Browse Source
This commit is contained in:
ksenianeva 2023-12-01 01:17:26 +04:00
parent 09de4581a8
commit df730da8eb
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NevaevaLibrary/AccountContracts/BindingModels/AccountBindingModel.cs
View File

@ -12,7 +12,7 @@ namespace AccountContracts.BindingModels
public int Id { get; set; } public int Id { get; set; }
public string Login { get; set; } = string.Empty; public string Login { get; set; } = string.Empty;
public string? Warnings { 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; } public int RoleId { get; set; }
} }
} }

5
NevaevaLibrary/AccountDatabaseImplement/Models/Account.cs
View File

@ -16,8 +16,9 @@ namespace AccountDatabaseImplement.Models
public int Id { get; private set; } public int Id { get; private set; }
[Required] [Required]
public string Login { get; set; } 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] [Required]
public int RoleId { get; set; } public int RoleId { get; set; }
public virtual Role Role { get; set; } = new(); public virtual Role Role { get; set; } = new();

2
NevaevaLibrary/AccountsView/FormAccount.cs
View File

@ -82,7 +82,7 @@ namespace AccountsView
Id = _id ?? 0, Id = _id ?? 0,
Login = textBoxLogin.Text, Login = textBoxLogin.Text,
Warnings = textBoxWarnings.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, RoleId = _roles.First(x => x.RoleName == comboBoxControlRole.SelectedValue).Id,
}; };
var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);

9
NevaevaLibrary/AccountsView/FormMain.cs
View File

@ -20,7 +20,7 @@ namespace AccountsView
{ {
InitializeComponent(); InitializeComponent();
_logic = logic; _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) private void ролиToolStripMenuItem_Click(object sender, EventArgs e)
@ -43,6 +43,13 @@ namespace AccountsView
var accounts = _logic.ReadList(null); var accounts = _logic.ReadList(null);
if (accounts != null) if (accounts != null)
{ {
foreach (var account in accounts)
{
if (!account.Rating.HasValue)
{
account.Rating = 0;
}
}
abazovTreeView.addItems(accounts); abazovTreeView.addItems(accounts);
} }
} }