From ff6b73068ffdb0a43a946717bef64969b4e40362 Mon Sep 17 00:00:00 2001 From: sheymuh Date: Sun, 15 Dec 2024 13:17:37 +0400 Subject: [PATCH 1/5] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D1=81=D1=82=D0=B0?= =?UTF-8?q?=D0=BB=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D1=82=D1=8C?= =?UTF-8?q?=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=20=D1=81=D0=BE=20=D1=81=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/StartingShift.cs | 13 + .../Entities/TempStartingShiftEmployee.cs | 16 ++ .../FormPassengerTransportation.Designer.cs | 21 ++ .../FormPassengerTransportation.cs | 24 ++ .../Forms/FormBusesReport.Designer.cs | 163 +++++++++++ .../Forms/FormBusesReport.cs | 68 +++++ .../Forms/FormBusesReport.resx | 120 ++++++++ .../Forms/FormDirectoryReport.Designer.cs | 99 +++++++ .../Forms/FormDirectoryReport.cs | 53 ++++ .../Forms/FormDirectoryReport.resx | 120 ++++++++ .../Forms/FormStartingShift.cs | 7 +- .../ProjectPassengerTransportation.csproj | 9 +- .../Reports/DocReport.cs | 90 ++++++ .../Reports/ExcelBuilder.cs | 262 ++++++++++++++++++ .../Reports/TableReport.cs | 74 +++++ .../Reports/WordBuilder.cs | 104 +++++++ .../StartingShiftRepository.cs | 10 +- docAll1.docx | Bin 0 -> 1800 bytes docBuses1.docx | Bin 0 -> 1466 bytes 19 files changed, 1243 insertions(+), 10 deletions(-) create mode 100644 ProjectPassengerTransportation/ProjectPassengerTransportation/Entities/TempStartingShiftEmployee.cs create mode 100644 ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBusesReport.Designer.cs create mode 100644 ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBusesReport.cs create mode 100644 ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBusesReport.resx create mode 100644 ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormDirectoryReport.Designer.cs create mode 100644 ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormDirectoryReport.cs create mode 100644 ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormDirectoryReport.resx create mode 100644 ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/DocReport.cs create mode 100644 ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/ExcelBuilder.cs create mode 100644 ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/TableReport.cs create mode 100644 ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/WordBuilder.cs create mode 100644 docAll1.docx create mode 100644 docBuses1.docx diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Entities/StartingShift.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Entities/StartingShift.cs index 7aa4dcf..2c48190 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/Entities/StartingShift.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Entities/StartingShift.cs @@ -24,4 +24,17 @@ public class StartingShift Starting_shift_employees = startingShiftEmployees }; } + + public static StartingShift CreateOperation(TempStartingShiftEmployee tempStartingShiftEmployee, + IEnumerable startingShiftEmployee) + { + return new StartingShift + { + Id = tempStartingShiftEmployee.Starting_shift_id, + Date = tempStartingShiftEmployee.Date, + Route_list_id = tempStartingShiftEmployee.Route_list_id, + Bus_id = tempStartingShiftEmployee.Bus_id, + Starting_shift_employees = startingShiftEmployee + }; + } } diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Entities/TempStartingShiftEmployee.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Entities/TempStartingShiftEmployee.cs new file mode 100644 index 0000000..36ba12b --- /dev/null +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Entities/TempStartingShiftEmployee.cs @@ -0,0 +1,16 @@ +namespace ProjectPassengerTransportation.Entities; + +public class TempStartingShiftEmployee +{ + public int Starting_shift_id { get; private set; } + + public int Employee_id { get; private set; } + + public int Route_list_id { get; private set; } + + public int Bus_id { get; private set; } + + public DateTime Date { get; private set; } + + public int Work_time { get; private set; } +} diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.Designer.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.Designer.cs index bdf115b..142fe69 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.Designer.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.Designer.cs @@ -37,6 +37,8 @@ StartingShiftsToolStripMenuItem = new ToolStripMenuItem(); GoToServicesToolStripMenuItem = new ToolStripMenuItem(); отчётыToolStripMenuItem = new ToolStripMenuItem(); + directoryReportToolStripMenuItem = new ToolStripMenuItem(); + busesReportToolStripMenuItem = new ToolStripMenuItem(); menuStrip1.SuspendLayout(); SuspendLayout(); // @@ -101,10 +103,27 @@ // // отчётыToolStripMenuItem // + отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { directoryReportToolStripMenuItem, busesReportToolStripMenuItem }); отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem"; отчётыToolStripMenuItem.Size = new Size(103, 34); отчётыToolStripMenuItem.Text = "Отчёты"; // + // directoryReportToolStripMenuItem + // + directoryReportToolStripMenuItem.Name = "directoryReportToolStripMenuItem"; + directoryReportToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.W; + directoryReportToolStripMenuItem.Size = new Size(490, 40); + directoryReportToolStripMenuItem.Text = "Документ со справочниками"; + directoryReportToolStripMenuItem.Click += DirectoryReportToolStripMenuItem_Click; + // + // busesReportToolStripMenuItem + // + busesReportToolStripMenuItem.Name = "busesReportToolStripMenuItem"; + busesReportToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.E; + busesReportToolStripMenuItem.Size = new Size(490, 40); + busesReportToolStripMenuItem.Text = "Работа автобусов"; + busesReportToolStripMenuItem.Click += BusesReportToolStripMenuItem_Click; + // // FormPassengerTransportation // AutoScaleDimensions = new SizeF(12F, 30F); @@ -134,5 +153,7 @@ private ToolStripMenuItem отчётыToolStripMenuItem; private ToolStripMenuItem StartingShiftsToolStripMenuItem; private ToolStripMenuItem GoToServicesToolStripMenuItem; + private ToolStripMenuItem directoryReportToolStripMenuItem; + private ToolStripMenuItem busesReportToolStripMenuItem; } } diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.cs index 764a3e8..586fd54 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.cs @@ -72,5 +72,29 @@ namespace ProjectPassengerTransportation MessageBox.Show(ex.Message, " ", MessageBoxButtons.OK, MessageBoxIcon.Error); } } + + private void DirectoryReportToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void BusesReportToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } } } diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBusesReport.Designer.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBusesReport.Designer.cs new file mode 100644 index 0000000..a73db63 --- /dev/null +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBusesReport.Designer.cs @@ -0,0 +1,163 @@ +namespace ProjectPassengerTransportation.Forms +{ + partial class FormBusesReport + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + labelFilePath = new Label(); + textBoxFilePath = new TextBox(); + buttonSelectFilePath = new Button(); + comboBoxShift = new ComboBox(); + dateTimePickerBeginDate = new DateTimePicker(); + dateTimePickerEndDate = new DateTimePicker(); + labelShift = new Label(); + labelBeginDate = new Label(); + labelEndDate = new Label(); + buttonMakeReport = new Button(); + SuspendLayout(); + // + // labelFilePath + // + labelFilePath.AutoSize = true; + labelFilePath.Location = new Point(23, 37); + labelFilePath.Name = "labelFilePath"; + labelFilePath.Size = new Size(157, 30); + labelFilePath.TabIndex = 0; + labelFilePath.Text = "Путь до файла:"; + // + // textBoxFilePath + // + textBoxFilePath.Location = new Point(203, 37); + textBoxFilePath.Name = "textBoxFilePath"; + textBoxFilePath.ReadOnly = true; + textBoxFilePath.Size = new Size(284, 35); + textBoxFilePath.TabIndex = 1; + // + // buttonSelectFilePath + // + buttonSelectFilePath.Location = new Point(493, 35); + buttonSelectFilePath.Name = "buttonSelectFilePath"; + buttonSelectFilePath.Size = new Size(40, 40); + buttonSelectFilePath.TabIndex = 2; + buttonSelectFilePath.Text = "..."; + buttonSelectFilePath.UseVisualStyleBackColor = true; + buttonSelectFilePath.Click += ButtonSelectFilePath_Click; + // + // comboBoxShift + // + comboBoxShift.FormattingEnabled = true; + comboBoxShift.Location = new Point(203, 114); + comboBoxShift.Name = "comboBoxShift"; + comboBoxShift.Size = new Size(330, 38); + comboBoxShift.TabIndex = 3; + // + // dateTimePickerBeginDate + // + dateTimePickerBeginDate.Location = new Point(203, 190); + dateTimePickerBeginDate.Name = "dateTimePickerBeginDate"; + dateTimePickerBeginDate.Size = new Size(330, 35); + dateTimePickerBeginDate.TabIndex = 4; + // + // dateTimePickerEndDate + // + dateTimePickerEndDate.Location = new Point(203, 262); + dateTimePickerEndDate.Name = "dateTimePickerEndDate"; + dateTimePickerEndDate.Size = new Size(330, 35); + dateTimePickerEndDate.TabIndex = 5; + // + // labelShift + // + labelShift.AutoSize = true; + labelShift.Location = new Point(23, 117); + labelShift.Name = "labelShift"; + labelShift.Size = new Size(75, 30); + labelShift.TabIndex = 6; + labelShift.Text = "Смена"; + // + // labelBeginDate + // + labelBeginDate.AutoSize = true; + labelBeginDate.Location = new Point(23, 194); + labelBeginDate.Name = "labelBeginDate"; + labelBeginDate.Size = new Size(133, 30); + labelBeginDate.TabIndex = 7; + labelBeginDate.Text = "Дата начала"; + // + // labelEndDate + // + labelEndDate.AutoSize = true; + labelEndDate.Location = new Point(23, 266); + labelEndDate.Name = "labelEndDate"; + labelEndDate.Size = new Size(123, 30); + labelEndDate.TabIndex = 8; + labelEndDate.Text = "Дата конца"; + // + // buttonMakeReport + // + buttonMakeReport.Location = new Point(203, 329); + buttonMakeReport.Name = "buttonMakeReport"; + buttonMakeReport.Size = new Size(177, 40); + buttonMakeReport.TabIndex = 9; + buttonMakeReport.Text = "Сформировать"; + buttonMakeReport.UseVisualStyleBackColor = true; + buttonMakeReport.Click += ButtonMakeReport_Click; + // + // FormBusesReport + // + AutoScaleDimensions = new SizeF(12F, 30F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(576, 393); + Controls.Add(buttonMakeReport); + Controls.Add(labelEndDate); + Controls.Add(labelBeginDate); + Controls.Add(labelShift); + Controls.Add(dateTimePickerEndDate); + Controls.Add(dateTimePickerBeginDate); + Controls.Add(comboBoxShift); + Controls.Add(buttonSelectFilePath); + Controls.Add(textBoxFilePath); + Controls.Add(labelFilePath); + Name = "FormBusesReport"; + Text = "Отчёт по работе автобусов"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label labelFilePath; + private TextBox textBoxFilePath; + private Button buttonSelectFilePath; + private ComboBox comboBoxShift; + private DateTimePicker dateTimePickerBeginDate; + private DateTimePicker dateTimePickerEndDate; + private Label labelShift; + private Label labelBeginDate; + private Label labelEndDate; + private Button buttonMakeReport; + } +} \ No newline at end of file diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBusesReport.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBusesReport.cs new file mode 100644 index 0000000..3ca6340 --- /dev/null +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBusesReport.cs @@ -0,0 +1,68 @@ +using ProjectPassengerTransportation.Reports; +using ProjectPassengerTransportation.Repositories; +using Unity; + +namespace ProjectPassengerTransportation.Forms +{ + public partial class FormBusesReport : Form + { + private readonly IUnityContainer _container; + + public FormBusesReport(IUnityContainer container, IStartingShiftRepository startingShiftRepository) + { + InitializeComponent(); + _container = container ?? throw new ArgumentNullException(nameof(container)); + comboBoxShift.DataSource = startingShiftRepository.ReadShifts(); + comboBoxShift.DisplayMember = "Id"; + comboBoxShift.ValueMember = "Id"; + } + + private void ButtonSelectFilePath_Click(object sender, EventArgs e) + { + var sfd = new SaveFileDialog() + { + Filter = "Excel Files | *.xlsx" + }; + if (sfd.ShowDialog() != DialogResult.OK) + { + return; + } + textBoxFilePath.Text = sfd.FileName; + } + + private void ButtonMakeReport_Click(object sender, EventArgs e) + { + try + { + if (string.IsNullOrWhiteSpace(textBoxFilePath.Text)) + { + throw new Exception("Отсутствует имя файла для отчета"); + } + if (comboBoxShift.SelectedIndex < 0) + { + throw new Exception("Не выбран корм"); + } + if (dateTimePickerEndDate.Value <= dateTimePickerBeginDate.Value) + { + throw new Exception("Дата начала должна быть раньше даты окончания"); + } + if (_container.Resolve().CreateTable(textBoxFilePath.Text, + (int)comboBoxShift.SelectedValue!, dateTimePickerBeginDate.Value, dateTimePickerEndDate.Value)) + { + MessageBox.Show("Документ сформирован", "Формирование документа", + MessageBoxButtons.OK, MessageBoxIcon.Information); + } + else + { + MessageBox.Show("Возникли ошибки при формировании документа.Подробности в логах", + "Формирование документа", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка при создании очета", + MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } +} diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBusesReport.resx b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBusesReport.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBusesReport.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormDirectoryReport.Designer.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormDirectoryReport.Designer.cs new file mode 100644 index 0000000..6aa59f1 --- /dev/null +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormDirectoryReport.Designer.cs @@ -0,0 +1,99 @@ +namespace ProjectPassengerTransportation.Forms +{ + partial class FormDirectoryReport + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + checkBoxBuses = new CheckBox(); + checkBoxEmployees = new CheckBox(); + checkBoxRouteLists = new CheckBox(); + buttonBuild = new Button(); + SuspendLayout(); + // + // checkBoxBuses + // + checkBoxBuses.AutoSize = true; + checkBoxBuses.Location = new Point(69, 43); + checkBoxBuses.Name = "checkBoxBuses"; + checkBoxBuses.Size = new Size(132, 34); + checkBoxBuses.TabIndex = 0; + checkBoxBuses.Text = "Автобусы"; + checkBoxBuses.UseVisualStyleBackColor = true; + // + // checkBoxEmployees + // + checkBoxEmployees.AutoSize = true; + checkBoxEmployees.Location = new Point(69, 109); + checkBoxEmployees.Name = "checkBoxEmployees"; + checkBoxEmployees.Size = new Size(141, 34); + checkBoxEmployees.TabIndex = 1; + checkBoxEmployees.Text = "Работники"; + checkBoxEmployees.UseVisualStyleBackColor = true; + // + // checkBoxRouteLists + // + checkBoxRouteLists.AutoSize = true; + checkBoxRouteLists.Location = new Point(69, 176); + checkBoxRouteLists.Name = "checkBoxRouteLists"; + checkBoxRouteLists.Size = new Size(230, 34); + checkBoxRouteLists.TabIndex = 2; + checkBoxRouteLists.Text = "Маршрутные листы"; + checkBoxRouteLists.UseVisualStyleBackColor = true; + // + // buttonBuild + // + buttonBuild.Location = new Point(369, 99); + buttonBuild.Name = "buttonBuild"; + buttonBuild.Size = new Size(181, 53); + buttonBuild.TabIndex = 3; + buttonBuild.Text = "Сформировать"; + buttonBuild.UseVisualStyleBackColor = true; + buttonBuild.Click += ButtonBuild_Click; + // + // FormDirectoryReport + // + AutoScaleDimensions = new SizeF(12F, 30F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(616, 256); + Controls.Add(buttonBuild); + Controls.Add(checkBoxRouteLists); + Controls.Add(checkBoxEmployees); + Controls.Add(checkBoxBuses); + Name = "FormDirectoryReport"; + Text = "Выгрузка справочников"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private CheckBox checkBoxBuses; + private CheckBox checkBoxEmployees; + private CheckBox checkBoxRouteLists; + private Button buttonBuild; + } +} \ No newline at end of file diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormDirectoryReport.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormDirectoryReport.cs new file mode 100644 index 0000000..6bafb15 --- /dev/null +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormDirectoryReport.cs @@ -0,0 +1,53 @@ +using ProjectPassengerTransportation.Reports; +using Unity; + +namespace ProjectPassengerTransportation.Forms +{ + public partial class FormDirectoryReport : Form + { + private readonly IUnityContainer _container; + + public FormDirectoryReport(IUnityContainer container) + { + InitializeComponent(); + _container = container ?? throw new ArgumentNullException(nameof(container)); + } + + private void ButtonBuild_Click(object sender, EventArgs e) + { + try + { + if (!checkBoxBuses.Checked && !checkBoxEmployees.Checked && !checkBoxRouteLists.Checked) + { + throw new Exception("Не выбран ни один справочник для выгрузки"); + } + + var sfd = new SaveFileDialog() + { + Filter = "Docx Files | *.docx" + }; + + if (sfd.ShowDialog() != DialogResult.OK) + { + throw new Exception("Не выбран файла для отчета"); + } + + if (_container.Resolve().CreateDoc(sfd.FileName, checkBoxBuses.Checked, + checkBoxEmployees.Checked, checkBoxRouteLists.Checked)) + { + MessageBox.Show("Документ сформирован", "Формирование документа", + MessageBoxButtons.OK, MessageBoxIcon.Information); + } + else + { + MessageBox.Show("Возникли ошибки при формировании документа.Подробности в логах", + "Формирование документа", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка при создании отчета", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } +} diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormDirectoryReport.resx b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormDirectoryReport.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormDirectoryReport.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormStartingShift.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormStartingShift.cs index 9cf3e1b..38852d7 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormStartingShift.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormStartingShift.cs @@ -61,10 +61,11 @@ namespace ProjectPassengerTransportation.Forms continue; } list.Add(StartingShiftEmployee.CreateElement(0, - Convert.ToInt32(row.Cells["ColumnEmployees"].Value), - Convert.ToInt32(row.Cells["ColumnWorkHours"].Value))); + Convert.ToInt32(row.Cells["ColumnEmployees"].Value), + Convert.ToInt32(row.Cells["ColumnWorkHours"].Value))); } - return list; + return list.GroupBy(x => x.Employee_id, x => x.Work_time, (employeeId, workTime) => + StartingShiftEmployee.CreateElement(0, employeeId, workTime.Sum())).ToList(); } } } diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/ProjectPassengerTransportation.csproj b/ProjectPassengerTransportation/ProjectPassengerTransportation/ProjectPassengerTransportation.csproj index ebed082..c9d4296 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/ProjectPassengerTransportation.csproj +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/ProjectPassengerTransportation.csproj @@ -10,14 +10,15 @@ + - - - - + + + + diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/DocReport.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/DocReport.cs new file mode 100644 index 0000000..c896c2d --- /dev/null +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/DocReport.cs @@ -0,0 +1,90 @@ +using Microsoft.Extensions.Logging; +using ProjectPassengerTransportation.Repositories; + +namespace ProjectPassengerTransportation.Reports; + +public class DocReport +{ + private readonly IBusRepository _busRepository; + + private readonly IEmployeeRepository _employeeRepository; + + private readonly IRouteListRepository _routeListRepository; + + private readonly ILogger _logger; + + public DocReport(IBusRepository busRepository, IEmployeeRepository employeeRepository, + IRouteListRepository routeListRepository, ILogger logger) + { + _busRepository = busRepository ?? throw new ArgumentNullException(nameof(busRepository)); + _employeeRepository = employeeRepository ?? throw new ArgumentNullException(nameof(employeeRepository)); + _routeListRepository = routeListRepository ?? throw new ArgumentNullException(nameof(routeListRepository)); + _logger = logger ?? throw new ArgumentNullException(nameof(logger)); + } + + public bool CreateDoc(string filePath, bool includeBuses, bool includeEmployees, bool includeRouteLists) + { + try + { + var builder = new WordBuilder(filePath) + .AddHeader("Документ со справочниками"); + + if (includeBuses) + { + builder.AddParagraph("Автобусы") + .AddTable([2400, 2400], GetBuses()); + } + + if (includeEmployees) + { + builder.AddParagraph("Работники") + .AddTable([2400, 2400, 2400], GetEmployess()); + } + + if (includeRouteLists) + { + builder.AddParagraph("Маршрутные листы") + .AddTable([1200, 1200], GetRouteLists()); + } + + builder.Build(); + + return true; + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка при формировании документа"); + return false; + } + } + + private List GetBuses() + { + return [ + ["Госномер", "Модель"], + .. _busRepository + .ReadBuses() + .Select(x => new string[] { x.Licence_plate, x.Model }), + ]; + } + + private List GetEmployess() + { + return [ + ["Имя", "Фамилия", "Должность"], + .. _employeeRepository + .ReadEmployees() + .Select(x => new string[] { x.First_name, x.Last_name, x.Post.ToString() }), + ]; + } + + private List GetRouteLists() + { + return [ + ["Начало работы", "Конец работы"], + .. _routeListRepository + .ReadRouteLists() + .Select(x => new string[] { x.Route_start.ToString(), x.Route_finish.ToString() }), + ]; + } +} diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/ExcelBuilder.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/ExcelBuilder.cs new file mode 100644 index 0000000..d987015 --- /dev/null +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/ExcelBuilder.cs @@ -0,0 +1,262 @@ +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Spreadsheet; +using DocumentFormat.OpenXml; + +namespace ProjectPassengerTransportation.Reports; + +public class ExcelBuilder +{ + private readonly string _filePath; + + private readonly SheetData _sheetData; + + private readonly MergeCells _mergeCells; + + private readonly Columns _columns; + + private uint _rowIndex = 0; + + public ExcelBuilder(string filePath) + { + if (string.IsNullOrWhiteSpace(filePath)) + { + throw new ArgumentNullException(nameof(filePath)); + } + + if (File.Exists(filePath)) + { + File.Delete(filePath); + } + + _filePath = filePath; + _sheetData = new SheetData(); + _mergeCells = new MergeCells(); + _columns = new Columns(); + _rowIndex = 1; + } + + public ExcelBuilder AddHeader(string header, int startIndex, int count) + { + CreateCell(startIndex, _rowIndex, header, StyleIndex.SimpleTextWithoutBorder); + for (int i = startIndex + 1; i < startIndex + count; ++i) + { + CreateCell(i, _rowIndex, "", StyleIndex.SimpleTextWithoutBorder); + } + + _mergeCells.Append(new MergeCell() + { + Reference = + new StringValue($"{GetExcelColumnName(startIndex)}{_rowIndex}:{GetExcelColumnName(startIndex + count - 1)}{_rowIndex}") + }); + + _rowIndex++; + return this; + } + + public ExcelBuilder AddParagraph(string text, int columnIndex) + { + CreateCell(columnIndex, _rowIndex++, text, StyleIndex.SimpleTextWithoutBorder); + return this; + } + + public ExcelBuilder AddTable(int[] columnsWidths, List data) + { + if (columnsWidths == null || columnsWidths.Length == 0) + { + throw new ArgumentNullException(nameof(columnsWidths)); + } + + if (data == null || data.Count == 0) + { + throw new ArgumentNullException(nameof(data)); + } + + if (data.Any(x => x.Length != columnsWidths.Length)) + { + throw new InvalidOperationException("widths.Length != data.Length"); + } + + uint counter = 1; + int coef = 2; + _columns.Append(columnsWidths.Select(x => new Column + { + Min = counter, + Max = counter++, + Width = x * coef, + CustomWidth = true + })); + + for (var j = 0; j < data.First().Length; ++j) + { + CreateCell(j, _rowIndex, data.First()[j], StyleIndex.SimpleTextWithoutBorder); + } + + _rowIndex++; + for (var i = 1; i < data.Count - 1; ++i) + { + for (var j = 0; j < data[i].Length; ++j) + { + CreateCell(j, _rowIndex, data[i][j], StyleIndex.SimpleTextWithoutBorder); + } + + _rowIndex++; + } + + for (var j = 0; j < data.Last().Length; ++j) + { + CreateCell(j, _rowIndex, data.Last()[j], StyleIndex.SimpleTextWithoutBorder); + } + + _rowIndex++; + return this; + } + + public void Build() + { + using var spreadsheetDocument = SpreadsheetDocument.Create(_filePath, SpreadsheetDocumentType.Workbook); + var workbookpart = spreadsheetDocument.AddWorkbookPart(); + GenerateStyle(workbookpart); + workbookpart.Workbook = new Workbook(); + var worksheetPart = workbookpart.AddNewPart(); + worksheetPart.Worksheet = new Worksheet(); + if (_columns.HasChildren) + { + worksheetPart.Worksheet.Append(_columns); + } + + worksheetPart.Worksheet.Append(_sheetData); + var sheets = spreadsheetDocument.WorkbookPart!.Workbook.AppendChild(new Sheets()); + var sheet = new Sheet() + { + Id = spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart), + SheetId = 1, + Name = "Лист 1" + }; + + sheets.Append(sheet); + if (_mergeCells.HasChildren) + { + worksheetPart.Worksheet.InsertAfter(_mergeCells, worksheetPart.Worksheet.Elements().First()); + } + } + + private static void GenerateStyle(WorkbookPart workbookPart) + { + var workbookStylesPart = workbookPart.AddNewPart(); + workbookStylesPart.Stylesheet = new Stylesheet(); + + var fonts = new Fonts() { Count = 2, KnownFonts = BooleanValue.FromBoolean(true) }; + fonts.Append(new DocumentFormat.OpenXml.Spreadsheet.Font + { + FontSize = new FontSize() { Val = 11 }, + FontName = new FontName() { Val = "Calibri" }, + FontFamilyNumbering = new FontFamilyNumbering() { Val = 2 }, + FontScheme = new FontScheme() { Val = new EnumValue(FontSchemeValues.Minor) } + }); + // TODO добавить шрифт с жирным + workbookStylesPart.Stylesheet.Append(fonts); + + // Default Fill + var fills = new Fills() { Count = 1 }; + fills.Append(new Fill + { + PatternFill = new PatternFill() + { + PatternType = new EnumValue(PatternValues.None) + } + }); + workbookStylesPart.Stylesheet.Append(fills); + + // Default Border + var borders = new Borders() { Count = 2 }; + borders.Append(new Border + { + LeftBorder = new LeftBorder(), + RightBorder = new RightBorder(), + TopBorder = new TopBorder(), + BottomBorder = new BottomBorder(), + DiagonalBorder = new DiagonalBorder() + }); + // TODO добавить настройку с границами + workbookStylesPart.Stylesheet.Append(borders); + + // Default cell format and a date cell format + var cellFormats = new CellFormats() { Count = 4 }; + cellFormats.Append(new CellFormat + { + NumberFormatId = 0, + FormatId = 0, + FontId = 0, + BorderId = 0, + FillId = 0, + Alignment = new Alignment() + { + Horizontal = HorizontalAlignmentValues.Left, + Vertical = VerticalAlignmentValues.Center, + WrapText = true + } + }); + // TODO дополнить форматы + workbookStylesPart.Stylesheet.Append(cellFormats); + } + + private enum StyleIndex + { + SimpleTextWithoutBorder = 0, + // TODO дополнить стили + } + + private void CreateCell(int columnIndex, uint rowIndex, string text, StyleIndex styleIndex) + { + var columnName = GetExcelColumnName(columnIndex); + var cellReference = columnName + rowIndex; + var row = _sheetData.Elements().FirstOrDefault(r => r.RowIndex! == rowIndex); + if (row == null) + { + row = new Row() { RowIndex = rowIndex }; + _sheetData.Append(row); + } + + var newCell = row.Elements() + .FirstOrDefault(c => c.CellReference != null && c.CellReference.Value == columnName + rowIndex); + if (newCell == null) + { + Cell? refCell = null; + foreach (Cell cell in row.Elements()) + { + if (cell.CellReference?.Value != null && cell.CellReference.Value.Length == cellReference.Length) + { + if (string.Compare(cell.CellReference.Value, cellReference, true) > 0) + { + refCell = cell; + break; + } + } + } + + newCell = new Cell() { CellReference = cellReference }; + row.InsertBefore(newCell, refCell); + } + + newCell.CellValue = new CellValue(text); + newCell.DataType = CellValues.String; + newCell.StyleIndex = (uint)styleIndex; + } + + private static string GetExcelColumnName(int columnNumber) + { + columnNumber += 1; + int dividend = columnNumber; + string columnName = string.Empty; + int modulo; + + while (dividend > 0) + { + modulo = (dividend - 1) % 26; + columnName = Convert.ToChar(65 + modulo).ToString() + columnName; + dividend = (dividend - modulo) / 26; + } + + return columnName; + } +} diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/TableReport.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/TableReport.cs new file mode 100644 index 0000000..a32c800 --- /dev/null +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/TableReport.cs @@ -0,0 +1,74 @@ +using Microsoft.Extensions.Logging; +using ProjectPassengerTransportation.Repositories; + +namespace ProjectPassengerTransportation.Reports; + +public class TableReport +{ + private readonly IStartingShiftRepository _startingShiftRepository; + + private readonly IGoToServiceRepository _goToServiceRepository; + + private readonly ILogger _logger; + + internal static readonly string[] item = ["Автобус", "Дата", "Отработано часов", "Потрачено на тех обслуживание"]; + + public TableReport(IStartingShiftRepository startingShiftRepository, + IGoToServiceRepository goToServiceRepository, ILogger logger) + { + _startingShiftRepository = startingShiftRepository ?? throw new ArgumentNullException(nameof(startingShiftRepository)); + _goToServiceRepository = goToServiceRepository ?? throw new ArgumentNullException(nameof(goToServiceRepository)); + _logger = logger ?? throw new ArgumentNullException(nameof(logger)); + } + + public bool CreateTable(string filePath, int startingShiftId, DateTime startDate, DateTime endDate) + { + try + { + new ExcelBuilder(filePath) + .AddHeader("Сводка по работе автобусов", 0, 4) + .AddParagraph("за период", 0) + .AddTable([10, 10, 15, 15], GetData(startingShiftId, startDate, endDate)) + .Build(); + return true; + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка при формировании документа"); + return false; + } + } + + private List GetData(int startingShiftId, DateTime startDate, DateTime endDate) + { + int busId = 0; + var data = _startingShiftRepository + .ReadShifts() + .Where(x => x.Date >= startDate && x.Date <= endDate && x.Starting_shift_employees.Any(y => y.Starting_shift_id == startingShiftId)) + .Select(x => new { + busId = x.Bus_id, + x.Date, + WorkHours = x.Starting_shift_employees.FirstOrDefault(y => y.Starting_shift_id == startingShiftId)?.Work_time, + Price = (int?)null + }) + .Union(_goToServiceRepository + .ReadServices() + .Where(x => x.Date >= startDate && x.Date <= endDate && x.Bus_id == busId) + .Select(x => new { + busId = x.Bus_id, + x.Date, + WorkHours = (int?)null, + Price = (int?)x.Price + })) + .OrderBy(x => x.Date); + return new List() { item } + .Union(data + .Select(x => new string[] { + x.busId.ToString(), + x.Date.ToString(), + x.WorkHours?.ToString() ?? string.Empty, + x.Price?.ToString() ?? string.Empty})) + .Union([["Всего", "", data.Sum(x => x.WorkHours ?? 0).ToString(), data.Sum(x => x.Price ?? 0).ToString()]]) + .ToList(); + } +} diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/WordBuilder.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/WordBuilder.cs new file mode 100644 index 0000000..145a7cd --- /dev/null +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/WordBuilder.cs @@ -0,0 +1,104 @@ +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Wordprocessing; +using DocumentFormat.OpenXml; + +namespace ProjectPassengerTransportation.Reports; + +public class WordBuilder +{ + private readonly string _filePath; + + private readonly Document _document; + + private readonly Body _body; + + public WordBuilder(string filePath) + { + if (string.IsNullOrWhiteSpace(filePath)) + { + throw new ArgumentNullException(nameof(filePath)); + } + if (File.Exists(filePath)) + { + File.Delete(filePath); + } + + _filePath = filePath; + _document = new Document(); + _body = _document.AppendChild(new Body()); + } + + public WordBuilder AddHeader(string header) + { + var paragraph = _body.AppendChild(new Paragraph()); + var run = paragraph.AppendChild(new Run()); + // TODO прописать настройки под жирный текст + run.AppendChild(new Text(header)); + + return this; + } + + public WordBuilder AddParagraph(string text) + { + var paragraph = _body.AppendChild(new Paragraph()); + var run = paragraph.AppendChild(new Run()); + run.AppendChild(new Text(text)); + + return this; + } + + public WordBuilder AddTable(int[] widths, List data) + { + if (widths == null || widths.Length == 0) + { + throw new ArgumentNullException(nameof(widths)); + } + + if (data == null || data.Count == 0) + { + throw new ArgumentNullException(nameof(data)); + } + + if (data.Any(x => x.Length != widths.Length)) + { + throw new InvalidOperationException("widths.Length != data.Length"); + } + + var table = new Table(); + table.AppendChild(new TableProperties( + new TableBorders( + new TopBorder() { Val = new EnumValue(BorderValues.Single), Size = 12 }, + new BottomBorder() { Val = new EnumValue(BorderValues.Single), Size = 12 }, + new LeftBorder() { Val = new EnumValue(BorderValues.Single), Size = 12 }, + new RightBorder() { Val = new EnumValue(BorderValues.Single), Size = 12 }, + new InsideHorizontalBorder() { Val = new EnumValue(BorderValues.Single), Size = 12 }, + new InsideVerticalBorder() { Val = new EnumValue(BorderValues.Single), Size = 12 } + ) + )); + + // Заголовок + var tr = new TableRow(); + for (var j = 0; j < widths.Length; ++j) + { + tr.Append(new TableCell( + new TableCellProperties(new TableCellWidth() { Width = widths[j].ToString() }), + new Paragraph(new Run(new RunProperties(new Bold()), new Text(data.First()[j]))))); + } + table.Append(tr); + + // Данные + table.Append(data.Skip(1).Select(x => + new TableRow(x.Select(y => new TableCell(new Paragraph(new Run(new Text(y)))))))); + + _body.Append(table); + + return this; + } + + public void Build() + { + using var wordDocument = WordprocessingDocument.Create(_filePath, WordprocessingDocumentType.Document); + var mainPart = wordDocument.AddMainDocumentPart(); + mainPart.Document = _document; + } +} diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Repositories/Implementations/StartingShiftRepository.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Repositories/Implementations/StartingShiftRepository.cs index 9921a08..7a54cdb 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/Repositories/Implementations/StartingShiftRepository.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Repositories/Implementations/StartingShiftRepository.cs @@ -56,10 +56,14 @@ VALUES (@Starting_shift_id, @Employee_id, @Work_time)"; try { using var connection = new NpgsqlConnection(_connectionString.ConnectionString); - var querySelect = @"SELECT * FROM starting_shift"; - var startingShifts = connection.Query(querySelect); + var querySelect = @" +SELECT ss.*, sse.employee_id, sse.work_time FROM starting_shift ss +INNER JOIN starting_shift_employee sse ON sse.starting_shift_id = ss.id"; + var startingShifts = connection.Query(querySelect); _logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(startingShifts)); - return startingShifts; + return startingShifts.GroupBy(x => x.Starting_shift_id, y => y, + (key, value) => StartingShift.CreateOperation(value.First(), + value.Select(z => StartingShiftEmployee.CreateElement(0, z.Employee_id, z.Work_time)))).ToList(); } catch (Exception ex) { diff --git a/docAll1.docx b/docAll1.docx new file mode 100644 index 0000000000000000000000000000000000000000..9c270fed4d96994030e0671b5d81203adbeca55e GIT binary patch literal 1800 zcmWIWW@Zs#U|`^2*wEV-ss8bFfDSVQ!y+LD20@@`d45rfeoB6FX>Mv>iC#r+&f5rY z|Jx1%|FoyQf8frfD8@K-Taf-*ts-D$X)IS+(Bu-Du`=XJ5Th@@trM4M ztIA*Q&HqD~p-3hr2owC)RS&M!8!9eH)( z=~@1;X4?$M>AKGBeGequb1kI8cZlQ%HeR}Xb$Nko)S5=G?>CiJZ@${dwB^Z{UB@>@ zoSfz5Y8*-7hP!J?+l7cQeli$T6=^5B<8m>E2;`J^n}1OYgPZ6JXxhxN&vz zn_V{B)|e>>Ox(BHd{3(yzrkF;8>ct-etLK1(r;nS>8BIT);>2ndEqyUdBCf=BISlW zF9l~V&)l#_@}lvIb(&pI6*+y9CKhCLRd8RL?3GYGg(Y*so2-r}!f!Hu?pY9RcOdP_ zj5YJFUslL?_PH{{saQvyW5LANQgQDD8OHNPI-*7z4 z!qC}W;G31+H-<*;!+vugUA$NoFT6f=$2HZsiyxw-Dz@x<_9iSe^h}1??44rw=LN3a ze!E^!We~-)3IrO9Yw0pbesZ7nOxN;)qP=VUshlbA5g63X-tcS&IRjwRTUO+NH(FzyQMBz^oNtl$ukluLmOE z@7`}?56oN&WvNBQnfZCPN``s{N(!lY$@wXndFi%Fr6p;)7E1PZHbJR5i6uZ4#Tl6e z#R@RF+Ek^$iTo% zA7~@O3?)=E6+$WtQi(A!KP@dYIn@PPGGH-SA612tLP%m!dTNQSl0HV6qNL!NVyhHn zVPue$YGjsdU~ZUdl46mhq@ZtSqmSZaJJcY(FU=Gl1q@CQ76t}sv~zx539z7w2l=8n z7F1plAGBaSWCm$6#9rMJkiEblbxBQ2EX^rVaIFA32NI(|w z=$GZCpv9XmB>doIFDTRsit>|Fi;ICtA~#15E|Z&>nWqgl9vEI&YzCz;(yWFi7f{+n zq!hRn`rwcPMg=322m|h_0~jAj03*^7+OcO3gx+XieT0-*&^4kb0))nOELf97fHx}} OND(s-?gY}7U>*RvAjp9L literal 0 HcmV?d00001 diff --git a/docBuses1.docx b/docBuses1.docx new file mode 100644 index 0000000000000000000000000000000000000000..23070af04d80fe55a212cfe336c951703340b32a GIT binary patch literal 1466 zcmWIWW@Zs#U|`^2Sl-(gxi0ls$vs8}hHb1241z$>^8BI{{gnLV(%jU%61|GtoV6im z^Mnlr>O@a}zcxEJad+S(FWW*!Ma6@bH%li?Eqgolt=ZD$%WMlc+Pjn*S=bfy1GFZr zn$#99v0w0U#m`O+oxmMu-rO+0U-Nl$-di~_OUnmd=|NjElZ_X&bh|8@DY50{zL)uL zF5LCYzT%U*DZU_);}`c`nXNA`%-D2thF{yB7q5IHiyF&oS9Yy)4CcMzv1&_*(ZeX^ zn2DPWINohqG@J94LbXxttCE*3MTbfrsGfOvYu+IqyTiSicdb?`ZIzaXY<$ zIlQ3v8qd0@Gp?4M3~LTWG1)YGS2rz?f4frl_Q|!3%ch6FTFC$UY4r)&-J3R~c)Fc! z&bzm4UEiEwldpnh+Dlq~di6|n?F~Nnd)YD9)aJyw{%R%DK2`sJ^7Y61xSX8<-?Ewa z`0QD8Zj!o0e>4B~<_GK!r9U@6JthA|tNqjw$2pJR9JAQHbM{)>eW?Q6d;ZV=p}Xu) z%j+*k?fw@BEw9tAt(>?><4~?u_qJCn^;zd7U(tRvb-AP52j|Uv)5XgV>9)*Xcj~EK zIH&*4dp90G>afuYRpSYNZBTjNK~4Tata4v?&S~k2y%}f9B-&pa%s5ua6FlRci?+~= zoqIFZOqBADH&or1P?n@#5IFnl|6cC5_dWmo_{Ubhk1+t67#P5bA?Vu=EiGVT0AX%m zVu&wF%_-K`1Cj4{@3*lBCI^MG)S}|d{5)GFLp=i}h19&{{FKbRbX%p;k~CclC3`!Y zpwyhi5}=CWjLd>!1)!F^Vq2w*l9B=|ef{F(jMUu3V!ix=)I6X}T7FS(VhNC2l&)Wp zn4F!Mo~mzTU|^;Xv=L#35~`UBA(aKG#F&_$mX?{E>HXv})1qP{0YFc7xPKknR1<*N=7zMgTNdf9U zNFXN`6y#(kgQG&fEH4Eu-gF`12QMu^p;l0opPX7;3``QaIeKuJ+{Da0ZLsmc@WNs< zD20(`H8i<^(k3FMz^%{+hZHa>7@0&Ea2IyK_&@>}k&e)gJ$oSZ@-m@h7Icm1i2$K7 Yff;L(2=HcQ11Vw#!ks|+H4BIb091Y`%>V!Z literal 0 HcmV?d00001 -- 2.25.1 From 240ea12b6b0e8d8cae2ff854166a7a0365e3a99c Mon Sep 17 00:00:00 2001 From: sheymuh Date: Tue, 17 Dec 2024 21:20:21 +0400 Subject: [PATCH 2/5] =?UTF-8?q?=D0=BB=D0=B0=D0=B1=D0=B0=203=20=D0=B3=D0=BE?= =?UTF-8?q?=D1=82=D0=BE=D0=B2=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 5 + .../FormPassengerTransportation.Designer.cs | 16 ++- .../FormPassengerTransportation.cs | 14 +- .../Forms/FormEmployee.Designer.cs | 2 +- .../Forms/FormServiceReport.Designer.cs | 107 ++++++++++++++++ .../Forms/FormServiceReport.cs | 60 +++++++++ ...usesReport.resx => FormServiceReport.resx} | 0 ...Designer.cs => FormWorkReport.Designer.cs} | 93 +++++++++----- .../{FormBusesReport.cs => FormWorkReport.cs} | 21 +-- .../Forms/FormWorkReport.resx | 120 ++++++++++++++++++ .../ProjectPassengerTransportation.csproj | 1 + .../Reports/ChartReport.cs | 48 +++++++ .../Reports/ExcelBuilder.cs | 68 +++++++++- .../Reports/PdfBuilder.cs | 92 ++++++++++++++ .../Reports/TableReport.cs | 29 +++-- .../Reports/WordBuilder.cs | 5 +- .../StartingShiftRepository.cs | 4 +- 17 files changed, 617 insertions(+), 68 deletions(-) create mode 100644 ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormServiceReport.Designer.cs create mode 100644 ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormServiceReport.cs rename ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/{FormBusesReport.resx => FormServiceReport.resx} (100%) rename ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/{FormBusesReport.Designer.cs => FormWorkReport.Designer.cs} (65%) rename ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/{FormBusesReport.cs => FormWorkReport.cs} (71%) create mode 100644 ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormWorkReport.resx create mode 100644 ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/ChartReport.cs create mode 100644 ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/PdfBuilder.cs diff --git a/.gitignore b/.gitignore index a2517d3..2977950 100644 --- a/.gitignore +++ b/.gitignore @@ -402,3 +402,8 @@ FodyWeavers.xsd /edit.png /minus.jpg /plus.jpg +/docAll1.docx +/docBus1.docx +/docBuses1.docx +/excel1.xlsx +/pdf1.pdf diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.Designer.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.Designer.cs index 142fe69..6d34c46 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.Designer.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.Designer.cs @@ -39,6 +39,7 @@ отчётыToolStripMenuItem = new ToolStripMenuItem(); directoryReportToolStripMenuItem = new ToolStripMenuItem(); busesReportToolStripMenuItem = new ToolStripMenuItem(); + serviceReportToolStripMenuItem = new ToolStripMenuItem(); menuStrip1.SuspendLayout(); SuspendLayout(); // @@ -90,20 +91,20 @@ // StartingShiftsToolStripMenuItem // StartingShiftsToolStripMenuItem.Name = "StartingShiftsToolStripMenuItem"; - StartingShiftsToolStripMenuItem.Size = new Size(315, 40); + StartingShiftsToolStripMenuItem.Size = new Size(314, 40); StartingShiftsToolStripMenuItem.Text = "Начало смены"; StartingShiftsToolStripMenuItem.Click += StartingShiftsToolStripMenuItem_Click; // // GoToServicesToolStripMenuItem // GoToServicesToolStripMenuItem.Name = "GoToServicesToolStripMenuItem"; - GoToServicesToolStripMenuItem.Size = new Size(315, 40); + GoToServicesToolStripMenuItem.Size = new Size(314, 40); GoToServicesToolStripMenuItem.Text = "Тех. обслуживание"; GoToServicesToolStripMenuItem.Click += GoToServicesToolStripMenuItem_Click; // // отчётыToolStripMenuItem // - отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { directoryReportToolStripMenuItem, busesReportToolStripMenuItem }); + отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { directoryReportToolStripMenuItem, busesReportToolStripMenuItem, serviceReportToolStripMenuItem }); отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem"; отчётыToolStripMenuItem.Size = new Size(103, 34); отчётыToolStripMenuItem.Text = "Отчёты"; @@ -124,6 +125,14 @@ busesReportToolStripMenuItem.Text = "Работа автобусов"; busesReportToolStripMenuItem.Click += BusesReportToolStripMenuItem_Click; // + // serviceReportToolStripMenuItem + // + serviceReportToolStripMenuItem.Name = "serviceReportToolStripMenuItem"; + serviceReportToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.P; + serviceReportToolStripMenuItem.Size = new Size(490, 40); + serviceReportToolStripMenuItem.Text = "Сломанные элементы"; + serviceReportToolStripMenuItem.Click += ServiceReportToolStripMenuItem_Click; + // // FormPassengerTransportation // AutoScaleDimensions = new SizeF(12F, 30F); @@ -155,5 +164,6 @@ private ToolStripMenuItem GoToServicesToolStripMenuItem; private ToolStripMenuItem directoryReportToolStripMenuItem; private ToolStripMenuItem busesReportToolStripMenuItem; + private ToolStripMenuItem serviceReportToolStripMenuItem; } } diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.cs index 586fd54..f2a255b 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.cs @@ -89,7 +89,19 @@ namespace ProjectPassengerTransportation { try { - _container.Resolve().ShowDialog(); + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ServiceReportToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); } catch (Exception ex) { diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormEmployee.Designer.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormEmployee.Designer.cs index 1ffd92b..ba0c474 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormEmployee.Designer.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormEmployee.Designer.cs @@ -126,7 +126,7 @@ Controls.Add(comboBoxPost); Name = "FormEmployee"; StartPosition = FormStartPosition.CenterParent; - Text = "FormEmployee"; + Text = "Сотрудник"; ResumeLayout(false); PerformLayout(); } diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormServiceReport.Designer.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormServiceReport.Designer.cs new file mode 100644 index 0000000..60daf83 --- /dev/null +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormServiceReport.Designer.cs @@ -0,0 +1,107 @@ +namespace ProjectPassengerTransportation.Forms +{ + partial class FormServiceReport + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + buttonSelectFile = new Button(); + labelFileName = new Label(); + dateTimePicker = new DateTimePicker(); + labelDate = new Label(); + buttonMakeReport = new Button(); + SuspendLayout(); + // + // buttonSelectFile + // + buttonSelectFile.Location = new Point(36, 36); + buttonSelectFile.Name = "buttonSelectFile"; + buttonSelectFile.Size = new Size(131, 40); + buttonSelectFile.TabIndex = 0; + buttonSelectFile.Text = "Выбрать"; + buttonSelectFile.UseVisualStyleBackColor = true; + buttonSelectFile.Click += ButtonSelectFile_Click; + // + // labelFileName + // + labelFileName.AutoSize = true; + labelFileName.Location = new Point(195, 41); + labelFileName.Name = "labelFileName"; + labelFileName.Size = new Size(62, 30); + labelFileName.TabIndex = 1; + labelFileName.Text = "Файл"; + // + // dateTimePicker + // + dateTimePicker.Location = new Point(144, 127); + dateTimePicker.Name = "dateTimePicker"; + dateTimePicker.Size = new Size(311, 35); + dateTimePicker.TabIndex = 2; + // + // labelDate + // + labelDate.AutoSize = true; + labelDate.Location = new Point(49, 131); + labelDate.Name = "labelDate"; + labelDate.Size = new Size(64, 30); + labelDate.TabIndex = 3; + labelDate.Text = "Дата:"; + // + // buttonMakeReport + // + buttonMakeReport.Location = new Point(168, 205); + buttonMakeReport.Name = "buttonMakeReport"; + buttonMakeReport.Size = new Size(178, 46); + buttonMakeReport.TabIndex = 4; + buttonMakeReport.Text = "Сформировать"; + buttonMakeReport.UseVisualStyleBackColor = true; + buttonMakeReport.Click += ButtonMakeReport_Click; + // + // FormServiceReport + // + AutoScaleDimensions = new SizeF(12F, 30F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(511, 276); + Controls.Add(buttonMakeReport); + Controls.Add(labelDate); + Controls.Add(dateTimePicker); + Controls.Add(labelFileName); + Controls.Add(buttonSelectFile); + Name = "FormServiceReport"; + Text = "Отчет по тех обслуживанию"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Button buttonSelectFile; + private Label labelFileName; + private DateTimePicker dateTimePicker; + private Label labelDate; + private Button buttonMakeReport; + } +} \ No newline at end of file diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormServiceReport.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormServiceReport.cs new file mode 100644 index 0000000..7a0e2fe --- /dev/null +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormServiceReport.cs @@ -0,0 +1,60 @@ +using ProjectPassengerTransportation.Reports; +using Unity; + +namespace ProjectPassengerTransportation.Forms +{ + public partial class FormServiceReport : Form + { + private string _fileName = string.Empty; + + private readonly IUnityContainer _container; + + public FormServiceReport(IUnityContainer container) + { + InitializeComponent(); + _container = container ?? throw new ArgumentNullException(nameof(container)); + } + + private void ButtonSelectFile_Click(object sender, EventArgs e) + { + var sfd = new SaveFileDialog() + { + Filter = "Pdf Files | *.pdf" + }; + + if (sfd.ShowDialog() == DialogResult.OK) + { + _fileName = sfd.FileName; + labelFileName.Text = Path.GetFileName(_fileName); + } + } + + private void ButtonMakeReport_Click(object sender, EventArgs e) + { + try + { + if (string.IsNullOrWhiteSpace(_fileName)) + { + throw new Exception("Отсутствует имя файла отчета"); + } + + if + (_container.Resolve().CreateChart(_fileName, dateTimePicker.Value)) + { + MessageBox.Show("Документ сформирован", "Формирование документа", + MessageBoxButtons.OK, MessageBoxIcon.Information); + } + else + { + MessageBox.Show("Возникли ошибки при формировании документа.Подробности в логах", + "Формирование документа", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка при создании очета", + MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } +} diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBusesReport.resx b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormServiceReport.resx similarity index 100% rename from ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBusesReport.resx rename to ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormServiceReport.resx diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBusesReport.Designer.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormWorkReport.Designer.cs similarity index 65% rename from ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBusesReport.Designer.cs rename to ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormWorkReport.Designer.cs index a73db63..0b099ba 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBusesReport.Designer.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormWorkReport.Designer.cs @@ -1,6 +1,6 @@ namespace ProjectPassengerTransportation.Forms { - partial class FormBusesReport + partial class FormWorkReport { /// /// Required designer variable. @@ -31,13 +31,15 @@ labelFilePath = new Label(); textBoxFilePath = new TextBox(); buttonSelectFilePath = new Button(); - comboBoxShift = new ComboBox(); dateTimePickerBeginDate = new DateTimePicker(); dateTimePickerEndDate = new DateTimePicker(); - labelShift = new Label(); + labelEmployee = new Label(); labelBeginDate = new Label(); labelEndDate = new Label(); buttonMakeReport = new Button(); + comboBoxEmployee = new ComboBox(); + comboBoxBus = new ComboBox(); + labelBus = new Label(); SuspendLayout(); // // labelFilePath @@ -54,12 +56,12 @@ textBoxFilePath.Location = new Point(203, 37); textBoxFilePath.Name = "textBoxFilePath"; textBoxFilePath.ReadOnly = true; - textBoxFilePath.Size = new Size(284, 35); + textBoxFilePath.Size = new Size(361, 35); textBoxFilePath.TabIndex = 1; // // buttonSelectFilePath // - buttonSelectFilePath.Location = new Point(493, 35); + buttonSelectFilePath.Location = new Point(570, 32); buttonSelectFilePath.Name = "buttonSelectFilePath"; buttonSelectFilePath.Size = new Size(40, 40); buttonSelectFilePath.TabIndex = 2; @@ -67,41 +69,33 @@ buttonSelectFilePath.UseVisualStyleBackColor = true; buttonSelectFilePath.Click += ButtonSelectFilePath_Click; // - // comboBoxShift - // - comboBoxShift.FormattingEnabled = true; - comboBoxShift.Location = new Point(203, 114); - comboBoxShift.Name = "comboBoxShift"; - comboBoxShift.Size = new Size(330, 38); - comboBoxShift.TabIndex = 3; - // // dateTimePickerBeginDate // - dateTimePickerBeginDate.Location = new Point(203, 190); + dateTimePickerBeginDate.Location = new Point(203, 271); dateTimePickerBeginDate.Name = "dateTimePickerBeginDate"; - dateTimePickerBeginDate.Size = new Size(330, 35); + dateTimePickerBeginDate.Size = new Size(407, 35); dateTimePickerBeginDate.TabIndex = 4; // // dateTimePickerEndDate // - dateTimePickerEndDate.Location = new Point(203, 262); + dateTimePickerEndDate.Location = new Point(203, 343); dateTimePickerEndDate.Name = "dateTimePickerEndDate"; - dateTimePickerEndDate.Size = new Size(330, 35); + dateTimePickerEndDate.Size = new Size(407, 35); dateTimePickerEndDate.TabIndex = 5; // - // labelShift + // labelEmployee // - labelShift.AutoSize = true; - labelShift.Location = new Point(23, 117); - labelShift.Name = "labelShift"; - labelShift.Size = new Size(75, 30); - labelShift.TabIndex = 6; - labelShift.Text = "Смена"; + labelEmployee.AutoSize = true; + labelEmployee.Location = new Point(23, 117); + labelEmployee.Name = "labelEmployee"; + labelEmployee.Size = new Size(103, 30); + labelEmployee.TabIndex = 6; + labelEmployee.Text = "Работник"; // // labelBeginDate // labelBeginDate.AutoSize = true; - labelBeginDate.Location = new Point(23, 194); + labelBeginDate.Location = new Point(23, 275); labelBeginDate.Name = "labelBeginDate"; labelBeginDate.Size = new Size(133, 30); labelBeginDate.TabIndex = 7; @@ -110,7 +104,7 @@ // labelEndDate // labelEndDate.AutoSize = true; - labelEndDate.Location = new Point(23, 266); + labelEndDate.Location = new Point(23, 347); labelEndDate.Name = "labelEndDate"; labelEndDate.Size = new Size(123, 30); labelEndDate.TabIndex = 8; @@ -118,7 +112,7 @@ // // buttonMakeReport // - buttonMakeReport.Location = new Point(203, 329); + buttonMakeReport.Location = new Point(203, 410); buttonMakeReport.Name = "buttonMakeReport"; buttonMakeReport.Size = new Size(177, 40); buttonMakeReport.TabIndex = 9; @@ -126,23 +120,50 @@ buttonMakeReport.UseVisualStyleBackColor = true; buttonMakeReport.Click += ButtonMakeReport_Click; // - // FormBusesReport + // comboBoxEmployee + // + comboBoxEmployee.FormattingEnabled = true; + comboBoxEmployee.Location = new Point(203, 114); + comboBoxEmployee.Name = "comboBoxEmployee"; + comboBoxEmployee.Size = new Size(407, 38); + comboBoxEmployee.TabIndex = 10; + // + // comboBoxBus + // + comboBoxBus.FormattingEnabled = true; + comboBoxBus.Location = new Point(203, 191); + comboBoxBus.Name = "comboBoxBus"; + comboBoxBus.Size = new Size(407, 38); + comboBoxBus.TabIndex = 12; + // + // labelBus + // + labelBus.AutoSize = true; + labelBus.Location = new Point(23, 194); + labelBus.Name = "labelBus"; + labelBus.Size = new Size(91, 30); + labelBus.TabIndex = 11; + labelBus.Text = "Автобус"; + // + // FormWorkReport // AutoScaleDimensions = new SizeF(12F, 30F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(576, 393); + ClientSize = new Size(646, 466); + Controls.Add(comboBoxBus); + Controls.Add(labelBus); + Controls.Add(comboBoxEmployee); Controls.Add(buttonMakeReport); Controls.Add(labelEndDate); Controls.Add(labelBeginDate); - Controls.Add(labelShift); + Controls.Add(labelEmployee); Controls.Add(dateTimePickerEndDate); Controls.Add(dateTimePickerBeginDate); - Controls.Add(comboBoxShift); Controls.Add(buttonSelectFilePath); Controls.Add(textBoxFilePath); Controls.Add(labelFilePath); - Name = "FormBusesReport"; - Text = "Отчёт по работе автобусов"; + Name = "FormWorkReport"; + Text = "Отчёт по работе сотрудников и автобусов"; ResumeLayout(false); PerformLayout(); } @@ -152,12 +173,14 @@ private Label labelFilePath; private TextBox textBoxFilePath; private Button buttonSelectFilePath; - private ComboBox comboBoxShift; private DateTimePicker dateTimePickerBeginDate; private DateTimePicker dateTimePickerEndDate; - private Label labelShift; + private Label labelEmployee; private Label labelBeginDate; private Label labelEndDate; private Button buttonMakeReport; + private ComboBox comboBoxEmployee; + private ComboBox comboBoxBus; + private Label labelBus; } } \ No newline at end of file diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBusesReport.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormWorkReport.cs similarity index 71% rename from ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBusesReport.cs rename to ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormWorkReport.cs index 3ca6340..1b1d583 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBusesReport.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormWorkReport.cs @@ -4,17 +4,21 @@ using Unity; namespace ProjectPassengerTransportation.Forms { - public partial class FormBusesReport : Form + public partial class FormWorkReport : Form { private readonly IUnityContainer _container; - public FormBusesReport(IUnityContainer container, IStartingShiftRepository startingShiftRepository) + public FormWorkReport(IUnityContainer container, IEmployeeRepository employeeRepository, + IBusRepository busRepository) { InitializeComponent(); _container = container ?? throw new ArgumentNullException(nameof(container)); - comboBoxShift.DataSource = startingShiftRepository.ReadShifts(); - comboBoxShift.DisplayMember = "Id"; - comboBoxShift.ValueMember = "Id"; + comboBoxEmployee.DataSource = employeeRepository.ReadEmployees(); + comboBoxEmployee.DisplayMember = "First_name"; + comboBoxEmployee.ValueMember = "Id"; + comboBoxBus.DataSource = busRepository.ReadBuses(); + comboBoxBus.DisplayMember = "Licence_plate"; + comboBoxBus.ValueMember = "Id"; } private void ButtonSelectFilePath_Click(object sender, EventArgs e) @@ -38,16 +42,17 @@ namespace ProjectPassengerTransportation.Forms { throw new Exception("Отсутствует имя файла для отчета"); } - if (comboBoxShift.SelectedIndex < 0) + if (comboBoxEmployee.SelectedIndex < 0 || comboBoxBus.SelectedIndex < 0) { - throw new Exception("Не выбран корм"); + throw new Exception("Не выбран сотрудник или автобус"); } if (dateTimePickerEndDate.Value <= dateTimePickerBeginDate.Value) { throw new Exception("Дата начала должна быть раньше даты окончания"); } if (_container.Resolve().CreateTable(textBoxFilePath.Text, - (int)comboBoxShift.SelectedValue!, dateTimePickerBeginDate.Value, dateTimePickerEndDate.Value)) + (int)comboBoxEmployee.SelectedValue!, (int)comboBoxBus.SelectedValue!, + dateTimePickerBeginDate.Value, dateTimePickerEndDate.Value)) { MessageBox.Show("Документ сформирован", "Формирование документа", MessageBoxButtons.OK, MessageBoxIcon.Information); diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormWorkReport.resx b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormWorkReport.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormWorkReport.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/ProjectPassengerTransportation.csproj b/ProjectPassengerTransportation/ProjectPassengerTransportation/ProjectPassengerTransportation.csproj index c9d4296..1b6a66e 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/ProjectPassengerTransportation.csproj +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/ProjectPassengerTransportation.csproj @@ -16,6 +16,7 @@ + diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/ChartReport.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/ChartReport.cs new file mode 100644 index 0000000..597bd58 --- /dev/null +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/ChartReport.cs @@ -0,0 +1,48 @@ +using Microsoft.Extensions.Logging; +using ProjectPassengerTransportation.Repositories; + +namespace ProjectPassengerTransportation.Reports; + +public class ChartReport +{ + private readonly IGoToServiceRepository _goToServiceRepository; + + private readonly ILogger _logger; + + public ChartReport(IGoToServiceRepository goToServiceRepository, ILogger logger) + { + _goToServiceRepository = goToServiceRepository ?? throw new ArgumentNullException(nameof(goToServiceRepository)); + _logger = logger ?? throw new ArgumentNullException(nameof(logger)); + } + + public bool CreateChart(string filePath, DateTime dateTime) + { + try + { + new PdfBuilder(filePath) + .AddHeader("Тех обслуживание") + .AddPieChart("Количество неисправных элементов", GetData(dateTime)) + .Build(); + + return true; + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка при формировании документа"); + return false; + } + } + + private List<(string Caption, double Value)> GetData(DateTime dateTime) + { + return _goToServiceRepository + .ReadServices() + .Where(x => x.Date.Date == dateTime.Date) + .GroupBy(x => x.Bus_id, (key, group) => new { + Id = key, + Elements = group.Sum(x => (double)x.Broken_elements) + }) + .Select(x => (x.Id.ToString(), (double)x.Elements)) + .ToList(); + } +} diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/ExcelBuilder.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/ExcelBuilder.cs index d987015..a4a134c 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/ExcelBuilder.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/ExcelBuilder.cs @@ -153,7 +153,17 @@ public class ExcelBuilder FontFamilyNumbering = new FontFamilyNumbering() { Val = 2 }, FontScheme = new FontScheme() { Val = new EnumValue(FontSchemeValues.Minor) } }); - // TODO добавить шрифт с жирным + fonts.Append(new DocumentFormat.OpenXml.Spreadsheet.Font + { + FontSize = new FontSize() { Val = 11 }, + FontName = new FontName() { Val = "Calibri" }, + FontFamilyNumbering = new FontFamilyNumbering() { Val = 2 }, + FontScheme = new FontScheme() + { + Val = new EnumValue(FontSchemeValues.Minor) + }, + Bold = new Bold() { Val = true } + }); workbookStylesPart.Stylesheet.Append(fonts); // Default Fill @@ -177,7 +187,14 @@ public class ExcelBuilder BottomBorder = new BottomBorder(), DiagonalBorder = new DiagonalBorder() }); - // TODO добавить настройку с границами + borders.Append(new Border + { + LeftBorder = new LeftBorder() { Style = BorderStyleValues.Thin }, + RightBorder = new RightBorder() { Style = BorderStyleValues.Thin }, + TopBorder = new TopBorder() { Style = BorderStyleValues.Thin }, + BottomBorder = new BottomBorder() { Style = BorderStyleValues.Thin }, + DiagonalBorder = new DiagonalBorder() + }); workbookStylesPart.Stylesheet.Append(borders); // Default cell format and a date cell format @@ -196,14 +213,57 @@ public class ExcelBuilder WrapText = true } }); - // TODO дополнить форматы + cellFormats.Append(new CellFormat + { + NumberFormatId = 0, + FormatId = 0, + FontId = 0, + BorderId = 1, + FillId = 0, + Alignment = new Alignment() + { + Horizontal = HorizontalAlignmentValues.Right, + Vertical = VerticalAlignmentValues.Center, + WrapText = true + } + }); + cellFormats.Append(new CellFormat + { + NumberFormatId = 0, + FormatId = 0, + FontId = 1, + BorderId = 0, + FillId = 0, + Alignment = new Alignment() + { + Horizontal = HorizontalAlignmentValues.Center, + Vertical = VerticalAlignmentValues.Center, + WrapText = true + } + }); + cellFormats.Append(new CellFormat + { + NumberFormatId = 0, + FormatId = 0, + FontId = 1, + BorderId = 1, + FillId = 0, + Alignment = new Alignment() + { + Horizontal = HorizontalAlignmentValues.Center, + Vertical = VerticalAlignmentValues.Center, + WrapText = true + } + }); workbookStylesPart.Stylesheet.Append(cellFormats); } private enum StyleIndex { SimpleTextWithoutBorder = 0, - // TODO дополнить стили + SimpleTextWithBorder = 1, + BoldTextWithoutBorder = 2, + BoldTextWithBorder = 3 } private void CreateCell(int columnIndex, uint rowIndex, string text, StyleIndex styleIndex) diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/PdfBuilder.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/PdfBuilder.cs new file mode 100644 index 0000000..7c65245 --- /dev/null +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/PdfBuilder.cs @@ -0,0 +1,92 @@ +using MigraDoc.DocumentObjectModel; +using MigraDoc.DocumentObjectModel.Shapes.Charts; +using MigraDoc.Rendering; +using System.Text; + +namespace ProjectPassengerTransportation.Reports; + +public class PdfBuilder +{ + private readonly string _filePath; + + private readonly Document _document; + + public PdfBuilder(string filePath) + { + if (string.IsNullOrWhiteSpace(filePath)) + { + throw new ArgumentNullException(nameof(filePath)); + } + + if (File.Exists(filePath)) + { + File.Delete(filePath); + } + + _filePath = filePath; + _document = new Document(); + DefineStyles(); + } + + public PdfBuilder AddHeader(string header) + { + _document.AddSection().AddParagraph(header, "NormalBold"); + return this; + } + + public PdfBuilder AddPieChart(string title, List<(string Caption, double Value)> data) + { + if (data == null || data.Count == 0) + { + return this; + } + + var chart = new Chart(ChartType.Pie2D); + var series = chart.SeriesCollection.AddSeries(); + series.Add(data.Select(x => x.Value).ToArray()); + + var xseries = chart.XValues.AddXSeries(); + xseries.Add(data.Select(x => x.Caption).ToArray()); + + chart.DataLabel.Type = DataLabelType.Percent; + chart.DataLabel.Position = DataLabelPosition.OutsideEnd; + + chart.Width = Unit.FromCentimeter(16); + chart.Height = Unit.FromCentimeter(12); + + chart.TopArea.AddParagraph(title); + + chart.XAxis.MajorTickMark = TickMarkType.Outside; + + chart.YAxis.MajorTickMark = TickMarkType.Outside; + chart.YAxis.HasMajorGridlines = true; + + chart.PlotArea.LineFormat.Width = 1; + chart.PlotArea.LineFormat.Visible = true; + + chart.TopArea.AddLegend(); + + _document.LastSection.Add(chart); + + return this; + } + + public void Build() + { + Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); + var renderer = new PdfDocumentRenderer(true) + { + Document = _document + }; + + renderer.RenderDocument(); + renderer.PdfDocument.Save(_filePath); + } + + private void DefineStyles() + { + var headerStyle = _document.Styles.AddStyle("NormalBold", "Normal"); + headerStyle.Font.Bold = true; + headerStyle.Font.Size = 14; + } +} diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/TableReport.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/TableReport.cs index a32c800..458b474 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/TableReport.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/TableReport.cs @@ -1,5 +1,6 @@ using Microsoft.Extensions.Logging; using ProjectPassengerTransportation.Repositories; +using System.Linq; namespace ProjectPassengerTransportation.Reports; @@ -11,7 +12,7 @@ public class TableReport private readonly ILogger _logger; - internal static readonly string[] item = ["Автобус", "Дата", "Отработано часов", "Потрачено на тех обслуживание"]; + internal static readonly string[] item = ["Работник", "Автобус", "Дата", "Отработано часов", "Потрачено на тех обслуживание"]; public TableReport(IStartingShiftRepository startingShiftRepository, IGoToServiceRepository goToServiceRepository, ILogger logger) @@ -21,14 +22,14 @@ public class TableReport _logger = logger ?? throw new ArgumentNullException(nameof(logger)); } - public bool CreateTable(string filePath, int startingShiftId, DateTime startDate, DateTime endDate) + public bool CreateTable(string filePath, int employeeId, int busId, DateTime startDate, DateTime endDate) { try { - new ExcelBuilder(filePath) - .AddHeader("Сводка по работе автобусов", 0, 4) + new ExcelBuilder(filePath) + .AddHeader("Сводка по работникам и автобусам", 0, 5) .AddParagraph("за период", 0) - .AddTable([10, 10, 15, 15], GetData(startingShiftId, startDate, endDate)) + .AddTable([10, 10, 10, 15, 15], GetData(employeeId, busId, startDate, endDate)) .Build(); return true; } @@ -39,23 +40,24 @@ public class TableReport } } - private List GetData(int startingShiftId, DateTime startDate, DateTime endDate) + private List GetData(int employeeId, int busId, DateTime startDate, DateTime endDate) { - int busId = 0; var data = _startingShiftRepository .ReadShifts() - .Where(x => x.Date >= startDate && x.Date <= endDate && x.Starting_shift_employees.Any(y => y.Starting_shift_id == startingShiftId)) + .Where(x => x.Date >= startDate && x.Date <= endDate && x.Starting_shift_employees.Any(y => y.Employee_id == employeeId)) .Select(x => new { - busId = x.Bus_id, + EmployeeId = (int?)employeeId, + BusId = (int?)null, x.Date, - WorkHours = x.Starting_shift_employees.FirstOrDefault(y => y.Starting_shift_id == startingShiftId)?.Work_time, + WorkHours = x.Starting_shift_employees.FirstOrDefault(y => y.Employee_id == employeeId)?.Work_time, Price = (int?)null }) .Union(_goToServiceRepository .ReadServices() .Where(x => x.Date >= startDate && x.Date <= endDate && x.Bus_id == busId) .Select(x => new { - busId = x.Bus_id, + EmployeeId = (int?)null, + BusId = (int?)busId, x.Date, WorkHours = (int?)null, Price = (int?)x.Price @@ -64,11 +66,12 @@ public class TableReport return new List() { item } .Union(data .Select(x => new string[] { - x.busId.ToString(), + x.EmployeeId.ToString() ?? string.Empty, + x.BusId.ToString() ?? string.Empty, x.Date.ToString(), x.WorkHours?.ToString() ?? string.Empty, x.Price?.ToString() ?? string.Empty})) - .Union([["Всего", "", data.Sum(x => x.WorkHours ?? 0).ToString(), data.Sum(x => x.Price ?? 0).ToString()]]) + .Union([["Всего", "", "", data.Sum(x => x.WorkHours ?? 0).ToString(), data.Sum(x => x.Price ?? 0).ToString()]]) .ToList(); } } diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/WordBuilder.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/WordBuilder.cs index 145a7cd..4d63a4c 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/WordBuilder.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/WordBuilder.cs @@ -32,7 +32,10 @@ public class WordBuilder { var paragraph = _body.AppendChild(new Paragraph()); var run = paragraph.AppendChild(new Run()); - // TODO прописать настройки под жирный текст + + var runProperties = run.AppendChild(new RunProperties()); + runProperties.AppendChild(new Bold()); + run.AppendChild(new Text(header)); return this; diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Repositories/Implementations/StartingShiftRepository.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Repositories/Implementations/StartingShiftRepository.cs index 7a54cdb..fce1e82 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/Repositories/Implementations/StartingShiftRepository.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Repositories/Implementations/StartingShiftRepository.cs @@ -57,12 +57,12 @@ VALUES (@Starting_shift_id, @Employee_id, @Work_time)"; { using var connection = new NpgsqlConnection(_connectionString.ConnectionString); var querySelect = @" -SELECT ss.*, sse.employee_id, sse.work_time FROM starting_shift ss +SELECT sse.starting_shift_id, ss.date, ss.route_list_id, ss.bus_id, sse.employee_id, sse.work_time FROM starting_shift ss INNER JOIN starting_shift_employee sse ON sse.starting_shift_id = ss.id"; var startingShifts = connection.Query(querySelect); _logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(startingShifts)); return startingShifts.GroupBy(x => x.Starting_shift_id, y => y, - (key, value) => StartingShift.CreateOperation(value.First(), + (key, value) => StartingShift.CreateOperation(value.First(), value.Select(z => StartingShiftEmployee.CreateElement(0, z.Employee_id, z.Work_time)))).ToList(); } catch (Exception ex) -- 2.25.1 From 842a3426da64360f6e8dbc2659bf9f9f61b1d55b Mon Sep 17 00:00:00 2001 From: sheymuh Date: Wed, 18 Dec 2024 12:40:20 +0400 Subject: [PATCH 3/5] =?UTF-8?q?=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 2977950..e931806 100644 --- a/.gitignore +++ b/.gitignore @@ -407,3 +407,6 @@ FodyWeavers.xsd /docBuses1.docx /excel1.xlsx /pdf1.pdf +*.docx +*.xlsx +*.pdf -- 2.25.1 From 9c10c71b34dcfad96f800b1edf55488a0be50bd5 Mon Sep 17 00:00:00 2001 From: sheymuh Date: Wed, 18 Dec 2024 12:40:37 +0400 Subject: [PATCH 4/5] =?UTF-8?q?Revert=20"=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D1=88=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 842a3426da64360f6e8dbc2659bf9f9f61b1d55b. --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index e931806..2977950 100644 --- a/.gitignore +++ b/.gitignore @@ -407,6 +407,3 @@ FodyWeavers.xsd /docBuses1.docx /excel1.xlsx /pdf1.pdf -*.docx -*.xlsx -*.pdf -- 2.25.1 From 8e37dd9918d37e5dc67d02e890f37ff87fdf4735 Mon Sep 17 00:00:00 2001 From: sheymuh Date: Wed, 18 Dec 2024 12:41:18 +0400 Subject: [PATCH 5/5] =?UTF-8?q?=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +++ .../FormPassengerTransportation.Designer.cs | 8 ++++---- .../Reports/ExcelBuilder.cs | 8 ++++---- .../ProjectPassengerTransportation/Reports/TableReport.cs | 1 - 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 2977950..e931806 100644 --- a/.gitignore +++ b/.gitignore @@ -407,3 +407,6 @@ FodyWeavers.xsd /docBuses1.docx /excel1.xlsx /pdf1.pdf +*.docx +*.xlsx +*.pdf diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.Designer.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.Designer.cs index 6d34c46..1c6c4c6 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.Designer.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.Designer.cs @@ -113,7 +113,7 @@ // directoryReportToolStripMenuItem.Name = "directoryReportToolStripMenuItem"; directoryReportToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.W; - directoryReportToolStripMenuItem.Size = new Size(490, 40); + directoryReportToolStripMenuItem.Size = new Size(517, 40); directoryReportToolStripMenuItem.Text = "Документ со справочниками"; directoryReportToolStripMenuItem.Click += DirectoryReportToolStripMenuItem_Click; // @@ -121,15 +121,15 @@ // busesReportToolStripMenuItem.Name = "busesReportToolStripMenuItem"; busesReportToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.E; - busesReportToolStripMenuItem.Size = new Size(490, 40); - busesReportToolStripMenuItem.Text = "Работа автобусов"; + busesReportToolStripMenuItem.Size = new Size(517, 40); + busesReportToolStripMenuItem.Text = "Работа сотрудников и автобусов"; busesReportToolStripMenuItem.Click += BusesReportToolStripMenuItem_Click; // // serviceReportToolStripMenuItem // serviceReportToolStripMenuItem.Name = "serviceReportToolStripMenuItem"; serviceReportToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.P; - serviceReportToolStripMenuItem.Size = new Size(490, 40); + serviceReportToolStripMenuItem.Size = new Size(517, 40); serviceReportToolStripMenuItem.Text = "Сломанные элементы"; serviceReportToolStripMenuItem.Click += ServiceReportToolStripMenuItem_Click; // diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/ExcelBuilder.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/ExcelBuilder.cs index a4a134c..d008dd5 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/ExcelBuilder.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/ExcelBuilder.cs @@ -37,7 +37,7 @@ public class ExcelBuilder public ExcelBuilder AddHeader(string header, int startIndex, int count) { - CreateCell(startIndex, _rowIndex, header, StyleIndex.SimpleTextWithoutBorder); + CreateCell(startIndex, _rowIndex, header, StyleIndex.BoldTextWithoutBorder); for (int i = startIndex + 1; i < startIndex + count; ++i) { CreateCell(i, _rowIndex, "", StyleIndex.SimpleTextWithoutBorder); @@ -88,7 +88,7 @@ public class ExcelBuilder for (var j = 0; j < data.First().Length; ++j) { - CreateCell(j, _rowIndex, data.First()[j], StyleIndex.SimpleTextWithoutBorder); + CreateCell(j, _rowIndex, data.First()[j], StyleIndex.BoldTextWithBorder); } _rowIndex++; @@ -96,7 +96,7 @@ public class ExcelBuilder { for (var j = 0; j < data[i].Length; ++j) { - CreateCell(j, _rowIndex, data[i][j], StyleIndex.SimpleTextWithoutBorder); + CreateCell(j, _rowIndex, data[i][j], StyleIndex.SimpleTextWithBorder); } _rowIndex++; @@ -104,7 +104,7 @@ public class ExcelBuilder for (var j = 0; j < data.Last().Length; ++j) { - CreateCell(j, _rowIndex, data.Last()[j], StyleIndex.SimpleTextWithoutBorder); + CreateCell(j, _rowIndex, data.Last()[j], StyleIndex.BoldTextWithBorder); } _rowIndex++; diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/TableReport.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/TableReport.cs index 458b474..eeb4f76 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/TableReport.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/TableReport.cs @@ -1,6 +1,5 @@ using Microsoft.Extensions.Logging; using ProjectPassengerTransportation.Repositories; -using System.Linq; namespace ProjectPassengerTransportation.Reports; -- 2.25.1