lab 6 done

This commit is contained in:
10Г Егор Романов 2023-05-01 20:29:36 +04:00
parent 5e1a1c0cb1
commit f4b64adc83
7 changed files with 17 additions and 21 deletions

View File

@ -36,7 +36,7 @@ namespace SecuritySystemView
componentsToolStripMenuItem = new ToolStripMenuItem(); componentsToolStripMenuItem = new ToolStripMenuItem();
goodsToolStripMenuItem = new ToolStripMenuItem(); goodsToolStripMenuItem = new ToolStripMenuItem();
clientsToolStripMenuItem = new ToolStripMenuItem(); clientsToolStripMenuItem = new ToolStripMenuItem();
implemntersToolStripMenuItem = new ToolStripMenuItem(); ImplementersToolStripMenuItem = new ToolStripMenuItem();
отчетыToolStripMenuItem = new ToolStripMenuItem(); отчетыToolStripMenuItem = new ToolStripMenuItem();
componentListToolStripMenuItem = new ToolStripMenuItem(); componentListToolStripMenuItem = new ToolStripMenuItem();
componentsSecureToolStripMenuItem = new ToolStripMenuItem(); componentsSecureToolStripMenuItem = new ToolStripMenuItem();
@ -63,7 +63,7 @@ namespace SecuritySystemView
// //
// guideToolStripMenuItem // guideToolStripMenuItem
// //
guideToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItem, goodsToolStripMenuItem, clientsToolStripMenuItem, implemntersToolStripMenuItem }); guideToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItem, goodsToolStripMenuItem, clientsToolStripMenuItem, ImplementersToolStripMenuItem });
guideToolStripMenuItem.Name = "guideToolStripMenuItem"; guideToolStripMenuItem.Name = "guideToolStripMenuItem";
guideToolStripMenuItem.Size = new Size(87, 20); guideToolStripMenuItem.Size = new Size(87, 20);
guideToolStripMenuItem.Text = "Справочник"; guideToolStripMenuItem.Text = "Справочник";
@ -89,12 +89,12 @@ namespace SecuritySystemView
clientsToolStripMenuItem.Text = "Клиенты"; clientsToolStripMenuItem.Text = "Клиенты";
clientsToolStripMenuItem.Click += ClientsToolStripMenuItem_Click; clientsToolStripMenuItem.Click += ClientsToolStripMenuItem_Click;
// //
// implemntersToolStripMenuItem // ImplementersToolStripMenuItem
// //
implemntersToolStripMenuItem.Name = "implemntersToolStripMenuItem"; ImplementersToolStripMenuItem.Name = "ImplementersToolStripMenuItem";
implemntersToolStripMenuItem.Size = new Size(180, 22); ImplementersToolStripMenuItem.Size = new Size(180, 22);
implemntersToolStripMenuItem.Text = "Исполнители"; ImplementersToolStripMenuItem.Text = "Исполнители";
implemntersToolStripMenuItem.Click += ImplemntersToolStripMenuItem_Click; ImplementersToolStripMenuItem.Click += ImplementersToolStripMenuItem_Click;
// //
// отчетыToolStripMenuItem // отчетыToolStripMenuItem
// //
@ -215,7 +215,7 @@ namespace SecuritySystemView
private ToolStripMenuItem componentsSecureToolStripMenuItem; private ToolStripMenuItem componentsSecureToolStripMenuItem;
private ToolStripMenuItem orderListToolStripMenuItem; private ToolStripMenuItem orderListToolStripMenuItem;
private ToolStripMenuItem clientsToolStripMenuItem; private ToolStripMenuItem clientsToolStripMenuItem;
private ToolStripMenuItem implemntersToolStripMenuItem; private ToolStripMenuItem ImplementersToolStripMenuItem;
private ToolStripMenuItem workToolStripMenuItem; private ToolStripMenuItem workToolStripMenuItem;
} }
} }

View File

@ -140,7 +140,7 @@ namespace SecuritySystemView
form.ShowDialog(); form.ShowDialog();
} }
} }
private void ImplemntersToolStripMenuItem_Click(object sender, EventArgs e) private void ImplementersToolStripMenuItem_Click(object sender, EventArgs e)
{ {
var service = Program.ServiceProvider?.GetService(typeof(FormImplementers)); var service = Program.ServiceProvider?.GetService(typeof(FormImplementers));
if (service is FormImplementers form) if (service is FormImplementers form)

View File

@ -9,12 +9,6 @@ using SecuritySystemDatabaseImplement.Implements;
using SecuritySystemContracts.BusinessLogicsContracts; using SecuritySystemContracts.BusinessLogicsContracts;
using SecuritySystemContracts.StoragesContracts; using SecuritySystemContracts.StoragesContracts;
using SecureCompanyBusinessLogic.BusinessLogics; using SecureCompanyBusinessLogic.BusinessLogics;
using SecuritySystemBusinessLogic.BusinessLogics;
using SecuritySystemContracts.BusinessLogicsContracts;
using SecuritySystemContracts.StorageContracts;
using SecuritySystemView;
using SecuritySystemBusinessLogic.BusinessLogics;
using SecuritySystemContracts.BusinessLogicsContracts;
using SecuritySystemContracts.StorageContracts; using SecuritySystemContracts.StorageContracts;
namespace SecuritySystemView namespace SecuritySystemView
@ -71,6 +65,8 @@ namespace SecuritySystemView
services.AddTransient<FormReportSecureComponents>(); services.AddTransient<FormReportSecureComponents>();
services.AddTransient<FormReportOrders>(); services.AddTransient<FormReportOrders>();
services.AddTransient<FormClients>(); services.AddTransient<FormClients>();
services.AddTransient<FormImplementers>();
services.AddTransient<FormImplementer>();
} }
} }
} }

View File

@ -125,7 +125,7 @@ namespace SecuritySystemBusinessLogic.BusinessLogics
model.Status = newStatus; model.Status = newStatus;
if (model.Status == OrderStatus.Готов) if (model.Status == OrderStatus.Готов)
{ {
model.DateImplement = DateTime.Now; model.DateImplement = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc);
} }
else else
{ {

File diff suppressed because one or more lines are too long

View File

@ -4,10 +4,7 @@ using SecuritySystemContracts.StorageContracts;
using SecuritySystemContracts.ViewModels; using SecuritySystemContracts.ViewModels;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using SecuritySystemDatabaseImplement.Models; using SecuritySystemDatabaseImplement.Models;
using SecuritySystemContracts.BindingModels;
using SecuritySystemContracts.SearchModels;
using SecuritySystemContracts.StoragesContracts; using SecuritySystemContracts.StoragesContracts;
using SecuritySystemContracts.ViewModels;
namespace SecuritySystemDatabaseImplement.Implements namespace SecuritySystemDatabaseImplement.Implements
{ {

View File

@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
@ -24,7 +25,8 @@ namespace SecuritySystemListImplement.Models
public double Sum { get; private set; } public double Sum { get; private set; }
public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
public DateTime DateCreate { get; set; } = DateTime.Now; public DateTime DateCreate { get; set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc);
[DisplayName("Дата выполнения")]
public DateTime? DateImplement { get; set; } public DateTime? DateImplement { get; set; }
public static Order? Create(OrderBindingModel? model) public static Order? Create(OrderBindingModel? model)