From 954efe5a151d7d24d76e69ebc174ff81b9c77b20 Mon Sep 17 00:00:00 2001 From: funa4i Date: Tue, 10 Dec 2024 12:32:34 +0400 Subject: [PATCH] Sdal --- StudentProgressRecord/Reports/ExcelBuilder.cs | 3 +-- StudentProgressRecord/Reports/WordBuilder.cs | 1 - StudentProgressRecord/RepositoryImp/StatementRepository.cs | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/StudentProgressRecord/Reports/ExcelBuilder.cs b/StudentProgressRecord/Reports/ExcelBuilder.cs index 84e4de4..6b4d715 100644 --- a/StudentProgressRecord/Reports/ExcelBuilder.cs +++ b/StudentProgressRecord/Reports/ExcelBuilder.cs @@ -304,8 +304,7 @@ namespace StudentProgressRecord.Reports while (dividend > 0) { modulo = (dividend - 1) % 26; - columnName = Convert.ToChar(65 + modulo).ToString() + - columnName; + columnName = Convert.ToChar(65 + modulo).ToString() + columnName; dividend = (dividend - modulo) / 26; } return columnName; diff --git a/StudentProgressRecord/Reports/WordBuilder.cs b/StudentProgressRecord/Reports/WordBuilder.cs index 2e2d50d..9a337c8 100644 --- a/StudentProgressRecord/Reports/WordBuilder.cs +++ b/StudentProgressRecord/Reports/WordBuilder.cs @@ -27,7 +27,6 @@ namespace StudentProgressRecord.Reports { var paragraph = _body.AppendChild(new Paragraph()); var run = paragraph.AppendChild(new Run()); - // TODO прописать настройки под жирный текст run.AppendChild(new Text(header)); return this; } diff --git a/StudentProgressRecord/RepositoryImp/StatementRepository.cs b/StudentProgressRecord/RepositoryImp/StatementRepository.cs index 807899f..608cd30 100644 --- a/StudentProgressRecord/RepositoryImp/StatementRepository.cs +++ b/StudentProgressRecord/RepositoryImp/StatementRepository.cs @@ -116,6 +116,7 @@ namespace StudentProgressRecord.RepositoryImp builder.AddCondition("st.date <= @dateTo"); } using var connection = new NpgsqlConnection(_connectionString.GetConnectionString()); + var querySelect = @$"SELECT st.*, s.Name as SubjectName, t.Name as TeacherName, m.StudentId, m.Mark, Student.Name as StudentName FROM Statement st