|
|
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 |
|
|
|
c69c8ba18c
|
Fixed lab 6 hard
|
2023-05-04 23:28:39 +04:00 |
|
|
|
fb3d255c3a
|
Complete lab 6 hard
Needs add migrations
|
2023-05-04 17:21:47 +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 |
|
|
|
324abc8c74
|
edit Forms
|
2023-05-04 16:29:50 +04:00 |
|
|
|
26ed5c0d05
|
Complete lab 5 hard
|
2023-04-25 10:31:41 +04:00 |
|
|
|
655b808c3c
|
complete lab 7
|
2023-04-25 08:53:50 +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 |
|
|
|
2c4cb0dbb2
|
Complete lab 7
|
2023-04-24 00:10:19 +04:00 |
|
|
|
63ba7d1a44
|
Changes some files
|
2023-04-23 19:48:34 +04:00 |
|
|
|
3db1002d0f
|
Edit logics files
|
2023-04-23 19:30:07 +04:00 |
|
|
|
6c683db8e9
|
Fix errors and add database impl
|
2023-04-23 19:14:04 +04:00 |
|
|
|
e3c8540c6f
|
Complete lab
|
2023-04-11 11:12:55 +04:00 |
|
|
|
90526748c5
|
complete lab
|
2023-04-11 08:52:16 +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 |
|
|
|
5e738327ea
|
complete lab
|
2023-03-28 08:53:30 +04:00 |
|
|
|
bf2b86f897
|
complete lab 5
|
2023-03-27 16:31:19 +04:00 |
|
|
|
a44b0f052d
|
complete lab 2 hard
|
2023-03-14 10:46:34 +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 |
|
|
|
153d212184
|
last fix
|
2023-02-14 22:45:26 +04:00 |
|
|
|
6c5c4607cf
|
last fix
|
2023-02-14 22:44:19 +04:00 |
|
|
|
4b9f66ba35
|
fix
|
2023-02-14 10:17:42 +04:00 |
|
|
|
0851de65f5
|
fix
|
2023-02-14 10:05:38 +04:00 |
|
|
|
b7ccba8acc
|
Complete lab 1 hard
|
2023-02-13 16:48:36 +04:00 |
|
|
|
665aaab1a6
|
additional class for store
|
2023-02-13 15:35:09 +04:00 |
|
|
|
9399daba9e
|
Bug fix
|
2023-01-31 20:14:33 +04:00 |
|
|
|
d7f9f16b23
|
complete
|
2023-01-31 01:11:18 +04:00 |
|
|
|
10a579904a
|
add listImplenets
|
2023-01-30 23:13:26 +04:00 |
|
|
|
a6bcc01785
|
add Business logic part
|
2023-01-30 19:25:38 +04:00 |
|
