From 523d823b255745259bc0db99b55b08c7f1904b00 Mon Sep 17 00:00:00 2001 From: funa4i Date: Sat, 7 Dec 2024 15:37:43 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=87=D0=B8=D1=81=D1=82=D0=BA=D0=B0=20us?= =?UTF-8?q?ing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entity/Enums/Direction.cs | 8 +------- .../Entity/Enums/Operations.cs | 8 +------- StudentProgressRecord/Entity/Marks.cs | 8 +------- StudentProgressRecord/Entity/Statement.cs | 11 ++--------- StudentProgressRecord/Entity/Student.cs | 10 ++-------- .../Entity/StudentTransition.cs | 5 ----- StudentProgressRecord/Entity/Subject.cs | 5 ----- StudentProgressRecord/Entity/Teacher.cs | 8 +------- StudentProgressRecord/Entity/TempStatement.cs | 8 +------- .../Forms/FormDirectoryReport.cs | 9 --------- .../Forms/FormOperationsReport.cs | 9 --------- .../Forms/FormStatementDistributionReport.cs | 9 --------- .../FormViewEntities/FormViewStatement.cs | 10 ---------- .../FormViewStudentTransition.cs | 14 +------------- .../FormViewEntities/FormViewStudents.cs | 10 ---------- .../FormViewEntities/FormViewSubjects.cs | 10 ---------- .../FormViewEntities/FormViewTeachers.cs | 12 ++---------- .../Forms/FormsEntity/FormStatement.cs | 13 ++----------- .../Forms/FormsEntity/FormStudent.cs | 10 ---------- .../FormsEntity/FormStudentTransition.cs | 15 ++------------- .../Forms/FormsEntity/FormSubject.cs | 14 ++------------ .../Forms/FormsEntity/FormTeacher.cs | 10 ---------- .../Forms/FormsEntity/FormUniversity.cs | 9 --------- .../IRepositories/IConnectionString.cs | 8 +------- .../IRepositories/IStatementRepository.cs | 2 +- .../IRepositories/IStudentRepository.cs | 7 +------ .../IStudentTransitionRepository.cs | 5 ----- .../IRepositories/ISubjectRepository.cs | 5 ----- .../IRepositories/ITeacherRepository.cs | 5 ----- StudentProgressRecord/Program.cs | 6 ++---- StudentProgressRecord/Reports/ChartReport.cs | 11 +++-------- StudentProgressRecord/Reports/DockReport.cs | 7 +------ StudentProgressRecord/Reports/ExcelBuilder.cs | 16 ++++++++-------- StudentProgressRecord/Reports/PdfBuilder.cs | 7 +------ StudentProgressRecord/Reports/TableReport.cs | 19 ++++++++----------- StudentProgressRecord/Reports/WordBuilder.cs | 9 ++------- .../RepositoryImp/ConnectionString.cs | 8 +------- .../RepositoryImp/StatementRepository.cs | 15 +++++++-------- .../RepositoryImp/StudentRepository.cs | 6 ------ .../StudentTransitionRepository.cs | 9 ++++----- .../RepositoryImp/SubjectRepository.cs | 1 - .../RepositoryImp/TeacherRepository.cs | 6 ------ 42 files changed, 58 insertions(+), 319 deletions(-) diff --git a/StudentProgressRecord/Entity/Enums/Direction.cs b/StudentProgressRecord/Entity/Enums/Direction.cs index 6a9e6ef..e1541b2 100644 --- a/StudentProgressRecord/Entity/Enums/Direction.cs +++ b/StudentProgressRecord/Entity/Enums/Direction.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace StudentProgressRecord.Entity.Enums +namespace StudentProgressRecord.Entity.Enums { [Flags] public enum Direction diff --git a/StudentProgressRecord/Entity/Enums/Operations.cs b/StudentProgressRecord/Entity/Enums/Operations.cs index fbaa34b..e9ba0e4 100644 --- a/StudentProgressRecord/Entity/Enums/Operations.cs +++ b/StudentProgressRecord/Entity/Enums/Operations.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace StudentProgressRecord.Entity.Enums +namespace StudentProgressRecord.Entity.Enums { public enum Operations { diff --git a/StudentProgressRecord/Entity/Marks.cs b/StudentProgressRecord/Entity/Marks.cs index 641d923..1773539 100644 --- a/StudentProgressRecord/Entity/Marks.cs +++ b/StudentProgressRecord/Entity/Marks.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace StudentProgressRecord.Entity +namespace StudentProgressRecord.Entity { public class Marks { diff --git a/StudentProgressRecord/Entity/Statement.cs b/StudentProgressRecord/Entity/Statement.cs index 1d8f2a8..b93c57c 100644 --- a/StudentProgressRecord/Entity/Statement.cs +++ b/StudentProgressRecord/Entity/Statement.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace StudentProgressRecord.Entity +namespace StudentProgressRecord.Entity { public class Statement { @@ -19,7 +12,7 @@ namespace StudentProgressRecord.Entity public IEnumerable Marks { get; set; } = []; - public static Statement CreateOperation(long id, long subjectId, long teacherId, + public static Statement CreateOperation(long id, long subjectId, long teacherId, DateTime timeStamp, IEnumerable marks) { return new Statement diff --git a/StudentProgressRecord/Entity/Student.cs b/StudentProgressRecord/Entity/Student.cs index ba2ed2c..f6e0355 100644 --- a/StudentProgressRecord/Entity/Student.cs +++ b/StudentProgressRecord/Entity/Student.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace StudentProgressRecord.Entity +namespace StudentProgressRecord.Entity { public class Student { @@ -18,7 +12,7 @@ namespace StudentProgressRecord.Entity public bool Domitory { get; set; } - public static Student CreateEntity(long id, string name, bool familyPos, + public static Student CreateEntity(long id, string name, bool familyPos, bool domitory) { return new Student diff --git a/StudentProgressRecord/Entity/StudentTransition.cs b/StudentProgressRecord/Entity/StudentTransition.cs index 5e69af6..10bc2c6 100644 --- a/StudentProgressRecord/Entity/StudentTransition.cs +++ b/StudentProgressRecord/Entity/StudentTransition.cs @@ -1,9 +1,4 @@ using StudentProgressRecord.Entity.Enums; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace StudentProgressRecord.Entity { diff --git a/StudentProgressRecord/Entity/Subject.cs b/StudentProgressRecord/Entity/Subject.cs index 16598d6..0e42629 100644 --- a/StudentProgressRecord/Entity/Subject.cs +++ b/StudentProgressRecord/Entity/Subject.cs @@ -1,9 +1,4 @@ using StudentProgressRecord.Entity.Enums; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace StudentProgressRecord.Entity { diff --git a/StudentProgressRecord/Entity/Teacher.cs b/StudentProgressRecord/Entity/Teacher.cs index 410b19f..bc0f3fe 100644 --- a/StudentProgressRecord/Entity/Teacher.cs +++ b/StudentProgressRecord/Entity/Teacher.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace StudentProgressRecord.Entity +namespace StudentProgressRecord.Entity { public class Teacher { diff --git a/StudentProgressRecord/Entity/TempStatement.cs b/StudentProgressRecord/Entity/TempStatement.cs index 2ad2cfc..875ab49 100644 --- a/StudentProgressRecord/Entity/TempStatement.cs +++ b/StudentProgressRecord/Entity/TempStatement.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace StudentProgressRecord.Entity +namespace StudentProgressRecord.Entity { public class TempStatement { diff --git a/StudentProgressRecord/Forms/FormDirectoryReport.cs b/StudentProgressRecord/Forms/FormDirectoryReport.cs index 1ee2b59..9fef767 100644 --- a/StudentProgressRecord/Forms/FormDirectoryReport.cs +++ b/StudentProgressRecord/Forms/FormDirectoryReport.cs @@ -1,13 +1,4 @@ using StudentProgressRecord.Reports; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; using Unity; namespace StudentProgressRecord.Forms diff --git a/StudentProgressRecord/Forms/FormOperationsReport.cs b/StudentProgressRecord/Forms/FormOperationsReport.cs index 5a67850..515a603 100644 --- a/StudentProgressRecord/Forms/FormOperationsReport.cs +++ b/StudentProgressRecord/Forms/FormOperationsReport.cs @@ -1,14 +1,5 @@ using StudentProgressRecord.Reports; using StudentProgressRecord.Repositories; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; using Unity; namespace StudentProgressRecord.Forms diff --git a/StudentProgressRecord/Forms/FormStatementDistributionReport.cs b/StudentProgressRecord/Forms/FormStatementDistributionReport.cs index 1bb663a..5263183 100644 --- a/StudentProgressRecord/Forms/FormStatementDistributionReport.cs +++ b/StudentProgressRecord/Forms/FormStatementDistributionReport.cs @@ -1,13 +1,4 @@ using StudentProgressRecord.Reports; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; using Unity; namespace StudentProgressRecord.Forms diff --git a/StudentProgressRecord/Forms/FormViewEntities/FormViewStatement.cs b/StudentProgressRecord/Forms/FormViewEntities/FormViewStatement.cs index ec13869..bc86049 100644 --- a/StudentProgressRecord/Forms/FormViewEntities/FormViewStatement.cs +++ b/StudentProgressRecord/Forms/FormViewEntities/FormViewStatement.cs @@ -1,14 +1,4 @@ using StudentProgressRecord.Repositories; -using StudentProgressRecord.RepositoryImp; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; using Unity; namespace StudentProgressRecord.Forms.FormViewEntities diff --git a/StudentProgressRecord/Forms/FormViewEntities/FormViewStudentTransition.cs b/StudentProgressRecord/Forms/FormViewEntities/FormViewStudentTransition.cs index 9d23d71..616addb 100644 --- a/StudentProgressRecord/Forms/FormViewEntities/FormViewStudentTransition.cs +++ b/StudentProgressRecord/Forms/FormViewEntities/FormViewStudentTransition.cs @@ -1,16 +1,4 @@ using StudentProgressRecord.IRepositories; -using StudentProgressRecord.Repositories; -using StudentProgressRecord.RepositoryImp; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; -using System.Xml.Linq; using Unity; namespace StudentProgressRecord.Forms.FormViewEntities @@ -25,7 +13,7 @@ namespace StudentProgressRecord.Forms.FormViewEntities { InitializeComponent(); _container = container ?? throw new ArgumentNullException(nameof(container)); - _studentTransitionRepository= studentTransitionRepository ?? throw new ArgumentNullException(nameof(studentTransitionRepository)); + _studentTransitionRepository = studentTransitionRepository ?? throw new ArgumentNullException(nameof(studentTransitionRepository)); } private void FormViewStudentTransition_Load(object sender, EventArgs e) diff --git a/StudentProgressRecord/Forms/FormViewEntities/FormViewStudents.cs b/StudentProgressRecord/Forms/FormViewEntities/FormViewStudents.cs index 9761ff6..0dfb6f8 100644 --- a/StudentProgressRecord/Forms/FormViewEntities/FormViewStudents.cs +++ b/StudentProgressRecord/Forms/FormViewEntities/FormViewStudents.cs @@ -1,14 +1,4 @@ using StudentProgressRecord.Repositories; -using StudentProgressRecord.RepositoryImp; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; using Unity; namespace StudentProgressRecord.Forms.FormViewEntities diff --git a/StudentProgressRecord/Forms/FormViewEntities/FormViewSubjects.cs b/StudentProgressRecord/Forms/FormViewEntities/FormViewSubjects.cs index 914c8af..cddd945 100644 --- a/StudentProgressRecord/Forms/FormViewEntities/FormViewSubjects.cs +++ b/StudentProgressRecord/Forms/FormViewEntities/FormViewSubjects.cs @@ -1,14 +1,4 @@ using StudentProgressRecord.Repositories; -using StudentProgressRecord.RepositoryImp; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; using Unity; namespace StudentProgressRecord.Forms.FormViewEntities diff --git a/StudentProgressRecord/Forms/FormViewEntities/FormViewTeachers.cs b/StudentProgressRecord/Forms/FormViewEntities/FormViewTeachers.cs index a4c34d4..b6395a9 100644 --- a/StudentProgressRecord/Forms/FormViewEntities/FormViewTeachers.cs +++ b/StudentProgressRecord/Forms/FormViewEntities/FormViewTeachers.cs @@ -1,13 +1,4 @@ using StudentProgressRecord.Repositories; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; using Unity; namespace StudentProgressRecord.Forms.FormViewEntities @@ -74,7 +65,8 @@ namespace StudentProgressRecord.Forms.FormViewEntities private void buttonDelete_Click(object sender, EventArgs e) { - if(!TryGetIdFromSelectesRow(out var findId)){ + if (!TryGetIdFromSelectesRow(out var findId)) + { return; } if (MessageBox.Show("Удалить запись?", "Удаление", diff --git a/StudentProgressRecord/Forms/FormsEntity/FormStatement.cs b/StudentProgressRecord/Forms/FormsEntity/FormStatement.cs index 1154cff..a2e3f5f 100644 --- a/StudentProgressRecord/Forms/FormsEntity/FormStatement.cs +++ b/StudentProgressRecord/Forms/FormsEntity/FormStatement.cs @@ -1,14 +1,5 @@ using StudentProgressRecord.Entity; using StudentProgressRecord.Repositories; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace StudentProgressRecord.Forms { @@ -34,10 +25,10 @@ namespace StudentProgressRecord.Forms comboBoxSubject.ValueMember = "Id"; - var list = new List() {1,2,3,4,5}; + var list = new List() { 1, 2, 3, 4, 5 }; columnMark.ValueType = typeof(int); columnMark.DataSource = list; - + columnStudent.DataSource = studentRepository.ReadStudents(); columnStudent.DisplayMember = "Name"; columnStudent.ValueMember = "Id"; diff --git a/StudentProgressRecord/Forms/FormsEntity/FormStudent.cs b/StudentProgressRecord/Forms/FormsEntity/FormStudent.cs index 95c528e..7757f06 100644 --- a/StudentProgressRecord/Forms/FormsEntity/FormStudent.cs +++ b/StudentProgressRecord/Forms/FormsEntity/FormStudent.cs @@ -1,15 +1,5 @@ using StudentProgressRecord.Entity; using StudentProgressRecord.Repositories; -using StudentProgressRecord.RepositoryImp; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace StudentProgressRecord.Forms { diff --git a/StudentProgressRecord/Forms/FormsEntity/FormStudentTransition.cs b/StudentProgressRecord/Forms/FormsEntity/FormStudentTransition.cs index e846e2d..7ee7049 100644 --- a/StudentProgressRecord/Forms/FormsEntity/FormStudentTransition.cs +++ b/StudentProgressRecord/Forms/FormsEntity/FormStudentTransition.cs @@ -1,18 +1,7 @@ -using Microsoft.VisualBasic.FileIO; -using StudentProgressRecord.Entity; +using StudentProgressRecord.Entity; using StudentProgressRecord.Entity.Enums; using StudentProgressRecord.IRepositories; using StudentProgressRecord.Repositories; -using StudentProgressRecord.RepositoryImp; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace StudentProgressRecord.Forms { @@ -51,7 +40,7 @@ namespace StudentProgressRecord.Forms Console.Write(comboBoxOperations.SelectedItem); _studentTransitionRepository.CreateStudentTransition( StudentTransition.CreateOperation( - 0L, + 0L, (long)comboBoxStudent.SelectedValue!, (Operations)comboBoxOperations.SelectedItem!, dateTimePicker.Value) diff --git a/StudentProgressRecord/Forms/FormsEntity/FormSubject.cs b/StudentProgressRecord/Forms/FormsEntity/FormSubject.cs index 5ceb3ac..8edd933 100644 --- a/StudentProgressRecord/Forms/FormsEntity/FormSubject.cs +++ b/StudentProgressRecord/Forms/FormsEntity/FormSubject.cs @@ -1,16 +1,6 @@ -using Microsoft.VisualBasic.FileIO; -using StudentProgressRecord.Entity; +using StudentProgressRecord.Entity; using StudentProgressRecord.Entity.Enums; using StudentProgressRecord.Repositories; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace StudentProgressRecord { @@ -62,7 +52,7 @@ namespace StudentProgressRecord { try { - if (string.IsNullOrWhiteSpace(textBoxSubject.Text) || + if (string.IsNullOrWhiteSpace(textBoxSubject.Text) || checkedListBoxDir.CheckedItems.Count == 0) { throw new Exception("Имя не может быть пустым"); diff --git a/StudentProgressRecord/Forms/FormsEntity/FormTeacher.cs b/StudentProgressRecord/Forms/FormsEntity/FormTeacher.cs index ad95f2e..e41c43c 100644 --- a/StudentProgressRecord/Forms/FormsEntity/FormTeacher.cs +++ b/StudentProgressRecord/Forms/FormsEntity/FormTeacher.cs @@ -1,15 +1,5 @@ using StudentProgressRecord.Entity; using StudentProgressRecord.Repositories; -using StudentProgressRecord.RepositoryImp; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace StudentProgressRecord.Forms { diff --git a/StudentProgressRecord/Forms/FormsEntity/FormUniversity.cs b/StudentProgressRecord/Forms/FormsEntity/FormUniversity.cs index 2285e00..eb9335a 100644 --- a/StudentProgressRecord/Forms/FormsEntity/FormUniversity.cs +++ b/StudentProgressRecord/Forms/FormsEntity/FormUniversity.cs @@ -1,14 +1,5 @@ using StudentProgressRecord.Forms; using StudentProgressRecord.Forms.FormViewEntities; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; using Unity; namespace StudentProgressRecord diff --git a/StudentProgressRecord/IRepositories/IConnectionString.cs b/StudentProgressRecord/IRepositories/IConnectionString.cs index 4dac8fe..783646b 100644 --- a/StudentProgressRecord/IRepositories/IConnectionString.cs +++ b/StudentProgressRecord/IRepositories/IConnectionString.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace StudentProgressRecord.IRepositories +namespace StudentProgressRecord.IRepositories { public interface IConnectionString { diff --git a/StudentProgressRecord/IRepositories/IStatementRepository.cs b/StudentProgressRecord/IRepositories/IStatementRepository.cs index 05f2b28..a9a8cab 100644 --- a/StudentProgressRecord/IRepositories/IStatementRepository.cs +++ b/StudentProgressRecord/IRepositories/IStatementRepository.cs @@ -4,7 +4,7 @@ namespace StudentProgressRecord.Repositories { public interface IStatementRepository { - IEnumerable ReadStatements(long? subjectId = null, long? teacherId = null, DateTime? dateFrom = null, DateTime? dateTo=null); + IEnumerable ReadStatements(long? subjectId = null, long? teacherId = null, DateTime? dateFrom = null, DateTime? dateTo = null); void CreateStatement(Statement statement); void DeleteStatement(long id); diff --git a/StudentProgressRecord/IRepositories/IStudentRepository.cs b/StudentProgressRecord/IRepositories/IStudentRepository.cs index 3990746..638f420 100644 --- a/StudentProgressRecord/IRepositories/IStudentRepository.cs +++ b/StudentProgressRecord/IRepositories/IStudentRepository.cs @@ -1,15 +1,10 @@ using StudentProgressRecord.Entity; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace StudentProgressRecord.Repositories { public interface IStudentRepository { - IEnumerable ReadStudents(bool? familyPos=null, bool? domitory=null); + IEnumerable ReadStudents(bool? familyPos = null, bool? domitory = null); Student ReadStudentById(long id); void CreateStudent(Student student); void UpdateStudent(Student student); diff --git a/StudentProgressRecord/IRepositories/IStudentTransitionRepository.cs b/StudentProgressRecord/IRepositories/IStudentTransitionRepository.cs index 21a1d6d..34e519c 100644 --- a/StudentProgressRecord/IRepositories/IStudentTransitionRepository.cs +++ b/StudentProgressRecord/IRepositories/IStudentTransitionRepository.cs @@ -1,9 +1,4 @@ using StudentProgressRecord.Entity; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace StudentProgressRecord.IRepositories { diff --git a/StudentProgressRecord/IRepositories/ISubjectRepository.cs b/StudentProgressRecord/IRepositories/ISubjectRepository.cs index a5e3dec..99ab85c 100644 --- a/StudentProgressRecord/IRepositories/ISubjectRepository.cs +++ b/StudentProgressRecord/IRepositories/ISubjectRepository.cs @@ -1,9 +1,4 @@ using StudentProgressRecord.Entity; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace StudentProgressRecord.Repositories { diff --git a/StudentProgressRecord/IRepositories/ITeacherRepository.cs b/StudentProgressRecord/IRepositories/ITeacherRepository.cs index f88c92f..6564448 100644 --- a/StudentProgressRecord/IRepositories/ITeacherRepository.cs +++ b/StudentProgressRecord/IRepositories/ITeacherRepository.cs @@ -1,9 +1,4 @@ using StudentProgressRecord.Entity; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace StudentProgressRecord.Repositories { diff --git a/StudentProgressRecord/Program.cs b/StudentProgressRecord/Program.cs index 05ab2e7..2f3a34d 100644 --- a/StudentProgressRecord/Program.cs +++ b/StudentProgressRecord/Program.cs @@ -1,8 +1,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; using Serilog; - -using StudentProgressRecord.Forms; using StudentProgressRecord.IRepositories; using StudentProgressRecord.Repositories; using StudentProgressRecord.RepositoryImp; @@ -30,7 +28,7 @@ namespace StudentProgressRecord container.AddExtension(new LoggingExtension(CreateLoggerFactory())); - container.RegisterType(new SingletonLifetimeManager()); + container.RegisterType(new SingletonLifetimeManager()); container.RegisterType (new TransientLifetimeManager()); @@ -40,7 +38,7 @@ namespace StudentProgressRecord container.RegisterType (new TransientLifetimeManager()); - + container.RegisterType (new TransientLifetimeManager()); diff --git a/StudentProgressRecord/Reports/ChartReport.cs b/StudentProgressRecord/Reports/ChartReport.cs index 1ea7cca..a18424f 100644 --- a/StudentProgressRecord/Reports/ChartReport.cs +++ b/StudentProgressRecord/Reports/ChartReport.cs @@ -1,11 +1,5 @@ using Microsoft.Extensions.Logging; using StudentProgressRecord.Repositories; -using StudentProgressRecord.RepositoryImp; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace StudentProgressRecord.Reports { @@ -38,12 +32,13 @@ namespace StudentProgressRecord.Reports } private List<(string Caption, double Value)> GetData(DateTime dateTimeStart, DateTime dateTimeEnd) { - + return _statementRepository .ReadStatements() .Where(x => x.Date >= dateTimeStart && x.Date <= dateTimeEnd) .SelectMany(x => x.Marks) - .GroupBy(x => x.Mark, (key, group) => new { + .GroupBy(x => x.Mark, (key, group) => new + { Id = key, Count = group.Count() }) diff --git a/StudentProgressRecord/Reports/DockReport.cs b/StudentProgressRecord/Reports/DockReport.cs index d06ea47..df8fb11 100644 --- a/StudentProgressRecord/Reports/DockReport.cs +++ b/StudentProgressRecord/Reports/DockReport.cs @@ -1,10 +1,5 @@ using Microsoft.Extensions.Logging; using StudentProgressRecord.Repositories; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace StudentProgressRecord.Reports { @@ -15,7 +10,7 @@ namespace StudentProgressRecord.Reports private readonly IStudentRepository _studentRepository; private readonly ITeacherRepository _teacherRepository; - + private readonly ILogger _logger; public DockReport(ISubjectRepository subjectRepository, IStudentRepository studentRepository, ITeacherRepository teacherRepository, ILogger logger) diff --git a/StudentProgressRecord/Reports/ExcelBuilder.cs b/StudentProgressRecord/Reports/ExcelBuilder.cs index bdca0ca..84e4de4 100644 --- a/StudentProgressRecord/Reports/ExcelBuilder.cs +++ b/StudentProgressRecord/Reports/ExcelBuilder.cs @@ -1,6 +1,6 @@ -using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml; +using DocumentFormat.OpenXml.Packaging; using DocumentFormat.OpenXml.Spreadsheet; -using DocumentFormat.OpenXml; namespace StudentProgressRecord.Reports { @@ -175,17 +175,17 @@ namespace StudentProgressRecord.Reports var borders = new Borders() { Count = 2 }; borders.Append(new Border { - LeftBorder = new LeftBorder (), - RightBorder = new RightBorder (), - TopBorder = new TopBorder (), - BottomBorder = new BottomBorder (), + LeftBorder = new LeftBorder(), + RightBorder = new RightBorder(), + TopBorder = new TopBorder(), + BottomBorder = new BottomBorder(), DiagonalBorder = new DiagonalBorder() }); borders.Append(new Border { - LeftBorder = new LeftBorder{ Style = BorderStyleValues.Thin }, + LeftBorder = new LeftBorder { Style = BorderStyleValues.Thin }, RightBorder = new RightBorder { Style = BorderStyleValues.Thin }, - TopBorder = new TopBorder {Style = BorderStyleValues.Thin}, + TopBorder = new TopBorder { Style = BorderStyleValues.Thin }, BottomBorder = new BottomBorder { Style = BorderStyleValues.Thin }, DiagonalBorder = new DiagonalBorder() }); diff --git a/StudentProgressRecord/Reports/PdfBuilder.cs b/StudentProgressRecord/Reports/PdfBuilder.cs index 18ddad4..a30a36c 100644 --- a/StudentProgressRecord/Reports/PdfBuilder.cs +++ b/StudentProgressRecord/Reports/PdfBuilder.cs @@ -1,11 +1,6 @@ using MigraDoc.DocumentObjectModel; using MigraDoc.DocumentObjectModel.Shapes.Charts; using MigraDoc.Rendering; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace StudentProgressRecord.Reports { @@ -71,7 +66,7 @@ namespace StudentProgressRecord.Reports { var style = _document.Styles.AddStyle("NormalBold", "Normal"); style.Font.Bold = true; - style.Font.Size = 16; + style.Font.Size = 16; style.ParagraphFormat.Alignment = ParagraphAlignment.Center; } } diff --git a/StudentProgressRecord/Reports/TableReport.cs b/StudentProgressRecord/Reports/TableReport.cs index 895bbc3..2fd99d0 100644 --- a/StudentProgressRecord/Reports/TableReport.cs +++ b/StudentProgressRecord/Reports/TableReport.cs @@ -2,11 +2,6 @@ using StudentProgressRecord.Entity.Enums; using StudentProgressRecord.IRepositories; using StudentProgressRecord.Repositories; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace StudentProgressRecord.Reports { @@ -16,9 +11,9 @@ namespace StudentProgressRecord.Reports private readonly IStatementRepository _statementRepository; private readonly ILogger _logger; internal static readonly string[] item = ["Дата", "Оценка", "Операция"]; - public TableReport(IStudentTransitionRepository studentTransitionRepository, IStatementRepository statementRepository, ILogger logger) + public TableReport(IStudentTransitionRepository studentTransitionRepository, IStatementRepository statementRepository, ILogger logger) { - _statementRepository = statementRepository?? throw new ArgumentNullException(nameof(statementRepository)); + _statementRepository = statementRepository ?? throw new ArgumentNullException(nameof(statementRepository)); _studentTransitionRepository = studentTransitionRepository ?? throw new ArgumentNullException(nameof(studentTransitionRepository)); _logger = logger ?? throw new ArgumentNullException(nameof(logger)); @@ -46,9 +41,10 @@ namespace StudentProgressRecord.Reports { var data = _statementRepository .ReadStatements() - .Where(x => x.Date >= startDate && x.Date <= endDate && + .Where(x => x.Date >= startDate && x.Date <= endDate && x.Marks.Any(y => y.StudentId == studentId)) - .Select(x => new { + .Select(x => new + { Date = x.Date, Mark = x.Marks.FirstOrDefault(y => y.StudentId == studentId)?.Mark, Operation = (Operations?)null @@ -57,7 +53,8 @@ namespace StudentProgressRecord.Reports _studentTransitionRepository .ReadStudentTransitions() .Where(x => x.Date >= startDate && x.Date <= endDate && x.StudentId == studentId) - .Select(x => new { + .Select(x => new + { Date = x.Date, Mark = (int?)null, Operation = (Operations?)x.Operation @@ -70,7 +67,7 @@ namespace StudentProgressRecord.Reports .Select(x => new string[] { x.Date.ToString(), x.Mark?.ToString() ?? string.Empty, x.Operation.ToString() ?? string.Empty})) .Union( - [["Всего",data.Where((x) => x.Mark.HasValue).Average(x => x.Mark).ToString(), data.Count(x => x.Operation.HasValue).ToString()]]).ToList(); + [["Всего", data.Where((x) => x.Mark.HasValue).Average(x => x.Mark).ToString(), data.Count(x => x.Operation.HasValue).ToString()]]).ToList(); } } } diff --git a/StudentProgressRecord/Reports/WordBuilder.cs b/StudentProgressRecord/Reports/WordBuilder.cs index 7a58692..2e2d50d 100644 --- a/StudentProgressRecord/Reports/WordBuilder.cs +++ b/StudentProgressRecord/Reports/WordBuilder.cs @@ -1,11 +1,6 @@ -using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml; +using DocumentFormat.OpenXml.Packaging; using DocumentFormat.OpenXml.Wordprocessing; -using DocumentFormat.OpenXml; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace StudentProgressRecord.Reports { diff --git a/StudentProgressRecord/RepositoryImp/ConnectionString.cs b/StudentProgressRecord/RepositoryImp/ConnectionString.cs index 7f8264e..f5b53c0 100644 --- a/StudentProgressRecord/RepositoryImp/ConnectionString.cs +++ b/StudentProgressRecord/RepositoryImp/ConnectionString.cs @@ -1,10 +1,4 @@ -using Microsoft.VisualBasic.ApplicationServices; -using StudentProgressRecord.IRepositories; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using StudentProgressRecord.IRepositories; namespace StudentProgressRecord.RepositoryImp { diff --git a/StudentProgressRecord/RepositoryImp/StatementRepository.cs b/StudentProgressRecord/RepositoryImp/StatementRepository.cs index 267c628..0a23935 100644 --- a/StudentProgressRecord/RepositoryImp/StatementRepository.cs +++ b/StudentProgressRecord/RepositoryImp/StatementRepository.cs @@ -5,7 +5,6 @@ using Npgsql; using StudentProgressRecord.Entity; using StudentProgressRecord.IRepositories; using StudentProgressRecord.Repositories; -using System.Data.SqlClient; namespace StudentProgressRecord.RepositoryImp @@ -32,18 +31,18 @@ namespace StudentProgressRecord.RepositoryImp connection.Open(); using var transaction = connection.BeginTransaction(); - + var queryInsert = @" INSERT INTO Statement (SubjectId, TeacherId, Date) VALUES (@SubjectId, @TeacherId, @Date); SELECT MAX(Id) FROM Statement"; - + var statementID = connection.QueryFirst(queryInsert, statement, transaction); - + var querySubInsert = @" INSERT INTO Marks (StatementId, StudentId, Mark) VALUES (@StatementId, @StudentId,@Mark)"; - + foreach (var elem in statement.Marks) { connection.Execute(querySubInsert, new @@ -82,7 +81,7 @@ namespace StudentProgressRecord.RepositoryImp } } - public IEnumerable ReadStatements(long? subjectId = null, long? teacherId = null, + public IEnumerable ReadStatements(long? subjectId = null, long? teacherId = null, DateTime? dateFrom = null, DateTime? dateTo = null) { _logger.LogInformation("Получение всех объектов"); @@ -97,8 +96,8 @@ namespace StudentProgressRecord.RepositoryImp _logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(objs)); - return objs.GroupBy(x => x.Id, y => y, - (key, value) => + return objs.GroupBy(x => x.Id, y => y, + (key, value) => Statement.CreateOperation(value.First(), value.Select(z => Marks.CreateElement(0, z.StudentId, z.Mark)))).ToList(); } catch (Exception ex) diff --git a/StudentProgressRecord/RepositoryImp/StudentRepository.cs b/StudentProgressRecord/RepositoryImp/StudentRepository.cs index a2e266a..5715476 100644 --- a/StudentProgressRecord/RepositoryImp/StudentRepository.cs +++ b/StudentProgressRecord/RepositoryImp/StudentRepository.cs @@ -2,15 +2,9 @@ using Microsoft.Extensions.Logging; using Newtonsoft.Json; using Npgsql; -using Serilog.Core; using StudentProgressRecord.Entity; using StudentProgressRecord.IRepositories; using StudentProgressRecord.Repositories; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace StudentProgressRecord.RepositoryImp { diff --git a/StudentProgressRecord/RepositoryImp/StudentTransitionRepository.cs b/StudentProgressRecord/RepositoryImp/StudentTransitionRepository.cs index d54c6f6..9b66066 100644 --- a/StudentProgressRecord/RepositoryImp/StudentTransitionRepository.cs +++ b/StudentProgressRecord/RepositoryImp/StudentTransitionRepository.cs @@ -1,10 +1,9 @@ -using StudentProgressRecord.Entity; -using StudentProgressRecord.IRepositories; -using StudentProgressRecord.Entity.Enums; +using Dapper; +using Microsoft.Extensions.Logging; using Newtonsoft.Json; using Npgsql; -using Microsoft.Extensions.Logging; -using Dapper; +using StudentProgressRecord.Entity; +using StudentProgressRecord.IRepositories; namespace StudentProgressRecord.RepositoryImp { public class StudentTransitionRepository : IStudentTransitionRepository diff --git a/StudentProgressRecord/RepositoryImp/SubjectRepository.cs b/StudentProgressRecord/RepositoryImp/SubjectRepository.cs index b7487a9..c3c18b0 100644 --- a/StudentProgressRecord/RepositoryImp/SubjectRepository.cs +++ b/StudentProgressRecord/RepositoryImp/SubjectRepository.cs @@ -3,7 +3,6 @@ using Microsoft.Extensions.Logging; using Newtonsoft.Json; using Npgsql; using StudentProgressRecord.Entity; -using StudentProgressRecord.Entity.Enums; using StudentProgressRecord.IRepositories; using StudentProgressRecord.Repositories; diff --git a/StudentProgressRecord/RepositoryImp/TeacherRepository.cs b/StudentProgressRecord/RepositoryImp/TeacherRepository.cs index 8fdc506..2357cb6 100644 --- a/StudentProgressRecord/RepositoryImp/TeacherRepository.cs +++ b/StudentProgressRecord/RepositoryImp/TeacherRepository.cs @@ -5,12 +5,6 @@ using Npgsql; using StudentProgressRecord.Entity; using StudentProgressRecord.IRepositories; using StudentProgressRecord.Repositories; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net.NetworkInformation; -using System.Text; -using System.Threading.Tasks; namespace StudentProgressRecord.RepositoryImp {