YakovlevMaxim/PIbd-21_Yakovlev_M.G._CarRepairShop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Сделанная 2 лабораторная

Browse Source
This commit is contained in:
Максим Яковлев 2024-03-03 00:02:43 +04:00
parent 9e907e15ca
commit 9bf1d4ed0e
21 changed files with 580 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CarRepairShop/CarRepairShop.sln
View File

@ -11,7 +11,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarRepairShopContracts", "C
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarRepairShopBusinessLogic", "CarRepairShopBusinessLogic\CarRepairShopBusinessLogic.csproj", "{7812DC03-21D5-46ED-BAB3-8D19A8062978}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarRepairShopListImplement", "CarRepairShopListImplement\CarRepairShopListImplement.csproj", "{5EFAC810-3F87-4A67-B741-57B5766B4D29}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarRepairShopListImplement", "CarRepairShopListImplement\CarRepairShopListImplement.csproj", "{5EFAC810-3F87-4A67-B741-57B5766B4D29}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarRepairShopFileImplement", "CarRepairShopFileImplement\CarRepairShopFileImplement.csproj", "{839833B6-BDA5-4967-8733-42B6B9DBF46D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -39,6 +41,10 @@ Global
{5EFAC810-3F87-4A67-B741-57B5766B4D29}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5EFAC810-3F87-4A67-B741-57B5766B4D29}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5EFAC810-3F87-4A67-B741-57B5766B4D29}.Release|Any CPU.Build.0 = Release|Any CPU
{839833B6-BDA5-4967-8733-42B6B9DBF46D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{839833B6-BDA5-4967-8733-42B6B9DBF46D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{839833B6-BDA5-4967-8733-42B6B9DBF46D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{839833B6-BDA5-4967-8733-42B6B9DBF46D}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

1
CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/OrderLogic.cs
View File

@ -67,7 +67,6 @@ namespace CarRepairShopBusinessLogic.BusinessLogics
private bool StatusUpdate(OrderBindingModel model, OrderStatus newStatus)
{
CheckModel(model);
if(model.Status + 1 != newStatus)
{

1
CarRepairShop/CarRepairShopContracts/BindingModels/OrderBindingModel.cs
View File

@ -12,7 +12,6 @@ namespace CarRepairShopContracts.BindingModels
{
public int Id { get; set; }
public int RepairId { get; set; }
public string RepairName { get; set; } = string.Empty;
public int Count { get; set; }
public double Sum { get; set; }
public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;

2
CarRepairShop/CarRepairShopContracts/ViewModels/OrderViewModel.cs
View File

@ -18,7 +18,7 @@ namespace CarRepairShopContracts.ViewModels
public int RepairId { get; set; }
[DisplayName("Ремонт")]
public string RepairName { get; set; } = string.Empty;
public string RepairName { get; set; } = string.Empty;
[DisplayName("Количество")]
public int Count { get; set; }

1
CarRepairShop/CarRepairShopDataModels/Models/IOrderModel.cs
View File

@ -10,7 +10,6 @@ namespace CarRepairShopDataModels.Models
public interface IOrderModel : IId
{
int RepairId { get; }
string RepairName { get; }
int Count { get; }
double Sum { get; }
OrderStatus Status { get; }

16
CarRepairShop/CarRepairShopFileImplement/CarRepairShopFileImplement.csproj Normal file
View File

@ -0,0 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\CarRepairShopBusinessLogic\CarRepairShopBusinessLogic.csproj" />
<ProjectReference Include="..\CarRepairShopContracts\CarRepairShopContracts.csproj" />
<ProjectReference Include="..\CarRepairShopDataModels\CarRepairShopDataModels.csproj" />
<ProjectReference Include="..\CarRepairShopListImplement\CarRepairShopListImplement.csproj" />
</ItemGroup>
</Project>

53
CarRepairShop/CarRepairShopFileImplement/DataFileSingleton.cs Normal file
View File

@ -0,0 +1,53 @@
using CarRepairShopFileImplement.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
namespace CarRepairShopFileImplement
{
internal class DataFileSingleton
{
private static DataFileSingleton? instance;
private readonly string ComponentFileName = "Component.xml";
private readonly string OrderFileName = "Order.xml";
private readonly string RepairFileName = "Repair.xml";
public List<Component> Components { get; private set; }
public List<Order> Orders { get; private set; }
public List<Repair> Repairs { get; private set; }
public static DataFileSingleton GetInstance()
{
if(instance == null)
{
instance = new DataFileSingleton();
}
return instance;
}
public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement);
public void SaveRepairs() => SaveData(Repairs, RepairFileName, "Repairs", x => x.GetXElement);
public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
private DataFileSingleton()
{
Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
Repairs = LoadData(RepairFileName, "Repair", x => Repair.Create(x)!)!;
Orders = LoadData(OrderFileName, "Order", x=> Order.Create(x)!)!;
}
private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
{
if(File.Exists(filename))
{
return XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList();
}
return new List<T>();
}
private static void SaveData<T>(List<T> data, string filename, string xmlNodeName, Func<T,XElement> selectFunction)
{
if(data != null)
{
new XDocument(new XElement(xmlNodeName, data.Select(selectFunction).ToArray())).Save(filename);
}
}
}
}

76
CarRepairShop/CarRepairShopFileImplement/Implements/ComponentStorage.cs Normal file
View File

@ -0,0 +1,76 @@
using CarRepairShopContracts.BindingModels;
using CarRepairShopContracts.SearchModels;
using CarRepairShopContracts.StoragesContracts;
using CarRepairShopContracts.ViewModels;
using CarRepairShopFileImplement.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CarRepairShopFileImplement.Implements
{
public class ComponentStorage : IComponentStorage
{
private readonly DataFileSingleton source;
public ComponentStorage()
{
source = DataFileSingleton.GetInstance();
}
public List<ComponentViewModel> GetFullList()
{
return source.Components.Select(x => x.GetViewModel).ToList();
}
public List<ComponentViewModel> GetFilteredList(ComponentSearchModel model)
{
if (string.IsNullOrEmpty(model.ComponentName))
{
return new();
}
return source.Components.Where(x => x.ComponentName.Contains(model.ComponentName)).Select(x => x.GetViewModel).ToList();
}
public ComponentViewModel? GetElement(ComponentSearchModel model)
{
if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue)
{
return null;
}
return source.Components.FirstOrDefault(x => (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName == model.ComponentName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
}
public ComponentViewModel? Insert(ComponentBindingModel model)
{
model.Id = source.Components.Count > 0 ? source.Components.Max(x => x.Id) + 1 : 1;
var newComponent = Component.Create(model);
if(newComponent == null)
{
return null;
}
source.Components.Add(newComponent);
source.SaveComponents();
return newComponent.GetViewModel;
}
public ComponentViewModel? Update(ComponentBindingModel model)
{
var component = source.Components.FirstOrDefault(x => x.Id == model.Id);
if(component == null)
{
return null;
}
component.Update(model);
source.SaveComponents();
return component.GetViewModel;
}
public ComponentViewModel? Delete(ComponentBindingModel model)
{
var element = source.Components.FirstOrDefault(x => x.Id == model.Id);
if(element != null)
{
source.Components.Remove(element);
source.SaveComponents();
return element.GetViewModel;
}
return null;
}
}
}

84
CarRepairShop/CarRepairShopFileImplement/Implements/OrderStorage.cs Normal file
View File

@ -0,0 +1,84 @@
using CarRepairShopContracts.BindingModels;
using CarRepairShopContracts.SearchModels;
using CarRepairShopContracts.StoragesContracts;
using CarRepairShopContracts.ViewModels;
using CarRepairShopFileImplement.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CarRepairShopFileImplement.Implements
{
public class OrderStorage : IOrderStorage
{
private readonly DataFileSingleton source;
public OrderStorage()
{
source = DataFileSingleton.GetInstance();
}
public List<OrderViewModel> GetFullList()
{
return source.Orders.Select(x => GetFullOrder(x.GetViewModel)).ToList();
}
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{
if (!model.Id.HasValue)
{
return new();
}
return source.Orders.Where(x => x.Id == model.Id).Select(x => GetFullOrder(x.GetViewModel)).ToList();
}
public OrderViewModel? GetElement(OrderSearchModel model)
{
if (!model.Id.HasValue)
{
return null;
}
return GetFullOrder(source.Orders.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)?.GetViewModel);
}
public OrderViewModel? Insert(OrderBindingModel model)
{
model.Id = source.Orders.Count > 0 ? source.Orders.Max(x => x.Id) + 1 : 1;
var newOrder = Order.Create(model);
if(newOrder == null)
{
return null;
}
source.Orders.Add(newOrder);
source.SaveOrders();
return GetFullOrder(newOrder.GetViewModel);
}
public OrderViewModel? Update(OrderBindingModel model)
{
var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
if(order == null)
{
return null;
}
order.Update(model);
source.SaveOrders();
return GetFullOrder(order.GetViewModel);
}
public OrderViewModel? Delete(OrderBindingModel model)
{
var element = source.Orders.FirstOrDefault(x => x.Id == model.Id);
if(element != null)
{
source.Orders.Remove(element);
source.SaveOrders();
return GetFullOrder(element.GetViewModel);
}
return null;
}
public OrderViewModel GetFullOrder(OrderViewModel model)
{
string? RepairName = source.Repairs.FirstOrDefault(x => x.Id == model.RepairId)?.RepairName;
if(RepairName != null) {
model.RepairName = RepairName;
}
return model;
}
}
}

76
CarRepairShop/CarRepairShopFileImplement/Implements/RepairStorage.cs Normal file
View File

@ -0,0 +1,76 @@
using CarRepairShopContracts.BindingModels;
using CarRepairShopContracts.SearchModels;
using CarRepairShopContracts.StoragesContracts;
using CarRepairShopContracts.ViewModels;
using CarRepairShopFileImplement.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CarRepairShopFileImplement.Implements
{
public class RepairStorage : IRepairStorage
{
private readonly DataFileSingleton source;
public RepairStorage()
{
source = DataFileSingleton.GetInstance();
}
public List<RepairViewModel> GetFullList()
{
return source.Repairs.Select(x => x.GetViewModel).ToList();
}
public List<RepairViewModel> GetFilteredList(RepairSearchModel model)
{
if(string.IsNullOrEmpty(model.RepairName))
{
return new();
}
return source.Repairs.Where(x => x.RepairName.Contains(model.RepairName)).Select(x => x.GetViewModel).ToList();
}
public RepairViewModel? GetElement(RepairSearchModel model)
{
if (string.IsNullOrEmpty(model.RepairName) && !model.Id.HasValue)
{
return null;
}
return source.Repairs.FirstOrDefault(x => (!string.IsNullOrEmpty(model.RepairName) && x.RepairName == model.RepairName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
}
public RepairViewModel? Insert(RepairBindingModel model)
{
model.Id = source.Repairs.Count > 0 ? source.Repairs.Max(x => x.Id) + 1 : 1;
var newRepair = Repair.Create(model);
if(newRepair == null)
{
return null;
}
source.Repairs.Add(newRepair);
source.SaveRepairs();
return newRepair.GetViewModel;
}
public RepairViewModel? Update(RepairBindingModel model)
{
var repair = source.Repairs.FirstOrDefault(x => x.Id == model.Id);
if(repair == null)
{
return null;
}
repair.Update(model);
source.SaveRepairs();
return repair.GetViewModel;
}
public RepairViewModel? Delete(RepairBindingModel model)
{
var element = source.Repairs.FirstOrDefault(x => x.Id == model.Id);
if(element != null)
{
source.Repairs.Remove(element);
source.SaveRepairs();
return element.GetViewModel;
}
return null;
}
}
}

65
CarRepairShop/CarRepairShopFileImplement/Models/Component.cs Normal file
View File

@ -0,0 +1,65 @@
using CarRepairShopContracts.BindingModels;
using CarRepairShopContracts.ViewModels;
using CarRepairShopDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
namespace CarRepairShopFileImplement.Models
{
public class Component : IComponentModel
{
public int Id { get; private set; }
public string ComponentName { get; private set; } = String.Empty;
public double Cost { get; set; }
public static Component? Create(ComponentBindingModel model)
{
if (model == null)
{
return null;
}
return new Component()
{
Id = model.Id,
ComponentName = model.ComponentName,
Cost = model.Cost,
};
}
public static Component? Create(XElement element)
{
if (element == null)
{
return null;
}
return new Component()
{
Id = Convert.ToInt32(element.Attribute("Id")!.Value),
ComponentName = element.Element("ComponentName")!.Value,
Cost = Convert.ToDouble(element.Element("Cost")!.Value)
};
}
public void Update(ComponentBindingModel model)
{
if (model == null)
{
return;
}
ComponentName = model.ComponentName;
Cost = model.Cost;
}
public ComponentViewModel GetViewModel => new()
{
Id = Id,
ComponentName = ComponentName,
Cost = Cost,
};
public XElement GetXElement => new("Component",
new XAttribute("Id", Id),
new XElement("ComponentName", ComponentName),
new XElement("Cost", Cost.ToString()));
}
}

86
CarRepairShop/CarRepairShopFileImplement/Models/Order.cs Normal file
View File

@ -0,0 +1,86 @@
using CarRepairShopContracts.BindingModels;
using CarRepairShopContracts.ViewModels;
using CarRepairShopDataModels.Enums;
using CarRepairShopDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
namespace CarRepairShopFileImplement.Models
{
public class Order : IOrderModel
{
public int Id { get; private set; }
public int RepairId { get; private set; }
public int Count { get; private set; }
public double Sum { get; private set; }
public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
public DateTime DateCreate { get; private set; } = DateTime.Now;
public DateTime? DateImplement { get; private set; }
public static Order? Create(OrderBindingModel model)
{
if(model == null)
{
return null;
}
return new Order()
{
Id = model.Id,
RepairId = model.RepairId,
Count = model.Count,
Sum = model.Sum,
Status = model.Status,
DateCreate = model.DateCreate,
DateImplement = model.DateImplement,
};
}
public static Order? Create(XElement element)
{
if (element == null)
{
return null;
}
return new Order()
{
Id = Convert.ToInt32(element.Attribute("Id")!.Value),
RepairId = Convert.ToInt32(element.Element("RepairId")!.Value),
Count = Convert.ToInt32(element.Element("Count")!.Value),
Sum = Convert.ToDouble(element.Element("Sum")!.Value),
Status = Enum.Parse<OrderStatus>(element.Element("Status")!.Value),
DateCreate = DateTime.ParseExact(element.Element("DateCreate")!.Value, "G", null),
DateImplement = !string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? DateTime.ParseExact(element.Element("DateImplement")!.Value, "G", null) : null
};
}
public void Update(OrderBindingModel model)
{
if(model == null)
{
return;
}
Status = model.Status;
DateImplement = model.DateImplement;
}
public OrderViewModel GetViewModel => new()
{
Id = Id,
RepairId = RepairId,
Count = Count,
Sum = Sum,
Status = Status,
DateCreate = DateCreate,
DateImplement = DateImplement,
};
public XElement GetXElement => new("Order",
new XAttribute("Id", Id),
new XElement("RepairId", RepairId),
new XElement("Count", Count.ToString()),
new XElement("Sum", Sum.ToString()),
new XElement("Status", Status.ToString()),
new XElement("DateCreate", DateCreate.ToString()),
new XElement("DateImplement", DateImplement.ToString()));
}
}

88
CarRepairShop/CarRepairShopFileImplement/Models/Repair.cs Normal file
View File

@ -0,0 +1,88 @@
using CarRepairShopContracts.BindingModels;
using CarRepairShopContracts.ViewModels;
using CarRepairShopDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http.Headers;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
namespace CarRepairShopFileImplement.Models
{
public class Repair : IRepairModel
{
public int Id { get; private set; }
public string RepairName { get; private set; } = string.Empty;
public double Price { get; private set; }
public Dictionary<int, int> Components { get; private set; } = new();
private Dictionary<int, (IComponentModel, int)>? _repairComponents = null;
public Dictionary<int, (IComponentModel, int)> RepairComponents
{
get
{
if(_repairComponents == null)
{
var source = DataFileSingleton.GetInstance();
_repairComponents = Components.ToDictionary(x => x.Key, y => ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, y.Value));
}
return _repairComponents;
}
}
public static Repair? Create(RepairBindingModel model)
{
if(model == null)
{
return null;
}
return new Repair()
{
Id = model.Id,
RepairName = model.RepairName,
Price = model.Price,
Components = model.RepairComponents.ToDictionary(x => x.Key, x => x.Value.Item2)
};
}
public static Repair? Create(XElement element)
{
if (element == null)
{
return null;
}
return new Repair()
{
Id = Convert.ToInt32(element.Attribute("Id")!.Value),
RepairName = element.Element("RepairName")!.Value,
Price = Convert.ToDouble(element.Element("Price")!.Value),
Components = element.Element("RepairComponents")!.Elements("RepairComponent").ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value), x => Convert.ToInt32(x.Element("Value")?.Value))
};
}
public void Update(RepairBindingModel model)
{
if(model == null)
{
return;
}
RepairName = model.RepairName;
Price = model.Price;
Components = model.RepairComponents.ToDictionary(x => x.Key, x => x.Value.Item2);
_repairComponents = null;
}
public RepairViewModel GetViewModel => new()
{
Id = Id,
RepairName = RepairName,
Price = Price,
RepairComponents = RepairComponents
};
public XElement GetXElement => new("Repair",
new XAttribute("Id", Id),
new XElement("RepairName", RepairName),
new XElement("Price", Price.ToString()),
new XElement("RepairComponents", Components.Select(x =>
new XElement("RepairComponent",
new XElement("Key", x.Key),
new XElement("Value", x.Value))).ToArray()));
}
}

25
CarRepairShop/CarRepairShopListImplement/Implements/OrderStorage.cs
View File

@ -24,7 +24,7 @@ namespace CarRepairShopListImplement.Implements
var result = new List<OrderViewModel>();
foreach(var order in _source.Orders)
{
result.Add(order.GetViewModel);
result.Add(AccessRepairStorage(order.GetViewModel));
}
return result;
}
@ -40,7 +40,7 @@ namespace CarRepairShopListImplement.Implements
{
if(order.Id == model.Id)
{
result.Add(order.GetViewModel);
result.Add(AccessRepairStorage(order.GetViewModel));
}
}
return result;
@ -56,7 +56,7 @@ namespace CarRepairShopListImplement.Implements
{
if(order.Id == model.Id)
{
return order.GetViewModel;
return AccessRepairStorage(order.GetViewModel);
}
}
return null;
@ -78,7 +78,7 @@ namespace CarRepairShopListImplement.Implements
return null;
}
_source.Orders.Add(newOrder);
return newOrder.GetViewModel;
return AccessRepairStorage(newOrder.GetViewModel);
}
public OrderViewModel? Update(OrderBindingModel model)
@ -88,7 +88,7 @@ namespace CarRepairShopListImplement.Implements
if(order.Id == model.Id)
{
order.Update(model);
return order.GetViewModel;
return AccessRepairStorage(order.GetViewModel);
}
}
return null;
@ -101,10 +101,23 @@ namespace CarRepairShopListImplement.Implements
{
var element = _source.Orders[i];
_source.Orders.RemoveAt(i);
return element.GetViewModel;
return AccessRepairStorage(element.GetViewModel);
}
}
return null;
}
public OrderViewModel AccessRepairStorage(OrderViewModel model)
{
foreach(var repair in _source.Repairs)
{
if(repair.Id == model.RepairId)
{
model.RepairName = repair.RepairName;
break;
}
}
return model;
}
}
}

4
CarRepairShop/CarRepairShopListImplement/Models/Order.cs
View File

@ -16,7 +16,7 @@ namespace CarRepairShopListImplement.Models
public int Id { get; private set; }
public int RepairId { get; private set; }
public string RepairName { get; private set; } = string.Empty;
//public string RepairName { get; private set; } = string.Empty;
public int Count { get; private set; }
@ -38,7 +38,6 @@ namespace CarRepairShopListImplement.Models
{
Id = model.Id,
RepairId = model.RepairId,
RepairName = model.RepairName,
Count = model.Count,
Sum = model.Sum,
Status = model.Status,
@ -61,7 +60,6 @@ namespace CarRepairShopListImplement.Models
{
Id = Id,
RepairId = RepairId,
RepairName = RepairName,
Count = Count,
Sum = Sum,
Status = Status,

1
CarRepairShop/CarRepairShopView/CarRepairShopView.csproj
View File

@ -29,6 +29,7 @@
<ItemGroup>
<ProjectReference Include="..\CarRepairShopBusinessLogic\CarRepairShopBusinessLogic.csproj" />
<ProjectReference Include="..\CarRepairShopContracts\CarRepairShopContracts.csproj" />
<ProjectReference Include="..\CarRepairShopFileImplement\CarRepairShopFileImplement.csproj" />
<ProjectReference Include="..\CarRepairShopListImplement\CarRepairShopListImplement.csproj" />
</ItemGroup>

4
CarRepairShop/CarRepairShopView/FormComponent.Designer.cs generated
View File

@ -70,9 +70,9 @@
//
// buttonSave
//
buttonSave.Location = new Point(165, 70);
buttonSave.Location = new Point(165, 71);
buttonSave.Name = "buttonSave";
buttonSave.Size = new Size(77, 30);
buttonSave.Size = new Size(83, 30);
buttonSave.TabIndex = 4;
buttonSave.Text = "Сохранить";
buttonSave.UseVisualStyleBackColor = true;

1
CarRepairShop/CarRepairShopView/FormCreateOrder.cs
View File

@ -90,7 +90,6 @@ namespace CarRepairShopView
var operationResult = _logicO.CreateOrder(new OrderBindingModel
{
RepairId = Convert.ToInt32(comboBoxRepair.SelectedValue),
RepairName = comboBoxRepair.Text,
Count = Convert.ToInt32(textBoxCount.Text),
Sum = Convert.ToDouble(textBoxSum.Text)
});

17
CarRepairShop/CarRepairShopView/FormMain.cs
View File

@ -77,14 +77,9 @@ namespace CarRepairShopView
_logger.LogInformation("Заказ №{id}. Меняется статус на 'В работе'", id);
try
{
var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel {
var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel {
Id = id,
RepairId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["RepairId"].Value),
RepairName = dataGridView.SelectedRows[0].Cells["RepairName"].Value.ToString(),
Status = Enum.Parse<OrderStatus>(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()),
Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value),
Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()),
DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()),
});
if (!operationResult)
{
@ -110,12 +105,7 @@ namespace CarRepairShopView
{
var operationResult = _orderLogic.FinishOrder(new OrderBindingModel {
Id = id,
RepairId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["RepairId"].Value),
RepairName = dataGridView.SelectedRows[0].Cells["RepairName"].Value.ToString(),
Status = Enum.Parse<OrderStatus>(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()),
Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value),
Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()),
DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()),
});
if (!operationResult)
{
@ -141,12 +131,7 @@ namespace CarRepairShopView
{
var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel {
Id = id,
RepairId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["RepairId"].Value),
RepairName = dataGridView.SelectedRows[0].Cells["RepairName"].Value.ToString(),
Status = Enum.Parse<OrderStatus>(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()),
Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value),
Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()),
DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()),
});
if (!operationResult)
{

6
CarRepairShop/CarRepairShopView/FormRepairComponent.Designer.cs generated
View File

@ -90,7 +90,7 @@
buttonCancel.UseVisualStyleBackColor = true;
buttonCancel.Click += buttonCancel_Click;
//
// FormProductComponent
// FormRepairComponent
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
@ -101,8 +101,8 @@
Controls.Add(comboBoxComponent);
Controls.Add(label2);
Controls.Add(label1);
Name = "FormProductComponent";
Text = "FormProductComponent";
Name = "FormRepairComponent";
Text = "Компоненты в ремонте";
ResumeLayout(false);
PerformLayout();
}

2
CarRepairShop/CarRepairShopView/Program.cs
View File

@ -1,7 +1,7 @@
using CarRepairShopBusinessLogic.BusinessLogics;
using CarRepairShopContracts.BusinessLogicsContracts;
using CarRepairShopContracts.StoragesContracts;
using CarRepairShopListImplement.Implements;
using CarRepairShopFileImplement.Implements;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using NLog.Extensions.Logging;