diff --git a/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/DiyBindingModel.cs b/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/DiyBindingModel.cs index 2e334fc..01ad2da 100644 --- a/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/DiyBindingModel.cs +++ b/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/DiyBindingModel.cs @@ -13,12 +13,13 @@ namespace SchoolAgainStudyContracts.BindingModel public string Description { get; set; } = string.Empty; - public DateTime DateCreate { get; set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); + public DateTime DateCreate { get; set; } public int TaskId { get; set; } public string TaskName { get; set; } = string.Empty; public int StudentId { get; set; } + public string StudentName { get; set; } = string.Empty; public Dictionary DiyInterests { get; set; } = new(); diff --git a/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/InterestBindingModel.cs b/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/InterestBindingModel.cs index a7f08d6..679325e 100644 --- a/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/InterestBindingModel.cs +++ b/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/InterestBindingModel.cs @@ -12,6 +12,7 @@ namespace SchoolAgainStudyContracts.BindingModel public string Title { get; set; } = string.Empty; public string Description { get; set; } = string.Empty; + public int StudentId { get; set; } public int Id { get; set; } } diff --git a/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/LessonBindingModel.cs b/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/LessonBindingModel.cs index 4a9f16c..b1445dc 100644 --- a/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/LessonBindingModel.cs +++ b/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/LessonBindingModel.cs @@ -16,7 +16,8 @@ namespace SchoolAgainStudyContracts.BindingModel public int ProductId { get; set; } public string ProductName { get; set; } = string.Empty; - public int TeacherId { get; set; } + public int TeacherId { get; set; } + public string TeacherName { get; set; } = string.Empty; public Dictionary LessonMaterials { get; set; } = new(); diff --git a/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/MaterialBindingModel.cs b/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/MaterialBindingModel.cs index a7fa437..ccf74e5 100644 --- a/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/MaterialBindingModel.cs +++ b/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/MaterialBindingModel.cs @@ -12,6 +12,7 @@ namespace SchoolAgainStudyContracts.BindingModel public string Title { get; set; } = string.Empty; public string SphereUse { get; set; } = string.Empty; + public int TeacherId { get; set; } public int Id { get; set; } } diff --git a/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/ProductBindingModel.cs b/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/ProductBindingModel.cs index 8c4ee18..a1b7d90 100644 --- a/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/ProductBindingModel.cs +++ b/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/ProductBindingModel.cs @@ -16,6 +16,7 @@ namespace SchoolAgainStudyContracts.BindingModel public DateTime DateCreate { get; set; } public int StudentId { get; set; } + public string StudentName { get; set; } = string.Empty; public Dictionary ProductInterests { get; set; } = new(); diff --git a/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/StudentBindingModel.cs b/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/StudentBindingModel.cs index d77ba13..d50bbeb 100644 --- a/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/StudentBindingModel.cs +++ b/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/StudentBindingModel.cs @@ -18,8 +18,6 @@ namespace SchoolAgainStudyContracts.BindingModel public string Password { get; set; } = string.Empty; - public Dictionary StudentInterests { get; set; } = new() ; - public int Id { get; set; } } } diff --git a/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/TaskBindingModel.cs b/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/TaskBindingModel.cs index b543652..7f91120 100644 --- a/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/TaskBindingModel.cs +++ b/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/TaskBindingModel.cs @@ -15,7 +15,8 @@ namespace SchoolAgainStudyContracts.BindingModel public DateTime DateDelivery { get; set; } - public int TeacherId { get; set; } + public int TeacherId { get; set; } + public string TeacherName { get; set; } = string.Empty; public Dictionary TaskMaterials { get; set; } = new(); diff --git a/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/TeacherBindingModel.cs b/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/TeacherBindingModel.cs index e78e294..f935d64 100644 --- a/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/TeacherBindingModel.cs +++ b/SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/TeacherBindingModel.cs @@ -19,8 +19,6 @@ namespace SchoolAgainStudyContracts.BindingModel public string Password { get; set; } = string.Empty; - public Dictionary TeacherMaterials { get; set; } = new(); - public int Id { get; set; } } } diff --git a/SchoolAgainStudy/SchoolAgainStudyContracts/BusinessLogicContracts/IReportLogic.cs b/SchoolAgainStudy/SchoolAgainStudyContracts/BusinessLogicContracts/IReportLogic.cs index b39efd9..3bab246 100644 --- a/SchoolAgainStudy/SchoolAgainStudyContracts/BusinessLogicContracts/IReportLogic.cs +++ b/SchoolAgainStudy/SchoolAgainStudyContracts/BusinessLogicContracts/IReportLogic.cs @@ -13,7 +13,7 @@ namespace SchoolAgainStudyContracts.BusinessLogicContracts List GetInterestLesson(); - List GetOrders(ReportBindingModel model); + List GetInterests(ReportBindingModel model); List GetDiyMaterial(); diff --git a/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/DiySearchModel.cs b/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/DiySearchModel.cs index eec05b7..59e91cc 100644 --- a/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/DiySearchModel.cs +++ b/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/DiySearchModel.cs @@ -10,6 +10,7 @@ namespace SchoolAgainStudyContracts.SearchModel { public int? Id { get; set; } public string? Title { get; set; } + public int? StudentId { get; set; } public DateTime? DateFrom { get; set; } public DateTime? DateTo { get; set; } diff --git a/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/InterestSearchModel.cs b/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/InterestSearchModel.cs index bcefc9a..9681af2 100644 --- a/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/InterestSearchModel.cs +++ b/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/InterestSearchModel.cs @@ -10,6 +10,7 @@ namespace SchoolAgainStudyContracts.SearchModel { public int? Id { get; set; } public string? Title { get; set; } + public int? StudentId { get; set; } } } diff --git a/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/LessonSearchModel.cs b/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/LessonSearchModel.cs index 15df107..cd80367 100644 --- a/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/LessonSearchModel.cs +++ b/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/LessonSearchModel.cs @@ -10,6 +10,7 @@ namespace SchoolAgainStudyContracts.SearchModel { public int? Id { get; set; } public string? Title { get; set; } + public int? TeacherId { get; set; } public DateTime? DateFrom { get; set; } public DateTime? DateTo { get; set; } diff --git a/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/MaterialSearchModel.cs b/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/MaterialSearchModel.cs index 9f557eb..1f0e180 100644 --- a/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/MaterialSearchModel.cs +++ b/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/MaterialSearchModel.cs @@ -10,5 +10,6 @@ namespace SchoolAgainStudyContracts.SearchModel { public int? Id { get; set; } public string? Title { get; set; } + public int? TeacherId { get; set; } } } diff --git a/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/ProductSearchModel.cs b/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/ProductSearchModel.cs index dc92f98..1e7c27c 100644 --- a/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/ProductSearchModel.cs +++ b/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/ProductSearchModel.cs @@ -10,6 +10,7 @@ namespace SchoolAgainStudyContracts.SearchModel { public int? Id { get; set; } public string? Title { get; set; } + public int? StudentId { get; set; } public DateTime? DateFrom { get; set; } public DateTime? DateTo { get; set; } diff --git a/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/TaskSearchModel.cs b/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/TaskSearchModel.cs index fb6ea06..7cefff8 100644 --- a/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/TaskSearchModel.cs +++ b/SchoolAgainStudy/SchoolAgainStudyContracts/SearchModel/TaskSearchModel.cs @@ -11,6 +11,7 @@ namespace SchoolAgainStudyContracts.SearchModel { public int? Id { get; set; } public string? Title { get; set; } + public int? TeacherId { get; set; } public DateTime? DateFrom { get; set; } public DateTime? DateTo { get; set; } diff --git a/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/DiyViewModel.cs b/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/DiyViewModel.cs index a21c3cd..d287a2c 100644 --- a/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/DiyViewModel.cs +++ b/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/DiyViewModel.cs @@ -15,11 +15,13 @@ namespace SchoolAgainStudyContracts.ViewModel [DisplayName("Описание")] public string Description { get; set; } = string.Empty; [DisplayName("Дата создания")] - public DateTime DateCreate { get; set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); + public DateTime DateCreate { get; set; } public int TaskId { get; set; } [DisplayName("Задание")] public string TaskName { get; set; } = string.Empty; + [DisplayName("Школьник")] + public string StudentName { get; set; } = string.Empty; public int StudentId { get; set; } diff --git a/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/InterestViewModel.cs b/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/InterestViewModel.cs index 8f07702..f880655 100644 --- a/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/InterestViewModel.cs +++ b/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/InterestViewModel.cs @@ -10,6 +10,7 @@ namespace SchoolAgainStudyContracts.ViewModel { public class InterestViewModel : IInterest { + public int StudentId { get; set; } [DisplayName("Название")] public string Title { get; set; } = string.Empty; [DisplayName("Описание")] diff --git a/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/LessonViewModel.cs b/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/LessonViewModel.cs index 586803d..a8c6436 100644 --- a/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/LessonViewModel.cs +++ b/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/LessonViewModel.cs @@ -18,6 +18,8 @@ namespace SchoolAgainStudyContracts.ViewModel public int ProductId { get; set; } [DisplayName("Изделие")] public string ProductName { get; set; } = string.Empty; + [DisplayName("Учитель")] + public string TeacherName { get; set; } = string.Empty; public int TeacherId { get; set; } diff --git a/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/MaterialViewModel.cs b/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/MaterialViewModel.cs index d85c1ed..81ae173 100644 --- a/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/MaterialViewModel.cs +++ b/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/MaterialViewModel.cs @@ -10,6 +10,7 @@ namespace SchoolAgainStudyContracts.ViewModel { public class MaterialViewModel : IMaterial { + public int TeacherId { get; set; } [DisplayName("Название")] public string Title { get; set; } = string.Empty; [DisplayName("Сфера использования")] diff --git a/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/ProductViewModel.cs b/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/ProductViewModel.cs index 02bd9c0..46eb123 100644 --- a/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/ProductViewModel.cs +++ b/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/ProductViewModel.cs @@ -18,6 +18,8 @@ namespace SchoolAgainStudyContracts.ViewModel public DateTime DateCreate { get; set; } public int StudentId { get; set; } + [DisplayName("Школьник")] + public string StudentName { get; set; } = string.Empty; public Dictionary ProductInterests { get; set; } = new(); [DisplayName("Номер")] diff --git a/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/StudentViewModel.cs b/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/StudentViewModel.cs index 18763a5..c82d327 100644 --- a/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/StudentViewModel.cs +++ b/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/StudentViewModel.cs @@ -20,7 +20,6 @@ namespace SchoolAgainStudyContracts.ViewModel [DisplayName("Пароль")] public string Password { get; set; } = string.Empty; - public Dictionary StudentInterests { get; set; } = new() ; [DisplayName("Номер")] public int Id { get; set; } } diff --git a/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/TaskViewModel.cs b/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/TaskViewModel.cs index bfb9bba..5954e09 100644 --- a/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/TaskViewModel.cs +++ b/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/TaskViewModel.cs @@ -15,7 +15,9 @@ namespace SchoolAgainStudyContracts.ViewModel [DisplayName("Дата выдачи")] public DateTime DateIssue { get; set; } [DisplayName("Дата сдачи")] - public DateTime DateDelivery { get; set; } + public DateTime DateDelivery { get; set; } + [DisplayName("Учитель")] + public string TeacherName { get; set; } = string.Empty; public int TeacherId { get; set; } diff --git a/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/TeacherViewModel.cs b/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/TeacherViewModel.cs index 0061e21..010116a 100644 --- a/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/TeacherViewModel.cs +++ b/SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/TeacherViewModel.cs @@ -21,7 +21,6 @@ namespace SchoolAgainStudyContracts.ViewModel [DisplayName("Пароль")] public string Password { get; set; } = string.Empty; - public Dictionary TeacherMaterials { get; set; } = new(); [DisplayName("Номер")] public int Id { get; set; } }