diff --git a/School/SchoolContracts/SchoolContracts.csproj b/School/SchoolContracts/SchoolContracts.csproj index 8172c1c..c457f2f 100644 --- a/School/SchoolContracts/SchoolContracts.csproj +++ b/School/SchoolContracts/SchoolContracts.csproj @@ -12,9 +12,7 @@ - - diff --git a/School/SchoolContracts/SearchModels/AchievementSearchModel.cs b/School/SchoolContracts/SearchModels/AchievementSearchModel.cs new file mode 100644 index 0000000..ff56a16 --- /dev/null +++ b/School/SchoolContracts/SearchModels/AchievementSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SchoolContracts.SearchModels +{ + public class AchievementSearchModel + { + public int? Id { get; set; } + public string? Name { get; set; } + } +} diff --git a/School/SchoolContracts/SearchModels/InterestSearchModel.cs b/School/SchoolContracts/SearchModels/InterestSearchModel.cs new file mode 100644 index 0000000..2ed3248 --- /dev/null +++ b/School/SchoolContracts/SearchModels/InterestSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SchoolContracts.SearchModels +{ + public class InterestSearchModel + { + public int? Id { get; set; } + public string? Name { get; set; } + } +} diff --git a/School/SchoolContracts/SearchModels/LessonSearchModel.cs b/School/SchoolContracts/SearchModels/LessonSearchModel.cs new file mode 100644 index 0000000..9e60a3d --- /dev/null +++ b/School/SchoolContracts/SearchModels/LessonSearchModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SchoolContracts.SearchModels +{ + public class LessonSearchModel + { + public int? Id { get; set; } + } +} diff --git a/School/SchoolContracts/SearchModels/UserSearchModel.cs b/School/SchoolContracts/SearchModels/UserSearchModel.cs new file mode 100644 index 0000000..e356188 --- /dev/null +++ b/School/SchoolContracts/SearchModels/UserSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SchoolContracts.SearchModels +{ + public class UserSearchModel + { + public int? Id { get; set; } + public string? Name { get; set; } + } +} diff --git a/School/SchoolContracts/ViewModels/AchievementViewModel.cs b/School/SchoolContracts/ViewModels/AchievementViewModel.cs new file mode 100644 index 0000000..ad56f1b --- /dev/null +++ b/School/SchoolContracts/ViewModels/AchievementViewModel.cs @@ -0,0 +1,22 @@ +using SchoolDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.ComponentModel; + +namespace SchoolContracts.ViewModels +{ + internal class AchievementViewModel : IAchievementModel + { + public int Id { get; set; } + public int LessonId { get; set; } + [DisplayName("Название достижения")] + public string Name { get; set; } = string.Empty; + [DisplayName("Описание достижения")] + public string Description { get; set; } = string.Empty; + [DisplayName("Дата время получения")] + public DateTime ReceiptDate { get; set; } + } +} diff --git a/School/SchoolContracts/ViewModels/InterestViewModel.cs b/School/SchoolContracts/ViewModels/InterestViewModel.cs new file mode 100644 index 0000000..e40fb53 --- /dev/null +++ b/School/SchoolContracts/ViewModels/InterestViewModel.cs @@ -0,0 +1,26 @@ +using SchoolDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.ComponentModel; + +namespace SchoolContracts.ViewModels +{ + public class InterestViewModel : IInterestModel + { + public int Id { get; set; } + [DisplayName("Название интереса")] + public string Name { get; set; } = string.Empty; + [DisplayName("Направление интереса")] + public string Direction { get; set; } = string.Empty; + [DisplayName("Описание интереса")] + public string Discription { get; set; } = string.Empty; + public Dictionary InterestLessons + { + get; + set; + } = new(); + } +} diff --git a/School/SchoolContracts/ViewModels/LessonViewModel.cs b/School/SchoolContracts/ViewModels/LessonViewModel.cs new file mode 100644 index 0000000..e1d6a27 --- /dev/null +++ b/School/SchoolContracts/ViewModels/LessonViewModel.cs @@ -0,0 +1,20 @@ +using SchoolDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.ComponentModel; + +namespace SchoolContracts.ViewModels +{ + internal class LessonViewModel : ILessonModel + { + public int Id { get; set; } + public int UserId { get; set; } + [DisplayName("Время начала занятие")] + public DateTime TimeStart { get; set; } + [DisplayName("Время конца занятия")] + public DateTime TimeEnd { get; set; } + } +} diff --git a/School/SchoolContracts/ViewModels/UserViewModel.cs b/School/SchoolContracts/ViewModels/UserViewModel.cs new file mode 100644 index 0000000..e43b0e7 --- /dev/null +++ b/School/SchoolContracts/ViewModels/UserViewModel.cs @@ -0,0 +1,24 @@ +using SchoolDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.ComponentModel; + +namespace SchoolContracts.ViewModels +{ + internal class UserViewModel : IUserModel + { + public int Id { get; set; } + [DisplayName("Имя пользователя")] + public string Name { get; set; } = string.Empty; + [DisplayName("Дата рождения")] + public DateTime BirthDate { get; set; } + [DisplayName("Электронная почта")] + public string Mail { get; set; } = string.Empty; + [DisplayName("Номер телефона")] + public string PhoneNumber { get; set; } = string.Empty; + public string Password { get; set; } = string.Empty; + } +}