Commit graph

93 commits

Author SHA1 Message Date
c50a14be6a update docker-compose file 2024-01-05 21:09:54 +08:00
7bd33228a6 Allow blank values in certain transaction fields 2024-01-05 20:44:21 +08:00
004896cb26 Add consumables and additional members field to transaction 2024-01-05 19:33:25 +08:00
1757538db1 Add status field in equipments for transaction serializer 2024-01-03 17:31:08 +08:00
d9d94c03ef Allow update requests for editing only remarks on transactions 2024-01-03 17:14:35 +08:00
7a8281dabd Add course to slug related field for borrower in transaction serializer 2023-12-29 18:47:21 +08:00
2ddc9da179 Added subject field to transaction and course field to customuser 2023-12-29 18:38:59 +08:00
0b1c065a80 Improved transaction and breakage report serializers when handling breakages 2023-12-27 20:38:43 +08:00
d0ca68149a Improved serializer for transaction and added available equipment viewset 2023-12-27 18:36:52 +08:00
94ba018c9e Add remarks to transaction serializer 2023-12-27 16:50:52 +08:00
02df5b5ea9 Update postmgiration script for equipments 2023-12-27 16:31:37 +08:00
6d25157c5f Improved postmigration data seeding for equipments 2023-12-26 19:47:51 +08:00
9443631102 Improve transaction serializer and add user id to django admin list view in admin panel 2023-12-26 17:02:18 +08:00
9d2f777ffc Add viewsets for listing teachers and technicians 2023-12-22 15:50:22 +08:00
372e466744 Add clearance viewset for student 2023-12-22 14:12:10 +08:00
5c8a99675d Format timestamp properly for transaction 2023-12-21 15:23:28 +08:00
fd6da2de81 Fix urls for transactions 2023-12-21 15:17:10 +08:00
d5dbe2b876 Fix is student permission and add viewsets for teachers and students for viewing transactions assigned to them 2023-12-21 14:57:42 +08:00
938614fafa Format last updated field properly to add space between actual time and AM/PM indicator 2023-12-16 15:47:03 +08:00
9e16bda918 Change Working status to Available 2023-12-16 15:00:13 +08:00
8abf689544 Readd permission class in transaction view set 2023-12-14 19:28:10 +08:00
31b527cd9d Updated transaction serializer to include id and name of borrower and of equipments 2023-12-14 19:27:49 +08:00
1e8af2173f Allow remarks and description fields to be specified as blank or not be specified at all 2023-12-09 09:43:53 +08:00
5d5ff22ee4 Improve breakages 2023-12-09 00:59:17 +08:00
c1a7e21e95 Added breakage report model 2023-12-09 00:38:29 +08:00
aa078a78c5 Allow students and teachers to view equipments and equipment instances but forbid them from creating, updating, or deleting 2023-12-08 23:07:08 +08:00
2c8cc87cbe Added transactions and updated models to reflect transactions 2023-12-08 23:00:15 +08:00
d915852632 Remove historical tracking for equipment groups to simplify handling 2023-12-05 20:33:25 +08:00
acb92b09b0 Turn off debug flag 2023-12-05 20:09:15 +08:00
1bf99e8bd2 Added equipment group serializers, views, and urls 2023-12-05 20:07:31 +08:00
ed79408116 Remove ignored pycache files 2023-12-05 00:28:39 +08:00
ffdfb7fcd1 Add .env sample and add pycache folders to gitignore 2023-12-05 00:27:42 +08:00
a5952f64d6 Add .env sample and add pycache folders to gitignore 2023-12-05 00:26:58 +08:00
09149223a6 Update dockerfile for crossplatform building 2023-12-04 22:06:17 +08:00
c43df90d77 Test commit 2 2023-12-04 14:04:25 +08:00
ba03979f6c Test commit 2023-12-04 14:04:03 +08:00
372ddc04f8 Update gitignore 2023-12-04 14:01:06 +08:00
Keannu Bernasol
2c17336b31
Merge branch 'prod' into master 2023-12-04 13:59:06 +08:00
83e72d61ed Fix gitignore 2023-12-04 13:58:13 +08:00
c7a4894bbb Remove static files from git cache on prod branch 2023-12-04 13:57:14 +08:00
71d0919c79 Remove static files from git cache 2023-12-04 13:54:46 +08:00
ce793c1d13 Merge branch 'prod' of github.com:lemeow125/EquipmentTracker-Backend 2023-12-04 13:47:17 +08:00
c0e3b22ff6 Merge branch 'ERD' of github.com:lemeow125/EquipmentTracker-Backend 2023-12-04 13:47:11 +08:00
Lorenzo
48e253adfe 12/3 commit 2023-12-03 16:54:28 +08:00
Keannu Bernasol
3eb9edd684
Merge pull request #12 from lemeow125/master
Merge to prod
2023-12-03 16:45:57 +08:00
Lorenzo
f0bc1d4483 12/3 ERD changes 2023-12-03 16:43:53 +08:00
ba857dff38 Add ID to equipment instance log serializer 2023-12-03 13:03:49 +08:00
8a38392534 Fix admin panel fields causing crashes 2023-12-03 12:38:37 +08:00
b4d177f8c3 Improve view in lists 2023-12-03 12:34:20 +08:00
c1ca024b4e Add is_technician field to django admin panel 2023-12-03 12:20:56 +08:00