From 7cb433c58630091c68717fbf4624857b65792ddb Mon Sep 17 00:00:00 2001 From: Aleksandr4350 Date: Wed, 20 Nov 2024 19:31:06 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=201=20?= =?UTF-8?q?=D0=BB=D0=B0=D0=B1=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectLibrary/Entites/Book.cs | 1 - ProjectLibrary/Entites/Book_library.cs | 12 +- ProjectLibrary/Entites/Ticket_Extension.cs | 9 +- ProjectLibrary/FormLibrary.Designer.cs | 39 ++-- ProjectLibrary/FormLibrary.cs | 42 ++++- ProjectLibrary/FormLibrary.resx | 4 +- ProjectLibrary/Forms/FBook.Designer.cs | 82 ++++----- ProjectLibrary/Forms/FBook.cs | 172 +++++++----------- ProjectLibrary/Forms/FBook.resx | 4 +- .../Forms/FBook_library.Designer.cs | 126 ------------- ProjectLibrary/Forms/FBook_library.cs | 44 ----- ProjectLibrary/Forms/FBooks.Designer.cs | 106 +++++++++++ ProjectLibrary/Forms/FBooks.cs | 104 +++++++++++ .../Forms/{FBook_library.resx => FBooks.resx} | 4 +- ProjectLibrary/Forms/FLibraries.Designer.cs | 105 +++++++++++ ProjectLibrary/Forms/FLibraries.cs | 102 +++++++++++ ProjectLibrary/Forms/FLibraries.resx | 120 ++++++++++++ ProjectLibrary/Forms/FLibrary.Designer.cs | 100 +++++----- ProjectLibrary/Forms/FLibrary.cs | 88 +++++++-- ProjectLibrary/Forms/FLibrary.resx | 10 +- ProjectLibrary/Forms/FOrder.Designer.cs | 59 +++--- ProjectLibrary/Forms/FOrder.cs | 93 ++++------ ProjectLibrary/Forms/FOrder.resx | 7 +- ProjectLibrary/Forms/FOrders.Designer.cs | 26 ++- ProjectLibrary/Forms/FOrders.cs | 21 ++- ProjectLibrary/Forms/FOrders.resx | 4 +- ProjectLibrary/Forms/FReader.cs | 7 +- .../Forms/FTicket_Extension.Designer.cs | 61 +++---- ProjectLibrary/Forms/FTicket_Extension.cs | 64 +++---- ProjectLibrary/Forms/FTicket_Extension.resx | 4 +- .../Forms/FTiclet_Extensions.Designer.cs | 92 ++++++++++ ProjectLibrary/Forms/FTiclet_Extensions.cs | 79 ++++++++ ProjectLibrary/Forms/FTiclet_Extensions.resx | 120 ++++++++++++ ProjectLibrary/Program.cs | 4 +- .../Repositores/IBookOrderRepository.cs | 15 -- ProjectLibrary/Repositores/IBookRepository.cs | 2 +- .../Repositores/IReaderRepository.cs | 8 +- .../Repositores/ITicketExtension.cs | 11 ++ .../Repositores/ITicketExtensionRepository.cs | 13 -- .../Implementations/BookOrderRepository.cs | 37 ---- .../Implementations/BookRepository.cs | 15 +- .../Implementations/LibraryRepository.cs | 12 +- .../Implementations/OrderRepository.cs | 15 +- .../Implementations/ReaderRepository.cs | 17 +- .../TicketExtensionsRepository.cs | 21 ++- 45 files changed, 1338 insertions(+), 743 deletions(-) delete mode 100644 ProjectLibrary/Forms/FBook_library.Designer.cs delete mode 100644 ProjectLibrary/Forms/FBook_library.cs create mode 100644 ProjectLibrary/Forms/FBooks.Designer.cs create mode 100644 ProjectLibrary/Forms/FBooks.cs rename ProjectLibrary/Forms/{FBook_library.resx => FBooks.resx} (99%) create mode 100644 ProjectLibrary/Forms/FLibraries.Designer.cs create mode 100644 ProjectLibrary/Forms/FLibraries.cs create mode 100644 ProjectLibrary/Forms/FLibraries.resx create mode 100644 ProjectLibrary/Forms/FTiclet_Extensions.Designer.cs create mode 100644 ProjectLibrary/Forms/FTiclet_Extensions.cs create mode 100644 ProjectLibrary/Forms/FTiclet_Extensions.resx delete mode 100644 ProjectLibrary/Repositores/IBookOrderRepository.cs create mode 100644 ProjectLibrary/Repositores/ITicketExtension.cs delete mode 100644 ProjectLibrary/Repositores/ITicketExtensionRepository.cs delete mode 100644 ProjectLibrary/Repositores/Implementations/BookOrderRepository.cs diff --git a/ProjectLibrary/Entites/Book.cs b/ProjectLibrary/Entites/Book.cs index 024f24b..2ad8a04 100644 --- a/ProjectLibrary/Entites/Book.cs +++ b/ProjectLibrary/Entites/Book.cs @@ -8,7 +8,6 @@ public string Author { get; private set; } = string.Empty; public string Name { get; private set; } = string.Empty; public BookType Type { get; private set; } = BookType.None; - public int LibraryID { get; private set; } public static Book CreateEntity(int id, string author, string name, BookType type, int libraryID) diff --git a/ProjectLibrary/Entites/Book_library.cs b/ProjectLibrary/Entites/Book_library.cs index 63133f1..5c08041 100644 --- a/ProjectLibrary/Entites/Book_library.cs +++ b/ProjectLibrary/Entites/Book_library.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ProjectLibrary.Entites +namespace ProjectLibrary.Entites { public class Book_Library { @@ -12,9 +6,7 @@ namespace ProjectLibrary.Entites public int LibraryID { get; private set; } public int Count { get; private set; } - - - public static Book_Library CreateEntity(int bookID, int libraryID, int count) + public static Book_Library CreateEntity(int libraryID, int bookID, int count) { return new Book_Library { diff --git a/ProjectLibrary/Entites/Ticket_Extension.cs b/ProjectLibrary/Entites/Ticket_Extension.cs index ae05aaa..2f6f2dc 100644 --- a/ProjectLibrary/Entites/Ticket_Extension.cs +++ b/ProjectLibrary/Entites/Ticket_Extension.cs @@ -1,15 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ProjectLibrary.Entites +namespace ProjectLibrary.Entites { public class TicketExtensions { public int ReaderID { get; private set; } - public int ExtensionID { get; private set; } public DateTime LastUpdateDate { get; private set; } public DateTime NextUpdateDate { get; private set; } diff --git a/ProjectLibrary/FormLibrary.Designer.cs b/ProjectLibrary/FormLibrary.Designer.cs index 3b3ebb0..ad19e59 100644 --- a/ProjectLibrary/FormLibrary.Designer.cs +++ b/ProjectLibrary/FormLibrary.Designer.cs @@ -35,8 +35,8 @@ библиотекиToolStripMenuItem = new ToolStripMenuItem(); операцииToolStripMenuItem = new ToolStripMenuItem(); обновлениеБилетаToolStripMenuItem = new ToolStripMenuItem(); - отчетыToolStripMenuItem = new ToolStripMenuItem(); заказатьКнигиToolStripMenuItem = new ToolStripMenuItem(); + отчетыToolStripMenuItem = new ToolStripMenuItem(); menuStrip1.SuspendLayout(); SuspendLayout(); // @@ -47,7 +47,8 @@ menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, операцииToolStripMenuItem, отчетыToolStripMenuItem }); menuStrip1.Location = new Point(0, 0); menuStrip1.Name = "menuStrip1"; - menuStrip1.Size = new Size(832, 28); + menuStrip1.Padding = new Padding(5, 2, 0, 2); + menuStrip1.Size = new Size(728, 24); menuStrip1.TabIndex = 0; menuStrip1.Text = "menuStrip"; // @@ -55,63 +56,67 @@ // справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { книгаToolStripMenuItem, читателиToolStripMenuItem, библиотекиToolStripMenuItem }); справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; - справочникиToolStripMenuItem.Size = new Size(117, 24); + справочникиToolStripMenuItem.Size = new Size(94, 20); справочникиToolStripMenuItem.Text = "Справочники"; // // книгаToolStripMenuItem // книгаToolStripMenuItem.Name = "книгаToolStripMenuItem"; - книгаToolStripMenuItem.Size = new Size(175, 26); + книгаToolStripMenuItem.Size = new Size(180, 22); книгаToolStripMenuItem.Text = "Книга"; + книгаToolStripMenuItem.Click += книгаToolStripMenuItem_Click; // // читателиToolStripMenuItem // читателиToolStripMenuItem.Name = "читателиToolStripMenuItem"; - читателиToolStripMenuItem.Size = new Size(175, 26); + читателиToolStripMenuItem.Size = new Size(180, 22); читателиToolStripMenuItem.Text = "Читатели"; читателиToolStripMenuItem.Click += читателиToolStripMenuItem_Click; // // библиотекиToolStripMenuItem // библиотекиToolStripMenuItem.Name = "библиотекиToolStripMenuItem"; - библиотекиToolStripMenuItem.Size = new Size(175, 26); + библиотекиToolStripMenuItem.Size = new Size(180, 22); библиотекиToolStripMenuItem.Text = "Библиотеки"; + библиотекиToolStripMenuItem.Click += библиотекиToolStripMenuItem_Click; // // операцииToolStripMenuItem // операцииToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { обновлениеБилетаToolStripMenuItem, заказатьКнигиToolStripMenuItem }); операцииToolStripMenuItem.Name = "операцииToolStripMenuItem"; - операцииToolStripMenuItem.Size = new Size(95, 24); + операцииToolStripMenuItem.Size = new Size(75, 20); операцииToolStripMenuItem.Text = "Операции"; // // обновлениеБилетаToolStripMenuItem // обновлениеБилетаToolStripMenuItem.Name = "обновлениеБилетаToolStripMenuItem"; - обновлениеБилетаToolStripMenuItem.Size = new Size(232, 26); + обновлениеБилетаToolStripMenuItem.Size = new Size(184, 22); обновлениеБилетаToolStripMenuItem.Text = "Обновление билета"; - // - // отчетыToolStripMenuItem - // - отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; - отчетыToolStripMenuItem.Size = new Size(73, 24); - отчетыToolStripMenuItem.Text = "Отчеты"; + обновлениеБилетаToolStripMenuItem.Click += обновлениеБилетаToolStripMenuItem_Click; // // заказатьКнигиToolStripMenuItem // заказатьКнигиToolStripMenuItem.Name = "заказатьКнигиToolStripMenuItem"; - заказатьКнигиToolStripMenuItem.Size = new Size(232, 26); + заказатьКнигиToolStripMenuItem.Size = new Size(184, 22); заказатьКнигиToolStripMenuItem.Text = "Заказать книги"; заказатьКнигиToolStripMenuItem.Click += заказатьКнигиToolStripMenuItem_Click; // + // отчетыToolStripMenuItem + // + отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; + отчетыToolStripMenuItem.Size = new Size(60, 20); + отчетыToolStripMenuItem.Text = "Отчеты"; + // // FormLibrary // - AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; BackColor = SystemColors.ButtonHighlight; BackgroundImage = Properties.Resources.Снимок_экрана_2024_11_19_132940; - ClientSize = new Size(832, 453); + ClientSize = new Size(728, 340); Controls.Add(menuStrip1); MainMenuStrip = menuStrip1; + Margin = new Padding(3, 2, 3, 2); Name = "FormLibrary"; StartPosition = FormStartPosition.CenterScreen; Text = "Библиотека"; diff --git a/ProjectLibrary/FormLibrary.cs b/ProjectLibrary/FormLibrary.cs index 3b876b8..1baf67b 100644 --- a/ProjectLibrary/FormLibrary.cs +++ b/ProjectLibrary/FormLibrary.cs @@ -1,4 +1,3 @@ -using System.ComponentModel; using Unity; namespace ProjectLibrary @@ -13,11 +12,6 @@ namespace ProjectLibrary _container = container ?? throw new ArgumentNullException(nameof(container)); } - private void ToolStripMenuItem_Click(object sender, EventArgs e) - { - - } - private void ToolStripMenuItem_Click(object sender, EventArgs e) { try @@ -41,5 +35,41 @@ namespace ProjectLibrary MessageBox.Show(ex.Message, "", MessageBoxButtons.OK, MessageBoxIcon.Error); } } + + private void ToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } } } diff --git a/ProjectLibrary/FormLibrary.resx b/ProjectLibrary/FormLibrary.resx index b48baf1..a0623c8 100644 --- a/ProjectLibrary/FormLibrary.resx +++ b/ProjectLibrary/FormLibrary.resx @@ -1,7 +1,7 @@  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/Forms/FLibrary.Designer.cs b/ProjectLibrary/Forms/FLibrary.Designer.cs index e04e04b..05898f0 100644 --- a/ProjectLibrary/Forms/FLibrary.Designer.cs +++ b/ProjectLibrary/Forms/FLibrary.Designer.cs @@ -3,14 +3,11 @@ partial class FLibrary { private System.ComponentModel.IContainer components = null; - - private Label lblId; - private TextBox txtId; private Label lblName; private TextBox txtName; private Label lblAddress; private TextBox txtAddress; - private Button btnSave; + private Button ButtonSave; protected override void Dispose(bool disposing) { @@ -23,100 +20,113 @@ private void InitializeComponent() { - lblId = new Label(); - txtId = new TextBox(); lblName = new Label(); txtName = new TextBox(); lblAddress = new Label(); txtAddress = new TextBox(); - btnSave = new Button(); + ButtonSave = new Button(); buttonCancel_Click = new Button(); + dataGridView = new DataGridView(); + Book = new DataGridViewComboBoxColumn(); + Count = new DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); // - // lblId - // - lblId.AutoSize = true; - lblId.Location = new Point(20, 20); - lblId.Name = "lblId"; - lblId.Size = new Size(27, 20); - lblId.TabIndex = 0; - lblId.Text = "ID:"; - // - // txtId - // - txtId.Location = new Point(100, 20); - txtId.Name = "txtId"; - txtId.ReadOnly = true; - txtId.Size = new Size(200, 27); - txtId.TabIndex = 1; - // // lblName // lblName.AutoSize = true; - lblName.Location = new Point(20, 60); + lblName.Location = new Point(20, 9); lblName.Name = "lblName"; - lblName.Size = new Size(42, 20); + lblName.Size = new Size(62, 15); lblName.TabIndex = 2; - lblName.Text = "Имя:"; + lblName.Text = "Название:"; // // txtName // - txtName.Location = new Point(100, 60); + txtName.Location = new Point(100, 12); txtName.Name = "txtName"; - txtName.Size = new Size(200, 27); + txtName.Size = new Size(200, 23); txtName.TabIndex = 3; // // lblAddress // lblAddress.AutoSize = true; - lblAddress.Location = new Point(20, 100); + lblAddress.Location = new Point(20, 49); lblAddress.Name = "lblAddress"; - lblAddress.Size = new Size(54, 20); + lblAddress.Size = new Size(43, 15); lblAddress.TabIndex = 4; lblAddress.Text = "Адрес:"; // // txtAddress // - txtAddress.Location = new Point(100, 100); + txtAddress.Location = new Point(100, 49); txtAddress.Name = "txtAddress"; - txtAddress.Size = new Size(200, 27); + txtAddress.Size = new Size(200, 23); txtAddress.TabIndex = 5; // - // btnSave + // ButtonSave // - btnSave.Location = new Point(20, 133); - btnSave.Name = "btnSave"; - btnSave.Size = new Size(100, 30); - btnSave.TabIndex = 6; - btnSave.Text = "Сохранить"; - btnSave.Click += btnSave_Click; + ButtonSave.Location = new Point(20, 224); + ButtonSave.Name = "ButtonSave"; + ButtonSave.Size = new Size(100, 27); + ButtonSave.TabIndex = 14; + ButtonSave.Text = "Сохранить"; + ButtonSave.Click += ButtonSave_Click; // // buttonCancel_Click // - buttonCancel_Click.Location = new Point(200, 133); + buttonCancel_Click.Location = new Point(200, 222); buttonCancel_Click.Name = "buttonCancel_Click"; buttonCancel_Click.Size = new Size(100, 30); buttonCancel_Click.TabIndex = 10; buttonCancel_Click.Text = "Отмена"; buttonCancel_Click.Click += buttonCancel_Click_Click; // + // dataGridView + // + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Columns.AddRange(new DataGridViewColumn[] { Book, Count }); + dataGridView.Location = new Point(20, 93); + dataGridView.Name = "dataGridView"; + dataGridView.RowHeadersWidth = 51; + dataGridView.Size = new Size(280, 123); + dataGridView.TabIndex = 13; + // + // Book + // + Book.HeaderText = "Book"; + Book.MinimumWidth = 6; + Book.Name = "Book"; + Book.SortMode = DataGridViewColumnSortMode.Automatic; + Book.Width = 125; + // + // Count + // + Count.HeaderText = "Count"; + Count.MinimumWidth = 6; + Count.Name = "Count"; + Count.Width = 125; + // // FLibrary // - ClientSize = new Size(400, 200); + ClientSize = new Size(400, 436); + Controls.Add(dataGridView); Controls.Add(buttonCancel_Click); - Controls.Add(lblId); - Controls.Add(txtId); Controls.Add(lblName); Controls.Add(txtName); Controls.Add(lblAddress); Controls.Add(txtAddress); - Controls.Add(btnSave); + Controls.Add(ButtonSave); Name = "FLibrary"; Text = "Библиотека"; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ResumeLayout(false); PerformLayout(); } private Button buttonCancel_Click; + private DataGridView dataGridView; + private DataGridViewComboBoxColumn Book; + private DataGridViewTextBoxColumn Count; } } diff --git a/ProjectLibrary/Forms/FLibrary.cs b/ProjectLibrary/Forms/FLibrary.cs index af739ec..e771c1c 100644 --- a/ProjectLibrary/Forms/FLibrary.cs +++ b/ProjectLibrary/Forms/FLibrary.cs @@ -1,36 +1,94 @@ -using System; +using ProjectLibrary.Entites; +using ProjectLibrary.Repositories; +using ProjectLibrary.Repositories.Implementations; using System.Windows.Forms; -using ProjectLibrary.Entites; + namespace ProjectLibrary.Forms { public partial class FLibrary : Form { - private Library _library; + private readonly ILibraryRepository _libraryRepository; + private int? _orderId; + public int Id + { + set + { + try + { + var library = _libraryRepository.ReadLibraryById(value); + if (library == null) + { + throw new InvalidOperationException("Заказ не найден."); + } - public FLibrary(Library library) + txtName.Text = library.Name; + txtAddress.Text = library.Address; + dataGridView.DataSource = library.BookLibrary; + _orderId = value; + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка при загрузке данных", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + public FLibrary(ILibraryRepository libraryRepository) { InitializeComponent(); - _library = library; - LoadLibraryData(); + _libraryRepository = libraryRepository ?? throw new ArgumentNullException(nameof(libraryRepository)); } - private void LoadLibraryData() + private void ButtonSave_Click(object sender, EventArgs e) { - txtId.Text = _library.Id.ToString(); - txtName.Text = _library.Name; - txtAddress.Text = _library.Address; - } + try + { + if (string.IsNullOrWhiteSpace(txtName.Text) || string.IsNullOrWhiteSpace(txtAddress.Text)) + { + throw new Exception("Не все поля заполнены."); + } - private void btnSave_Click(object sender, EventArgs e) - { - + var library = Library.CreateEntity( + _orderId ?? 0, + txtName.Text, + txtAddress.Text, + CreateListBooksFromDataGrid() + ); + + if (_orderId.HasValue) + { + _libraryRepository.UpdateLibrary(library); + } + else + { + _libraryRepository.CreateLibrary(library); + } + Close(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка при сохранении данных", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } private void buttonCancel_Click_Click(object sender, EventArgs e) { - // Закрытие формы без сохранения this.Close(); } + + private List CreateListBooksFromDataGrid() + { + var list = new List(); + foreach (DataGridViewRow row in dataGridView.Rows) + { + if (row.Cells["Book"].Value == null || row.Cells["Count"].Value == null) + { + continue; + } + list.Add(Book_Library.CreateEntity(0, Convert.ToInt32(row.Cells["ColumnBook"].Value), Convert.ToInt32(row.Cells["ColumnCount"].Value))); + } + return list; + } } } diff --git a/ProjectLibrary/Forms/FLibrary.resx b/ProjectLibrary/Forms/FLibrary.resx index 8b2ff64..5faf464 100644 --- a/ProjectLibrary/Forms/FLibrary.resx +++ b/ProjectLibrary/Forms/FLibrary.resx @@ -1,7 +1,7 @@  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/Program.cs b/ProjectLibrary/Program.cs index 9a38a45..e0ded03 100644 --- a/ProjectLibrary/Program.cs +++ b/ProjectLibrary/Program.cs @@ -1,6 +1,7 @@ using ProjectLibrary.Repositories.Implementations; using ProjectLibrary.Repositories; using Unity; +using ProjectLibrary.Repositores; namespace ProjectLibrary { @@ -28,10 +29,7 @@ namespace ProjectLibrary container.RegisterType(); container.RegisterType(); container.RegisterType(); - container.RegisterType(); return container; } - - } } \ No newline at end of file diff --git a/ProjectLibrary/Repositores/IBookOrderRepository.cs b/ProjectLibrary/Repositores/IBookOrderRepository.cs deleted file mode 100644 index f4d5284..0000000 --- a/ProjectLibrary/Repositores/IBookOrderRepository.cs +++ /dev/null @@ -1,15 +0,0 @@ -using ProjectLibrary.Entites; -using ProjectLibrary.Entities; -using System.Collections.Generic; - -namespace ProjectLibrary.Repositories -{ - public interface IBookOrderRepository - { - Book_Orders GetBookOrderByOrderId(int orderId); // Получить книгу по ID заказа - void AddBookOrder(Book_Orders bookOrder); // Добавить книгу к заказу - void UpdateBookOrder(Book_Orders bookOrder); // Обновить данные о книге в заказе - void DeleteBookOrder(int bookId, int orderId); // Удалить книгу из заказа - List ReadBookOrders(); // Получить все записи о книгах в заказах - } -} diff --git a/ProjectLibrary/Repositores/IBookRepository.cs b/ProjectLibrary/Repositores/IBookRepository.cs index bdfb283..07ffa28 100644 --- a/ProjectLibrary/Repositores/IBookRepository.cs +++ b/ProjectLibrary/Repositores/IBookRepository.cs @@ -1,4 +1,4 @@ -namespace ProjectLibrary.Repositories +namespace ProjectLibrary.Repositores { using ProjectLibrary.Entities; diff --git a/ProjectLibrary/Repositores/IReaderRepository.cs b/ProjectLibrary/Repositores/IReaderRepository.cs index 503ad12..b7050a6 100644 --- a/ProjectLibrary/Repositores/IReaderRepository.cs +++ b/ProjectLibrary/Repositores/IReaderRepository.cs @@ -5,10 +5,10 @@ public interface IReaderRepository { - Reader GetReaderById(int id); - void AddReader(Reader reader); + Reader ReadReaderById(int id); + void CreateReader(Reader reader); void UpdateReader(Reader reader); - void DeleteReader(int id); // Метод для удаления - List ReadReaders(); // Метод для чтения всех читателей + void DeleteReader(int id); + List ReadReaders(); } } diff --git a/ProjectLibrary/Repositores/ITicketExtension.cs b/ProjectLibrary/Repositores/ITicketExtension.cs new file mode 100644 index 0000000..e07e971 --- /dev/null +++ b/ProjectLibrary/Repositores/ITicketExtension.cs @@ -0,0 +1,11 @@ +using ProjectLibrary.Entites; + +namespace ProjectLibrary.Repositores; + +public interface ITicketExtensionsRepository +{ + TicketExtensions ReadTicketExtensionById(int id); + List ReadTicketExtensions(); + void CreateTicketExtension(TicketExtensions ticketExtension); + void UpdateTicketExtension(TicketExtensions ticketExtension); +} diff --git a/ProjectLibrary/Repositores/ITicketExtensionRepository.cs b/ProjectLibrary/Repositores/ITicketExtensionRepository.cs deleted file mode 100644 index 510b1db..0000000 --- a/ProjectLibrary/Repositores/ITicketExtensionRepository.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace ProjectLibrary.Repositories -{ - using ProjectLibrary.Entites; - using ProjectLibrary.Entities; - - public interface ITicketExtensionsRepository - { - TicketExtensions GetTicketExtensionById(int id); - void AddTicketExtension(TicketExtensions ticketExtension); - void UpdateTicketExtension(TicketExtensions ticketExtension); - } - -} diff --git a/ProjectLibrary/Repositores/Implementations/BookOrderRepository.cs b/ProjectLibrary/Repositores/Implementations/BookOrderRepository.cs deleted file mode 100644 index 0a582f9..0000000 --- a/ProjectLibrary/Repositores/Implementations/BookOrderRepository.cs +++ /dev/null @@ -1,37 +0,0 @@ -using ProjectLibrary.Entites; -using ProjectLibrary.Entities; -using System.Collections.Generic; -using System.Linq; - -namespace ProjectLibrary.Repositories -{ - public class BookOrderRepository : IBookOrderRepository - { - - - public Book_Orders GetBookOrderByOrderId(int orderId) - { - return Book_Orders.CreateEntity(orderId,0); - } - - public void AddBookOrder(Book_Orders bookOrder) - { - - } - - public void UpdateBookOrder(Book_Orders bookOrder) - { - - } - - public void DeleteBookOrder(int bookId, int orderId) - { - - } - - public List ReadBookOrders() - { - return []; - } - } -} diff --git a/ProjectLibrary/Repositores/Implementations/BookRepository.cs b/ProjectLibrary/Repositores/Implementations/BookRepository.cs index 99b78fb..7d3b3db 100644 --- a/ProjectLibrary/Repositores/Implementations/BookRepository.cs +++ b/ProjectLibrary/Repositores/Implementations/BookRepository.cs @@ -1,19 +1,21 @@ using ProjectLibrary.Entities; using ProjectLibrary.Entities.Enums; -using ProjectLibrary.Repositories; -using System.Collections.Generic; -using System.Linq; +using ProjectLibrary.Repositores; namespace ProjectLibrary.Repositories.Implementations { public class BookRepository : IBookRepository { - public void CreateBook(Book book) { } + public void UpdateBook(Book book) + { + + } + public void DeleteBook(int id) { @@ -29,10 +31,5 @@ namespace ProjectLibrary.Repositories.Implementations { return []; } - - public void UpdateBook(Book book) - { - - } } } diff --git a/ProjectLibrary/Repositores/Implementations/LibraryRepository.cs b/ProjectLibrary/Repositores/Implementations/LibraryRepository.cs index fc02e54..4bfe06e 100644 --- a/ProjectLibrary/Repositores/Implementations/LibraryRepository.cs +++ b/ProjectLibrary/Repositores/Implementations/LibraryRepository.cs @@ -5,13 +5,16 @@ namespace ProjectLibrary.Repositories.Implementations { public class LibraryRepository : ILibraryRepository { - - public void CreateLibrary(Library library) { } + public void UpdateLibrary(Library library) + { + + } + public void DeleteLibrary(int id) { @@ -26,10 +29,5 @@ namespace ProjectLibrary.Repositories.Implementations { return []; } - - public void UpdateLibrary(Library library) - { - - } } } diff --git a/ProjectLibrary/Repositores/Implementations/OrderRepository.cs b/ProjectLibrary/Repositores/Implementations/OrderRepository.cs index 65d13ab..f514ed1 100644 --- a/ProjectLibrary/Repositores/Implementations/OrderRepository.cs +++ b/ProjectLibrary/Repositores/Implementations/OrderRepository.cs @@ -1,18 +1,16 @@ using ProjectLibrary.Entites; -using ProjectLibrary.Entities; -using ProjectLibrary.Repositories; -using System.Collections.Generic; -using System.Linq; namespace ProjectLibrary.Repositories.Implementations { public class OrderRepository : IOrderRepository { - - public void CreateOrder(Orders order) { + } + public void UpdateOrder(Orders order) + { + } public void DeleteOrder(int id) @@ -29,10 +27,5 @@ namespace ProjectLibrary.Repositories.Implementations { return [] ; } - - public void UpdateOrder(Orders order) - { - - } } } diff --git a/ProjectLibrary/Repositores/Implementations/ReaderRepository.cs b/ProjectLibrary/Repositores/Implementations/ReaderRepository.cs index b1bd7e6..ce70eda 100644 --- a/ProjectLibrary/Repositores/Implementations/ReaderRepository.cs +++ b/ProjectLibrary/Repositores/Implementations/ReaderRepository.cs @@ -1,19 +1,10 @@ -using System.Collections.Generic; -using System.Linq; -using ProjectLibrary.Entities; +using ProjectLibrary.Entities; namespace ProjectLibrary.Repositories { public class ReaderRepository : IReaderRepository { - - - public Reader GetReaderById(int id) - { - return Reader.CreateEntity(id, "", 0); - } - - public void AddReader(Reader reader) + public void CreateReader(Reader reader) { } @@ -27,6 +18,10 @@ namespace ProjectLibrary.Repositories { } + public Reader ReadReaderById(int id) + { + return Reader.CreateEntity(id, "", 0); + } public List ReadReaders() { diff --git a/ProjectLibrary/Repositores/Implementations/TicketExtensionsRepository.cs b/ProjectLibrary/Repositores/Implementations/TicketExtensionsRepository.cs index 860739d..1632764 100644 --- a/ProjectLibrary/Repositores/Implementations/TicketExtensionsRepository.cs +++ b/ProjectLibrary/Repositores/Implementations/TicketExtensionsRepository.cs @@ -1,16 +1,9 @@ using ProjectLibrary.Entites; -using ProjectLibrary.Repositories; +using ProjectLibrary.Repositores; public class TicketExtensionsRepository : ITicketExtensionsRepository { - - - public TicketExtensions GetTicketExtensionById(int id) - { - return TicketExtensions.CreateEntity(0, DateTime.Now, DateTime.Now); - } - - public void AddTicketExtension(TicketExtensions ticketExtension) + public void CreateTicketExtension(TicketExtensions ticketExtension) { } @@ -19,4 +12,14 @@ public class TicketExtensionsRepository : ITicketExtensionsRepository { } + + public TicketExtensions ReadTicketExtensionById(int id) + { + return TicketExtensions.CreateEntity(0, DateTime.Now, DateTime.Now); + } + + public List ReadTicketExtensions() + { + return []; + } }