Commit Graph

280 Commits

Author SHA1 Message Date
3ee1ebaa1e docs: org tree deepest levels only design spec 2026-07-09 16:06:09 +08:00
7e4f06058c fix(admin): match flat API response shape, no nested data envelope 2026-07-09 15:52:40 +08:00
64c8964ea4 fix(server): handle existing User from syncAll in importDingTalkUsers to avoid UNIQUE constraint error 2026-07-09 15:51:04 +08:00
2da2e68318 fix(admin): refactor inline map arrow to avoid oxc TSX parser confusion 2026-07-09 15:46:24 +08:00
d2d0ca31ad fix(admin): use type pattern consistent with rest of codebase (oxc compat) 2026-07-09 15:43:46 +08:00
867e1aab1f fix(admin): avoid TSX generic syntax to fix oxc parser in Vite 8 2026-07-09 15:41:30 +08:00
8bfb8bf7ae fix(admin): fix syntax error — missing closing parens in map after console.log removal 2026-07-09 15:39:03 +08:00
4d4db7626c chore: remove dead CampusScope references from attendance spec test 2026-07-09 15:35:59 +08:00
3240c7cfdd fix(server): restore @InjectRepository(UserDingMapping) accidentally removed with scope 2026-07-09 15:31:35 +08:00
7f355952fd fix(server): remove CampusScope from AttendanceService 2026-07-09 15:29:50 +08:00
897ffbe018 fix(server): restore staff exclusion in StudentsService.findAll default filter 2026-07-09 15:28:18 +08:00
9b36284f1a fix(server): remove CampusScope from StudentsService 2026-07-09 15:25:54 +08:00
b624c52b30 fix(admin): restore nested ImportUsersResponse and remove debug console.log 2026-07-09 15:24:54 +08:00
f7df3bdcf1 fix(admin): only show class-mark button on leaf departments with users 2026-07-09 15:18:23 +08:00
3ea7f9a2b7 docs: add DingTalk import fix implementation plan 2026-07-09 15:17:25 +08:00
a568d9a871 docs: add DingTalk import fix design spec 2026-07-09 15:15:56 +08:00
7666baceff fix: add missing Bed and Locker entities to TypeORM registration 2026-07-09 14:00:58 +08:00
db3e4aae84 fix(admin): display classCount and warnings in import response 2026-07-09 13:01:07 +08:00
eeacab6130 test(sync): add class-marking import test cases (7 new, 5 fixed) 2026-07-09 12:53:03 +08:00
7f42c12392 feat(admin): add class marking modal in DingTalk org import drawer 2026-07-09 12:41:29 +08:00
0f3fec6b44 fix(sync): remove unused classStudentRepo injection, use transactional manager for class lookup 2026-07-09 12:37:49 +08:00
00de6cbd3a feat(sync): importDingTalkUsers supports class creation and teacher/student linking 2026-07-09 12:33:10 +08:00
5b92521426 docs: remove 班主任 distinction — all teachers use roleType='teacher' 2026-07-09 12:24:35 +08:00
166066f49f feat(sync): add ImportClassItemDto and expose deptIds in org-tree-with-users 2026-07-09 12:21:39 +08:00
e90f73cb60 fix: broken Form.Item tag in check-in room select 2026-07-09 12:19:04 +08:00
74e6171e17 feat: add bed occupancy stats to RoomVisual cards and API 2026-07-09 12:18:30 +08:00
0d82c96ec6 docs: dingtalk import class marking design spec 2026-07-09 12:18:21 +08:00
ba94a0e091 feat: add bed/locker selection to check-in form and occupancy table 2026-07-09 12:16:51 +08:00
f959d2adf2 docs: add task-7 fix report 2026-07-09 12:13:21 +08:00
5700fa556b fix: restore RoomPage component wrapper and fix action column 2026-07-09 12:13:19 +08:00
e572f92017 feat: upgrade Room detail to Drawer with Bed/Locker tabs 2026-07-09 12:08:06 +08:00
454a0d24c6 fix: release beds/lockers in batchCheckOut
The batchCheckOut method was not releasing assigned beds and lockers
after checkout, leaving them orphaned as 'occupied'. Added the same
release pattern used in checkOut() — using runner.manager.update()
since batchCheckOut operates inside a QueryRunner transaction.
2026-07-09 12:05:36 +08:00
54d8d0545e feat: integrate Bed/Locker into Occupancy check-in/out flow 2026-07-09 12:02:43 +08:00
3bed3409fe feat: add Bed and Locker REST routes to RoomsController 2026-07-09 12:00:04 +08:00
79d6e97bd8 fix: restore CampusScope injection, fix batchCreate bed/locker numbering 2026-07-09 11:58:42 +08:00
12fa2e974f feat: add Bed and Locker CRUD to RoomsService 2026-07-09 11:55:37 +08:00
87a3f0c554 chore: remove unused IsArray/ArrayMinSize imports from Bed DTO 2026-07-09 11:54:24 +08:00
9b7dee17f3 feat: add Bed and Locker DTOs 2026-07-09 11:53:38 +08:00
a6fbb71251 feat: add bed_id and locker_id to Occupancy entity 2026-07-09 11:52:34 +08:00
513b6c11e4 fix: add @Unique constraints for Bed and Locker entities 2026-07-09 11:51:29 +08:00
ad6c303369 feat: add Bed and Locker entities with Room FK 2026-07-09 11:49:59 +08:00
36a1aca6f0 docs: bed/locker management implementation plan (10 tasks) 2026-07-09 11:48:29 +08:00
543fddbc1e docs: bed & locker management design spec 2026-07-09 11:44:24 +08:00
115ee5206e Merge branch 'feat/dingtalk-sync-role-selection' 2026-07-09 11:33:07 +08:00
fb8c897b4f fix: disable import button when roles not loaded (null defaultTeacherRoleId guard) 2026-07-09 11:32:01 +08:00
0cfdab95ee fix: add DTO validation, transactional imports, role-not-found handling, null role guard 2026-07-09 11:28:11 +08:00
33e6cb445c fix: parallel fetches, error handling, extract UserTreeNode component 2026-07-09 11:16:47 +08:00
a42039d1df feat: add sync users Tab with Drawer tree to IntegrationConfig 2026-07-09 11:13:05 +08:00
ff6cb03419 feat: add org-tree-with-users and import-users endpoints 2026-07-09 11:08:33 +08:00
8ba3327074 fix: handle duplicate usernames and failed role lookups in importDingTalkUsers 2026-07-09 11:07:25 +08:00