Victoria_Presnyakova/Pibd-22_Presnyakova.V.V_JewelryStore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

клиент показывается, с кайфом

Browse Source
This commit is contained in:
VictoriaPresnyakova 2023-04-03 22:10:09 +04:00
parent 48641a33aa
commit 3042a732ac
16 changed files with 279 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
JewelryStore/FormClients.cs
View File

@ -37,10 +37,8 @@ namespace JewelryStore
{ {
dataGridView.DataSource = list; dataGridView.DataSource = list;
dataGridView.Columns["Id"].Visible = false; dataGridView.Columns["Id"].Visible = false;
dataGridView.Columns["ClientFIO"].AutoSizeMode = dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
DataGridViewAutoSizeColumnMode.Fill; dataGridView.Columns["Email"].AutoSizeMode =DataGridViewAutoSizeColumnMode.Fill;
dataGridView.Columns["Email"].AutoSizeMode =
DataGridViewAutoSizeColumnMode.Fill;
dataGridView.Columns["Password"].Visible = false; dataGridView.Columns["Password"].Visible = false;
} }
_logger.LogInformation("Загрузка клиентов"); _logger.LogInformation("Загрузка клиентов");

330
JewelryStore/FormMain.Designer.cs generated
View File

@ -28,171 +28,180 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.buttonReady = new System.Windows.Forms.Button(); this.buttonReady = new System.Windows.Forms.Button();
this.dataGridView = new System.Windows.Forms.DataGridView(); this.dataGridView = new System.Windows.Forms.DataGridView();
this.buttonCreate = new System.Windows.Forms.Button(); this.buttonCreate = new System.Windows.Forms.Button();
this.buttonToWork = new System.Windows.Forms.Button(); this.buttonToWork = new System.Windows.Forms.Button();
this.buttonPut = new System.Windows.Forms.Button(); this.buttonPut = new System.Windows.Forms.Button();
this.buttonRefresh = new System.Windows.Forms.Button(); this.buttonRefresh = new System.Windows.Forms.Button();
this.menuStrip = new System.Windows.Forms.MenuStrip(); this.menuStrip = new System.Windows.Forms.MenuStrip();
this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.компонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.компонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.изделияToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.изделияToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.отчетыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.отчетыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.списокКомпонентовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.списокКомпонентовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.компонентыПоИзделиямToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.компонентыПоИзделиямToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.списокЗаказзовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.списокЗаказзовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.клиентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
this.SuspendLayout(); this.menuStrip.SuspendLayout();
// this.SuspendLayout();
// buttonReady //
// // buttonReady
this.buttonReady.Location = new System.Drawing.Point(1273, 225); //
this.buttonReady.Name = "buttonReady"; this.buttonReady.Location = new System.Drawing.Point(1273, 225);
this.buttonReady.Size = new System.Drawing.Size(215, 34); this.buttonReady.Name = "buttonReady";
this.buttonReady.TabIndex = 3; this.buttonReady.Size = new System.Drawing.Size(215, 34);
this.buttonReady.Text = "Заказ готов"; this.buttonReady.TabIndex = 3;
this.buttonReady.UseVisualStyleBackColor = true; this.buttonReady.Text = "Заказ готов";
this.buttonReady.Click += new System.EventHandler(this.buttonReady_Click); this.buttonReady.UseVisualStyleBackColor = true;
// this.buttonReady.Click += new System.EventHandler(this.buttonReady_Click);
// dataGridView //
// // dataGridView
this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; //
this.dataGridView.Location = new System.Drawing.Point(9, 52); this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView.Name = "dataGridView"; this.dataGridView.Location = new System.Drawing.Point(9, 52);
this.dataGridView.RowHeadersWidth = 62; this.dataGridView.Name = "dataGridView";
this.dataGridView.RowTemplate.Height = 33; this.dataGridView.RowHeadersWidth = 62;
this.dataGridView.Size = new System.Drawing.Size(1227, 386); this.dataGridView.RowTemplate.Height = 33;
this.dataGridView.TabIndex = 0; this.dataGridView.Size = new System.Drawing.Size(1227, 386);
// this.dataGridView.TabIndex = 0;
// buttonCreate //
// // buttonCreate
this.buttonCreate.Location = new System.Drawing.Point(1273, 52); //
this.buttonCreate.Name = "buttonCreate"; this.buttonCreate.Location = new System.Drawing.Point(1273, 52);
this.buttonCreate.Size = new System.Drawing.Size(215, 34); this.buttonCreate.Name = "buttonCreate";
this.buttonCreate.TabIndex = 1; this.buttonCreate.Size = new System.Drawing.Size(215, 34);
this.buttonCreate.Text = "Создать заказ"; this.buttonCreate.TabIndex = 1;
this.buttonCreate.UseVisualStyleBackColor = true; this.buttonCreate.Text = "Создать заказ";
this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click); this.buttonCreate.UseVisualStyleBackColor = true;
// this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click);
// buttonToWork //
// // buttonToWork
this.buttonToWork.Location = new System.Drawing.Point(1273, 137); //
this.buttonToWork.Name = "buttonToWork"; this.buttonToWork.Location = new System.Drawing.Point(1273, 137);
this.buttonToWork.Size = new System.Drawing.Size(215, 34); this.buttonToWork.Name = "buttonToWork";
this.buttonToWork.TabIndex = 2; this.buttonToWork.Size = new System.Drawing.Size(215, 34);
this.buttonToWork.Text = "Отдать на выполнение"; this.buttonToWork.TabIndex = 2;
this.buttonToWork.UseVisualStyleBackColor = true; this.buttonToWork.Text = "Отдать на выполнение";
this.buttonToWork.Click += new System.EventHandler(this.buttonToWork_Click); this.buttonToWork.UseVisualStyleBackColor = true;
// this.buttonToWork.Click += new System.EventHandler(this.buttonToWork_Click);
// buttonPut //
// // buttonPut
this.buttonPut.Location = new System.Drawing.Point(1273, 308); //
this.buttonPut.Name = "buttonPut"; this.buttonPut.Location = new System.Drawing.Point(1273, 308);
this.buttonPut.Size = new System.Drawing.Size(215, 34); this.buttonPut.Name = "buttonPut";
this.buttonPut.TabIndex = 4; this.buttonPut.Size = new System.Drawing.Size(215, 34);
this.buttonPut.Text = "Заказ выдан"; this.buttonPut.TabIndex = 4;
this.buttonPut.UseVisualStyleBackColor = true; this.buttonPut.Text = "Заказ выдан";
this.buttonPut.Click += new System.EventHandler(this.buttonPut_Click); this.buttonPut.UseVisualStyleBackColor = true;
// this.buttonPut.Click += new System.EventHandler(this.buttonPut_Click);
// buttonRefresh //
// // buttonRefresh
this.buttonRefresh.Location = new System.Drawing.Point(1273, 389); //
this.buttonRefresh.Name = "buttonRefresh"; this.buttonRefresh.Location = new System.Drawing.Point(1273, 389);
this.buttonRefresh.Size = new System.Drawing.Size(215, 34); this.buttonRefresh.Name = "buttonRefresh";
this.buttonRefresh.TabIndex = 5; this.buttonRefresh.Size = new System.Drawing.Size(215, 34);
this.buttonRefresh.Text = "Обновить список"; this.buttonRefresh.TabIndex = 5;
this.buttonRefresh.UseVisualStyleBackColor = true; this.buttonRefresh.Text = "Обновить список";
this.buttonRefresh.Click += new System.EventHandler(this.buttonRefresh_Click); this.buttonRefresh.UseVisualStyleBackColor = true;
// this.buttonRefresh.Click += new System.EventHandler(this.buttonRefresh_Click);
// menuStrip //
// // menuStrip
this.menuStrip.ImageScalingSize = new System.Drawing.Size(24, 24); //
this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.menuStrip.ImageScalingSize = new System.Drawing.Size(24, 24);
this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.справочникиToolStripMenuItem, this.справочникиToolStripMenuItem,
this.отчетыToolStripMenuItem}); this.отчетыToolStripMenuItem});
this.menuStrip.Location = new System.Drawing.Point(0, 0); this.menuStrip.Location = new System.Drawing.Point(0, 0);
this.menuStrip.Name = "menuStrip"; this.menuStrip.Name = "menuStrip";
this.menuStrip.Size = new System.Drawing.Size(1530, 33); this.menuStrip.Size = new System.Drawing.Size(1530, 33);
this.menuStrip.TabIndex = 6; this.menuStrip.TabIndex = 6;
this.menuStrip.Text = "menuStrip1"; this.menuStrip.Text = "menuStrip1";
// //
// справочникиToolStripMenuItem // справочникиToolStripMenuItem
// //
this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.компонентыToolStripMenuItem, this.компонентыToolStripMenuItem,
this.изделияToolStripMenuItem}); this.изделияToolStripMenuItem,
this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; this.клиентыToolStripMenuItem});
this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(139, 29); this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
this.справочникиToolStripMenuItem.Text = "Справочники"; this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(139, 29);
// this.справочникиToolStripMenuItem.Text = "Справочники";
// компонентыToolStripMenuItem //
// // компонентыToolStripMenuItem
this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; //
this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(240, 34); this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
this.компонентыToolStripMenuItem.Text = "Компоненты"; this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(270, 34);
this.компонентыToolStripMenuItem.Click += new System.EventHandler(this.компонентыToolStripMenuItem_Click); this.компонентыToolStripMenuItem.Text = "Компоненты";
// this.компонентыToolStripMenuItem.Click += new System.EventHandler(this.компонентыToolStripMenuItem_Click);
// изделияToolStripMenuItem //
// // изделияToolStripMenuItem
this.изделияToolStripMenuItem.Name = "изделияToolStripMenuItem"; //
this.изделияToolStripMenuItem.Size = new System.Drawing.Size(240, 34); this.изделияToolStripMenuItem.Name = "изделияToolStripMenuItem";
this.изделияToolStripMenuItem.Text = "Драгоценности"; this.изделияToolStripMenuItem.Size = new System.Drawing.Size(270, 34);
this.изделияToolStripMenuItem.Click += new System.EventHandler(this.драгоценностиToolStripMenuItem_Click); this.изделияToolStripMenuItem.Text = "Драгоценности";
// this.изделияToolStripMenuItem.Click += new System.EventHandler(this.драгоценностиToolStripMenuItem_Click);
// отчетыToolStripMenuItem //
// // отчетыToolStripMenuItem
this.отчетыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { //
this.отчетыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.списокКомпонентовToolStripMenuItem, this.списокКомпонентовToolStripMenuItem,
this.компонентыПоИзделиямToolStripMenuItem, this.компонентыПоИзделиямToolStripMenuItem,
this.списокЗаказзовToolStripMenuItem}); this.списокЗаказзовToolStripMenuItem});
this.отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; this.отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
this.отчетыToolStripMenuItem.Size = new System.Drawing.Size(88, 29); this.отчетыToolStripMenuItem.Size = new System.Drawing.Size(88, 29);
this.отчетыToolStripMenuItem.Text = "Отчеты"; this.отчетыToolStripMenuItem.Text = "Отчеты";
// //
// списокКомпонентовToolStripMenuItem // списокКомпонентовToolStripMenuItem
// //
this.списокКомпонентовToolStripMenuItem.Name = "списокКомпонентовToolStripMenuItem"; this.списокКомпонентовToolStripMenuItem.Name = "списокКомпонентовToolStripMenuItem";
this.списокКомпонентовToolStripMenuItem.Size = new System.Drawing.Size(325, 34); this.списокКомпонентовToolStripMenuItem.Size = new System.Drawing.Size(325, 34);
this.списокКомпонентовToolStripMenuItem.Text = "Список изделий"; this.списокКомпонентовToolStripMenuItem.Text = "Список изделий";
this.списокКомпонентовToolStripMenuItem.Click += new System.EventHandler(this.списокКомпонентовToolStripMenuItem_Click); this.списокКомпонентовToolStripMenuItem.Click += new System.EventHandler(this.списокКомпонентовToolStripMenuItem_Click);
// //
// компонентыПоИзделиямToolStripMenuItem // компонентыПоИзделиямToolStripMenuItem
// //
this.компонентыПоИзделиямToolStripMenuItem.Name = "компонентыПоИзделиямToolStripMenuItem"; this.компонентыПоИзделиямToolStripMenuItem.Name = "компонентыПоИзделиямToolStripMenuItem";
this.компонентыПоИзделиямToolStripMenuItem.Size = new System.Drawing.Size(325, 34); this.компонентыПоИзделиямToolStripMenuItem.Size = new System.Drawing.Size(325, 34);
this.компонентыПоИзделиямToolStripMenuItem.Text = "Изделия по компонентам"; this.компонентыПоИзделиямToolStripMenuItem.Text = "Изделия по компонентам";
this.компонентыПоИзделиямToolStripMenuItem.Click += new System.EventHandler(this.компонентыПоИзделиямToolStripMenuItem_Click); this.компонентыПоИзделиямToolStripMenuItem.Click += new System.EventHandler(this.компонентыПоИзделиямToolStripMenuItem_Click);
// //
// списокЗаказзовToolStripMenuItem // списокЗаказзовToolStripMenuItem
// //
this.списокЗаказзовToolStripMenuItem.Name = "списокЗаказзовToolStripMenuItem"; this.списокЗаказзовToolStripMenuItem.Name = "списокЗаказзовToolStripMenuItem";
this.списокЗаказзовToolStripMenuItem.Size = new System.Drawing.Size(325, 34); this.списокЗаказзовToolStripMenuItem.Size = new System.Drawing.Size(325, 34);
this.списокЗаказзовToolStripMenuItem.Text = "Список заказов"; this.списокЗаказзовToolStripMenuItem.Text = "Список заказов";
this.списокЗаказзовToolStripMenuItem.Click += new System.EventHandler(this.списокЗаказзовToolStripMenuItem_Click); this.списокЗаказзовToolStripMenuItem.Click += new System.EventHandler(this.списокЗаказзовToolStripMenuItem_Click);
// //
// FormMain // клиентыToolStripMenuItem
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); this.клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.клиентыToolStripMenuItem.Size = new System.Drawing.Size(270, 34);
this.ClientSize = new System.Drawing.Size(1530, 450); this.клиентыToolStripMenuItem.Text = "Клиенты";
this.Controls.Add(this.buttonRefresh); this.клиентыToolStripMenuItem.Click += new System.EventHandler(this.клиентыToolStripMenuItem_Click);
this.Controls.Add(this.buttonPut); //
this.Controls.Add(this.buttonReady); // FormMain
this.Controls.Add(this.buttonToWork); //
this.Controls.Add(this.buttonCreate); this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
this.Controls.Add(this.dataGridView); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.menuStrip); this.ClientSize = new System.Drawing.Size(1530, 450);
this.MainMenuStrip = this.menuStrip; this.Controls.Add(this.buttonRefresh);
this.Name = "FormMain"; this.Controls.Add(this.buttonPut);
this.Text = "Изготовление Драгоценностей"; this.Controls.Add(this.buttonReady);
this.Load += new System.EventHandler(this.FormMain_Load); this.Controls.Add(this.buttonToWork);
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); this.Controls.Add(this.buttonCreate);
this.menuStrip.ResumeLayout(false); this.Controls.Add(this.dataGridView);
this.menuStrip.PerformLayout(); this.Controls.Add(this.menuStrip);
this.ResumeLayout(false); this.MainMenuStrip = this.menuStrip;
this.PerformLayout(); this.Name = "FormMain";
this.Text = "Изготовление Драгоценностей";
this.Load += new System.EventHandler(this.FormMain_Load);
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
this.menuStrip.ResumeLayout(false);
this.menuStrip.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
} }
@ -212,5 +221,6 @@
private ToolStripMenuItem списокКомпонентовToolStripMenuItem; private ToolStripMenuItem списокКомпонентовToolStripMenuItem;
private ToolStripMenuItem компонентыПоИзделиямToolStripMenuItem; private ToolStripMenuItem компонентыПоИзделиямToolStripMenuItem;
private ToolStripMenuItem списокЗаказзовToolStripMenuItem; private ToolStripMenuItem списокЗаказзовToolStripMenuItem;
} private ToolStripMenuItem клиентыToolStripMenuItem;
}
} }

17
JewelryStore/FormMain.cs
View File

@ -47,9 +47,10 @@ namespace JewelryStore
dataGridView.DataSource = list; dataGridView.DataSource = list;
dataGridView.Columns["JewelId"].Visible = false; dataGridView.Columns["JewelId"].Visible = false;
dataGridView.Columns["ClientId"].Visible = false; dataGridView.Columns["ClientId"].Visible = false;
}
_logger.LogInformation("Загрузка заказов"); }
_logger.LogInformation("Загрузка заказов");
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -100,6 +101,7 @@ namespace JewelryStore
Id = id, Id = id,
JewelId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["JewelId"].Value), JewelId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["JewelId"].Value),
ClientId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["ClientId"].Value), ClientId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["ClientId"].Value),
JewelName = dataGridView.SelectedRows[0].Cells["JewelName"].Value.ToString(), JewelName = dataGridView.SelectedRows[0].Cells["JewelName"].Value.ToString(),
Status = Enum.Parse<OrderStatus>(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()), Status = Enum.Parse<OrderStatus>(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()),
Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value), Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value),
@ -229,6 +231,13 @@ namespace JewelryStore
} }
} }
private void клиентыToolStripMenuItem_Click(object sender, EventArgs e)
} {
var service = Program.ServiceProvider?.GetService(typeof(FormClients));
if (service is FormClients form)
{
form.ShowDialog();
}
}
}
} }

12
JewelryStore/Properties/launchSettings.json Normal file
View File

@ -0,0 +1,12 @@
{
"profiles": {
"JewelryStore": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:53750;http://localhost:53753"
}
}
}

12
JewelryStoreBusinessLogic/Properties/launchSettings.json Normal file
View File

@ -0,0 +1,12 @@
{
"profiles": {
"JewelryStoreBusinessLogic": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:53746;http://localhost:53754"
}
}
}

3
JewelryStoreClientApp/APIClient.cs
View File

@ -32,8 +32,7 @@ namespace JewelryStoreClientApp
public static void PostRequest<T>(string requestUrl, T model) public static void PostRequest<T>(string requestUrl, T model)
{ {
var json = JsonConvert.SerializeObject(model); var json = JsonConvert.SerializeObject(model);
var data = new StringContent(json, Encoding.UTF8, var data = new StringContent(json, Encoding.UTF8, "application/json");
"application/json");
var response = _client.PostAsync(requestUrl, data); var response = _client.PostAsync(requestUrl, data);
var result = response.Result.Content.ReadAsStringAsync().Result; var result = response.Result.Content.ReadAsStringAsync().Result;
if (!response.Result.IsSuccessStatusCode) if (!response.Result.IsSuccessStatusCode)

6
JewelryStoreClientApp/Controllers/HomeController.cs
View File

@ -47,8 +47,7 @@ namespace JewelryStoreClientApp.Controllers
{ {
throw new Exception("Введите логин, пароль и ФИО"); throw new Exception("Введите логин, пароль и ФИО");
} }
APIClient.PostRequest("api/client/updatedata", new APIClient.PostRequest("api/client/updatedata", new ClientBindingModel
ClientBindingModel
{ {
Id = APIClient.Client.Id, Id = APIClient.Client.Id,
ClientFIO = fio, ClientFIO = fio,
@ -104,8 +103,7 @@ namespace JewelryStoreClientApp.Controllers
{ {
throw new Exception("Введите логин, пароль и ФИО"); throw new Exception("Введите логин, пароль и ФИО");
} }
APIClient.PostRequest("api/client/register", new APIClient.PostRequest("api/client/register", new ClientBindingModel
ClientBindingModel
{ {
ClientFIO = fio, ClientFIO = fio,
Email = login, Email = login,

2
JewelryStoreClientApp/Views/Shared/_Layout.cshtml
View File

@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>@ViewData["Title"] - AbstractShowClientApp</title> <title>@ViewData["Title"] - JewelryStoreClientApp</title>
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" /> <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
<link rel="stylesheet" href="~/css/site.css" /> <link rel="stylesheet" href="~/css/site.css" />
<script src="~/lib/jquery/dist/jquery.min.js"></script> <script src="~/lib/jquery/dist/jquery.min.js"></script>

12
JewelryStoreContracts/Properties/launchSettings.json Normal file
View File

@ -0,0 +1,12 @@
{
"profiles": {
"JewelryStoreContracts": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:53749;http://localhost:53751"
}
}
}

1
JewelryStoreContracts/ViewModels/OrderViewModel.cs
View File

@ -16,7 +16,6 @@ namespace JewelryStoreContracts.ViewModels
public int JewelId { get; set; } public int JewelId { get; set; }
public int ClientId { get; set; } public int ClientId { get; set; }
[DisplayName("Драгоценность")] [DisplayName("Драгоценность")]
public string JewelName { get; set; } = string.Empty; public string JewelName { get; set; } = string.Empty;

4
JewelryStoreDataModels/Models/IOrderModel.cs
View File

@ -13,8 +13,8 @@ namespace JewelryStoreDataModels.Models
int JewelId { get; } int JewelId { get; }
string JewelName { get; } string JewelName { get; }
int ClientId { get; }
int Count { get; } int Count { get; }
double Sum { get; } double Sum { get; }
OrderStatus Status { get; } OrderStatus Status { get; }
DateTime DateCreate { get; } DateTime DateCreate { get; }

12
JewelryStoreDataModels/Properties/launchSettings.json Normal file
View File

@ -0,0 +1,12 @@
{
"profiles": {
"JewelryStoreDataModels": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:53757;http://localhost:53759"
}
}
}

7
JewelryStoreDatabaseImplement/Models/Order.cs
View File

@ -38,7 +38,7 @@ namespace JewelryStoreDatabaseImplement.Models
public DateTime? DateImplement { get; private set; } public DateTime? DateImplement { get; private set; }
public virtual Jewel Jewel { get; set; } public virtual Jewel Jewel { get; set; }
public Client Client { get; set; } public virtual Client Client { get; set; }
public static Order? Create(OrderBindingModel? model) public static Order? Create(OrderBindingModel? model)
{ {
@ -87,7 +87,8 @@ namespace JewelryStoreDatabaseImplement.Models
Sum = Sum, Sum = Sum,
Status = Status, Status = Status,
DateCreate = DateCreate, DateCreate = DateCreate,
DateImplement = DateImplement DateImplement = DateImplement,
}; ClientFIO = Client.ClientFIO
};
} }
} }

12
JewelryStoreDatabaseImplement/Properties/launchSettings.json Normal file
View File

@ -0,0 +1,12 @@
{
"profiles": {
"JewelryStoreDatabaseImplement": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:53756;http://localhost:53758"
}
}
}

12
JewelryStoreFileImplement/Properties/launchSettings.json Normal file
View File

@ -0,0 +1,12 @@
{
"profiles": {
"JewelryStoreFileImplement": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:53747;http://localhost:53752"
}
}
}

12
JewelryStoreListImplement/Properties/launchSettings.json Normal file
View File

@ -0,0 +1,12 @@
{
"profiles": {
"JewelryStoreListImplement": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:53748;http://localhost:53755"
}
}
}