PIbd-21 Yakovlev M.G. lab work 2 Hard #13

Closed
YakovlevMaxim wants to merge 5 commits from Lab2_Hard into Lab2_Base
21 changed files with 723 additions and 29 deletions
Showing only changes of commit 168e1f6385 - Show all commits

View File

@ -17,11 +17,14 @@ namespace CarRepairShopBusinessLogic.BusinessLogics
{
private readonly ILogger _logger;
private readonly IOrderStorage _orderStorage;
public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
private readonly IRepairStorage _repairStorage;
private readonly IShopLogic _slogic;
public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IRepairStorage repairStorage, IShopLogic shopLogic)
{
_logger = logger;
_orderStorage = orderStorage;
_repairStorage = repairStorage;
_slogic = shopLogic;
}
public List<OrderViewModel>? ReadList(OrderSearchModel? model)
@ -67,8 +70,9 @@ namespace CarRepairShopBusinessLogic.BusinessLogics
private bool StatusUpdate(OrderBindingModel model, OrderStatus newStatus)
{
if(model.Status + 1 != newStatus)
var viewModel = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id });
if (viewModel == null) throw new ArgumentNullException(nameof(model));
if (model.Status + 1 != newStatus)
{
_logger.LogInformation("Status update operation failed. Incorrect order status");
return false;
@ -78,6 +82,23 @@ namespace CarRepairShopBusinessLogic.BusinessLogics
{
model.DateImplement = DateTime.Now;
}
if(model.Status == OrderStatus.Готов)
{
model.DateImplement = DateTime.Now;
var repair = _repairStorage.GetElement(new() { Id = viewModel.RepairId });
if(repair == null) throw new ArgumentNullException(nameof(repair));
if(!_slogic.AddRepairs(repair, viewModel.Count))
{
throw new Exception($"Невозможно выдать изделия, магазины переполнены.");
}
}
else
{
model.DateImplement = viewModel.DateImplement;
}
if(_orderStorage.Update(model) == null)
{
model.Status--;

View File

@ -92,6 +92,8 @@ namespace CarRepairShopBusinessLogic.BusinessLogics
if (shop == null) return false;
if(count > shop.MaxCountRepairs) throw new ArgumentNullException("Количество добавляемых изделий превышает максимум допустимых");
if (!shop.ShopRepairs.ContainsKey(repair.Id))
{
shop.ShopRepairs[repair.Id] = (repair, count);
@ -106,6 +108,7 @@ namespace CarRepairShopBusinessLogic.BusinessLogics
ShopName = shop.ShopName,
ShopAddress = shop.ShopAddress,
DateOpen = shop.DateOpen,
MaxCountRepairs = shop.MaxCountRepairs,
ShopRepairs = shop.ShopRepairs
});
return true;
@ -139,5 +142,53 @@ namespace CarRepairShopBusinessLogic.BusinessLogics
throw new InvalidOperationException("Магазин с таким названием уже есть");
}
}
public bool AddRepairs(IRepairModel model, int count)
{
if(count <= 0)
{
throw new ArgumentNullException("Количество должно быть больше 0", nameof(count));
}
_logger.LogInformation("AddRepairs. Repair: {Repair}. Count: {Count}", model?.RepairName, count);
var capacity = _shopStorage.GetFullList().Select(x => x.MaxCountRepairs - x.ShopRepairs.Select(x => x.Value.Item2).Sum()).Sum() - count;
if(capacity < 0)
{
_logger.LogWarning("AddRepairs operation failed. Sell {count} Repairs ", capacity);
return false;
}
foreach(var shop in _shopStorage.GetFullList())
{
if(shop.MaxCountRepairs - shop.ShopRepairs.Select(x => x.Value.Item2).Sum() < count)
{
if(!AddRepair(new() { Id = shop.Id }, model, shop.MaxCountRepairs - shop.ShopRepairs.Select(x => x.Value.Item2).Sum())){
_logger.LogWarning("AddRepairs operation failed.");
return false;
}
count -= shop.MaxCountRepairs - shop.ShopRepairs.Select(x => x.Value.Item2).Sum();
}
else
{
if (!AddRepair(new() { Id = shop.Id}, model, count))
{
_logger.LogWarning("AddRepairs operation failed.");
return false;
}
count -= count;
}
if (count == 0)
{
return true;
}
}
return true;
}
public bool SellRepairs(IRepairModel model, int count)
{
return _shopStorage.SellRepairs(model, count);
}
}
}

View File

@ -12,7 +12,7 @@ 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.Неизвестен;

View File

@ -13,6 +13,7 @@ namespace CarRepairShopContracts.BindingModels
public string ShopName { get; set; } = string.Empty;
public string ShopAddress { get; set; } = string.Empty;
public DateTime DateOpen { get; set; } = DateTime.Now;
public int MaxCountRepairs { get; set; }
public Dictionary<int, (IRepairModel, int)> ShopRepairs { get; set; } = new();
}
}

View File

@ -19,5 +19,7 @@ namespace CarRepairShopContracts.BusinessLogicsContracts
bool Update(ShopBindingModel model);
bool Delete(ShopBindingModel model);
bool AddRepair(ShopSearchModel model, IRepairModel repair, int count);
bool SellRepairs(IRepairModel model, int count);
bool AddRepairs(IRepairModel model, int count);
}
}

View File

@ -1,6 +1,7 @@
using CarRepairShopContracts.BindingModels;
using CarRepairShopContracts.SearchModels;
using CarRepairShopContracts.ViewModels;
using CarRepairShopDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
@ -18,5 +19,7 @@ namespace CarRepairShopContracts.StoragesContracts
ShopViewModel? Insert(ShopBindingModel model);
ShopViewModel? Update(ShopBindingModel model);
ShopViewModel? Delete(ShopBindingModel model);
bool SellRepairs(IRepairModel model, int count);
}
}

View File

@ -21,6 +21,9 @@ namespace CarRepairShopContracts.ViewModels
[DisplayName("Дата открытия")]
public DateTime DateOpen { get; set; } = DateTime.Now;
[DisplayName("Вместимость магазина")]
public int MaxCountRepairs { get; set; }
public Dictionary<int, (IRepairModel, int)> ShopRepairs { get; set; } = new();
}
}

View File

@ -11,6 +11,7 @@ namespace CarRepairShopDataModels.Models
string ShopName { get; }
string ShopAddress { get; }
DateTime DateOpen { get; }
public int MaxCountRepairs { get; set; }
Dictionary<int,(IRepairModel, int)> ShopRepairs { get; }
}
}

View File

@ -14,9 +14,11 @@ namespace CarRepairShopFileImplement
private readonly string ComponentFileName = "Component.xml";
private readonly string OrderFileName = "Order.xml";
private readonly string RepairFileName = "Repair.xml";
private readonly string ShopFileName = "Shop.xml";
public List<Component> Components { get; private set; }
public List<Order> Orders { get; private set; }
public List<Repair> Repairs { get; private set; }
public List<Shop> Shops { get; private set; }
public static DataFileSingleton GetInstance()
{
if(instance == null)
@ -28,11 +30,13 @@ namespace CarRepairShopFileImplement
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);
public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", 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)!)!;
Shops = LoadData(ShopFileName, "Shop", x=> Shop.Create(x)!)!;
}
private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
{

View File

@ -0,0 +1,114 @@
using CarRepairShopContracts.BindingModels;
using CarRepairShopContracts.SearchModels;
using CarRepairShopContracts.StoragesContracts;
using CarRepairShopContracts.ViewModels;
using CarRepairShopDataModels.Models;
using CarRepairShopFileImplement.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CarRepairShopFileImplement.Implements
{
public class ShopStorage : IShopStorage
{
private readonly DataFileSingleton _source;
public ShopStorage()
{
_source = DataFileSingleton.GetInstance();
}
public List<ShopViewModel> GetFullList()
{
return _source.Shops.Select(x => x.GetViewModel).ToList();
}
public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
{
if (string.IsNullOrEmpty(model.ShopName)) return new();
return _source.Shops.Where(x => x.ShopName.Contains(model.ShopName)).Select(x => x.GetViewModel).ToList();
}
public ShopViewModel? GetElement(ShopSearchModel model)
{
if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue) return null;
return _source.Shops.FirstOrDefault(x => (!string.IsNullOrEmpty(model.ShopName) && x.ShopName == model.ShopName) || (model.Id.HasValue && model.Id == x.Id))?.GetViewModel;
}
public ShopViewModel? Insert(ShopBindingModel model)
{
model.Id = _source.Shops.Count > 0 ? _source.Shops.Max(x => x.Id) + 1 : 1;
var newShop = Shop.Create(model);
if(newShop == null) return null;
_source.Shops.Add(newShop);
_source.SaveShops();
return newShop.GetViewModel;
}
public ShopViewModel? Update(ShopBindingModel model)
{
var shop = _source.Shops.FirstOrDefault(x => x.ShopName.Contains(model.ShopName) || x.Id == model.Id);
if(shop == null) return null;
shop.Update(model);
_source.SaveShops();
return shop.GetViewModel;
}
public ShopViewModel? Delete(ShopBindingModel model)
{
var element = _source.Shops.FirstOrDefault(x => x.Id == model.Id);
if(element != null)
{
_source.Shops.Remove(element);
_source.SaveShops();
return element.GetViewModel;
}
return null;
}
public bool SellRepairs(IRepairModel model, int count)
{
if(_source.Shops.Select(x => x.ShopRepairs.FirstOrDefault(x => x.Key == model.Id).Value.Item2).Sum() < count)
{
return false;
}
var list = _source.Shops.Where(x => x.ShopRepairs.ContainsKey(model.Id));
foreach(var shop in list)
{
if (shop.ShopRepairs[model.Id].Item2 < count)
{
count -= shop.ShopRepairs[model.Id].Item2;
shop.ShopRepairs[model.Id] = (shop.ShopRepairs[model.Id].Item1, 0);
}
else
{
shop.ShopRepairs[model.Id] = (shop.ShopRepairs[model.Id].Item1, shop.ShopRepairs[model.Id].Item2 - count);
count -= count;
}
Update(new()
{
ShopName = shop.ShopName,
ShopAddress = shop.ShopAddress,
DateOpen = shop.DateOpen,
MaxCountRepairs = shop.MaxCountRepairs,
ShopRepairs = shop.ShopRepairs,
});
if(count == 0)
{
return true;
}
}
return true;
}
}
}

View File

@ -0,0 +1,101 @@
using CarRepairShopContracts.BindingModels;
using CarRepairShopContracts.ViewModels;
using CarRepairShopDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
namespace CarRepairShopFileImplement.Models
{
internal class Shop : IShopModel
{
public int Id { get; set; }
public string ShopName { get; set; } = string.Empty;
public string ShopAddress { get; set; } = string.Empty;
public DateTime DateOpen { get; set; }
public int MaxCountRepairs { get; set; }
public Dictionary<int, int> countRepair { get; private set; } = new();
public Dictionary<int, (IRepairModel, int)> _repairs = null;
public Dictionary<int, (IRepairModel, int)> ShopRepairs
{
get
{
if(_repairs == null)
{
var source = DataFileSingleton.GetInstance();
_repairs = countRepair.ToDictionary(x => x.Key, y => ((source.Repairs.FirstOrDefault(z => z.Id == y.Key) as IRepairModel)!, y.Value));
}
return _repairs;
}
}
public static Shop? Create(ShopBindingModel? model)
{
if (model == null) return null;
return new Shop()
{
Id = model.Id,
ShopName = model.ShopName,
ShopAddress = model.ShopAddress,
DateOpen = model.DateOpen,
MaxCountRepairs = model.MaxCountRepairs,
countRepair = model.ShopRepairs.ToDictionary(x => x.Key, x=> x.Value.Item2)
};
}
public static Shop? Create(XElement element)
{
if (element == null) return null;
return new Shop()
{
Id = Convert.ToInt32(element.Attribute("Id")!.Value),
ShopName = element.Element("ShopName")!.Value,
ShopAddress = element.Element("ShopAddress")!.Value,
DateOpen = Convert.ToDateTime(element.Element("DateOpen")!.Value),
MaxCountRepairs = Convert.ToInt32(element.Element("MaxCountRepairs")!.Value),
countRepair = element.Element("ShopRepairs")!.Elements("ShopRepairs").ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value), x => Convert.ToInt32(x.Element("Value")?.Value))
};
}
public void Update(ShopBindingModel? model)
{
if (model == null) return;
ShopName = model.ShopName;
ShopAddress = model.ShopAddress;
DateOpen = model.DateOpen;
MaxCountRepairs = model.MaxCountRepairs;
countRepair = model.ShopRepairs.ToDictionary(x => x.Key, x => x.Value.Item2);
_repairs = null;
}
public ShopViewModel GetViewModel => new()
{
Id = Id,
ShopName = ShopName,
ShopAddress = ShopAddress,
DateOpen = DateOpen,
MaxCountRepairs = MaxCountRepairs,
ShopRepairs = ShopRepairs
};
public XElement GetXElement => new("Shop",
new XAttribute("Id", Id),
new XElement("ShopName", ShopName),
new XElement("ShopAddress", ShopAddress),
new XElement("DateOpen", DateOpen.ToString()),
new XElement("MaxCountRepairs", MaxCountRepairs.ToString()),
new XElement("ShopRepairs", countRepair.Select(x => new XElement("ShopRepairs",
new XElement("Key", x.Key),
new XElement("Value", x.Value))).ToArray()));
}
}

View File

@ -2,6 +2,7 @@
using CarRepairShopContracts.SearchModels;
using CarRepairShopContracts.StoragesContracts;
using CarRepairShopContracts.ViewModels;
using CarRepairShopDataModels.Models;
using CarRepairShopListImplement.Models;
using System;
using System.Collections.Generic;
@ -102,5 +103,10 @@ namespace CarRepairShopListImplement.Implements
}
return null;
}
public bool SellRepairs(IRepairModel model, int count)
{
throw new NotImplementedException();
}
}
}

View File

@ -15,6 +15,7 @@ namespace CarRepairShopListImplement.Models
public string ShopName { get; private set; } = string.Empty;
public string ShopAddress { get; private set; } = string.Empty;
public DateTime DateOpen { get; private set; } = DateTime.Now;
public int MaxCountRepairs { get; set; }
public Dictionary<int, (IRepairModel, int)> ShopRepairs { get; private set; } = new Dictionary<int, (IRepairModel, int)>();
public static Shop? Create(ShopBindingModel? model)
@ -46,5 +47,6 @@ namespace CarRepairShopListImplement.Models
DateOpen = DateOpen,
ShopRepairs = ShopRepairs
};
}
}

View File

@ -40,6 +40,7 @@
buttonOrderReady = new Button();
buttonIssuedOrder = new Button();
buttonRef = new Button();
buttonSellRepairs = new Button();
menuStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
SuspendLayout();
@ -158,11 +159,23 @@
buttonRef.UseVisualStyleBackColor = true;
buttonRef.Click += buttonRef_Click;
//
// buttonSellRepairs
//
buttonSellRepairs.Anchor = AnchorStyles.Top | AnchorStyles.Right;
buttonSellRepairs.Location = new Point(844, 323);
buttonSellRepairs.Name = "buttonSellRepairs";
buttonSellRepairs.Size = new Size(198, 28);
buttonSellRepairs.TabIndex = 7;
buttonSellRepairs.Text = "Продать услуги";
buttonSellRepairs.UseVisualStyleBackColor = true;
buttonSellRepairs.Click += buttonSellRepairs_Click;
//
// FormMain
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(1059, 377);
Controls.Add(buttonSellRepairs);
Controls.Add(buttonRef);
Controls.Add(buttonIssuedOrder);
Controls.Add(buttonOrderReady);
@ -195,5 +208,6 @@
private Button buttonRef;
private ToolStripMenuItem ShopsToolStripMenuItem;
private ToolStripMenuItem FillShopToolStripMenuItem;
private Button buttonSellRepairs;
}
}

View File

@ -187,5 +187,15 @@ namespace CarRepairShopView
form.ShowDialog();
}
}
private void buttonSellRepairs_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormSellRepairs));
if (service is FormSellRepairs form)
{
form.ShowDialog();
LoadData();
}
}
}
}

View File

@ -0,0 +1,119 @@
namespace CarRepairShopView
{
partial class FormSellRepairs
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
label1 = new Label();
label2 = new Label();
comboBoxRepairs = new ComboBox();
textBoxCount = new TextBox();
buttonSell = new Button();
buttonCancel = new Button();
SuspendLayout();
//
// label1
//
label1.AutoSize = true;
label1.Location = new Point(17, 17);
label1.Name = "label1";
label1.Size = new Size(51, 15);
label1.TabIndex = 0;
label1.Text = "Ремонт:";
//
// label2
//
label2.AutoSize = true;
label2.Location = new Point(19, 62);
label2.Name = "label2";
label2.Size = new Size(49, 15);
label2.TabIndex = 1;
label2.Text = "Кол-во:";
//
// comboBoxRepairs
//
comboBoxRepairs.FormattingEnabled = true;
comboBoxRepairs.Location = new Point(74, 12);
comboBoxRepairs.Name = "comboBoxRepairs";
comboBoxRepairs.Size = new Size(149, 23);
comboBoxRepairs.TabIndex = 2;
//
// textBoxCount
//
textBoxCount.Location = new Point(74, 59);
textBoxCount.Name = "textBoxCount";
textBoxCount.Size = new Size(149, 23);
textBoxCount.TabIndex = 3;
//
// buttonSell
//
buttonSell.Location = new Point(148, 92);
buttonSell.Name = "buttonSell";
buttonSell.Size = new Size(75, 28);
buttonSell.TabIndex = 4;
buttonSell.Text = "Продать";
buttonSell.UseVisualStyleBackColor = true;
buttonSell.Click += buttonSell_Click;
//
// buttonCancel
//
buttonCancel.Location = new Point(19, 92);
buttonCancel.Name = "buttonCancel";
buttonCancel.Size = new Size(75, 28);
buttonCancel.TabIndex = 5;
buttonCancel.Text = "Отмена";
buttonCancel.UseVisualStyleBackColor = true;
buttonCancel.Click += buttonCancel_Click;
//
// FormSellRepairs
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(249, 125);
Controls.Add(buttonCancel);
Controls.Add(buttonSell);
Controls.Add(textBoxCount);
Controls.Add(comboBoxRepairs);
Controls.Add(label2);
Controls.Add(label1);
Name = "FormSellRepairs";
Text = "Продать услуги";
Load += FormSellRepairs_Load;
ResumeLayout(false);
PerformLayout();
}
#endregion
private Label label1;
private Label label2;
private ComboBox comboBoxRepairs;
private TextBox textBoxCount;
private Button buttonSell;
private Button buttonCancel;
}
}

View File

@ -0,0 +1,95 @@
using CarRepairShopContracts.BusinessLogicsContracts;
using CarRepairShopContracts.SearchModels;
using CarRepairShopContracts.StoragesContracts;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace CarRepairShopView
{
public partial class FormSellRepairs : Form
{
private readonly IRepairLogic _rlogic;
private readonly IShopLogic _slogic;
private readonly ILogger _logger;
public FormSellRepairs(ILogger<FormSellRepairs> logger, IRepairLogic repairLogic, IShopLogic shopLogic)
{
InitializeComponent();
_rlogic = repairLogic;
_slogic = shopLogic;
_logger = logger;
}
private void FormSellRepairs_Load(object sender, EventArgs e)
{
try
{
var list = _rlogic.ReadList(null);
if (list != null)
{
comboBoxRepairs.DisplayMember = "RepairName";
comboBoxRepairs.ValueMember = "Id";
comboBoxRepairs.DataSource = list;
comboBoxRepairs.SelectedItem = null;
}
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка загрузки списка");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void buttonSell_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(textBoxCount.Text))
{
MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
if (comboBoxRepairs.SelectedValue == null)
{
MessageBox.Show("Выберите Ремонт", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
_logger.LogInformation("Продажа");
try
{
var operationResult = _slogic.SellRepairs(_rlogic.ReadElement(new RepairSearchModel()
{
Id = Convert.ToInt32(comboBoxRepairs.SelectedValue)
})!, Convert.ToInt32(textBoxCount.Text));
if (!operationResult)
{
throw new Exception("Ошибка при продаже. Дополнительная информация в логах.");
}
MessageBox.Show("Продажа прошла успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
DialogResult = DialogResult.OK;
Close();
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка продажи");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void buttonCancel_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
Close();
}
}
}

View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

View File

@ -35,14 +35,17 @@
label3 = new Label();
dateTimePickerDateOpen = new DateTimePicker();
groupBox = new GroupBox();
buttonSave = new Button();
buttonCancel = new Button();
dataGridView = new DataGridView();
ColumnId = new DataGridViewTextBoxColumn();
ColumnName = new DataGridViewTextBoxColumn();
ColumnCount = new DataGridViewTextBoxColumn();
buttonSave = new Button();
buttonCancel = new Button();
label4 = new Label();
numericUpDownCount = new NumericUpDown();
groupBox.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
((System.ComponentModel.ISupportInitialize)numericUpDownCount).BeginInit();
SuspendLayout();
//
// textBoxName
@ -96,33 +99,13 @@
// groupBox
//
groupBox.Controls.Add(dataGridView);
groupBox.Location = new Point(12, 47);
groupBox.Location = new Point(12, 94);
groupBox.Name = "groupBox";
groupBox.Size = new Size(611, 274);
groupBox.TabIndex = 8;
groupBox.TabStop = false;
groupBox.Text = "Ремонты";
//
// buttonSave
//
buttonSave.Location = new Point(530, 327);
buttonSave.Name = "buttonSave";
buttonSave.Size = new Size(93, 32);
buttonSave.TabIndex = 9;
buttonSave.Text = "Сохранить";
buttonSave.UseVisualStyleBackColor = true;
buttonSave.Click += buttonSave_Click;
//
// buttonCancel
//
buttonCancel.Location = new Point(431, 327);
buttonCancel.Name = "buttonCancel";
buttonCancel.Size = new Size(93, 32);
buttonCancel.TabIndex = 10;
buttonCancel.Text = "Отмена";
buttonCancel.UseVisualStyleBackColor = true;
buttonCancel.Click += buttonCancel_Click;
//
// dataGridView
//
dataGridView.AllowUserToAddRows = false;
@ -159,11 +142,49 @@
ColumnCount.Name = "ColumnCount";
ColumnCount.ReadOnly = true;
//
// buttonSave
//
buttonSave.Location = new Point(530, 374);
buttonSave.Name = "buttonSave";
buttonSave.Size = new Size(93, 32);
buttonSave.TabIndex = 9;
buttonSave.Text = "Сохранить";
buttonSave.UseVisualStyleBackColor = true;
buttonSave.Click += buttonSave_Click;
//
// buttonCancel
//
buttonCancel.Location = new Point(431, 374);
buttonCancel.Name = "buttonCancel";
buttonCancel.Size = new Size(93, 32);
buttonCancel.TabIndex = 10;
buttonCancel.Text = "Отмена";
buttonCancel.UseVisualStyleBackColor = true;
buttonCancel.Click += buttonCancel_Click;
//
// label4
//
label4.AutoSize = true;
label4.Location = new Point(17, 55);
label4.Name = "label4";
label4.Size = new Size(83, 15);
label4.TabIndex = 11;
label4.Text = "Вместимость:";
//
// numericUpDownCount
//
numericUpDownCount.Location = new Point(106, 51);
numericUpDownCount.Name = "numericUpDownCount";
numericUpDownCount.Size = new Size(120, 23);
numericUpDownCount.TabIndex = 13;
//
// FormShop
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(635, 368);
ClientSize = new Size(635, 418);
Controls.Add(numericUpDownCount);
Controls.Add(label4);
Controls.Add(buttonCancel);
Controls.Add(buttonSave);
Controls.Add(groupBox);
@ -178,6 +199,7 @@
Load += FormShop_Load;
groupBox.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
((System.ComponentModel.ISupportInitialize)numericUpDownCount).EndInit();
ResumeLayout(false);
PerformLayout();
}
@ -197,5 +219,7 @@
private DataGridViewTextBoxColumn ColumnId;
private DataGridViewTextBoxColumn ColumnName;
private DataGridViewTextBoxColumn ColumnCount;
private Label label4;
private NumericUpDown numericUpDownCount;
}
}

View File

@ -46,6 +46,7 @@ namespace CarRepairShopView
textBoxName.Text = view.ShopName;
textBoxAddress.Text = view.ShopAddress;
dateTimePickerDateOpen.Value = view.DateOpen;
numericUpDownCount.Value = view.MaxCountRepairs;
_shopRepairs = view.ShopRepairs ?? new Dictionary<int, (IRepairModel, int)>();
LoadData();
}
@ -106,6 +107,7 @@ namespace CarRepairShopView
ShopName = textBoxName.Text,
ShopAddress = textBoxAddress.Text,
DateOpen = dateTimePickerDateOpen.Value.Date,
MaxCountRepairs = (int)numericUpDownCount.Value,
ShopRepairs = _shopRepairs
};
var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);

View File

@ -55,6 +55,7 @@ namespace CarRepairShopView
services.AddTransient<FormShops>();
services.AddTransient<FormShop>();
services.AddTransient<FormRepairShop>();
services.AddTransient<FormSellRepairs>();
}
}
}