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 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 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 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 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 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 TeacherMaterials { get; } } }