ttartt/SUBD_Labs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

норм вывод

Browse Source
This commit is contained in:
Татьяна Артамонова 2023-05-17 02:04:30 +04:00
parent 194747f238
commit c983d6aa31
15 changed files with 137 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
BeautySalon/FormCreateVisit.Designer.cs generated
View File

@ -28,9 +28,7 @@
/// </summary>
private void InitializeComponent()
{
this.labelMaster = new System.Windows.Forms.Label();
this.labelSum = new System.Windows.Forms.Label();
this.comboBoxMaster = new System.Windows.Forms.ComboBox();
this.textBoxSum = new System.Windows.Forms.TextBox();
this.buttonSave = new System.Windows.Forms.Button();
this.buttonCancel = new System.Windows.Forms.Button();
@ -42,38 +40,18 @@
this.dateTimePicker = new System.Windows.Forms.DateTimePicker();
this.SuspendLayout();
//
// labelMaster
//
this.labelMaster.AutoSize = true;
this.labelMaster.Location = new System.Drawing.Point(12, 44);
this.labelMaster.Name = "labelMaster";
this.labelMaster.Size = new System.Drawing.Size(51, 15);
this.labelMaster.TabIndex = 0;
this.labelMaster.Text = "Мастер:";
//
// labelSum
//
this.labelSum.AutoSize = true;
this.labelSum.Location = new System.Drawing.Point(11, 102);
this.labelSum.Location = new System.Drawing.Point(11, 73);
this.labelSum.Name = "labelSum";
this.labelSum.Size = new System.Drawing.Size(48, 15);
this.labelSum.TabIndex = 2;
this.labelSum.Text = "Сумма:";
//
// comboBoxMaster
//
this.comboBoxMaster.BackColor = System.Drawing.SystemColors.Window;
this.comboBoxMaster.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxMaster.FormattingEnabled = true;
this.comboBoxMaster.Location = new System.Drawing.Point(93, 41);
this.comboBoxMaster.Name = "comboBoxMaster";
this.comboBoxMaster.Size = new System.Drawing.Size(238, 23);
this.comboBoxMaster.TabIndex = 3;
this.comboBoxMaster.SelectedIndexChanged += new System.EventHandler(this.ComboBoxMaster_SelectedIndexChanged);
//
// textBoxSum
//
this.textBoxSum.Location = new System.Drawing.Point(93, 99);
this.textBoxSum.Location = new System.Drawing.Point(93, 70);
this.textBoxSum.Name = "textBoxSum";
this.textBoxSum.ReadOnly = true;
this.textBoxSum.Size = new System.Drawing.Size(238, 23);
@ -81,7 +59,7 @@
//
// buttonSave
//
this.buttonSave.Location = new System.Drawing.Point(175, 170);
this.buttonSave.Location = new System.Drawing.Point(175, 141);
this.buttonSave.Name = "buttonSave";
this.buttonSave.Size = new System.Drawing.Size(75, 23);
this.buttonSave.TabIndex = 6;
@ -91,7 +69,7 @@
//
// buttonCancel
//
this.buttonCancel.Location = new System.Drawing.Point(256, 170);
this.buttonCancel.Location = new System.Drawing.Point(256, 141);
this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.Size = new System.Drawing.Size(75, 23);
this.buttonCancel.TabIndex = 7;
@ -124,7 +102,7 @@
this.comboBoxService.BackColor = System.Drawing.SystemColors.Window;
this.comboBoxService.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxService.FormattingEnabled = true;
this.comboBoxService.Location = new System.Drawing.Point(93, 70);
this.comboBoxService.Location = new System.Drawing.Point(93, 41);
this.comboBoxService.Name = "comboBoxService";
this.comboBoxService.Size = new System.Drawing.Size(238, 23);
this.comboBoxService.TabIndex = 11;
@ -133,7 +111,7 @@
// labelService
//
this.labelService.AutoSize = true;
this.labelService.Location = new System.Drawing.Point(11, 73);
this.labelService.Location = new System.Drawing.Point(11, 44);
this.labelService.Name = "labelService";
this.labelService.Size = new System.Drawing.Size(47, 15);
this.labelService.TabIndex = 10;
@ -142,7 +120,7 @@
// labelDate
//
this.labelDate.AutoSize = true;
this.labelDate.Location = new System.Drawing.Point(12, 134);
this.labelDate.Location = new System.Drawing.Point(12, 105);
this.labelDate.Name = "labelDate";
this.labelDate.Size = new System.Drawing.Size(35, 15);
this.labelDate.TabIndex = 12;
@ -150,7 +128,7 @@
//
// dateTimePicker
//
this.dateTimePicker.Location = new System.Drawing.Point(93, 128);
this.dateTimePicker.Location = new System.Drawing.Point(93, 99);
this.dateTimePicker.Name = "dateTimePicker";
this.dateTimePicker.Size = new System.Drawing.Size(238, 23);
this.dateTimePicker.TabIndex = 13;
@ -159,7 +137,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(346, 206);
this.ClientSize = new System.Drawing.Size(346, 177);
this.Controls.Add(this.dateTimePicker);
this.Controls.Add(this.labelDate);
this.Controls.Add(this.comboBoxService);
@ -169,9 +147,7 @@
this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.buttonSave);
this.Controls.Add(this.textBoxSum);
this.Controls.Add(this.comboBoxMaster);
this.Controls.Add(this.labelSum);
this.Controls.Add(this.labelMaster);
this.Name = "FormCreateVisit";
this.Text = "Посещение";
this.Load += new System.EventHandler(this.FormCreateVisit_Load);
@ -181,10 +157,7 @@
}
#endregion
private Label labelMaster;
private Label labelSum;
private ComboBox comboBoxMaster;
private TextBox textBoxSum;
private Button buttonSave;
private Button buttonCancel;

53
BeautySalon/FormCreateVisit.cs
View File

@ -10,16 +10,14 @@ namespace BeautySalon
private readonly ILogger _logger;
private readonly IServiceLogic _logicS;
private readonly IClientLogic _logicC;
private readonly IMasterLogic _logicM;
private readonly IVisitLogic _logicV;
public FormCreateVisit(ILogger<FormCreateVisit> logger, IVisitLogic logicV, IServiceLogic logicS, IClientLogic logicC, IMasterLogic logicM)
public FormCreateVisit(ILogger<FormCreateVisit> logger, IVisitLogic logicV, IServiceLogic logicS, IClientLogic logicC)
{
InitializeComponent();
_logger = logger;
_logicS = logicS;
_logicV = logicV;
_logicC = logicC;
_logicM = logicM;
LoadData();
}
@ -58,24 +56,7 @@ namespace BeautySalon
{
_logger.LogError(ex, "Ошибка загрузки списка клиентов");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
_logger.LogInformation("Загрузка мастеров для заказа");
try
{
var list = _logicM.ReadList(null);
if (list != null)
{
comboBoxMaster.DisplayMember = "MasterFIO";
comboBoxMaster.ValueMember = "Id";
comboBoxMaster.DataSource = list;
comboBoxMaster.SelectedItem = null;
}
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка загрузки списка мастеров");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
private void FormCreateVisit_Load(object sender, EventArgs e)
@ -86,7 +67,7 @@ namespace BeautySalon
private void CalcSum()
{
if (comboBoxService.SelectedValue != null)
if (comboBoxService.SelectedValue != null && comboBoxClient.SelectedValue != null)
{
try
{
@ -112,6 +93,23 @@ namespace BeautySalon
private void ComboBoxMaster_SelectedIndexChanged(object sender, EventArgs e)
{
_logger.LogInformation("Загрузка услуг для мастера");
try
{
var list = _logicS.ReadList(null);
if (list != null)
{
comboBoxService.DisplayMember = "ServiceName";
comboBoxService.ValueMember = "Id";
comboBoxService.DataSource = list;
comboBoxService.SelectedItem = null;
}
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка загрузки списка мастеров");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void ComboBoxService_SelectedIndexChanged(object sender, EventArgs e)
@ -130,24 +128,17 @@ namespace BeautySalon
{
MessageBox.Show("Выберите услугу", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
if (comboBoxMaster.SelectedValue == null)
{
MessageBox.Show("Выберите мастера", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
}
_logger.LogInformation("Создание посещения");
try
{
var operationResult = _logicV.Create(new VisitBindingModel
{
MasterId = Convert.ToInt32(comboBoxMaster.SelectedValue),
MasterFIO = comboBoxMaster.Text,
ClientId = Convert.ToInt32(comboBoxClient.SelectedValue),
ClientFIO = comboBoxClient.Text,
ServiceId = Convert.ToInt32(comboBoxService.SelectedValue),
ServiceName = comboBoxService.Text,
DateOfVisit = dateTimePicker.Value,
DateOfVisit = dateTimePicker.Value.ToUniversalTime(),
Sum = Convert.ToDouble(textBoxSum.Text)
});
if (!operationResult)

2
BeautySalon/FormMain.cs
View File

@ -72,8 +72,6 @@ namespace BeautySalon
dataGridView.DataSource = list;
dataGridView.Columns["ClientId"].Visible = false;
dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
dataGridView.Columns["MasterId"].Visible = false;
dataGridView.Columns["MasterFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
dataGridView.Columns["ServiceId"].Visible = false;
dataGridView.Columns["ServiceName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
dataGridView.Columns["DateOfVisit"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;

1
BeautySalonDataModels/Models/IVisitModel.cs
View File

@ -4,7 +4,6 @@
{
DateTime DateOfVisit { get; }
int ClientId { get; }
int MasterId { get; }
int ServiceId { get; }
double Sum { get; }
}

2
BeautySalonDatabaseImplement/BeautySalonDatabase.cs
View File

@ -9,7 +9,7 @@ namespace BeautySalonDatabaseImplement
{
if (optionsBuilder.IsConfigured == false)
{
optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-IHH1ICP\SQLEXPRESS;Initial Catalog=BeautySalonDatabaseFull;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
optionsBuilder.UseNpgsql("Host=192.168.56.102;Port=5432;Database=BeautySalonDatabase;Username=postgres;Password=12345");
}
base.OnConfiguring(optionsBuilder);
}

1
BeautySalonDatabaseImplement/BeautySalonDatabaseImplement.csproj
View File

@ -13,6 +13,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.4" />
</ItemGroup>
<ItemGroup>

11
BeautySalonDatabaseImplement/Implements/MasterStorage.cs
View File

@ -2,6 +2,7 @@
using BeautySalonContracts.SearchModels;
using BeautySalonContracts.StoragesContracts;
using BeautySalonContracts.ViewModels;
using BeautySalonDatabaseImplement;
using BeautySalonDatabaseImplement.Models;
using Microsoft.EntityFrameworkCore;
@ -68,17 +69,17 @@ namespace BeautySalonDatabaseImplement.Implements
using var transaction = context.Database.BeginTransaction();
try
{
var engine = context.Masters.FirstOrDefault(rec =>
var master = context.Masters.FirstOrDefault(rec =>
rec.Id == model.Id);
if (engine == null)
if (master == null)
{
return null;
}
engine.Update(model);
master.Update(model);
context.SaveChanges();
engine.UpdateServices(context, model);
master.UpdateServices(context, model);
transaction.Commit();
return engine.GetViewModel;
return master.GetViewModel;
}
catch
{

3
BeautySalonDatabaseImplement/Implements/ServiceStorage.cs
View File

@ -2,6 +2,7 @@
using BeautySalonContracts.SearchModels;
using BeautySalonContracts.StoragesContracts;
using BeautySalonContracts.ViewModels;
using BeautySalonDatabaseImplement;
using BeautySalonDatabaseImplement.Models;
using System.ServiceModel;
@ -79,4 +80,4 @@ namespace BeautySalonDatabaseImplement.Implements
return null;
}
}
}
}

3
BeautySalonDatabaseImplement/Implements/VisitStorage.cs
View File

@ -13,7 +13,6 @@ namespace BeautySalonDatabaseImplement.Implements
{
using var context = new BeautySalonDatabase();
var element = context.Visits
.Include(x => x.Master)
.Include(x => x.Client)
.Include(x => x.Service)
.FirstOrDefault(rec => rec.Id == model.Id);
@ -55,7 +54,6 @@ namespace BeautySalonDatabaseImplement.Implements
using var context = new BeautySalonDatabase();
return context.Visits
.Include(x => x.Service)
.Include(x => x.Master)
.Include(x => x.Client)
.Select(x => x.GetViewModel).ToList();
}
@ -72,7 +70,6 @@ namespace BeautySalonDatabaseImplement.Implements
context.SaveChanges();
return context.Visits
.Include(x => x.Service)
.Include(x => x.Master)
.Include(x => x.Client)
.FirstOrDefault(x => x.Id == newVisit.Id)
?.GetViewModel;

76
BeautySalonDatabaseImplement/Migrations/20230513191649_InitialCreate.Designer.cs → BeautySalonDatabaseImplement/Migrations/20230516215849_InitialCreate.Designer.cs generated
View File

@ -3,16 +3,16 @@ using System;
using BeautySalonDatabaseImplement;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace BeautySalonDatabaseImplement.Migrations
{
[DbContext(typeof(BeautySalonDatabase))]
[Migration("20230513191649_InitialCreate")]
[Migration("20230516215849_InitialCreate")]
partial class InitialCreate
{
/// <inheritdoc />
@ -21,25 +21,25 @@ namespace BeautySalonDatabaseImplement.Migrations
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "7.0.5")
.HasAnnotation("Relational:MaxIdentifierLength", 128);
.HasAnnotation("Relational:MaxIdentifierLength", 63);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Client", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
.HasColumnType("integer");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("ClientFIO")
.IsRequired()
.HasColumnType("nvarchar(max)");
.HasColumnType("text");
b.Property<string>("PhoneNumber")
.IsRequired()
.HasColumnType("nvarchar(max)");
.HasColumnType("text");
b.HasKey("Id");
@ -50,16 +50,16 @@ namespace BeautySalonDatabaseImplement.Migrations
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
.HasColumnType("integer");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("MasterFIO")
.IsRequired()
.HasColumnType("nvarchar(max)");
.HasColumnType("text");
b.Property<double>("Wage")
.HasColumnType("float");
.HasColumnType("double precision");
b.HasKey("Id");
@ -70,18 +70,18 @@ namespace BeautySalonDatabaseImplement.Migrations
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
.HasColumnType("integer");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<int>("MasterId")
.HasColumnType("int");
.HasColumnType("integer");
b.Property<int>("ServiceId")
.HasColumnType("int");
.HasColumnType("integer");
b.Property<double>("Wage")
.HasColumnType("float");
.HasColumnType("double precision");
b.HasKey("Id");
@ -96,19 +96,19 @@ namespace BeautySalonDatabaseImplement.Migrations
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
.HasColumnType("integer");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<double>("Cost")
.HasColumnType("float");
.HasColumnType("double precision");
b.Property<string>("ServiceName")
.IsRequired()
.HasColumnType("nvarchar(max)");
.HasColumnType("text");
b.Property<double>("Time")
.HasColumnType("float");
.HasColumnType("double precision");
b.HasKey("Id");
@ -119,36 +119,32 @@ namespace BeautySalonDatabaseImplement.Migrations
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
.HasColumnType("integer");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("ClientFIO")
.IsRequired()
.HasColumnType("nvarchar(max)");
.HasColumnType("text");
b.Property<int>("ClientId")
.HasColumnType("int");
.HasColumnType("integer");
b.Property<DateTime>("DateOfVisit")
.HasColumnType("datetime2");
.HasColumnType("timestamp with time zone");
b.Property<string>("MasterFIO")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.Property<int>("MasterId")
.HasColumnType("int");
b.Property<int?>("MasterId")
.HasColumnType("integer");
b.Property<int>("ServiceId")
.HasColumnType("int");
.HasColumnType("integer");
b.Property<string>("ServiceName")
.IsRequired()
.HasColumnType("nvarchar(max)");
.HasColumnType("text");
b.Property<double>("Sum")
.HasColumnType("float");
.HasColumnType("double precision");
b.HasKey("Id");
@ -188,11 +184,9 @@ namespace BeautySalonDatabaseImplement.Migrations
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("BeautySalonDatabaseImplement.Models.Master", "Master")
b.HasOne("BeautySalonDatabaseImplement.Models.Master", null)
.WithMany("Visits")
.HasForeignKey("MasterId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
.HasForeignKey("MasterId");
b.HasOne("BeautySalonDatabaseImplement.Models.Service", "Service")
.WithMany()
@ -202,8 +196,6 @@ namespace BeautySalonDatabaseImplement.Migrations
b.Navigation("Client");
b.Navigation("Master");
b.Navigation("Service");
});

59
BeautySalonDatabaseImplement/Migrations/20230513191649_InitialCreate.cs → BeautySalonDatabaseImplement/Migrations/20230516215849_InitialCreate.cs
View File

@ -1,5 +1,6 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
@ -15,10 +16,10 @@ namespace BeautySalonDatabaseImplement.Migrations
name: "Clients",
columns: table => new
{
Id = table.Column<int>(type: "int", nullable: false)
.Annotation("SqlServer:Identity", "1, 1"),
ClientFIO = table.Column<string>(type: "nvarchar(max)", nullable: false),
PhoneNumber = table.Column<string>(type: "nvarchar(max)", nullable: false)
Id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
ClientFIO = table.Column<string>(type: "text", nullable: false),
PhoneNumber = table.Column<string>(type: "text", nullable: false)
},
constraints: table =>
{
@ -29,10 +30,10 @@ namespace BeautySalonDatabaseImplement.Migrations
name: "Masters",
columns: table => new
{
Id = table.Column<int>(type: "int", nullable: false)
.Annotation("SqlServer:Identity", "1, 1"),
MasterFIO = table.Column<string>(type: "nvarchar(max)", nullable: false),
Wage = table.Column<double>(type: "float", nullable: false)
Id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
MasterFIO = table.Column<string>(type: "text", nullable: false),
Wage = table.Column<double>(type: "double precision", nullable: false)
},
constraints: table =>
{
@ -43,11 +44,11 @@ namespace BeautySalonDatabaseImplement.Migrations
name: "Services",
columns: table => new
{
Id = table.Column<int>(type: "int", nullable: false)
.Annotation("SqlServer:Identity", "1, 1"),
ServiceName = table.Column<string>(type: "nvarchar(max)", nullable: false),
Cost = table.Column<double>(type: "float", nullable: false),
Time = table.Column<double>(type: "float", nullable: false)
Id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
ServiceName = table.Column<string>(type: "text", nullable: false),
Cost = table.Column<double>(type: "double precision", nullable: false),
Time = table.Column<double>(type: "double precision", nullable: false)
},
constraints: table =>
{
@ -58,11 +59,11 @@ namespace BeautySalonDatabaseImplement.Migrations
name: "MasterServices",
columns: table => new
{
Id = table.Column<int>(type: "int", nullable: false)
.Annotation("SqlServer:Identity", "1, 1"),
MasterId = table.Column<int>(type: "int", nullable: false),
ServiceId = table.Column<int>(type: "int", nullable: false),
Wage = table.Column<double>(type: "float", nullable: false)
Id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
MasterId = table.Column<int>(type: "integer", nullable: false),
ServiceId = table.Column<int>(type: "integer", nullable: false),
Wage = table.Column<double>(type: "double precision", nullable: false)
},
constraints: table =>
{
@ -85,16 +86,15 @@ namespace BeautySalonDatabaseImplement.Migrations
name: "Visits",
columns: table => new
{
Id = table.Column<int>(type: "int", nullable: false)
.Annotation("SqlServer:Identity", "1, 1"),
DateOfVisit = table.Column<DateTime>(type: "datetime2", nullable: false),
ClientId = table.Column<int>(type: "int", nullable: false),
MasterId = table.Column<int>(type: "int", nullable: false),
ServiceId = table.Column<int>(type: "int", nullable: false),
ClientFIO = table.Column<string>(type: "nvarchar(max)", nullable: false),
MasterFIO = table.Column<string>(type: "nvarchar(max)", nullable: false),
ServiceName = table.Column<string>(type: "nvarchar(max)", nullable: false),
Sum = table.Column<double>(type: "float", nullable: false)
Id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
DateOfVisit = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
ClientId = table.Column<int>(type: "integer", nullable: false),
ServiceId = table.Column<int>(type: "integer", nullable: false),
ClientFIO = table.Column<string>(type: "text", nullable: false),
ServiceName = table.Column<string>(type: "text", nullable: false),
Sum = table.Column<double>(type: "double precision", nullable: false),
MasterId = table.Column<int>(type: "integer", nullable: true)
},
constraints: table =>
{
@ -109,8 +109,7 @@ namespace BeautySalonDatabaseImplement.Migrations
name: "FK_Visits_Masters_MasterId",
column: x => x.MasterId,
principalTable: "Masters",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
principalColumn: "Id");
table.ForeignKey(
name: "FK_Visits_Services_ServiceId",
column: x => x.ServiceId,

74
BeautySalonDatabaseImplement/Migrations/BeautySalonDatabaseModelSnapshot.cs
View File

@ -3,8 +3,8 @@ using System;
using BeautySalonDatabaseImplement;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
@ -18,25 +18,25 @@ namespace BeautySalonDatabaseImplement.Migrations
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "7.0.5")
.HasAnnotation("Relational:MaxIdentifierLength", 128);
.HasAnnotation("Relational:MaxIdentifierLength", 63);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Client", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
.HasColumnType("integer");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("ClientFIO")
.IsRequired()
.HasColumnType("nvarchar(max)");
.HasColumnType("text");
b.Property<string>("PhoneNumber")
.IsRequired()
.HasColumnType("nvarchar(max)");
.HasColumnType("text");
b.HasKey("Id");
@ -47,16 +47,16 @@ namespace BeautySalonDatabaseImplement.Migrations
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
.HasColumnType("integer");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("MasterFIO")
.IsRequired()
.HasColumnType("nvarchar(max)");
.HasColumnType("text");
b.Property<double>("Wage")
.HasColumnType("float");
.HasColumnType("double precision");
b.HasKey("Id");
@ -67,18 +67,18 @@ namespace BeautySalonDatabaseImplement.Migrations
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
.HasColumnType("integer");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<int>("MasterId")
.HasColumnType("int");
.HasColumnType("integer");
b.Property<int>("ServiceId")
.HasColumnType("int");
.HasColumnType("integer");
b.Property<double>("Wage")
.HasColumnType("float");
.HasColumnType("double precision");
b.HasKey("Id");
@ -93,19 +93,19 @@ namespace BeautySalonDatabaseImplement.Migrations
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
.HasColumnType("integer");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<double>("Cost")
.HasColumnType("float");
.HasColumnType("double precision");
b.Property<string>("ServiceName")
.IsRequired()
.HasColumnType("nvarchar(max)");
.HasColumnType("text");
b.Property<double>("Time")
.HasColumnType("float");
.HasColumnType("double precision");
b.HasKey("Id");
@ -116,36 +116,32 @@ namespace BeautySalonDatabaseImplement.Migrations
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
.HasColumnType("integer");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("ClientFIO")
.IsRequired()
.HasColumnType("nvarchar(max)");
.HasColumnType("text");
b.Property<int>("ClientId")
.HasColumnType("int");
.HasColumnType("integer");
b.Property<DateTime>("DateOfVisit")
.HasColumnType("datetime2");
.HasColumnType("timestamp with time zone");
b.Property<string>("MasterFIO")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.Property<int>("MasterId")
.HasColumnType("int");
b.Property<int?>("MasterId")
.HasColumnType("integer");
b.Property<int>("ServiceId")
.HasColumnType("int");
.HasColumnType("integer");
b.Property<string>("ServiceName")
.IsRequired()
.HasColumnType("nvarchar(max)");
.HasColumnType("text");
b.Property<double>("Sum")
.HasColumnType("float");
.HasColumnType("double precision");
b.HasKey("Id");
@ -185,11 +181,9 @@ namespace BeautySalonDatabaseImplement.Migrations
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("BeautySalonDatabaseImplement.Models.Master", "Master")
b.HasOne("BeautySalonDatabaseImplement.Models.Master", null)
.WithMany("Visits")
.HasForeignKey("MasterId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
.HasForeignKey("MasterId");
b.HasOne("BeautySalonDatabaseImplement.Models.Service", "Service")
.WithMany()
@ -199,8 +193,6 @@ namespace BeautySalonDatabaseImplement.Migrations
b.Navigation("Client");
b.Navigation("Master");
b.Navigation("Service");
});

7
BeautySalonDatabaseImplement/Models/Visit.cs
View File

@ -11,15 +11,12 @@ namespace BeautySalonDatabaseImplement.Models
[Required]
public DateTime DateOfVisit { get; private set; }
public int ClientId { get; private set; }
public int MasterId { get; private set; }
public int ServiceId { get; private set; }
public string ClientFIO { get; set; } = string.Empty;
public string MasterFIO { get; set; } = string.Empty;
public string ServiceName { get; set; } = string.Empty;
[Required]
public double Sum { get; private set; }
public Client Client { get; set; }
public virtual Master Master { get; set; }
public virtual Service Service { get; set; }
public static Visit? Create(VisitBindingModel? model)
@ -34,8 +31,6 @@ namespace BeautySalonDatabaseImplement.Models
Id = model.Id,
ClientId = model.ClientId,
ClientFIO = model.ClientFIO,
MasterId = model.MasterId,
MasterFIO = model.MasterFIO,
ServiceId = model.ServiceId,
ServiceName = model.ServiceName,
Sum = model.Sum,
@ -64,8 +59,6 @@ namespace BeautySalonDatabaseImplement.Models
Id = Id,
ClientId = ClientId,
ClientFIO = context.Clients.FirstOrDefault(x => x.Id == ClientId)?.ClientFIO ?? string.Empty,
MasterId = MasterId,
MasterFIO = context.Masters.FirstOrDefault(x => x.Id == MasterId)?.MasterFIO ?? string.Empty,
ServiceId = ServiceId,
ServiceName = context.Services.FirstOrDefault(x => x.Id == ServiceId)?.ServiceName ?? string.Empty,
Sum = Sum,

2
BeauySalonContracts/BindingModels/VisitBindingModel.cs
View File

@ -7,10 +7,8 @@ namespace BeautySalonContracts.BindingModels
public int Id { get; set; }
public DateTime DateOfVisit { get; set; }
public int ClientId { get; set; }
public int MasterId { get; set; }
public int ServiceId { get; set; }
public string ClientFIO { get; set; } = string.Empty;
public string MasterFIO { get; set; } = string.Empty;
public string ServiceName { get; set; } = string.Empty;
public double Sum { get; set; }
}

3
BeauySalonContracts/ViewModels/VisitViewModel.cs
View File

@ -11,9 +11,6 @@ namespace BeautySalonContracts.ViewModels
public int ClientId { get; set; }
[DisplayName("Клиент")]
public string ClientFIO { get; set; } = string.Empty;
public int MasterId { get; set; }
[DisplayName("Мастер")]
public string MasterFIO { get; set; } = string.Empty;
public int ServiceId { get; set; }
[DisplayName("Услуга")]
public string ServiceName { get; set; } = string.Empty;