From 939cba359a8a835a7b11d5be52eb175f5f47bf4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=93=D0=BE=D1=80=D0=B4?= =?UTF-8?q?=D0=B5=D0=B5=D0=B2?= <89176335310x@gmail.com> Date: Wed, 1 May 2024 14:03:19 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=D0=B5=D1=82=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=B4?= =?UTF-8?q?=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BE=20=D0=B7=D0=B0=D0=BA?= =?UTF-8?q?=D0=B0=D0=B7=D0=B5=20=D1=83=20=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD?= =?UTF-8?q?=D1=82=D0=B0=20=D0=B2=20=D0=B2=D0=B5=D0=B1=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SushiBar/SushiBar/FormMain.Designer.cs | 37 +++++++++++-------- SushiBar/SushiBar/FormMain.cs | 1 - SushiBar/SushiBarClientApp/APIClient.cs | 3 +- .../SushiBarClientApp.csproj | 4 +- .../ViewModels/SushiViewModel.cs | 6 +-- .../Implements/OrderStorage.cs | 1 + .../SushiBarDatabaseImplement/Models/Order.cs | 9 ++--- SushiBar/SushiBarRestApi/Program.cs | 1 + .../Properties/serviceDependencies.json | 3 ++ .../Properties/serviceDependencies.local.json | 3 ++ .../SushiBarRestApi/SushiBarRestApi.csproj | 1 + 11 files changed, 39 insertions(+), 30 deletions(-) create mode 100644 SushiBar/SushiBarRestApi/Properties/serviceDependencies.json create mode 100644 SushiBar/SushiBarRestApi/Properties/serviceDependencies.local.json diff --git a/SushiBar/SushiBar/FormMain.Designer.cs b/SushiBar/SushiBar/FormMain.Designer.cs index e4e339b..13a4bbe 100644 --- a/SushiBar/SushiBar/FormMain.Designer.cs +++ b/SushiBar/SushiBar/FormMain.Designer.cs @@ -36,13 +36,13 @@ списокСушиToolStripMenuItem = new ToolStripMenuItem(); сушиСИнгредиентамиToolStripMenuItem = new ToolStripMenuItem(); списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); + клиентыToolStripMenuItem = new ToolStripMenuItem(); buttonUpdate = new Button(); buttonSetToFinish = new Button(); buttonSetToDone = new Button(); buttonSetToWork = new Button(); buttonCreateOrder = new Button(); dataGridView = new DataGridView(); - клиентыToolStripMenuItem = new ToolStripMenuItem(); menuStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); @@ -52,7 +52,7 @@ menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem, клиентыToolStripMenuItem }); menuStrip.Location = new Point(0, 0); menuStrip.Name = "menuStrip"; - menuStrip.Size = new Size(975, 24); + menuStrip.Size = new Size(1112, 24); menuStrip.TabIndex = 0; menuStrip.Text = "menuStrip1"; // @@ -105,9 +105,17 @@ списокЗаказовToolStripMenuItem.Text = "Список заказов"; списокЗаказовToolStripMenuItem.Click += OrdersToolStripMenuItem_Click; // + // клиентыToolStripMenuItem + // + клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem"; + клиентыToolStripMenuItem.Size = new Size(67, 20); + клиентыToolStripMenuItem.Text = "Клиенты"; + клиентыToolStripMenuItem.Click += клиентыToolStripMenuItem_Click; + // // buttonUpdate // - buttonUpdate.Location = new Point(780, 314); + buttonUpdate.Anchor = AnchorStyles.Top | AnchorStyles.Right; + buttonUpdate.Location = new Point(930, 307); buttonUpdate.Margin = new Padding(3, 2, 3, 2); buttonUpdate.Name = "buttonUpdate"; buttonUpdate.Size = new Size(170, 58); @@ -118,7 +126,8 @@ // // buttonSetToFinish // - buttonSetToFinish.Location = new Point(780, 252); + buttonSetToFinish.Anchor = AnchorStyles.Top | AnchorStyles.Right; + buttonSetToFinish.Location = new Point(930, 245); buttonSetToFinish.Margin = new Padding(3, 2, 3, 2); buttonSetToFinish.Name = "buttonSetToFinish"; buttonSetToFinish.Size = new Size(170, 58); @@ -129,7 +138,8 @@ // // buttonSetToDone // - buttonSetToDone.Location = new Point(780, 190); + buttonSetToDone.Anchor = AnchorStyles.Top | AnchorStyles.Right; + buttonSetToDone.Location = new Point(930, 183); buttonSetToDone.Margin = new Padding(3, 2, 3, 2); buttonSetToDone.Name = "buttonSetToDone"; buttonSetToDone.Size = new Size(170, 58); @@ -140,7 +150,8 @@ // // buttonSetToWork // - buttonSetToWork.Location = new Point(780, 128); + buttonSetToWork.Anchor = AnchorStyles.Top | AnchorStyles.Right; + buttonSetToWork.Location = new Point(930, 121); buttonSetToWork.Margin = new Padding(3, 2, 3, 2); buttonSetToWork.Name = "buttonSetToWork"; buttonSetToWork.Size = new Size(170, 58); @@ -151,7 +162,8 @@ // // buttonCreateOrder // - buttonCreateOrder.Location = new Point(780, 66); + buttonCreateOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right; + buttonCreateOrder.Location = new Point(930, 59); buttonCreateOrder.Margin = new Padding(3, 2, 3, 2); buttonCreateOrder.Name = "buttonCreateOrder"; buttonCreateOrder.Size = new Size(170, 58); @@ -169,21 +181,14 @@ dataGridView.Name = "dataGridView"; dataGridView.RowHeadersWidth = 51; dataGridView.RowTemplate.Height = 29; - dataGridView.Size = new Size(755, 426); + dataGridView.Size = new Size(919, 426); dataGridView.TabIndex = 7; // - // клиентыToolStripMenuItem - // - клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem"; - клиентыToolStripMenuItem.Size = new Size(67, 20); - клиентыToolStripMenuItem.Text = "Клиенты"; - клиентыToolStripMenuItem.Click += клиентыToolStripMenuItem_Click; - // // FormMain // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(975, 450); + ClientSize = new Size(1112, 450); Controls.Add(buttonUpdate); Controls.Add(buttonSetToFinish); Controls.Add(buttonSetToDone); diff --git a/SushiBar/SushiBar/FormMain.cs b/SushiBar/SushiBar/FormMain.cs index 01cf497..9841dc6 100644 --- a/SushiBar/SushiBar/FormMain.cs +++ b/SushiBar/SushiBar/FormMain.cs @@ -31,7 +31,6 @@ namespace SushiBarView { dataGridView.DataSource = list; dataGridView.Columns["SushiId"].Visible = false; - } _logger.LogInformation("Загрузка заказов"); } diff --git a/SushiBar/SushiBarClientApp/APIClient.cs b/SushiBar/SushiBarClientApp/APIClient.cs index aaea3ec..216a26d 100644 --- a/SushiBar/SushiBarClientApp/APIClient.cs +++ b/SushiBar/SushiBarClientApp/APIClient.cs @@ -32,7 +32,8 @@ namespace SushiBarClientApp public static void PostRequest(string requestUrl, T model) { var json = JsonConvert.SerializeObject(model); - var data = new StringContent(json, Encoding.UTF8, "application/json"); + var data = new StringContent(json, Encoding.UTF8, + "application/json"); var response = _client.PostAsync(requestUrl, data); var result = response.Result.Content.ReadAsStringAsync().Result; if (!response.Result.IsSuccessStatusCode) diff --git a/SushiBar/SushiBarClientApp/SushiBarClientApp.csproj b/SushiBar/SushiBarClientApp/SushiBarClientApp.csproj index a38181b..c1fd8c5 100644 --- a/SushiBar/SushiBarClientApp/SushiBarClientApp.csproj +++ b/SushiBar/SushiBarClientApp/SushiBarClientApp.csproj @@ -1,4 +1,4 @@ - + net8.0 @@ -10,7 +10,7 @@ - + diff --git a/SushiBar/SushiBarContracts/ViewModels/SushiViewModel.cs b/SushiBar/SushiBarContracts/ViewModels/SushiViewModel.cs index 12c51a0..1312769 100644 --- a/SushiBar/SushiBarContracts/ViewModels/SushiViewModel.cs +++ b/SushiBar/SushiBarContracts/ViewModels/SushiViewModel.cs @@ -10,10 +10,6 @@ namespace SushiBarContracts.ViewModels public string SushiName { get; set; } = string.Empty; [DisplayName("Цена")] public double Price { get; set; } - public Dictionary SushiIngredients - { - get; - set; - } = new(); + public Dictionary SushiIngredients{ get; set; } = new(); } } \ No newline at end of file diff --git a/SushiBar/SushiBarDatabaseImplement/Implements/OrderStorage.cs b/SushiBar/SushiBarDatabaseImplement/Implements/OrderStorage.cs index be05502..5de7f1c 100644 --- a/SushiBar/SushiBarDatabaseImplement/Implements/OrderStorage.cs +++ b/SushiBar/SushiBarDatabaseImplement/Implements/OrderStorage.cs @@ -59,6 +59,7 @@ namespace SushiBarDatabaseImplement.Implements using var context = new SushiBarDatabase(); return context.Orders .Include(x => x.Sushi) + .Include(x => x.Client) .Select(x => x.GetViewModel) .ToList(); } diff --git a/SushiBar/SushiBarDatabaseImplement/Models/Order.cs b/SushiBar/SushiBarDatabaseImplement/Models/Order.cs index 6326d41..a884911 100644 --- a/SushiBar/SushiBarDatabaseImplement/Models/Order.cs +++ b/SushiBar/SushiBarDatabaseImplement/Models/Order.cs @@ -3,7 +3,6 @@ using SushiBarContracts.ViewModels; using SushiBarDataModels.Enums; using SushiBarDataModels.Models; using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; namespace SushiBarDatabaseImplement.Models { @@ -56,16 +55,16 @@ namespace SushiBarDatabaseImplement.Models public OrderViewModel GetViewModel => new() { + Id = Id, SushiId = SushiId, + SushiName=Sushi.SushiName, Count = Count, Sum = Sum, + Status = Status, DateCreate = DateCreate, DateImplement = DateImplement, - Id = Id, - Status = Status, - SushiName = Sushi.SushiName, ClientId = ClientId, - ClientFIO = Client.ClientFIO + ClientFIO = Client.ClientFIO, }; } } diff --git a/SushiBar/SushiBarRestApi/Program.cs b/SushiBar/SushiBarRestApi/Program.cs index 293a60c..8f5d3b8 100644 --- a/SushiBar/SushiBarRestApi/Program.cs +++ b/SushiBar/SushiBarRestApi/Program.cs @@ -26,6 +26,7 @@ builder.Services.AddSwaggerGen(c => Version = "v1" }); }); +builder.Services.AddApplicationInsightsTelemetry(); var app = builder.Build(); // Configure the HTTP request pipeline. if (app.Environment.IsDevelopment()) diff --git a/SushiBar/SushiBarRestApi/Properties/serviceDependencies.json b/SushiBar/SushiBarRestApi/Properties/serviceDependencies.json new file mode 100644 index 0000000..33703d5 --- /dev/null +++ b/SushiBar/SushiBarRestApi/Properties/serviceDependencies.json @@ -0,0 +1,3 @@ +{ + "dependencies": {} +} \ No newline at end of file diff --git a/SushiBar/SushiBarRestApi/Properties/serviceDependencies.local.json b/SushiBar/SushiBarRestApi/Properties/serviceDependencies.local.json new file mode 100644 index 0000000..33703d5 --- /dev/null +++ b/SushiBar/SushiBarRestApi/Properties/serviceDependencies.local.json @@ -0,0 +1,3 @@ +{ + "dependencies": {} +} \ No newline at end of file diff --git a/SushiBar/SushiBarRestApi/SushiBarRestApi.csproj b/SushiBar/SushiBarRestApi/SushiBarRestApi.csproj index 546a183..409f478 100644 --- a/SushiBar/SushiBarRestApi/SushiBarRestApi.csproj +++ b/SushiBar/SushiBarRestApi/SushiBarRestApi.csproj @@ -7,6 +7,7 @@ +