Artyom_Yashin/PIbd-23_Yashin_A_DBCS
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Мегадоделал

Browse Source
This commit is contained in:
Artyom_Yashin 2024-04-01 00:58:22 +04:00
parent f3dc40b9a5
commit 63cc7ab010
10 changed files with 154 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BarberShop/BarberShop/FormClient.Designer.cs generated
View File

@ -55,7 +55,7 @@
labelName.AutoSize = true; labelName.AutoSize = true;
labelName.Location = new Point(16, 15); labelName.Location = new Point(16, 15);
labelName.Name = "labelName"; labelName.Name = "labelName";
labelName.Size = new Size(77, 20); labelName.Size = new Size(42, 20);
labelName.TabIndex = 2; labelName.TabIndex = 2;
labelName.Text = "ФИО"; labelName.Text = "ФИО";
// //
@ -64,7 +64,7 @@
labelPhone.AutoSize = true; labelPhone.AutoSize = true;
labelPhone.Location = new Point(16, 63); labelPhone.Location = new Point(16, 63);
labelPhone.Name = "labelPhone"; labelPhone.Name = "labelPhone";
labelPhone.Size = new Size(45, 20); labelPhone.Size = new Size(69, 20);
labelPhone.TabIndex = 3; labelPhone.TabIndex = 3;
labelPhone.Text = "Телефон"; labelPhone.Text = "Телефон";
// //
@ -88,7 +88,7 @@
buttonCancel.UseVisualStyleBackColor = true; buttonCancel.UseVisualStyleBackColor = true;
buttonCancel.Click += ButtonCancel_Click; buttonCancel.Click += ButtonCancel_Click;
// //
// FormComponent // FormClient
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
@ -99,8 +99,8 @@
Controls.Add(labelName); Controls.Add(labelName);
Controls.Add(textBoxPhone); Controls.Add(textBoxPhone);
Controls.Add(textBoxName); Controls.Add(textBoxName);
Name = "FormComponent"; Name = "FormClient";
Text = "Компонент"; Text = "Клиент";
Load += FormClient_Load; Load += FormClient_Load;
ResumeLayout(false); ResumeLayout(false);
PerformLayout(); PerformLayout();

6
BarberShop/BarberShop/FormClients.Designer.cs generated
View File

@ -87,7 +87,7 @@
buttonRefresh.UseVisualStyleBackColor = true; buttonRefresh.UseVisualStyleBackColor = true;
buttonRefresh.Click += ButtonRef_Click; buttonRefresh.Click += ButtonRef_Click;
// //
// FormComponents // FormClients
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
@ -97,8 +97,8 @@
Controls.Add(buttonChange); Controls.Add(buttonChange);
Controls.Add(buttonAdd); Controls.Add(buttonAdd);
Controls.Add(dataGridView); Controls.Add(dataGridView);
Name = "FormComponents"; Name = "FormClients";
Text = "Компоненты"; Text = "Клиенты";
Load += FormClients_Load; Load += FormClients_Load;
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
ResumeLayout(false); ResumeLayout(false);

30
BarberShop/BarberShop/FormCreateAppointment.Designer.cs generated
View File

@ -36,6 +36,8 @@
labelEmployee = new Label(); labelEmployee = new Label();
buttonSave = new Button(); buttonSave = new Button();
buttonCancel = new Button(); buttonCancel = new Button();
textBoxDateTime = new TextBox();
label1 = new Label();
SuspendLayout(); SuspendLayout();
// //
// comboBoxService // comboBoxService
@ -93,7 +95,7 @@
// //
// buttonSave // buttonSave
// //
buttonSave.Location = new Point(278, 157); buttonSave.Location = new Point(278, 154);
buttonSave.Name = "buttonSave"; buttonSave.Name = "buttonSave";
buttonSave.Size = new Size(93, 26); buttonSave.Size = new Size(93, 26);
buttonSave.TabIndex = 6; buttonSave.TabIndex = 6;
@ -103,7 +105,7 @@
// //
// buttonCancel // buttonCancel
// //
buttonCancel.Location = new Point(386, 157); buttonCancel.Location = new Point(386, 154);
buttonCancel.Name = "buttonCancel"; buttonCancel.Name = "buttonCancel";
buttonCancel.Size = new Size(97, 26); buttonCancel.Size = new Size(97, 26);
buttonCancel.TabIndex = 7; buttonCancel.TabIndex = 7;
@ -111,11 +113,29 @@
buttonCancel.UseVisualStyleBackColor = true; buttonCancel.UseVisualStyleBackColor = true;
buttonCancel.Click += CancelButton_Click; buttonCancel.Click += CancelButton_Click;
// //
// textBoxDateTime
//
textBoxDateTime.Location = new Point(130, 121);
textBoxDateTime.Name = "textBoxDateTime";
textBoxDateTime.Size = new Size(353, 27);
textBoxDateTime.TabIndex = 9;
//
// label1
//
label1.AutoSize = true;
label1.Location = new Point(21, 124);
label1.Name = "label1";
label1.Size = new Size(102, 20);
label1.TabIndex = 10;
label1.Text = "Дата и время";
//
// FormCreateAppointment // FormCreateAppointment
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(515, 202); ClientSize = new Size(515, 192);
Controls.Add(label1);
Controls.Add(textBoxDateTime);
Controls.Add(buttonCancel); Controls.Add(buttonCancel);
Controls.Add(buttonSave); Controls.Add(buttonSave);
Controls.Add(labelService); Controls.Add(labelService);
@ -125,7 +145,7 @@
Controls.Add(labelClient); Controls.Add(labelClient);
Controls.Add(comboBoxClient); Controls.Add(comboBoxClient);
Name = "FormCreateAppointment"; Name = "FormCreateAppointment";
Text = "Заказ"; Text = "Запись";
Load += AppointmentForm_Load; Load += AppointmentForm_Load;
ResumeLayout(false); ResumeLayout(false);
PerformLayout(); PerformLayout();
@ -141,5 +161,7 @@
private Label labelEmployee; private Label labelEmployee;
private Button buttonSave; private Button buttonSave;
private Button buttonCancel; private Button buttonCancel;
private TextBox textBoxDateTime;
private Label label1;
} }
} }

33
BarberShop/BarberShop/FormCreateAppointment.cs
View File

@ -1,5 +1,6 @@
using BarberShopContracts.BindingModels; using BarberShopContracts.BindingModels;
using BarberShopContracts.BusinessLogicContracts; using BarberShopContracts.BusinessLogicContracts;
using BarberShopContracts.SearchModels;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -62,6 +63,30 @@ namespace BarberShop
comboBoxEmployee.DataSource = listE; comboBoxEmployee.DataSource = listE;
comboBoxEmployee.SelectedItem = null; comboBoxEmployee.SelectedItem = null;
} }
if (_id.HasValue)
{
try
{
var view = _logicA.ReadElement(new AppointmentSearchModel
{
Id = _id.Value
});
if (view != null)
{
comboBoxClient.Text = view.ClientName;
comboBoxEmployee.Text = view.EmployeeName;
comboBoxService.Text = view.ServiceName;
textBoxDateTime.Text = view.Time.ToString();
}
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения записи");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
MessageBoxIcon.Error);
}
}
_logger.LogInformation("Компьютер загружен"); _logger.LogInformation("Компьютер загружен");
} }
catch (Exception ex) catch (Exception ex)
@ -82,13 +107,15 @@ namespace BarberShop
_logger.LogInformation("Создание заказа"); _logger.LogInformation("Создание заказа");
try try
{ {
var operationResult = _logicA.Create(new AppointmentBindingModel var model = new AppointmentBindingModel
{ {
Id = _id ?? 0,
ServiceId = Convert.ToInt32(comboBoxService.SelectedValue), ServiceId = Convert.ToInt32(comboBoxService.SelectedValue),
ClientId = Convert.ToInt32(comboBoxClient.SelectedValue), ClientId = Convert.ToInt32(comboBoxClient.SelectedValue),
EmployeeId = Convert.ToInt32(comboBoxEmployee.SelectedValue), EmployeeId = Convert.ToInt32(comboBoxEmployee.SelectedValue),
Time = DateTime.UtcNow Time = Convert.ToDateTime(textBoxDateTime.Text)
}); };
var operationResult = _id.HasValue ? _logicA.Update(model) : _logicA.Create(model);
if (!operationResult) if (!operationResult)
{ {
throw new Exception("Ошибка при создании заказа. Дополнительная информация в логах."); throw new Exception("Ошибка при создании заказа. Дополнительная информация в логах.");

6
BarberShop/BarberShop/FormEmployees.Designer.cs generated
View File

@ -87,7 +87,7 @@
buttonRefresh.UseVisualStyleBackColor = true; buttonRefresh.UseVisualStyleBackColor = true;
buttonRefresh.Click += ButtonRef_Click; buttonRefresh.Click += ButtonRef_Click;
// //
// FormComponents // FormEmployees
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
@ -97,8 +97,8 @@
Controls.Add(buttonChange); Controls.Add(buttonChange);
Controls.Add(buttonAdd); Controls.Add(buttonAdd);
Controls.Add(dataGridView); Controls.Add(dataGridView);
Name = "FormComponents"; Name = "FormEmployees";
Text = "Компоненты"; Text = "Сотрудники";
Load += FormEmployees_Load; Load += FormEmployees_Load;
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
ResumeLayout(false); ResumeLayout(false);

16
BarberShop/BarberShop/FormMain.Designer.cs generated
View File

@ -63,28 +63,28 @@
// компонентыToolStripMenuItem // компонентыToolStripMenuItem
// //
компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
компонентыToolStripMenuItem.Size = new Size(184, 26); компонентыToolStripMenuItem.Size = new Size(182, 26);
компонентыToolStripMenuItem.Text = "Компоненты"; компонентыToolStripMenuItem.Text = "Компоненты";
компонентыToolStripMenuItem.Click += ComponentsStripMenuItem_Click; компонентыToolStripMenuItem.Click += ComponentsStripMenuItem_Click;
// //
// услугиToolStripMenuItem // услугиToolStripMenuItem
// //
услугиToolStripMenuItem.Name = "услугиToolStripMenuItem"; услугиToolStripMenuItem.Name = "услугиToolStripMenuItem";
услугиToolStripMenuItem.Size = new Size(184, 26); услугиToolStripMenuItem.Size = new Size(182, 26);
услугиToolStripMenuItem.Text = "Услуги"; услугиToolStripMenuItem.Text = "Услуги";
услугиToolStripMenuItem.Click += ServicesStripMenuItem_Click; услугиToolStripMenuItem.Click += ServicesStripMenuItem_Click;
// //
// клиентыToolStripMenuItem // клиентыToolStripMenuItem
// //
клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem"; клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
клиентыToolStripMenuItem.Size = new Size(184, 26); клиентыToolStripMenuItem.Size = new Size(182, 26);
клиентыToolStripMenuItem.Text = "Клиенты"; клиентыToolStripMenuItem.Text = "Клиенты";
клиентыToolStripMenuItem.Click += ClientsStripMenuItem_Click; клиентыToolStripMenuItem.Click += ClientsStripMenuItem_Click;
// //
// мастераToolStripMenuItem // мастераToolStripMenuItem
// //
мастераToolStripMenuItem.Name = "мастераToolStripMenuItem"; мастераToolStripMenuItem.Name = "мастераToolStripMenuItem";
мастераToolStripMenuItem.Size = new Size(184, 26); мастераToolStripMenuItem.Size = new Size(182, 26);
мастераToolStripMenuItem.Text = "Мастера"; мастераToolStripMenuItem.Text = "Мастера";
мастераToolStripMenuItem.Click += EmployeesStripMenuItem_Click; мастераToolStripMenuItem.Click += EmployeesStripMenuItem_Click;
// //
@ -104,7 +104,7 @@
buttonCreate.Name = "buttonCreate"; buttonCreate.Name = "buttonCreate";
buttonCreate.Size = new Size(187, 37); buttonCreate.Size = new Size(187, 37);
buttonCreate.TabIndex = 2; buttonCreate.TabIndex = 2;
buttonCreate.Text = "Создать заказ"; buttonCreate.Text = "Создать запись";
buttonCreate.UseVisualStyleBackColor = true; buttonCreate.UseVisualStyleBackColor = true;
buttonCreate.Click += CreateAppointmentButton_Click; buttonCreate.Click += CreateAppointmentButton_Click;
// //
@ -114,7 +114,7 @@
buttonUpdate.Name = "buttonUpdate"; buttonUpdate.Name = "buttonUpdate";
buttonUpdate.Size = new Size(187, 37); buttonUpdate.Size = new Size(187, 37);
buttonUpdate.TabIndex = 3; buttonUpdate.TabIndex = 3;
buttonUpdate.Text = "Отдать на выполнение"; buttonUpdate.Text = "Обновить";
buttonUpdate.UseVisualStyleBackColor = true; buttonUpdate.UseVisualStyleBackColor = true;
buttonUpdate.Click += ButtonUpd_Click; buttonUpdate.Click += ButtonUpd_Click;
// //
@ -124,7 +124,7 @@
buttonDelete.Name = "buttonDelete"; buttonDelete.Name = "buttonDelete";
buttonDelete.Size = new Size(187, 37); buttonDelete.Size = new Size(187, 37);
buttonDelete.TabIndex = 4; buttonDelete.TabIndex = 4;
buttonDelete.Text = "Заказ готов"; buttonDelete.Text = "Удалить";
buttonDelete.UseVisualStyleBackColor = true; buttonDelete.UseVisualStyleBackColor = true;
buttonDelete.Click += ButtonDelete_Click; buttonDelete.Click += ButtonDelete_Click;
// //
@ -151,7 +151,7 @@
Controls.Add(menuStrip); Controls.Add(menuStrip);
MainMenuStrip = menuStrip; MainMenuStrip = menuStrip;
Name = "FormMain"; Name = "FormMain";
Text = "Магазин компьютеров"; Text = "Салон суеты";
Load += FormMain_Load; Load += FormMain_Load;
menuStrip.ResumeLayout(false); menuStrip.ResumeLayout(false);
menuStrip.PerformLayout(); menuStrip.PerformLayout();

8
BarberShop/BarberShopBusinessLogic/AppointmentLogic.cs
View File

@ -97,10 +97,10 @@ namespace BarberShopBusinessLogic
{ {
return; return;
} }
//if (model.Time < DateTime.Now) if (model.Time < DateTime.Now)
//{ {
// throw new ArgumentNullException("Некорректная дата", nameof(model.Time)); throw new ArgumentNullException("Некорректная дата", nameof(model.Time));
//} }
_logger.LogInformation("Time. Time:{Time}. Id: { Id}", model.Time, model.Id); _logger.LogInformation("Time. Time:{Time}. Id: { Id}", model.Time, model.Id);
} }
} }