diff --git a/PrecastConcretePlant/PrecastConcretePlantClientApp/Properties/launchSettings.json b/PrecastConcretePlant/PrecastConcretePlantClientApp/Properties/launchSettings.json
index a8c1f77..d621e2e 100644
--- a/PrecastConcretePlant/PrecastConcretePlantClientApp/Properties/launchSettings.json
+++ b/PrecastConcretePlant/PrecastConcretePlantClientApp/Properties/launchSettings.json
@@ -1,11 +1,10 @@
{
- "$schema": "https://json.schemastore.org/launchsettings.json",
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
- "applicationUrl": "http://localhost:45900",
- "sslPort": 44351
+ "applicationUrl": "http://localhost:22958",
+ "sslPort": 44305
}
},
"profiles": {
@@ -13,8 +12,7 @@
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
- "launchUrl": "swagger",
- "applicationUrl": "https://localhost:7283;http://localhost:5297",
+ "applicationUrl": "https://localhost:7175;http://localhost:5257",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
@@ -22,7 +20,6 @@
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
- "launchUrl": "swagger",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
diff --git a/PrecastConcretePlant/PrecastConcretePlantClientApp/appsettings.json b/PrecastConcretePlant/PrecastConcretePlantClientApp/appsettings.json
index 6146d79..e96ebdb 100644
--- a/PrecastConcretePlant/PrecastConcretePlantClientApp/appsettings.json
+++ b/PrecastConcretePlant/PrecastConcretePlantClientApp/appsettings.json
@@ -6,5 +6,6 @@
}
},
"AllowedHosts": "*",
- "IPAddress": "http://localhost:5287"
+
+ "IPAddress": "http://localhost:5028"
}
diff --git a/PrecastConcretePlant/PrecastConcretePlantRestApi/Properties/launchSettings.json b/PrecastConcretePlant/PrecastConcretePlantRestApi/Properties/launchSettings.json
index 26d147b..5515e23 100644
--- a/PrecastConcretePlant/PrecastConcretePlantRestApi/Properties/launchSettings.json
+++ b/PrecastConcretePlant/PrecastConcretePlantRestApi/Properties/launchSettings.json
@@ -4,8 +4,8 @@
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
- "applicationUrl": "http://localhost:63747",
- "sslPort": 44389
+ "applicationUrl": "http://localhost:33063",
+ "sslPort": 44303
}
},
"profiles": {
@@ -14,7 +14,7 @@
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "swagger",
- "applicationUrl": "https://localhost:7063;http://localhost:5287",
+ "applicationUrl": "https://localhost:7170;http://localhost:5028",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
diff --git a/PrecastConcretePlant/PrecastConcretePlantView/FormMain.Designer.cs b/PrecastConcretePlant/PrecastConcretePlantView/FormMain.Designer.cs
index f98a7fc..7f49adb 100644
--- a/PrecastConcretePlant/PrecastConcretePlantView/FormMain.Designer.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantView/FormMain.Designer.cs
@@ -32,6 +32,7 @@
справочникиToolStripMenuItem = new ToolStripMenuItem();
компонентыToolStripMenuItem = new ToolStripMenuItem();
жБИзделияToolStripMenuItem = new ToolStripMenuItem();
+ клиентыToolStripMenuItem = new ToolStripMenuItem();
отчётыToolStripMenuItem = new ToolStripMenuItem();
ComponentsToolStripMenuItem = new ToolStripMenuItem();
ComponentReinforcedToolStripMenuItem = new ToolStripMenuItem();
@@ -42,7 +43,6 @@
buttonOrderReady = new Button();
buttonIssuedOrder = new Button();
buttonRef = new Button();
- клиентыToolStripMenuItem = new ToolStripMenuItem();
menuStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
SuspendLayout();
@@ -52,7 +52,7 @@
menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчётыToolStripMenuItem });
menuStrip1.Location = new Point(0, 0);
menuStrip1.Name = "menuStrip1";
- menuStrip1.Size = new Size(1007, 24);
+ menuStrip1.Size = new Size(1134, 24);
menuStrip1.TabIndex = 0;
menuStrip1.Text = "menuStrip1";
//
@@ -66,17 +66,24 @@
// компонентыToolStripMenuItem
//
компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
- компонентыToolStripMenuItem.Size = new Size(180, 22);
+ компонентыToolStripMenuItem.Size = new Size(145, 22);
компонентыToolStripMenuItem.Text = "Компоненты";
компонентыToolStripMenuItem.Click += компонентыToolStripMenuItem_Click;
//
// жБИзделияToolStripMenuItem
//
жБИзделияToolStripMenuItem.Name = "жБИзделияToolStripMenuItem";
- жБИзделияToolStripMenuItem.Size = new Size(180, 22);
+ жБИзделияToolStripMenuItem.Size = new Size(145, 22);
жБИзделияToolStripMenuItem.Text = "ЖБ изделия";
жБИзделияToolStripMenuItem.Click += жБИзделияToolStripMenuItem_Click;
//
+ // клиентыToolStripMenuItem
+ //
+ клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
+ клиентыToolStripMenuItem.Size = new Size(145, 22);
+ клиентыToolStripMenuItem.Text = "Клиенты";
+ клиентыToolStripMenuItem.Click += клиентыToolStripMenuItem_Click;
+ //
// отчётыToolStripMenuItem
//
отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ComponentsToolStripMenuItem, ComponentReinforcedToolStripMenuItem, OrdersToolStripMenuItem });
@@ -112,12 +119,12 @@
dataGridView.Location = new Point(0, 27);
dataGridView.Name = "dataGridView";
dataGridView.RowTemplate.Height = 25;
- dataGridView.Size = new Size(800, 359);
+ dataGridView.Size = new Size(927, 360);
dataGridView.TabIndex = 1;
//
// buttonCreateOrder
//
- buttonCreateOrder.Location = new Point(806, 81);
+ buttonCreateOrder.Location = new Point(933, 94);
buttonCreateOrder.Name = "buttonCreateOrder";
buttonCreateOrder.Size = new Size(189, 40);
buttonCreateOrder.TabIndex = 2;
@@ -127,7 +134,7 @@
//
// buttonTakeOrderInWork
//
- buttonTakeOrderInWork.Location = new Point(806, 127);
+ buttonTakeOrderInWork.Location = new Point(933, 140);
buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
buttonTakeOrderInWork.Size = new Size(189, 40);
buttonTakeOrderInWork.TabIndex = 3;
@@ -137,7 +144,7 @@
//
// buttonOrderReady
//
- buttonOrderReady.Location = new Point(806, 173);
+ buttonOrderReady.Location = new Point(933, 186);
buttonOrderReady.Name = "buttonOrderReady";
buttonOrderReady.Size = new Size(189, 40);
buttonOrderReady.TabIndex = 4;
@@ -147,7 +154,7 @@
//
// buttonIssuedOrder
//
- buttonIssuedOrder.Location = new Point(806, 219);
+ buttonIssuedOrder.Location = new Point(933, 232);
buttonIssuedOrder.Name = "buttonIssuedOrder";
buttonIssuedOrder.Size = new Size(189, 40);
buttonIssuedOrder.TabIndex = 5;
@@ -157,7 +164,7 @@
//
// buttonRef
//
- buttonRef.Location = new Point(806, 265);
+ buttonRef.Location = new Point(933, 278);
buttonRef.Name = "buttonRef";
buttonRef.Size = new Size(189, 40);
buttonRef.TabIndex = 6;
@@ -165,18 +172,11 @@
buttonRef.UseVisualStyleBackColor = true;
buttonRef.Click += buttonRef_Click;
//
- // клиентыToolStripMenuItem
- //
- клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
- клиентыToolStripMenuItem.Size = new Size(180, 22);
- клиентыToolStripMenuItem.Text = "Клиенты";
- клиентыToolStripMenuItem.Click += клиентыToolStripMenuItem_Click;
- //
// FormMain
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(1007, 389);
+ ClientSize = new Size(1134, 391);
Controls.Add(buttonRef);
Controls.Add(buttonIssuedOrder);
Controls.Add(buttonOrderReady);
diff --git a/PrecastConcretePlant/PrecastConcretePlantView/FormMain.resx b/PrecastConcretePlant/PrecastConcretePlantView/FormMain.resx
index 938108a..2c06f7d 100644
--- a/PrecastConcretePlant/PrecastConcretePlantView/FormMain.resx
+++ b/PrecastConcretePlant/PrecastConcretePlantView/FormMain.resx
@@ -60,4 +60,7 @@
17, 17
+
+ 34
+
\ No newline at end of file