Merge branch 'ModelsAndContracts' of http://student.git.athene.tech/maxKarme/PIbd-22_Karamushko_M_K_University_CourseWork into DatabaseImplement

University/UniversityContracts/BindingModels/ExaminationResultBindingModel.cs

@@ -9,5 +9,6 @@ namespace UniversityContracts.BindingModels
         public string ExaminationForm { get; set; } = String.Empty;
         public MarkType Mark { get; set; } = MarkType.Неизвестен;
         public DateTime Date { get; set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc);
+        public Dictionary<int, IStudentModel> Students { get; set; } = new();
     }
 }

University/UniversityContracts/BindingModels/StudentBindingModel.cs

@@ -7,7 +7,6 @@ namespace UniversityContracts.BindingModels
         public int Id { get; set; }
         public string Name { get; set; } = String.Empty;
         public string RecordCardNumber { get; set; } = String.Empty;
-        public Dictionary<int, IExaminationResultModel> Results { get; set; } = new();
         public Dictionary<int, IStatementModel> Statements { get; set; } = new();
     }
 }

University/UniversityContracts/SearchModels/ExaminationResultSearchModel.cs

@@ -6,5 +6,7 @@ namespace UniversityContracts.SearchModels
     public class ExaminationResultSearchModel
     {
         public int? Id { get; set; }
+        DateTime? From { get; set; }
+        DateTime? To { get; set; }
     }
 }

University/UniversityContracts/SearchModels/StatementSearchModel.cs

@@ -5,5 +5,7 @@ namespace UniversityContracts.SearchModels
     public class StatementSearchModel
     {
         public int? Id { get; set; }
+        DateTime? From { get; set; }
+        DateTime? To { get; set; }
     }
 }

University/UniversityContracts/ViewModels/ExaminationResultViewModel.cs

@@ -9,5 +9,6 @@ namespace UniversityContracts.ViewModels
         public string ExaminationForm { get; set; } = String.Empty;
         public MarkType Mark { get; set; } = MarkType.Неизвестен;
         public DateTime Date { get; set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc);
+        public Dictionary<int, IStudentModel> Students { get; set; } = new();
     }
 }

University/UniversityContracts/ViewModels/StudentViewModel.cs

@@ -7,7 +7,6 @@ namespace UniversityContracts.ViewModels
         public int Id { get; set; }
         public string Name { get; set; } = String.Empty;
         public string RecordCardNumber { get; set; } = String.Empty;
-        public Dictionary<int, IExaminationResultModel> Results { get; set; } = new();
         public Dictionary<int, IStatementModel> Statements { get; set; } = new();
     }
 }

University/UniversityDataModels/Models/IExaminationResultModel.cs

@@ -6,5 +6,6 @@ namespace UniversityDataModels.Models
         String ExaminationForm { get; }
         MarkType Mark { get; }
         DateTime Date { get; }
+        Dictionary<int, IStudentModel> Students { get; }
     }
 }

University/UniversityDataModels/Models/IStudentModel.cs

@@ -4,7 +4,6 @@
     {
         String Name { get; }
         String RecordCardNumber { get; }
-        Dictionary<int, IExaminationResultModel> Results { get; }
         Dictionary<int, IStatementModel> Statements { get; }
     }
 }