Viltskaa d20613c3bb Merge branch 'LabWork_7' into LabWork_7_hard ...

# Conflicts:
#	SushiBar/SushiBar.sln
#	SushiBar/SushiBar/FormMain.Designer.cs
#	SushiBar/SushiBar/FormMain.cs
#	SushiBar/SushiBarBusinessLogic/BusinessLogics/OrderLogic.cs
#	SushiBar/SushiBarDatabaseImplement/Migrations/20230425050030_lab5hard.Designer.cs
#	SushiBar/SushiBarFileImplement/DataFileSingleton.cs
#	SushiBar/SushiBarRestApi/Controllers/ImplementerController.cs
#	SushiBar/SushiBarRestApi/Program.cs

2023-05-04 23:41:52 +04:00

..

ClientViewModel.cs

Add Client models

2023-03-26 16:43:18 +04:00

ComponentViewModel.cs

Add Models and Contracts

2023-01-30 18:15:58 +04:00

ImplementerViewModel.cs

Add implementer

2023-04-09 23:25:46 +04:00

MessageInfoViewModel.cs

Fix errors and add database impl

2023-04-23 19:14:04 +04:00

OrderViewModel.cs

complete lab work

2023-04-10 15:36:30 +04:00

ReportOrderGroupViewModel.cs

complete lab

2023-04-21 18:44:15 +04:00

ReportOrdersViewModel.cs

ready lab work

2023-03-14 10:12:32 +04:00

ReportSushiComponentViewModel.cs

ready lab work

2023-03-14 10:12:32 +04:00

StoreViewModel.cs

2 hard lab

2023-03-11 21:23:26 +04:00

SushiViewModel.cs

Switch product to sushi

2023-01-30 18:27:32 +04:00