33 Commits

Author SHA1 Message Date
2f9a01c0a6 Passed lab8 2023-05-05 10:36:33 +04:00
a35d2e05c7 Merge branch 'LabWork_8' into LabWork_8_hard
# Conflicts:
#	SushiBar/SushiBar/FormMails.cs
#	SushiBar/SushiBar/FormMain.Designer.cs
#	SushiBar/SushiBar/Program.cs
#	SushiBar/SushiBarContracts/BindingModels/MessageInfoBindingModel.cs
#	SushiBar/SushiBarContracts/ViewModels/MessageInfoViewModel.cs
#	SushiBar/SushiBarDatabaseImplement/Models/Order.cs
#	SushiBar/SushiBarDatabaseImplement/Models/Sushi.cs
#	SushiBar/SushiBarFileImplement/Models/Message.cs
#	SushiBar/SushibarListImplement/Models/Message.cs
2023-05-05 09:32:57 +04:00
3ba1703499 Complete lab 7 hard 2023-05-05 01:49:24 +04:00
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
a1fd4cff58 Merge branch 'LabWork_6' into LabWork_6_hard
# Conflicts:
#	SushiBar/SushiBar/FormMain.Designer.cs
#	SushiBar/SushiBar/FormMain.cs
#	SushiBar/SushiBarBusinessLogic/BusinessLogics/OrderLogic.cs
#	SushiBar/SushiBarDatabaseImplement/SushiBarDatabase.cs
#	SushiBar/SushiBarFileImplement/DataFileSingleton.cs
#	SushiBar/SushibarListImplement/DataListSingleton.cs
2023-05-04 16:55:53 +04:00
8fdc5bc1cc one step is required 2023-05-04 16:10:15 +04:00
be38e23ab5 Merge branch 'LabWork_5' into LabWork_5_hard
# Conflicts:
#	SushiBar/SushiBar/FormMain.Designer.cs
#	SushiBar/SushiBar/Program.cs
#	SushiBar/SushiBarDatabaseImplement/SushiBarDatabase.cs
2023-04-24 21:59:30 +04:00
fe06793f3c Back up and dm 2023-04-24 21:25:09 +04:00
6c683db8e9 Fix errors and add database impl 2023-04-23 19:14:04 +04:00
6f8741b69c edit logic and storage 2023-04-21 18:59:12 +04:00
d075650fc4 Add configs and MessageInfo 2023-04-21 18:57:07 +04:00
3b5ed82b3f complete lab 2023-04-21 18:44:15 +04:00
e3c8540c6f Complete lab 2023-04-11 11:12:55 +04:00
6dca3efbb7 Add new order + fix 2023-04-11 08:33:53 +04:00
8e73008033 Merge branch 'LabWork_4' into LabWork_4_hard
# Conflicts:
#	SushiBar/SushiBar/FormMain.Designer.cs
#	SushiBar/SushiBar/FormMain.cs
#	SushiBar/SushiBar/Program.cs
2023-04-10 22:16:15 +04:00
bbf06c417e complete lab work 2023-04-10 15:36:30 +04:00
055e45b191 second part lab work 2023-04-10 13:35:57 +04:00
003c54db7d Add implementer 2023-04-09 23:25:46 +04:00
bf2b86f897 complete lab 5 2023-03-27 16:31:19 +04:00
55afd631fe add migration 2023-03-26 17:40:34 +04:00
242352a50b Add Client to storage filters 2023-03-26 17:19:08 +04:00
92139ca325 Add client to order 2023-03-26 17:15:42 +04:00
87f51db748 Database: add clients 2023-03-26 17:10:29 +04:00
5c55c2584c Add Client models 2023-03-26 16:43:18 +04:00
55c5aedfd2 ready lab work 2023-03-14 10:12:32 +04:00
56ad2da264 Report Logic 2023-03-12 20:56:37 +04:00
b9747e4e18 b_logic + contracts 2023-03-12 20:49:40 +04:00
40a93a182a 2 hard lab 2023-03-11 21:23:26 +04:00
ae4eef9254 add new models for store 2023-02-13 15:18:58 +04:00
9399daba9e Bug fix 2023-01-31 20:14:33 +04:00
d7f9f16b23 complete 2023-01-31 01:11:18 +04:00
3e25205bf6 Switch product to sushi 2023-01-30 18:27:32 +04:00
a87d95c92b Add Models and Contracts 2023-01-30 18:15:58 +04:00