YourDax/PIbd-23_Tikhonenkov_A.E_CarpentryWorkshop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ПИбд-23 Тихоненков Алексей Евгеньевич Лабораторная работа №5 #6

Closed
YourDax wants to merge 2 commits from Lab5 into Lab4
pull from: Lab5
merge into: YourDax:Lab4
Conversation 0 Commits 2 Files Changed 132 +28 -29
15 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cddc25961e - Show all commits

10
CarpentryWorkshop/CarpentryWorkshop.sln
View File

@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarpentryWorkshopDatabaseIm
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarpentryWorkshopRestApi", "CarpentryWorkshopRestApi\CarpentryWorkshopRestApi.csproj", "{5B3828AF-D9D0-475D-9860-DF7A7BF139D3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarpentryWorkshopClientApp", "..\..\..\..\Users\Leo\Desktop\123\pibd-21_spasskiy.a.d._carpentryworkshop28\CarpentryWorkshopClientApp\CarpentryWorkshopClientApp.csproj", "{A3182B93-4DB6-4EBD-ACE5-43FDD59ED96D}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarpentryWorkshopClientApp", "CarpentryWorkshopClientApp\CarpentryWorkshopClientApp.csproj", "{9F21487D-B5B2-43DD-952D-BAAD1A416353}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -59,10 +59,10 @@ Global
{5B3828AF-D9D0-475D-9860-DF7A7BF139D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5B3828AF-D9D0-475D-9860-DF7A7BF139D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5B3828AF-D9D0-475D-9860-DF7A7BF139D3}.Release|Any CPU.Build.0 = Release|Any CPU
{A3182B93-4DB6-4EBD-ACE5-43FDD59ED96D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A3182B93-4DB6-4EBD-ACE5-43FDD59ED96D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A3182B93-4DB6-4EBD-ACE5-43FDD59ED96D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A3182B93-4DB6-4EBD-ACE5-43FDD59ED96D}.Release|Any CPU.Build.0 = Release|Any CPU
{9F21487D-B5B2-43DD-952D-BAAD1A416353}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9F21487D-B5B2-43DD-952D-BAAD1A416353}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9F21487D-B5B2-43DD-952D-BAAD1A416353}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9F21487D-B5B2-43DD-952D-BAAD1A416353}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

2
CarpentryWorkshop/CarpentryWorkshopBusinessLogic/CarpentryWorkshopBusinessLogic.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

2
CarpentryWorkshop/CarpentryWorkshopClientApp/CarpentryWorkshopClientApp.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

1
CarpentryWorkshop/CarpentryWorkshopClientApp/Program.cs
View File

@ -11,7 +11,6 @@ APIClient.Connect(builder.Configuration);
if (!app.Environment.IsDevelopment())
{
app.UseExceptionHandler("/Home/Error");
// The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
app.UseHsts();
}

2
CarpentryWorkshop/CarpentryWorkshopClientApp/appsettings.json
View File

@ -7,5 +7,5 @@
},
"AllowedHosts": "*",
"IPAddress": "http://localhost:7177/"
"IPAddress": "http://localhost:5024/"
}

2
CarpentryWorkshop/CarpentryWorkshopContracts/CarpentryWorkshopContracts.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

2
CarpentryWorkshop/CarpentryWorkshopDataModels/CarpentryWorkshopDataModels.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

2
CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/CarpentryWorkshopDatabaseImplement.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

2
CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240415192521_InitialCreate.Designer.cs → CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240416072714_InitialCreate.Designer.cs generated
View File

@ -12,7 +12,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
namespace CarpentryWorkshopDatabaseImplement.Migrations
{
[DbContext(typeof(CarpentryWorkshopDatabase))]
[Migration("20240415192521_InitialCreate")]
[Migration("20240416072714_InitialCreate")]
partial class InitialCreate
{
/// <inheritdoc />

0
CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240415192521_InitialCreate.cs → CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240416072714_InitialCreate.cs
View File

2
CarpentryWorkshop/CarpentryWorkshopFileImplement/CarpentryWorkshopFileImplement.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

2
CarpentryWorkshop/CarpentryWorkshopListImplement/CarpentryWorkshopListImplement.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

2
CarpentryWorkshop/CarpentryWorkshopRestApi/CarpentryWorkshopRestApi.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

2
CarpentryWorkshop/CarpentryWorkshopView/CarpentryWorkshopView.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows7.0</TargetFramework>
<TargetFramework>net7.0-windows7.0</TargetFramework>
<Nullable>enable</Nullable>
<UseWindowsForms>true</UseWindowsForms>
<ImplicitUsings>enable</ImplicitUsings>

24
CarpentryWorkshop/CarpentryWorkshopView/FormMain.Designer.cs generated
View File

@ -52,7 +52,7 @@
menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem });
menuStrip1.Location = new Point(0, 0);
menuStrip1.Name = "menuStrip1";
menuStrip1.Size = new Size(896, 24);
menuStrip1.Size = new Size(1174, 24);
menuStrip1.TabIndex = 0;
menuStrip1.Text = "menuStrip1";
//
@ -66,21 +66,21 @@
// Компоненты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;
//
// ClientsToolStripMenuItem
//
ClientsToolStripMenuItem.Name = "ClientsToolStripMenuItem";
ClientsToolStripMenuItem.Size = new Size(180, 22);
ClientsToolStripMenuItem.Size = new Size(145, 22);
ClientsToolStripMenuItem.Text = "Клиенты";
ClientsToolStripMenuItem.Click += clientsToolStripMenuItem_Click;
//
@ -117,15 +117,15 @@
dataGridView.BackgroundColor = SystemColors.ButtonHighlight;
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.EnableHeadersVisualStyles = false;
dataGridView.Location = new Point(1, 32);
dataGridView.Location = new Point(12, 32);
dataGridView.MultiSelect = false;
dataGridView.Name = "dataGridView";
dataGridView.Size = new Size(755, 243);
dataGridView.Size = new Size(1022, 371);
dataGridView.TabIndex = 1;
//
// ButtonCreateOrder
//
ButtonCreateOrder.Location = new Point(762, 44);
ButtonCreateOrder.Location = new Point(1040, 32);
ButtonCreateOrder.Name = "ButtonCreateOrder";
ButtonCreateOrder.Size = new Size(122, 23);
ButtonCreateOrder.TabIndex = 2;
@ -135,7 +135,7 @@
//
// ButtonTakeOrderInWork
//
ButtonTakeOrderInWork.Location = new Point(762, 73);
ButtonTakeOrderInWork.Location = new Point(1040, 61);
ButtonTakeOrderInWork.Name = "ButtonTakeOrderInWork";
ButtonTakeOrderInWork.Size = new Size(122, 42);
ButtonTakeOrderInWork.TabIndex = 3;
@ -145,7 +145,7 @@
//
// ButtonOrderReady
//
ButtonOrderReady.Location = new Point(762, 121);
ButtonOrderReady.Location = new Point(1040, 109);
ButtonOrderReady.Name = "ButtonOrderReady";
ButtonOrderReady.Size = new Size(122, 23);
ButtonOrderReady.TabIndex = 4;
@ -155,7 +155,7 @@
//
// ButtonIssuedOrder
//
ButtonIssuedOrder.Location = new Point(762, 150);
ButtonIssuedOrder.Location = new Point(1040, 138);
ButtonIssuedOrder.Name = "ButtonIssuedOrder";
ButtonIssuedOrder.Size = new Size(122, 23);
ButtonIssuedOrder.TabIndex = 5;
@ -165,7 +165,7 @@
//
// ButtonRef
//
ButtonRef.Location = new Point(762, 179);
ButtonRef.Location = new Point(1040, 167);
ButtonRef.Name = "ButtonRef";
ButtonRef.Size = new Size(122, 23);
ButtonRef.TabIndex = 6;
@ -177,7 +177,7 @@
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(896, 280);
ClientSize = new Size(1174, 415);
Controls.Add(ButtonRef);
Controls.Add(ButtonIssuedOrder);
Controls.Add(ButtonOrderReady);