Commit Graph

238 Commits

Author SHA1 Message Date
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
3790b2dabb refactor: remove sync and mark-staff buttons from Users page 2026-07-09 11:06:58 +08:00
cd7f9c90b3 feat: add importDingTalkUsers and org-tree-with-users to SyncService 2026-07-09 11:05:17 +08:00
3835110204 feat: add importDingTalkUsers and org-tree-with-users to SyncService 2026-07-09 11:04:24 +08:00
2b60a10927 feat: add fetchOrgTreeWithUsers to DingTalkService 2026-07-09 10:58:26 +08:00
5abc27c1f0 chore: add .worktrees to gitignore 2026-07-09 10:57:19 +08:00
3578ba92ed docs: implementation plan for dingtalk sync role selection 2026-07-09 10:56:24 +08:00
423472daf2 docs: dingtalk sync role selection design 2026-07-09 10:52:09 +08:00
40aad81087 fix: use rimraf for cross-platform clean command 2026-07-09 10:38:17 +08:00
129b011958 feat: add clean script to remove build artifacts, db, and node_modules 2026-07-09 10:37:53 +08:00
5ddd6d305a feat: ordered dev startup with concurrently + wait-on (server → admin) 2026-07-09 10:26:49 +08:00
731f74e51a refactor: remove scheduled cron sync, manual trigger only 2026-07-09 10:24:12 +08:00
e8dec3b171 feat: add DingTalk integration config page 2026-07-09 10:14:51 +08:00
7df7695073 fix: missing '>' in header div tag on Users page 2026-07-09 10:11:07 +08:00
903f090293 feat: add staff status filter in student management 2026-07-09 10:07:51 +08:00
e20e22fc65 feat: add mark-staff/restore-student buttons in user management 2026-07-09 10:07:34 +08:00
17ef1adcaa feat: Students list excludes staff by default 2026-07-09 10:07:04 +08:00
14eec2852a feat: add mark-staff/mark-student endpoints with studentStatus in user list 2026-07-09 10:06:31 +08:00
6e0ad8759f feat: syncOneUser skips Students with non-active status 2026-07-09 10:05:41 +08:00
6850777509 plan: student-role separation implementation (6 tasks) 2026-07-09 10:04:55 +08:00
9e828756ea spec: student-role separation design (batch-create + manual untag) 2026-07-09 10:01:57 +08:00
42d3f0e27f feat: DingTalk attendance import + integration config + expense types + UI polish
Server:
- Add DingTalk attendance import service with SSE progress streaming
- Add IntegrationConfig entity & module for multi-tenant DingTalk setup
- Add ExpenseType entity & ExpenseTypesModule
- Add SeedModule for DB initialization
- Add UserDingMapping entity for DingTalk user linkage
- Attendance service: import flow with dedup & student auto-mapping
- Rooms service: time-range overlap queries
- Sync controller/service: DingTalk integration wiring
- Permission guard: refactor to pure re-export
- Campus scope middleware: tenant-aware filtering

Admin UI:
- Attendance page: import UI with progress & result summary
- All pages: tableStyle/tablePagination standardization
- Login page: responsive styling
- Sensitive data: useViewSensitive hook for masked viewing
- Vite config: path aliases, build optimization
- Test infra: vitest config, test utilities

Docs: PRD DingTalk batch 1 & 2 design docs
2026-07-09 09:11:56 +08:00
f1959f0d2a fix: switch DingTalk attendance API from getcolumnval to listRecord 2026-07-08 14:49:22 +08:00
166d0b2694 feat: auto-create Student for DingTalk users on sync; add DingTalk env to ecosystem config 2026-07-08 14:34:49 +08:00
edaf3670ee fix: add onDelete cascade for User FK in class_teacher and students entities 2026-07-08 14:32:19 +08:00
8c791ec4f3 fix: add build script for server, fix duplicate index in user_ding_mapping entity 2026-07-08 14:18:41 +08:00
baa01a910a spec: PRD 差距收尾设计(8 个工作包,12 项 + 1 bug) 2026-07-07 11:08:38 +08:00
2877171f09 chore: remove empty .claude/commands and .claude/worktrees directories 2026-07-07 10:21:58 +08:00
7822b9b159 chore: remove openspec (skills, commands, data) 2026-07-07 10:06:49 +08:00
a7cb2865a9 fix: update StudentProfileContent report buttons to use /report-html, remove dead /report references 2026-07-07 10:03:19 +08:00
d3437311dc refactor: remove Puppeteer, delete old PDF download endpoint 2026-07-07 09:56:52 +08:00
6e6dd25dc1 feat: change report button to preview in new window 2026-07-07 09:53:39 +08:00
36978813cf feat: add GET /archive/:studentId/report-html endpoint 2026-07-07 09:50:05 +08:00
9f43f50867 plan: 学生档案报告前端预览实施计划 2026-07-07 09:48:08 +08:00
b56fa577cb spec: 学生档案报告前端预览方案设计 2026-07-07 09:47:24 +08:00
24126ab3a9 fix: adjust Students table scroll.x to match total column width 2026-07-07 09:40:52 +08:00
693ba5d3b8 feat: complete remaining PRD tasks — RBAC nodes and staff split, schedule month view, auto-generate attendance from schedules, plus fix TypeORM name 2026-07-06 18:10:14 +08:00
67952af52e feat(archive): log PDF report generation in operation logs 2026-07-06 18:00:46 +08:00
bdd2f53b1a feat(occupancies): inherit rentalType and tenantId on room transfer 2026-07-06 18:00:35 +08:00
38f6e18cca Task 3: sync RENTAL class_schedule on rental create/update/delete
- ClassroomRentalsService.create/update now upsert a ClassSchedule row with schedule_type='RENTAL' and rental_id set.
- ClassroomRentalsService.remove deletes the synced schedule row; update to 'cancelled' also removes it.
- SchedulesService.getClassroomOccupancy explicitly returns INTERNAL and RENTAL schedules.
- Make classId/teacherId/rentalId nullable in ClassSchedule entity to support rental schedules.
- Add unit tests for rental schedule sync and mixed-type occupancy.
2026-07-06 17:55:08 +08:00
5ea49d0a9e feat(classes): add schedule and attendance-summary endpoints + frontend tabs
- Add GET /classes/:id/schedule returning ClassSchedule list with classroom name
- Add GET /classes/:id/attendance-summary returning attendance/absence/late rates
- Add 课表 and 出勤汇总 tabs to Classes detail page
- Register ClassSchedule and AttendanceRecord in ClassesModule
2026-07-06 17:48:19 +08:00
b837e9b145 feat(task2): 排课与租赁双向冲突检测
- SchedulesService.checkConflict 增加对 classroom_rentals 的冲突检测
- ClassroomRentalsService.findConflicts 增加对 class_schedules 的冲突检测
- 创建排课时若教室已被租赁,给出明确冲突提示
- 创建租赁时若教室已有排课,给出明确冲突提示
2026-07-06 17:44:45 +08:00
3fa446f978 Task 4: 学生列表 tenantId 筛选生效
- StudentsService.findAll() 接收 tenantId 参数并按 tenantId 过滤
- StudentsController.findAll() 增加 tenantId 查询参数
- students.organization 列仍在 occupancy/room-visual/import 等场景使用,未删除列
2026-07-06 17:39:24 +08:00