Commit Graph

24 Commits

Author SHA1 Message Date
15f9e41b4c done 2023-05-20 08:01:11 -07:00
e96c1a10e7 Merge branch 'master' of http://student.git.athene.tech/Zyzf/PIbd-22_KalyshevYV_DozorovaAA_FurnitureAssembly 2023-05-20 10:48:39 +04:00
61e9c4a20e final 2023-05-20 06:48:07 -07:00
e0bfb7369d + 2023-05-20 10:48:23 +04:00
a4e276a26d Merge branch 'Dozorova' 2023-05-20 02:45:13 +04:00
8dceb4b4e0 generate files 2023-05-20 02:44:53 +04:00
454b2524f5 add material for orders 2023-05-19 23:07:37 +04:00
000fcfef44 added graphics page and 2 graphics 2023-05-19 11:07:53 -07:00
543946a9fe fix furniture 2023-05-19 21:25:43 +04:00
83943268b6 Merge branch 'master' into Dozorova 2023-05-19 11:04:35 +04:00
897acf6c08 add Furniture 2023-05-19 11:04:05 +04:00
ae9d5eb54c done base part, added order report page with mail support, added check for role of user 2023-05-18 11:06:34 -07:00
8caf2860a6 add scope and materials 2023-05-18 16:22:24 +04:00
ba9e854c9e Merge branch 'master' into Dozorova 2023-05-17 22:46:52 +04:00
250cf20519 add client 2023-05-17 22:45:40 +04:00
bf9efc105f added new pages, fixed logic and office packages, fixed db logic 2023-05-17 10:51:25 -07:00
35abda9b93 added get list in docx or xlsx page 2023-05-16 17:29:22 -07:00
27da6a9552 added worker client app, splitted controllers in back, fixed model and migrations, fixed contracts, added ability to add furniture modules in set in SetLogic 2023-05-16 13:17:21 -07:00
4f761b8a9b added migration + fixed errors 2023-05-15 12:30:13 -07:00
465606f054 fixes in namespaces, added new model and relation with contracts and etc, added res api with crud 2023-05-15 12:00:40 -07:00
c7871c3866 merged business logic 2023-05-13 06:34:38 -07:00
799fe59d75 some done 2023-05-13 06:12:30 -07:00
6994197938 delete unneded thigs 2023-05-13 06:09:06 -07:00
7c3053bbea migrate projects 2023-05-13 06:06:53 -07:00