Обновление слоя контрактов

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<int, IInterest> DiyInterests { get; set; } = new();
 

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; } 
     }

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<int, IMaterial> LessonMaterials { get; set; } = new();
 

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; }
     }

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<int, IInterest> ProductInterests { get; set; } = new();
 

SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/StudentBindingModel.cs

@@ -18,8 +18,6 @@ namespace SchoolAgainStudyContracts.BindingModel
 
         public string Password { get; set; } = string.Empty;
 
-        public Dictionary<int, IInterest> StudentInterests { get; set; } = new() ;
-
         public int Id { get; set; } 
     }
 }

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<int, IMaterial> TaskMaterials { get; set; } = new();
 

SchoolAgainStudy/SchoolAgainStudyContracts/BindingModel/TeacherBindingModel.cs

@@ -19,8 +19,6 @@ namespace SchoolAgainStudyContracts.BindingModel
 
         public string Password { get; set; } = string.Empty;
 
-        public Dictionary<int, IMaterial> TeacherMaterials { get; set; } = new();
-
         public int Id { get; set; }
     }
 }

SchoolAgainStudy/SchoolAgainStudyContracts/BusinessLogicContracts/IReportLogic.cs

@@ -13,7 +13,7 @@ namespace SchoolAgainStudyContracts.BusinessLogicContracts
         List<ReportInterestLessonViewModel> GetInterestLesson();
 
         
-        List<ReportInterestViewModel> GetOrders(ReportBindingModel model);
+        List<ReportInterestViewModel> GetInterests(ReportBindingModel model);
         List<ReportDiyMaterialViewModel> GetDiyMaterial();
 
 

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; }

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; }
 
     }
 }

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; }

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; }
     }
 }

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; }

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; }

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; }  
 

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("Описание")]

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; } 
 

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("Сфера использования")]

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<int, IInterest> ProductInterests { get; set; } = new();
         [DisplayName("Номер")]

SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/StudentViewModel.cs

@@ -20,7 +20,6 @@ namespace SchoolAgainStudyContracts.ViewModel
         [DisplayName("Пароль")]
         public string Password { get; set; } = string.Empty;
 
-        public Dictionary<int, IInterest> StudentInterests { get; set; } = new() ;
         [DisplayName("Номер")]
         public int Id { get; set; } 
     }

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; }  
 

SchoolAgainStudy/SchoolAgainStudyContracts/ViewModel/TeacherViewModel.cs

@@ -21,7 +21,6 @@ namespace SchoolAgainStudyContracts.ViewModel
         [DisplayName("Пароль")]
         public string Password { get; set; } = string.Empty;
 
-        public Dictionary<int, IMaterial> TeacherMaterials { get; set; } = new();
         [DisplayName("Номер")]
         public int Id { get; set; }
     }