ekallin/Beauty_Salon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

всё, всё работает, можно приступать к замерам времени

Browse Source
This commit is contained in:
Елена Бакальская 2024-05-15 00:34:17 +04:00
parent 942fa52827
commit 9d73746078
4 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BeautySalon/BeautySalon/FormCheques.cs
View File

@ -55,8 +55,8 @@ namespace BeautySalon
dataGridView.Columns.Add("ClientFIO", "ФИО клиента"); dataGridView.Columns.Add("ClientFIO", "ФИО клиента");
dataGridView.Columns.Add("ServiceName", "Название услуги"); dataGridView.Columns.Add("ServiceName", "Название услуги");
dataGridView.Columns.Add("MasterFIO", "ФИО мастера"); dataGridView.Columns.Add("MasterFIO", "ФИО мастера");
dataGridView.Columns.Add("DateReception", "Дата оказания услуги");
dataGridView.Columns.Add("Price", "Цена"); dataGridView.Columns.Add("Price", "Цена");
dataGridView.Columns.Add("DateReception", "Дата оказания услуги");
} }
foreach (Cheque cheque in cheques) foreach (Cheque cheque in cheques)
@ -67,7 +67,7 @@ namespace BeautySalon
if(clientFIO != null && serviceName != null && masterFIO != null) if(clientFIO != null && serviceName != null && masterFIO != null)
{ {
dataGridView.Rows.Add(cheque.ChequeId, clientFIO, serviceName, masterFIO, cheque.DateReception, cheque.Price); dataGridView.Rows.Add(cheque.ChequeId, clientFIO, serviceName, masterFIO, cheque.Price, cheque.DateReception);
} }
} }
dataGridView.Columns["ChequeId"].Visible = false; dataGridView.Columns["ChequeId"].Visible = false;

11
BeautySalon/BeautySalon/FormMain.Designer.cs generated
View File

@ -76,11 +76,16 @@
добавитьToolStripMenuItem1.Text = "Клиенты"; добавитьToolStripMenuItem1.Text = "Клиенты";
добавитьToolStripMenuItem1.Click += добавитьToolStripMenuItem1_Click; добавитьToolStripMenuItem1.Click += добавитьToolStripMenuItem1_Click;
// //
// создатьПриемToolStripMenuItem
//
создатьПриемToolStripMenuItem.Name = "создатьПриемToolStripMenuItem";
создатьПриемToolStripMenuItem.Size = new Size(14, 24);
//
// посмотретьЧекиToolStripMenuItem // посмотретьЧекиToolStripMenuItem
// //
посмотретьЧекиToolStripMenuItem.Name = "посмотретьЧекиToolStripMenuItem"; посмотретьЧекиToolStripMenuItem.Name = "посмотретьЧекиToolStripMenuItem";
посмотретьЧекиToolStripMenuItem.Size = new Size(143, 24); посмотретьЧекиToolStripMenuItem.Size = new Size(57, 24);
посмотретьЧекиToolStripMenuItem.Text = "Посмотреть чеки"; посмотретьЧекиToolStripMenuItem.Text = "Чеки";
посмотретьЧекиToolStripMenuItem.Click += посмотретьЧекиToolStripMenuItem_Click; посмотретьЧекиToolStripMenuItem.Click += посмотретьЧекиToolStripMenuItem_Click;
// //
// FormMain // FormMain
@ -91,7 +96,7 @@
Controls.Add(menuStrip1); Controls.Add(menuStrip1);
MainMenuStrip = menuStrip1; MainMenuStrip = menuStrip1;
Name = "FormMain"; Name = "FormMain";
Text = "FormMain"; Text = "Здрасьте до свидания";
menuStrip1.ResumeLayout(false); menuStrip1.ResumeLayout(false);
menuStrip1.PerformLayout(); menuStrip1.PerformLayout();
ResumeLayout(false); ResumeLayout(false);

2
BeautySalon/BeautySalon/FormService.Designer.cs generated
View File

@ -123,7 +123,7 @@
Controls.Add(FIO); Controls.Add(FIO);
Controls.Add(textBoxName); Controls.Add(textBoxName);
Name = "FormService"; Name = "FormService";
Text = "FormService"; Text = "Услуга";
Load += FormService_Load; Load += FormService_Load;
((System.ComponentModel.ISupportInitialize)numericUpDownPrice).EndInit(); ((System.ComponentModel.ISupportInitialize)numericUpDownPrice).EndInit();
ResumeLayout(false); ResumeLayout(false);

21
BeautySalon/BeautySalonDBModels/Implements/ChequeDatabase.cs
View File

@ -2,6 +2,7 @@
using Npgsql; using Npgsql;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -14,8 +15,8 @@ namespace BeautySalonDBModels.Implements
{ {
using var conn = GetConnection(); using var conn = GetConnection();
conn.Open(); conn.Open();
using var cmd = new NpgsqlCommand("INSERT INTO cheques (cheque_id, client_id, master_id, service_id, price, date_reception)" + using var cmd = new NpgsqlCommand("INSERT INTO cheques (cheque_id, client_id, service_id, master_id, date_reception, price)" +
" VALUES (nextval('seq_cheque'), @ClientId, @master_id, @service_id, @Price, @DateReception)", conn); " VALUES (nextval('seq_cheque'), @ClientId, @service_id, @master_id, @DateReception, @Price)", conn);
cmd.Parameters.AddWithValue("@ClientId", cheque.ClientId); cmd.Parameters.AddWithValue("@ClientId", cheque.ClientId);
cmd.Parameters.AddWithValue("@master_id", cheque.MasterId); cmd.Parameters.AddWithValue("@master_id", cheque.MasterId);
cmd.Parameters.AddWithValue("@service_id", cheque.ServiceId); cmd.Parameters.AddWithValue("@service_id", cheque.ServiceId);
@ -37,10 +38,10 @@ namespace BeautySalonDBModels.Implements
{ {
ChequeId = reader.GetInt32(0), ChequeId = reader.GetInt32(0),
ClientId = reader.GetInt32(1), ClientId = reader.GetInt32(1),
MasterId = reader.GetInt32(2), ServiceId = reader.GetInt32(4),
ServiceId = reader.GetInt32(3), MasterId = reader.GetInt32(3),
Price = reader.GetDouble(4), DateReception = reader.GetFieldValue<DateTime>(5),
DateReception = reader.GetDateTime(5) Price = reader.GetDouble(2),
}; };
} }
return null; return null;
@ -59,10 +60,10 @@ namespace BeautySalonDBModels.Implements
{ {
ChequeId = reader.GetInt32(0), ChequeId = reader.GetInt32(0),
ClientId = reader.GetInt32(1), ClientId = reader.GetInt32(1),
MasterId = reader.GetInt32(2), ServiceId = reader.GetInt32(4),
ServiceId = reader.GetInt32(3), MasterId = reader.GetInt32(3),
Price = reader.GetDouble(4), DateReception = reader.GetFieldValue<DateTime>(5),
DateReception = reader.GetDateTime(5) Price = reader.GetDouble(2),
}); });
} }
return cheques; return cheques;