diff --git a/University/UniversityContracts/BindingModels/ReportBindingModel.cs b/University/UniversityContracts/BindingModels/ReportBindingModel.cs new file mode 100644 index 0000000..38b7fbe --- /dev/null +++ b/University/UniversityContracts/BindingModels/ReportBindingModel.cs @@ -0,0 +1,12 @@ +using UniversityContracts.ViewModels; + +namespace UniversityContracts.BindingModels +{ + public class ReportBindingModel + { + public string? FileName { get; set; } = string.Empty; + public DateTime? From { get; set; } + public DateTime? To { get; set; } + public List Students { get; set; } = new(); + } +} diff --git a/University/UniversityContracts/BuisnessLogicContracts/IReportLogic.cs b/University/UniversityContracts/BuisnessLogicContracts/IReportLogic.cs new file mode 100644 index 0000000..c5e3818 --- /dev/null +++ b/University/UniversityContracts/BuisnessLogicContracts/IReportLogic.cs @@ -0,0 +1,10 @@ +using UniversityContracts.BindingModels; +using UniversityContracts.ViewModels; + +namespace UniversityContracts.BuisnessLogicContracts +{ + public interface IReportLogic + { + List GetStudentDiscipline(ReportBindingModel model); + } +} diff --git a/University/UniversityContracts/ViewModels/ReportStudentDisciplineViewModel.cs b/University/UniversityContracts/ViewModels/ReportStudentDisciplineViewModel.cs new file mode 100644 index 0000000..9ce5ab1 --- /dev/null +++ b/University/UniversityContracts/ViewModels/ReportStudentDisciplineViewModel.cs @@ -0,0 +1,8 @@ +namespace UniversityContracts.ViewModels +{ + public class ReportStudentDisciplineViewModel + { + public string StudentName { get; set; } = string.Empty; + public List Disciplines { get; set; } = new(); + } +} diff --git a/University/UniversityDataModels/Models/IDisciplineModel.cs b/University/UniversityDataModels/Models/IDisciplineModel.cs index a40373f..c2c26ae 100644 --- a/University/UniversityDataModels/Models/IDisciplineModel.cs +++ b/University/UniversityDataModels/Models/IDisciplineModel.cs @@ -4,5 +4,6 @@ { String Name { get; } String Department { get; } + int StatementId { get; } } } diff --git a/University/UniversityDataModels/Models/IStatementModel.cs b/University/UniversityDataModels/Models/IStatementModel.cs index 6188a75..681f016 100644 --- a/University/UniversityDataModels/Models/IStatementModel.cs +++ b/University/UniversityDataModels/Models/IStatementModel.cs @@ -4,6 +4,5 @@ { DateTime Date { get; } int HoursCount { get; } - Dictionary Students { get; } } } diff --git a/University/UniversityDataModels/Models/IStudentModel.cs b/University/UniversityDataModels/Models/IStudentModel.cs index ce5db79..1ff6eb5 100644 --- a/University/UniversityDataModels/Models/IStudentModel.cs +++ b/University/UniversityDataModels/Models/IStudentModel.cs @@ -5,5 +5,6 @@ String Name { get; } String RecordCardNumber { get; } Dictionary Results { get; } + Dictionary Statements { get; } } }