diff --git a/ProjectLibrary/ProjectLibrary/Entities/BookIssue.cs b/ProjectLibrary/ProjectLibrary/Entities/BookIssue.cs index 91344eb..47e5a59 100644 --- a/ProjectLibrary/ProjectLibrary/Entities/BookIssue.cs +++ b/ProjectLibrary/ProjectLibrary/Entities/BookIssue.cs @@ -8,20 +8,19 @@ namespace ProjectLibrary.Entities; public class BookIssue { - public int IssueId { get; private set; } + public int Id { get; private set; } - public string Description { get; private set; } + public string Description { get; private set; } = string.Empty; public int BookId { get;private set; } - public static BookIssue CreateElement(int issueId, string description, int bookId) + public static BookIssue CreateElement(int id, string description, int bookId) { return new BookIssue { - IssueId = issueId, + Id = id, Description = description, BookId = bookId }; } - } diff --git a/ProjectLibrary/ProjectLibrary/Entities/BookRestoration.cs b/ProjectLibrary/ProjectLibrary/Entities/BookRestoration.cs index a75696c..eba90e4 100644 --- a/ProjectLibrary/ProjectLibrary/Entities/BookRestoration.cs +++ b/ProjectLibrary/ProjectLibrary/Entities/BookRestoration.cs @@ -16,14 +16,14 @@ public class BookRestoration public string Description { get; private set; } = string.Empty; - public static BookRestoration CreateOperation(int id, int librarianId, int bookId, string description) + public static BookRestoration CreateOperation(int id, int librarianId, int bookId, DateTime restorationDate, string description) { return new BookRestoration { Id = id, LibrarianId = librarianId, BookId = bookId, - RestorationDate = DateTime.Now, + RestorationDate = restorationDate, Description = description }; } diff --git a/ProjectLibrary/ProjectLibrary/Entities/Issue.cs b/ProjectLibrary/ProjectLibrary/Entities/Issue.cs index 8b749ee..931f89d 100644 --- a/ProjectLibrary/ProjectLibrary/Entities/Issue.cs +++ b/ProjectLibrary/ProjectLibrary/Entities/Issue.cs @@ -22,17 +22,31 @@ public class Issue public IEnumerable BookIssue { get; private set; } = []; - public static Issue CreateOperation(int id, int librarianId, int readerId, IEnumerable bookIssue) + public static Issue CreateOperation(int id, DateTime issueDate, DateTime dueDate, DateTime returnDate, int librarianId, int readerId, IEnumerable bookIssue) { return new Issue { Id = id, - IssueDate = DateTime.Now, - DueDate = DateTime.Now, - ReturnDate = DateTime.Now, + IssueDate = issueDate, + DueDate = dueDate, + ReturnDate = returnDate.Date.AddDays(1), LibrarianId = librarianId, ReaderId = readerId, BookIssue = bookIssue }; } + + public static Issue CreateOperation(TempBookIssue tempBookIssue, IEnumerable bookIssue) + { + return new Issue + { + Id = tempBookIssue.Id, + IssueDate = tempBookIssue.IssueDate, + DueDate = tempBookIssue.DueDate, + ReturnDate = tempBookIssue.ReturnDate, + LibrarianId = tempBookIssue.LibrarianId, + ReaderId = tempBookIssue.ReaderId, + BookIssue = bookIssue + }; + } } diff --git a/ProjectLibrary/ProjectLibrary/Entities/TempBookIssue.cs b/ProjectLibrary/ProjectLibrary/Entities/TempBookIssue.cs new file mode 100644 index 0000000..9e897a5 --- /dev/null +++ b/ProjectLibrary/ProjectLibrary/Entities/TempBookIssue.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLibrary.Entities; + +public class TempBookIssue +{ + public int Id { get; private set; } + + public DateTime IssueDate { get; private set; } + + public DateTime DueDate { get; private set; } + + public DateTime ReturnDate { get; private set; } + + public int LibrarianId { get; private set; } + + public int ReaderId { get; private set; } + + public string Description { get; private set; } = string.Empty; + + public int BookId { get; private set; } +} diff --git a/ProjectLibrary/ProjectLibrary/FormLibrary.Designer.cs b/ProjectLibrary/ProjectLibrary/FormLibrary.Designer.cs index 2faa2d1..4c28f37 100644 --- a/ProjectLibrary/ProjectLibrary/FormLibrary.Designer.cs +++ b/ProjectLibrary/ProjectLibrary/FormLibrary.Designer.cs @@ -37,6 +37,9 @@ IssueToolStripMenuItem = new ToolStripMenuItem(); BookRestorationToolStripMenuItem = new ToolStripMenuItem(); отчетыToolStripMenuItem = new ToolStripMenuItem(); + DirectoryReportToolStripMenuItem = new ToolStripMenuItem(); + BookReportToolStripMenuItem = new ToolStripMenuItem(); + BookDistributionToolStripMenuItem = new ToolStripMenuItem(); menuStrip1.SuspendLayout(); SuspendLayout(); // @@ -59,21 +62,21 @@ // LibrariansToolStripMenuItem // LibrariansToolStripMenuItem.Name = "LibrariansToolStripMenuItem"; - LibrariansToolStripMenuItem.Size = new Size(180, 22); + LibrariansToolStripMenuItem.Size = new Size(153, 22); LibrariansToolStripMenuItem.Text = "Библиотекари"; LibrariansToolStripMenuItem.Click += LibrariansToolStripMenuItem_Click; // // BooksToolStripMenuItem // BooksToolStripMenuItem.Name = "BooksToolStripMenuItem"; - BooksToolStripMenuItem.Size = new Size(180, 22); + BooksToolStripMenuItem.Size = new Size(153, 22); BooksToolStripMenuItem.Text = "Книги"; BooksToolStripMenuItem.Click += BooksToolStripMenuItem_Click; // // ReadersToolStripMenuItem // ReadersToolStripMenuItem.Name = "ReadersToolStripMenuItem"; - ReadersToolStripMenuItem.Size = new Size(180, 22); + ReadersToolStripMenuItem.Size = new Size(153, 22); ReadersToolStripMenuItem.Text = "Читатели"; ReadersToolStripMenuItem.Click += ReadersToolStripMenuItem_Click; // @@ -87,23 +90,48 @@ // IssueToolStripMenuItem // IssueToolStripMenuItem.Name = "IssueToolStripMenuItem"; - IssueToolStripMenuItem.Size = new Size(180, 22); + IssueToolStripMenuItem.Size = new Size(171, 22); IssueToolStripMenuItem.Text = "Выдача книги"; IssueToolStripMenuItem.Click += IssueToolStripMenuItem_Click; // // BookRestorationToolStripMenuItem // BookRestorationToolStripMenuItem.Name = "BookRestorationToolStripMenuItem"; - BookRestorationToolStripMenuItem.Size = new Size(180, 22); + BookRestorationToolStripMenuItem.Size = new Size(171, 22); BookRestorationToolStripMenuItem.Text = "Реставрация книг"; BookRestorationToolStripMenuItem.Click += BookRestorationToolStripMenuItem_Click; // // отчетыToolStripMenuItem // + отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { DirectoryReportToolStripMenuItem, BookReportToolStripMenuItem, BookDistributionToolStripMenuItem }); отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; отчетыToolStripMenuItem.Size = new Size(60, 20); отчетыToolStripMenuItem.Text = "Отчеты"; // + // DirectoryReportToolStripMenuItem + // + DirectoryReportToolStripMenuItem.Name = "DirectoryReportToolStripMenuItem"; + DirectoryReportToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.W; + DirectoryReportToolStripMenuItem.Size = new Size(280, 22); + DirectoryReportToolStripMenuItem.Text = "Документ со справочниками"; + DirectoryReportToolStripMenuItem.Click += DirectoryReportToolStripMenuItem_Click; + // + // BookReportToolStripMenuItem + // + BookReportToolStripMenuItem.Name = "BookReportToolStripMenuItem"; + BookReportToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.E; + BookReportToolStripMenuItem.Size = new Size(280, 22); + BookReportToolStripMenuItem.Text = "Деятельность библиотекаря"; + BookReportToolStripMenuItem.Click += BookMoveToolStripMenuItem_Click; + // + // BookDistributionToolStripMenuItem + // + BookDistributionToolStripMenuItem.Name = "BookDistributionToolStripMenuItem"; + BookDistributionToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.P; + BookDistributionToolStripMenuItem.Size = new Size(280, 22); + BookDistributionToolStripMenuItem.Text = "Распределение книг"; + BookDistributionToolStripMenuItem.Click += BookDistributionToolStripMenuItem_Click; + // // FormLibrary // AutoScaleDimensions = new SizeF(7F, 15F); @@ -133,5 +161,8 @@ private ToolStripMenuItem IssueToolStripMenuItem; private ToolStripMenuItem отчетыToolStripMenuItem; private ToolStripMenuItem BookRestorationToolStripMenuItem; + private ToolStripMenuItem DirectoryReportToolStripMenuItem; + private ToolStripMenuItem BookReportToolStripMenuItem; + private ToolStripMenuItem BookDistributionToolStripMenuItem; } } diff --git a/ProjectLibrary/ProjectLibrary/FormLibrary.cs b/ProjectLibrary/ProjectLibrary/FormLibrary.cs index 8fd3847..f99f64a 100644 --- a/ProjectLibrary/ProjectLibrary/FormLibrary.cs +++ b/ProjectLibrary/ProjectLibrary/FormLibrary.cs @@ -78,5 +78,44 @@ namespace ProjectLibrary 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 BookMoveToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", + MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void BookDistributionToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", + MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } } } diff --git a/ProjectLibrary/ProjectLibrary/Forms/FormBookDistributionReport.Designer.cs b/ProjectLibrary/ProjectLibrary/Forms/FormBookDistributionReport.Designer.cs new file mode 100644 index 0000000..25bc777 --- /dev/null +++ b/ProjectLibrary/ProjectLibrary/Forms/FormBookDistributionReport.Designer.cs @@ -0,0 +1,107 @@ +namespace ProjectLibrary.Forms +{ + partial class FormBookDistributionReport + { + /// + /// 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() + { + buttonSelectFileName = new Button(); + labelFileName = new Label(); + dateTimePicker = new DateTimePicker(); + labelDate = new Label(); + buttonCreate = new Button(); + SuspendLayout(); + // + // buttonSelectFileName + // + buttonSelectFileName.Location = new Point(58, 32); + buttonSelectFileName.Name = "buttonSelectFileName"; + buttonSelectFileName.Size = new Size(75, 23); + buttonSelectFileName.TabIndex = 0; + buttonSelectFileName.Text = "Выбрать"; + buttonSelectFileName.UseVisualStyleBackColor = true; + buttonSelectFileName.Click += ButtonSelectFileName_Click; + // + // labelFileName + // + labelFileName.AutoSize = true; + labelFileName.Location = new Point(162, 36); + labelFileName.Name = "labelFileName"; + labelFileName.Size = new Size(36, 15); + labelFileName.TabIndex = 1; + labelFileName.Text = "Файл"; + // + // dateTimePicker + // + dateTimePicker.Location = new Point(135, 78); + dateTimePicker.Name = "dateTimePicker"; + dateTimePicker.Size = new Size(200, 23); + dateTimePicker.TabIndex = 2; + // + // labelDate + // + labelDate.AutoSize = true; + labelDate.Location = new Point(58, 84); + labelDate.Name = "labelDate"; + labelDate.Size = new Size(32, 15); + labelDate.TabIndex = 3; + labelDate.Text = "Дата"; + // + // buttonCreate + // + buttonCreate.Location = new Point(118, 137); + buttonCreate.Name = "buttonCreate"; + buttonCreate.Size = new Size(109, 23); + buttonCreate.TabIndex = 4; + buttonCreate.Text = "Сформировать"; + buttonCreate.UseVisualStyleBackColor = true; + buttonCreate.Click += ButtonCreate_Click; + // + // FormBookDistributionReport + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(349, 172); + Controls.Add(buttonCreate); + Controls.Add(labelDate); + Controls.Add(dateTimePicker); + Controls.Add(labelFileName); + Controls.Add(buttonSelectFileName); + Name = "FormBookDistributionReport"; + Text = "Распределение книг"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Button buttonSelectFileName; + private Label labelFileName; + private DateTimePicker dateTimePicker; + private Label labelDate; + private Button buttonCreate; + } +} \ No newline at end of file diff --git a/ProjectLibrary/ProjectLibrary/Forms/FormBookDistributionReport.cs b/ProjectLibrary/ProjectLibrary/Forms/FormBookDistributionReport.cs new file mode 100644 index 0000000..5dab689 --- /dev/null +++ b/ProjectLibrary/ProjectLibrary/Forms/FormBookDistributionReport.cs @@ -0,0 +1,70 @@ +using ProjectLibrary.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 ProjectLibrary.Forms +{ + public partial class FormBookDistributionReport : Form + { + + private string _fileName = string.Empty; + private readonly IUnityContainer _container; + + public FormBookDistributionReport(IUnityContainer container) + { + InitializeComponent(); + _container = container ?? throw new ArgumentNullException(nameof(container)); + } + + private void ButtonSelectFileName_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 ButtonCreate_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/ProjectLibrary/ProjectLibrary/Forms/FormBookDistributionReport.resx b/ProjectLibrary/ProjectLibrary/Forms/FormBookDistributionReport.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectLibrary/ProjectLibrary/Forms/FormBookDistributionReport.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/ProjectLibrary/ProjectLibrary/Forms/FormBookRestoration.Designer.cs b/ProjectLibrary/ProjectLibrary/Forms/FormBookRestoration.Designer.cs index 93bc6dd..5eb04fb 100644 --- a/ProjectLibrary/ProjectLibrary/Forms/FormBookRestoration.Designer.cs +++ b/ProjectLibrary/ProjectLibrary/Forms/FormBookRestoration.Designer.cs @@ -127,7 +127,7 @@ Controls.Add(buttonCancel); Controls.Add(buttonSave); Name = "FormBookRestoration"; - Text = "FormBookRestoration"; + Text = "Реставрация книги"; ResumeLayout(false); PerformLayout(); } diff --git a/ProjectLibrary/ProjectLibrary/Forms/FormBookRestoration.cs b/ProjectLibrary/ProjectLibrary/Forms/FormBookRestoration.cs index 7ebd068..908d79b 100644 --- a/ProjectLibrary/ProjectLibrary/Forms/FormBookRestoration.cs +++ b/ProjectLibrary/ProjectLibrary/Forms/FormBookRestoration.cs @@ -18,8 +18,6 @@ namespace ProjectLibrary.Forms { private readonly IBookRestorationRepository _bookRestorationRepository; - - public FormBookRestoration(IBookRestorationRepository bookRestorationRepository, IBookRepository bookRepository, ILibrarianRepository librarianRepository) { InitializeComponent(); @@ -40,7 +38,7 @@ namespace ProjectLibrary.Forms { throw new Exception("Имеются незаполненные поля"); } - _bookRestorationRepository.CreateBookRestoration(BookRestoration.CreateOperation(Convert.ToInt32(0),(int)comboBoxSelectLibrarian.SelectedValue!, (int)comboBoxSelectBook.SelectedValue!, textBoxDescription.Text)); + _bookRestorationRepository.CreateBookRestoration(BookRestoration.CreateOperation(Convert.ToInt32(0),(int)comboBoxSelectLibrarian.SelectedValue!, (int)comboBoxSelectBook.SelectedValue!, DateTime.Now, textBoxDescription.Text)); Close(); } catch (Exception ex) diff --git a/ProjectLibrary/ProjectLibrary/Forms/FormBookRestorations.Designer.cs b/ProjectLibrary/ProjectLibrary/Forms/FormBookRestorations.Designer.cs index 555db07..5458e24 100644 --- a/ProjectLibrary/ProjectLibrary/Forms/FormBookRestorations.Designer.cs +++ b/ProjectLibrary/ProjectLibrary/Forms/FormBookRestorations.Designer.cs @@ -30,8 +30,8 @@ { dataGridView = new DataGridView(); panel1 = new Panel(); - buttonAdd = new Button(); ButtonDel = new Button(); + buttonAdd = new Button(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); panel1.SuspendLayout(); SuspendLayout(); @@ -64,17 +64,6 @@ panel1.Size = new Size(144, 450); panel1.TabIndex = 2; // - // buttonAdd - // - buttonAdd.BackgroundImage = Properties.Resources.plus; - buttonAdd.BackgroundImageLayout = ImageLayout.Stretch; - buttonAdd.Location = new Point(33, 36); - buttonAdd.Name = "buttonAdd"; - buttonAdd.Size = new Size(75, 63); - buttonAdd.TabIndex = 0; - buttonAdd.UseVisualStyleBackColor = true; - buttonAdd.Click += ButtonAdd_Click; - // // ButtonDel // ButtonDel.BackgroundImage = Properties.Resources.minus; @@ -86,6 +75,17 @@ ButtonDel.UseVisualStyleBackColor = true; ButtonDel.Click += ButtonDel_Click; // + // buttonAdd + // + buttonAdd.BackgroundImage = Properties.Resources.plus; + buttonAdd.BackgroundImageLayout = ImageLayout.Stretch; + buttonAdd.Location = new Point(33, 36); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(75, 63); + buttonAdd.TabIndex = 0; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // // FormBookRestorations // AutoScaleDimensions = new SizeF(7F, 15F); @@ -94,7 +94,7 @@ Controls.Add(dataGridView); Controls.Add(panel1); Name = "FormBookRestorations"; - Text = "FormBookRestorations"; + Text = "Реставрации книг"; Load += FormBookRestorations_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); panel1.ResumeLayout(false); diff --git a/ProjectLibrary/ProjectLibrary/Forms/FormDirectoryReport.Designer.cs b/ProjectLibrary/ProjectLibrary/Forms/FormDirectoryReport.Designer.cs new file mode 100644 index 0000000..cbcb479 --- /dev/null +++ b/ProjectLibrary/ProjectLibrary/Forms/FormDirectoryReport.Designer.cs @@ -0,0 +1,99 @@ +namespace ProjectLibrary.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() + { + checkBoxLibrarians = new CheckBox(); + checkBoxReaders = new CheckBox(); + checkBoxBooks = new CheckBox(); + buttonBuild = new Button(); + SuspendLayout(); + // + // checkBoxLibrarians + // + checkBoxLibrarians.AutoSize = true; + checkBoxLibrarians.Location = new Point(31, 29); + checkBoxLibrarians.Name = "checkBoxLibrarians"; + checkBoxLibrarians.Size = new Size(105, 19); + checkBoxLibrarians.TabIndex = 0; + checkBoxLibrarians.Text = "Библиотекари"; + checkBoxLibrarians.UseVisualStyleBackColor = true; + // + // checkBoxReaders + // + checkBoxReaders.AutoSize = true; + checkBoxReaders.Location = new Point(31, 115); + checkBoxReaders.Name = "checkBoxReaders"; + checkBoxReaders.Size = new Size(77, 19); + checkBoxReaders.TabIndex = 1; + checkBoxReaders.Text = "Читатели"; + checkBoxReaders.UseVisualStyleBackColor = true; + // + // checkBoxBooks + // + checkBoxBooks.AutoSize = true; + checkBoxBooks.Location = new Point(31, 72); + checkBoxBooks.Name = "checkBoxBooks"; + checkBoxBooks.Size = new Size(59, 19); + checkBoxBooks.TabIndex = 2; + checkBoxBooks.Text = "Книги"; + checkBoxBooks.UseVisualStyleBackColor = true; + // + // buttonBuild + // + buttonBuild.Location = new Point(173, 72); + buttonBuild.Name = "buttonBuild"; + buttonBuild.Size = new Size(104, 23); + buttonBuild.TabIndex = 3; + buttonBuild.Text = "Сформировать"; + buttonBuild.UseVisualStyleBackColor = true; + buttonBuild.Click += ButtonBuild_Click; + // + // FormDirectoryReport + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(311, 155); + Controls.Add(buttonBuild); + Controls.Add(checkBoxBooks); + Controls.Add(checkBoxReaders); + Controls.Add(checkBoxLibrarians); + Name = "FormDirectoryReport"; + Text = "Отчет со справочниками"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private CheckBox checkBoxLibrarians; + private CheckBox checkBoxReaders; + private CheckBox checkBoxBooks; + private Button buttonBuild; + } +} \ No newline at end of file diff --git a/ProjectLibrary/ProjectLibrary/Forms/FormDirectoryReport.cs b/ProjectLibrary/ProjectLibrary/Forms/FormDirectoryReport.cs new file mode 100644 index 0000000..0b78bdc --- /dev/null +++ b/ProjectLibrary/ProjectLibrary/Forms/FormDirectoryReport.cs @@ -0,0 +1,65 @@ +using ProjectLibrary.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 ProjectLibrary.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 (!checkBoxLibrarians.Checked && + !checkBoxBooks.Checked && !checkBoxReaders.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, checkBoxLibrarians.Checked, checkBoxBooks.Checked, checkBoxReaders.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/ProjectLibrary/ProjectLibrary/Forms/FormDirectoryReport.resx b/ProjectLibrary/ProjectLibrary/Forms/FormDirectoryReport.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectLibrary/ProjectLibrary/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/ProjectLibrary/ProjectLibrary/Forms/FormIssue.cs b/ProjectLibrary/ProjectLibrary/Forms/FormIssue.cs index 431037f..6e3c74d 100644 --- a/ProjectLibrary/ProjectLibrary/Forms/FormIssue.cs +++ b/ProjectLibrary/ProjectLibrary/Forms/FormIssue.cs @@ -41,7 +41,7 @@ namespace ProjectLibrary.Forms { throw new Exception("Имеются незаполненные поля"); } - _issueRepository.CreateIssue(Issue.CreateOperation(Convert.ToInt32(0), (int)comboBoxSelectLibrarian.SelectedValue!, (int)comboBoxSelectReader.SelectedValue!, + _issueRepository.CreateIssue(Issue.CreateOperation(Convert.ToInt32(0), DateTime.Now, DateTime.Now, DateTime.Now,(int)comboBoxSelectLibrarian.SelectedValue!, (int)comboBoxSelectReader.SelectedValue!, CreateListBookIssueFromDataGrid())); Close(); } @@ -54,7 +54,7 @@ namespace ProjectLibrary.Forms private void ButtonCancel_Click(object sender, EventArgs e) => Close(); - private List CreateListBookIssueFromDataGrid() + private List CreateListBookIssueFromDataGrid() { var list = new List(); foreach (DataGridViewRow row in dataGridView.Rows) @@ -63,7 +63,7 @@ namespace ProjectLibrary.Forms { continue; } - list.Add(BookIssue.CreateElement(Convert.ToInt32(comboBoxSelectLibrarian.SelectedValue),string.Empty, + list.Add(BookIssue.CreateElement(0,string.Empty, Convert.ToInt32(row.Cells["ColumnBook"].Value))); } return list; diff --git a/ProjectLibrary/ProjectLibrary/Forms/FormIssues.Designer.cs b/ProjectLibrary/ProjectLibrary/Forms/FormIssues.Designer.cs index 72f146f..8417e53 100644 --- a/ProjectLibrary/ProjectLibrary/Forms/FormIssues.Designer.cs +++ b/ProjectLibrary/ProjectLibrary/Forms/FormIssues.Designer.cs @@ -30,8 +30,8 @@ { dataGridView = new DataGridView(); panel1 = new Panel(); - buttonAdd = new Button(); ButtonDel = new Button(); + buttonAdd = new Button(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); panel1.SuspendLayout(); SuspendLayout(); @@ -64,17 +64,6 @@ panel1.Size = new Size(144, 450); panel1.TabIndex = 2; // - // buttonAdd - // - buttonAdd.BackgroundImage = Properties.Resources.plus; - buttonAdd.BackgroundImageLayout = ImageLayout.Stretch; - buttonAdd.Location = new Point(33, 36); - buttonAdd.Name = "buttonAdd"; - buttonAdd.Size = new Size(75, 63); - buttonAdd.TabIndex = 0; - buttonAdd.UseVisualStyleBackColor = true; - buttonAdd.Click += ButtonAdd_Click; - // // ButtonDel // ButtonDel.BackgroundImage = Properties.Resources.minus; @@ -86,6 +75,17 @@ ButtonDel.UseVisualStyleBackColor = true; ButtonDel.Click += ButtonDel_Click; // + // buttonAdd + // + buttonAdd.BackgroundImage = Properties.Resources.plus; + buttonAdd.BackgroundImageLayout = ImageLayout.Stretch; + buttonAdd.Location = new Point(33, 36); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(75, 63); + buttonAdd.TabIndex = 0; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // // FormIssues // AutoScaleDimensions = new SizeF(7F, 15F); @@ -94,7 +94,7 @@ Controls.Add(dataGridView); Controls.Add(panel1); Name = "FormIssues"; - Text = "FormIssues"; + Text = "Выдачи книг"; Load += FormIssues_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); panel1.ResumeLayout(false); diff --git a/ProjectLibrary/ProjectLibrary/Forms/FormLibrarianReport.Designer.cs b/ProjectLibrary/ProjectLibrary/Forms/FormLibrarianReport.Designer.cs new file mode 100644 index 0000000..a387bda --- /dev/null +++ b/ProjectLibrary/ProjectLibrary/Forms/FormLibrarianReport.Designer.cs @@ -0,0 +1,166 @@ +namespace ProjectLibrary.Forms +{ + partial class FormLibrarianReport + { + /// + /// 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() + { + label1 = new Label(); + label2 = new Label(); + label3 = new Label(); + label4 = new Label(); + saveFileDialog1 = new SaveFileDialog(); + dateTimePickerDateBegin = new DateTimePicker(); + dateTimePickerDateEnd = new DateTimePicker(); + buttonSelectFilePath = new Button(); + textBoxFilePath = new TextBox(); + comboBoxLibrarian = new ComboBox(); + buttonMakeReport = new Button(); + SuspendLayout(); + // + // label1 + // + label1.AutoSize = true; + label1.Location = new Point(46, 36); + label1.Name = "label1"; + label1.Size = new Size(87, 15); + label1.TabIndex = 0; + label1.Text = "Путь до файла"; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new Point(46, 86); + label2.Name = "label2"; + label2.Size = new Size(85, 15); + label2.TabIndex = 1; + label2.Text = "Библиотекарь"; + // + // label3 + // + label3.AutoSize = true; + label3.Location = new Point(46, 138); + label3.Name = "label3"; + label3.Size = new Size(74, 15); + label3.TabIndex = 2; + label3.Text = "Дата начала"; + // + // label4 + // + label4.AutoSize = true; + label4.Location = new Point(46, 190); + label4.Name = "label4"; + label4.Size = new Size(68, 15); + label4.TabIndex = 3; + label4.Text = "Дата конца"; + // + // dateTimePickerDateBegin + // + dateTimePickerDateBegin.Location = new Point(135, 132); + dateTimePickerDateBegin.Name = "dateTimePickerDateBegin"; + dateTimePickerDateBegin.Size = new Size(200, 23); + dateTimePickerDateBegin.TabIndex = 4; + // + // dateTimePickerDateEnd + // + dateTimePickerDateEnd.Location = new Point(135, 190); + dateTimePickerDateEnd.Name = "dateTimePickerDateEnd"; + dateTimePickerDateEnd.Size = new Size(200, 23); + dateTimePickerDateEnd.TabIndex = 5; + // + // buttonSelectFilePath + // + buttonSelectFilePath.Location = new Point(310, 32); + buttonSelectFilePath.Name = "buttonSelectFilePath"; + buttonSelectFilePath.Size = new Size(25, 23); + buttonSelectFilePath.TabIndex = 6; + buttonSelectFilePath.Text = "..."; + buttonSelectFilePath.UseVisualStyleBackColor = true; + buttonSelectFilePath.Click += ButtonSelectFilePath_Click; + // + // textBoxFilePath + // + textBoxFilePath.Location = new Point(139, 32); + textBoxFilePath.Name = "textBoxFilePath"; + textBoxFilePath.ReadOnly = true; + textBoxFilePath.Size = new Size(165, 23); + textBoxFilePath.TabIndex = 7; + // + // comboBoxLibrarian + // + comboBoxLibrarian.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxLibrarian.FormattingEnabled = true; + comboBoxLibrarian.Location = new Point(139, 78); + comboBoxLibrarian.Name = "comboBoxLibrarian"; + comboBoxLibrarian.Size = new Size(169, 23); + comboBoxLibrarian.TabIndex = 8; + // + // buttonMakeReport + // + buttonMakeReport.Location = new Point(171, 242); + buttonMakeReport.Name = "buttonMakeReport"; + buttonMakeReport.Size = new Size(105, 23); + buttonMakeReport.TabIndex = 9; + buttonMakeReport.Text = "Сформировать"; + buttonMakeReport.UseVisualStyleBackColor = true; + buttonMakeReport.Click += ButtonMakeReport_Click; + // + // FormBookReport + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(443, 289); + Controls.Add(buttonMakeReport); + Controls.Add(comboBoxLibrarian); + Controls.Add(textBoxFilePath); + Controls.Add(buttonSelectFilePath); + Controls.Add(dateTimePickerDateEnd); + Controls.Add(dateTimePickerDateBegin); + Controls.Add(label4); + Controls.Add(label3); + Controls.Add(label2); + Controls.Add(label1); + Name = "FormLibrarianReport"; + Text = "Отчет по библиотекарю"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label label1; + private Label label2; + private Label label3; + private Label label4; + private SaveFileDialog saveFileDialog1; + private DateTimePicker dateTimePickerDateBegin; + private DateTimePicker dateTimePickerDateEnd; + private Button buttonSelectFilePath; + private TextBox textBoxFilePath; + private ComboBox comboBoxLibrarian; + private Button buttonMakeReport; + } +} \ No newline at end of file diff --git a/ProjectLibrary/ProjectLibrary/Forms/FormLibrarianReport.cs b/ProjectLibrary/ProjectLibrary/Forms/FormLibrarianReport.cs new file mode 100644 index 0000000..a7a843b --- /dev/null +++ b/ProjectLibrary/ProjectLibrary/Forms/FormLibrarianReport.cs @@ -0,0 +1,83 @@ +using ProjectLibrary.Reports; +using ProjectLibrary.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 ProjectLibrary.Forms; + +public partial class FormLibrarianReport : Form +{ + private readonly IUnityContainer _container; + public FormLibrarianReport(IUnityContainer container, ILibrarianRepository librarianRepository) + { + InitializeComponent(); + _container = container ?? + throw new ArgumentNullException(nameof(container)); + comboBoxLibrarian.DataSource = librarianRepository.ReadLibrarians(); + comboBoxLibrarian.DisplayMember = "Name"; + comboBoxLibrarian.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 (comboBoxLibrarian.SelectedIndex < 0) + { + throw new Exception("Не выбран корм"); + } + if (dateTimePickerDateEnd.Value <= + dateTimePickerDateBegin.Value) + { + throw new Exception("Дата начала должна быть раньше даты окончания"); + } + if + (_container.Resolve().CreateTable(textBoxFilePath.Text, + Convert.ToString(comboBoxLibrarian.SelectedValue!), + dateTimePickerDateBegin.Value, dateTimePickerDateEnd.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/ProjectLibrary/ProjectLibrary/Forms/FormLibrarianReport.resx b/ProjectLibrary/ProjectLibrary/Forms/FormLibrarianReport.resx new file mode 100644 index 0000000..b929b0e --- /dev/null +++ b/ProjectLibrary/ProjectLibrary/Forms/FormLibrarianReport.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 17, 17 + + \ No newline at end of file diff --git a/ProjectLibrary/ProjectLibrary/Forms/FormReaders.Designer.cs b/ProjectLibrary/ProjectLibrary/Forms/FormReaders.Designer.cs index 183a216..4ae400a 100644 --- a/ProjectLibrary/ProjectLibrary/Forms/FormReaders.Designer.cs +++ b/ProjectLibrary/ProjectLibrary/Forms/FormReaders.Designer.cs @@ -107,7 +107,7 @@ Controls.Add(dataGridView); Controls.Add(panel1); Name = "FormReaders"; - Text = "FormReaders"; + Text = "Читатели"; Load += FormReaders_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); panel1.ResumeLayout(false); diff --git a/ProjectLibrary/ProjectLibrary/Program.cs b/ProjectLibrary/ProjectLibrary/Program.cs index 63de25c..a473884 100644 --- a/ProjectLibrary/ProjectLibrary/Program.cs +++ b/ProjectLibrary/ProjectLibrary/Program.cs @@ -6,6 +6,7 @@ using Microsoft.Extensions.Logging; using Serilog; using Microsoft.Extensions.Configuration; using Unity.Microsoft.Logging; +using System.Text; namespace ProjectLibrary { @@ -17,6 +18,7 @@ namespace ProjectLibrary [STAThread] static void Main() { + Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); diff --git a/ProjectLibrary/ProjectLibrary/ProjectLibrary.csproj b/ProjectLibrary/ProjectLibrary/ProjectLibrary.csproj index 0307ec6..38299b7 100644 --- a/ProjectLibrary/ProjectLibrary/ProjectLibrary.csproj +++ b/ProjectLibrary/ProjectLibrary/ProjectLibrary.csproj @@ -10,11 +10,15 @@ + + + + diff --git a/ProjectLibrary/ProjectLibrary/Reports/ChartReport.cs b/ProjectLibrary/ProjectLibrary/Reports/ChartReport.cs new file mode 100644 index 0000000..6d2bcbd --- /dev/null +++ b/ProjectLibrary/ProjectLibrary/Reports/ChartReport.cs @@ -0,0 +1,53 @@ +using Microsoft.Extensions.Logging; +using ProjectLibrary.Reports; +using ProjectLibrary.Repositories; +namespace ProjectLibrary.Reports; +internal class ChartReport +{ + private readonly IIssueRepository _issueRepository; + private readonly IBookRestorationRepository _bookRestorationRepository; + private readonly ILogger _logger; + + public ChartReport(IIssueRepository issueRepository, IBookRestorationRepository bookRestorationRepository, ILogger logger) + { + _issueRepository = issueRepository ?? throw new ArgumentNullException(nameof(issueRepository)); + _bookRestorationRepository = bookRestorationRepository ?? throw new ArgumentNullException(nameof(bookRestorationRepository)); + _logger = logger ?? throw new ArgumentNullException(nameof(logger)); + } + + public bool CreateChart(string filePath, DateTime dateTime) + { + try + { + new PdfBuilder(filePath) + .AddHeader($"Диаграмма деятельности за {dateTime:dd.MM.yyyy}") + .AddPieChart("Деятельность библиотекарей", GetData(dateTime)) + .Build(); + return true; + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка при формировании документа"); + return false; + } + } + + private List<(string Caption, double Value)> GetData(DateTime dateTime) + { + var issueCount = _issueRepository + .ReadIssue() + .Where(x => x.IssueDate.Date == dateTime.Date) + .SelectMany(x => x.BookIssue) + .Count(); + + var restorationCount = _bookRestorationRepository + .ReadBookRestorations() + .Count(x => x.RestorationDate.Date == dateTime.Date); + + return new List<(string Caption, double Value)> + { + ("Выдачи", issueCount), + ("Реставрации", restorationCount) + }; + } +} diff --git a/ProjectLibrary/ProjectLibrary/Reports/DocReport.cs b/ProjectLibrary/ProjectLibrary/Reports/DocReport.cs new file mode 100644 index 0000000..89a7b10 --- /dev/null +++ b/ProjectLibrary/ProjectLibrary/Reports/DocReport.cs @@ -0,0 +1,90 @@ +using Microsoft.Extensions.Logging; +using ProjectLibrary.Repositories; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLibrary.Reports; + +internal class DocReport +{ + private readonly ILibrarianRepository _librarianRepository; + private readonly IBookRepository _bookRepository; + private readonly IReaderRepository _readerRepository; + + private readonly ILogger _logger; + public DocReport(ILibrarianRepository librarianRepository, IBookRepository bookRepository, IReaderRepository readerRepository, + ILogger logger) + { + _librarianRepository = librarianRepository ?? + throw new ArgumentNullException(nameof(librarianRepository)); + + _bookRepository = bookRepository ?? + throw new ArgumentNullException(nameof(bookRepository)); + + _readerRepository = readerRepository ?? + throw new ArgumentNullException(nameof(readerRepository)); + + _logger = logger ?? + throw new ArgumentNullException(nameof(logger)); + } + public bool CreateDoc(string filePath, bool includeLibrarians, bool includeBooks, + bool includeReaders) + { + try + { + var builder = new WordBuilder(filePath).AddHeader("Документ со справочниками"); + if (includeLibrarians) + { + builder.AddParagraph("Библиотекари") + .AddTable([2400, 2400], + GetLibrarians()); + } + if (includeBooks) + { + builder.AddParagraph("Книги") + .AddTable([2400, 2400, 1200], GetBooks()); + } + if (includeReaders) + { + builder.AddParagraph("Читатели") + .AddTable([2400, 1200, 2400], GetReaders()); + } + builder.Build(); + return true; + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка при формировании документа"); + return false; + } + } + private List GetLibrarians() + { + return [ + ["Имя", "Тема"], + .. _librarianRepository.ReadLibrarians() + .Select(x => new string[] { x.Name, x.AllowedTopic.ToString()}), + ]; + } + private List GetBooks() + { + return [ + ["Название", "Тема", "Занята?"], + .. _bookRepository + .ReadBooks() + .Select(x => new string[] { x.Title, x.Topic.ToString(), x.IsIssued.ToString()}), + ]; + } + private List GetReaders() + { + return [ + ["Имя", "Id карты читателя", "Дата окончания карты"], + .. _readerRepository + .ReadReaders() + .Select(x => new string[] { x.Name, x.LibraryCard.ToString(), x.CardValidity.ToString()}), + ]; + } +} diff --git a/ProjectLibrary/ProjectLibrary/Reports/ExcelBuilder.cs b/ProjectLibrary/ProjectLibrary/Reports/ExcelBuilder.cs new file mode 100644 index 0000000..61b2ead --- /dev/null +++ b/ProjectLibrary/ProjectLibrary/Reports/ExcelBuilder.cs @@ -0,0 +1,316 @@ +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Spreadsheet; +using DocumentFormat.OpenXml; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLibrary.Reports; + +internal 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.BoldTextWithoutBorder); + 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.BoldTextWithBorder); + } + _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.SimpleTextWithBorder); + } + _rowIndex++; + } + for (var j = 0; j < data.Last().Length; ++j) + { + CreateCell(j, _rowIndex, data.Last()[j], StyleIndex.BoldTextWithBorder); + } + _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) + } + }); + 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 + 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() + }); + 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 + 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 + } + }); + 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, + SimpleTextWithBorder = 1, + BoldTextWithoutBorder = 2, + BoldTextWithBorder = 3, + } + + 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/ProjectLibrary/ProjectLibrary/Reports/PdfBuilder.cs b/ProjectLibrary/ProjectLibrary/Reports/PdfBuilder.cs new file mode 100644 index 0000000..6b77992 --- /dev/null +++ b/ProjectLibrary/ProjectLibrary/Reports/PdfBuilder.cs @@ -0,0 +1,82 @@ +using MigraDoc.DocumentObjectModel; +using MigraDoc.Rendering; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using MigraDoc.DocumentObjectModel.Shapes.Charts; + +namespace ProjectLibrary.Reports; + +internal 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(); + Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); + } + + 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() + { + 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; + } +} \ No newline at end of file diff --git a/ProjectLibrary/ProjectLibrary/Reports/TableReport.cs b/ProjectLibrary/ProjectLibrary/Reports/TableReport.cs new file mode 100644 index 0000000..573fb67 --- /dev/null +++ b/ProjectLibrary/ProjectLibrary/Reports/TableReport.cs @@ -0,0 +1,111 @@ +using Microsoft.Extensions.Logging; +using ProjectLibrary.Repositories; +using System; +using System.Collections.Generic; +using System.Linq; + +namespace ProjectLibrary.Reports; + +internal class TableReport +{ + private readonly IBookRestorationRepository _bookRestorationRepository; + private readonly IIssueRepository _issueRepository; + private readonly ILibrarianRepository _librarianRepository; + private readonly ILogger _logger; + + internal static readonly string[] Headers = [ "Библиотекарь", "Действие", "Количество", "Дата" ]; + + public TableReport(IBookRestorationRepository bookRestorationRepository, IIssueRepository issueRepository, ILibrarianRepository librarianRepository, ILogger logger) + { + _bookRestorationRepository = bookRestorationRepository ?? throw new ArgumentNullException(nameof(bookRestorationRepository)); + _issueRepository = issueRepository ?? throw new ArgumentNullException(nameof(issueRepository)); + _librarianRepository = librarianRepository ?? throw new ArgumentNullException(nameof(librarianRepository)); + _logger = logger ?? throw new ArgumentNullException(nameof(logger)); + } + + public bool CreateTable(string filePath, string librarianName, DateTime startDate, DateTime endDate) + { + try + { + new ExcelBuilder(filePath) + .AddHeader($"Сводка по деятельности библиотекаря", 0, 4) + .AddParagraph($"за период: {startDate:dd.MM.yyyy} - {endDate:dd.MM.yyyy}", 0) + .AddTable(new[] { 30, 20, 20, 20 }, GetData(librarianName, startDate, endDate)) + .Build(); + return true; + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка при формировании документа"); + return false; + } + } + + private List GetData(string librarianName, DateTime startDate, DateTime endDate) + { + var librarian = _librarianRepository + .ReadLibrarianById(Convert.ToInt32(librarianName)); + + if (librarian == null) + { + throw new Exception($"Библиотекарь с именем {librarianName} не найден."); + } + + var librarianId = librarian.Id; + + var issueData = _issueRepository.ReadIssue() + .Where(issue => issue.IssueDate >= startDate && issue.IssueDate <= endDate) + .Where(issue => issue.LibrarianId == librarianId) + .SelectMany(issue => issue.BookIssue, (issue, bookIssue) => new + { + Librarian = librarian.Name, + Count = issue.BookIssue.Count(), + Description = "Выдачи", + Date = issue.IssueDate.ToString("dd.MM.yyyy") + }); + + + var restorationData = _bookRestorationRepository.ReadBookRestorations() + .Where(restoration => restoration.RestorationDate >= startDate && restoration.RestorationDate <= endDate) + .Where(restoration => restoration.LibrarianId == librarianId) + .GroupBy(restoration => new + { + restoration.RestorationDate, + restoration.LibrarianId + }) + .Select(group => new + { + Librarian = librarian.Name, + Count = group.Count(), + Description = "Реставрации", + Date = group.Key.RestorationDate.ToString("dd.MM.yyyy") + }); + + var data = issueData + .Union(restorationData) + .OrderBy(entry => entry.Description) + .ThenBy(entry => entry.Date) + .Select(entry => new string[] + { + entry.Librarian, + entry.Description, + entry.Count.ToString(), + entry.Date + }) + .ToList(); + + data.Insert(0, Headers); + + var totalCount = issueData.Sum(entry => entry.Count) + restorationData.Sum(entry => entry.Count); + + data.Add(new string[] + { + "ИТОГО", + "", + totalCount.ToString(), + "" + }); + + return data; + } +} diff --git a/ProjectLibrary/ProjectLibrary/Reports/WordBuilder.cs b/ProjectLibrary/ProjectLibrary/Reports/WordBuilder.cs new file mode 100644 index 0000000..f0e47e1 --- /dev/null +++ b/ProjectLibrary/ProjectLibrary/Reports/WordBuilder.cs @@ -0,0 +1,125 @@ +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Wordprocessing; +using DocumentFormat.OpenXml; + +namespace ProjectLibrary.Reports; + +internal 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()); + // прописать настройки под жирный текст + run.RunProperties = new RunProperties(new Bold()); + 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/ProjectLibrary/ProjectLibrary/Repositories/Implementations/IssueRepository.cs b/ProjectLibrary/ProjectLibrary/Repositories/Implementations/IssueRepository.cs index 8be084c..b91c02b 100644 --- a/ProjectLibrary/ProjectLibrary/Repositories/Implementations/IssueRepository.cs +++ b/ProjectLibrary/ProjectLibrary/Repositories/Implementations/IssueRepository.cs @@ -37,15 +37,15 @@ public class IssueRepository : IIssueRepository using var transaction = connection.BeginTransaction(); var queryInsert = @" INSERT INTO Issue (IssueDate, DueDate, ReturnDate, LibrarianId, ReaderId) - VALUES (@IssueDate, @DueDate, @ReturnDate, @LibrarianId, @ReaderId) - Returning Id"; + VALUES (@IssueDate, @DueDate, @ReturnDate, @LibrarianId, @ReaderId); + SELECT MAX(Id) FROM Issue"; var issueId = connection.QueryFirst(queryInsert, new { issue.IssueDate, issue.DueDate,issue.ReturnDate,issue.LibrarianId, issue.ReaderId }, transaction); var querySubInsert = @" - INSERT INTO BookIssue (Description, BookId, IssueId) + INSERT INTO Book_Issue (Description, BookId, IssueId) VALUES (@Description,@BookId, @IssueId)"; foreach (var elem in issue.BookIssue) { @@ -74,7 +74,7 @@ public class IssueRepository : IIssueRepository using var connection = new NpgsqlConnection(_connectionString.ConnectionString); var queryDelete = @" - DELETE FROM BookIssue + DELETE FROM Book_Issue WHERE IssueId=@Id"; connection.Execute(queryDelete, new { id }); @@ -96,12 +96,15 @@ public class IssueRepository : IIssueRepository { using var connection = new NpgsqlConnection(_connectionString.ConnectionString); - var querySelect = @"SELECT * FROM Issue"; + var querySelect = @"SELECT + iss.*, biss.Description, biss.BookId + FROM Issue iss + INNER JOIN Book_Issue biss on biss.IssueId = iss.Id"; var issue = - connection.Query(querySelect); + connection.Query(querySelect); _logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(issue)); - return issue; + return issue.GroupBy(x => x.Id, y => y, (key, value) => Issue.CreateOperation(value.First(), value.Select(z => BookIssue.CreateElement(0, z.Description, z.BookId)))).ToList(); } catch (Exception ex) {