diff --git a/University/UniversityContracts/BindingModels/DisciplineBindingModel.cs b/University/UniversityContracts/BindingModels/DisciplineBindingModel.cs index 9b07450..627295e 100644 --- a/University/UniversityContracts/BindingModels/DisciplineBindingModel.cs +++ b/University/UniversityContracts/BindingModels/DisciplineBindingModel.cs @@ -8,5 +8,6 @@ namespace UniversityContracts.BindingModels public string Name { get; set; } = String.Empty; public string Department { get; set; } = String.Empty; public int StatementId { get; set; } + public Dictionary DisciplineStatements { get; set; } = new(); } } diff --git a/University/UniversityContracts/BuisnessLogicContracts/IReportLogic.cs b/University/UniversityContracts/BuisnessLogicContracts/IReportLogic.cs index c5e3818..1a418ed 100644 --- a/University/UniversityContracts/BuisnessLogicContracts/IReportLogic.cs +++ b/University/UniversityContracts/BuisnessLogicContracts/IReportLogic.cs @@ -1,4 +1,5 @@ -using UniversityContracts.BindingModels; + +using UniversityContracts.BindingModels; using UniversityContracts.ViewModels; namespace UniversityContracts.BuisnessLogicContracts @@ -6,5 +7,9 @@ namespace UniversityContracts.BuisnessLogicContracts public interface IReportLogic { List GetStudentDiscipline(ReportBindingModel model); + List GetStudens(ReportBindingModel model); + void SaveStudentsToWord(); + void SaveStudentsToExcel(); + void SaveStudentsToPdf(); } } diff --git a/University/UniversityContracts/ViewModels/DisciplineViewModel.cs b/University/UniversityContracts/ViewModels/DisciplineViewModel.cs index 4b16129..a5f888d 100644 --- a/University/UniversityContracts/ViewModels/DisciplineViewModel.cs +++ b/University/UniversityContracts/ViewModels/DisciplineViewModel.cs @@ -8,5 +8,6 @@ namespace UniversityContracts.ViewModels public string Name { get; set; } = String.Empty; public string Department { get; set; } = String.Empty; public int StatementId { get; set; } + public Dictionary DisciplineStatements { get; set; } = new(); } } diff --git a/University/UniversityContracts/ViewModels/ReportStudentsViewModel.cs b/University/UniversityContracts/ViewModels/ReportStudentsViewModel.cs new file mode 100644 index 0000000..fa3ff50 --- /dev/null +++ b/University/UniversityContracts/ViewModels/ReportStudentsViewModel.cs @@ -0,0 +1,14 @@ +using UniversityDataModels.Enums; + +namespace UniversityContracts.ViewModels +{ + public class ReportStudentsViewModel + { + public string StudentName { get; set; } = string.Empty; + public string ExaminationForm { get; set; } = string.Empty; + public MarkType mark { get; set; } = MarkType.Неизвестен; + public DateTime ExaminationResultDate { get; set; } + public int HoursCount { get; set; } + public DateTime StatementDate { get; set; } + } +} diff --git a/University/UniversityDataModels/Models/IDisciplineModel.cs b/University/UniversityDataModels/Models/IDisciplineModel.cs index c2c26ae..efd1c9d 100644 --- a/University/UniversityDataModels/Models/IDisciplineModel.cs +++ b/University/UniversityDataModels/Models/IDisciplineModel.cs @@ -4,6 +4,6 @@ { String Name { get; } String Department { get; } - int StatementId { get; } + Dictionary DisciplineStatements { get; } } }