From eb719d26a2df4f9148861f5f32481b74fa330104 Mon Sep 17 00:00:00 2001
From: "ityurner02@mail.ru" <ityurner02@mail.ru>
Date: Wed, 5 Apr 2023 20:53:48 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BB=D0=BE=D1=8F=20=D0=BC=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B5=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SchoolAgainStudy/SchoolAgainStudyDataModels/Models/IDiy.cs | 3 ++-
 .../SchoolAgainStudyDataModels/Models/IInterest.cs         | 2 +-
 .../SchoolAgainStudyDataModels/Models/ILesson.cs           | 1 +
 .../SchoolAgainStudyDataModels/Models/IMaterial.cs         | 1 +
 .../SchoolAgainStudyDataModels/Models/IProduct.cs          | 1 +
 .../SchoolAgainStudyDataModels/Models/IStudent.cs          | 2 +-
 .../SchoolAgainStudyDataModels/Models/ITask.cs             | 7 ++++---
 .../SchoolAgainStudyDataModels/Models/ITeacher.cs          | 1 -
 8 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/IDiy.cs b/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/IDiy.cs
index 6e96e88..2f935fb 100644
--- a/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/IDiy.cs
+++ b/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/IDiy.cs
@@ -10,10 +10,11 @@ namespace SchoolAgainStudyDataModels.Models
     {
         string Title { get; }
         string Description { get; }
-        string TaskName { get; }
+        string? TaskName { get; }
         DateTime DateCreate { get; }
         int TaskId { get; }
         int StudentId { get; }
+        string StudentName { get; }
         Dictionary<int, IInterest> DiyInterests { get; }
     }
 }
diff --git a/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/IInterest.cs b/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/IInterest.cs
index a824099..5f00fb5 100644
--- a/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/IInterest.cs
+++ b/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/IInterest.cs
@@ -10,7 +10,7 @@ namespace SchoolAgainStudyDataModels.Models
     {
         string Title { get; }
         string Description { get; }
-
+        int StudentId { get; }
 
     }
 }
diff --git a/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/ILesson.cs b/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/ILesson.cs
index 63c041f..cf4975d 100644
--- a/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/ILesson.cs
+++ b/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/ILesson.cs
@@ -13,6 +13,7 @@ namespace SchoolAgainStudyDataModels.Models
         int ProductId { get; }
         string ProductName { get; }
         int TeacherId { get; }
+        string TeacherName { get; }
         Dictionary<int, IMaterial> LessonMaterials { get; }
 
     }
diff --git a/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/IMaterial.cs b/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/IMaterial.cs
index a6610ab..9273db1 100644
--- a/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/IMaterial.cs
+++ b/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/IMaterial.cs
@@ -10,5 +10,6 @@ namespace SchoolAgainStudyDataModels.Models
     {
         string Title { get; }
         string SphereUse { get; }
+        int TeacherId { get; }
     }
 }
diff --git a/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/IProduct.cs b/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/IProduct.cs
index d0833a5..3d77d3d 100644
--- a/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/IProduct.cs
+++ b/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/IProduct.cs
@@ -12,6 +12,7 @@ namespace SchoolAgainStudyDataModels.Models
         string Description { get; }
         DateTime DateCreate { get; }
         int StudentId { get; }
+        string StudentName { get; }
         Dictionary<int, IInterest> ProductInterests { get; }
     }
 }
diff --git a/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/IStudent.cs b/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/IStudent.cs
index 00dfbe1..c8155be 100644
--- a/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/IStudent.cs
+++ b/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/IStudent.cs
@@ -13,6 +13,6 @@ namespace SchoolAgainStudyDataModels.Models
         string Email { get; }
         string Login { get; }
         string Password { get; }
-        Dictionary<int, IInterest> StudentInterests { get; }
+        
     }
 }
diff --git a/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/ITask.cs b/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/ITask.cs
index 949abb2..a5c97fe 100644
--- a/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/ITask.cs
+++ b/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/ITask.cs
@@ -8,10 +8,11 @@ namespace SchoolAgainStudyDataModels.Models
 {
     public interface ITask : IId
     {
-        string Title { get; }
-        DateTime DateIssue { get; }
-        DateTime DateDelivery { get; }
+        string Title { get;}
+        DateTime DateIssue { get;}
+        DateTime DateDelivery { get;}
         int TeacherId { get; }
+        string TeacherName { get; }
         Dictionary<int, IMaterial> TaskMaterials { get; }
     }
 }
diff --git a/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/ITeacher.cs b/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/ITeacher.cs
index 21bfbd3..93620a1 100644
--- a/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/ITeacher.cs
+++ b/SchoolAgainStudy/SchoolAgainStudyDataModels/Models/ITeacher.cs
@@ -13,6 +13,5 @@ namespace SchoolAgainStudyDataModels.Models
         string Phone { get; }
         string Login { get; }
         string Password { get; }
-        Dictionary<int, IMaterial> TeacherMaterials { get; }
     }
 }