Commit Graph

30 Commits

Author SHA1 Message Date
6737c00d96 fix: make JwtAuthGuard global to run before PermissionGuard, skip @Public routes 2026-07-05 21:23:42 +08:00
898738b775 fix: remove null assignments incompatible with non-null entity types 2026-07-05 20:59:20 +08:00
6d589f6faa fix: remove null union types causing TypeORM Object inference on Deposit columns 2026-07-05 20:58:49 +08:00
f7cb7a9599 fix: add explicit datetime type to Deposit refund columns 2026-07-05 20:57:45 +08:00
2357db31dd fix: remove broken Department relation from Class entity 2026-07-05 20:56:23 +08:00
eb82b269c1 fix: add missing Class/ClassStudent/ClassTeacher/DepositInstallment to TypeORM entities list 2026-07-05 20:55:36 +08:00
a7a1969d79 test: add unit tests for Schedules, Bills, and Attendance services 2026-07-05 20:51:24 +08:00
09580e4a4e feat: P2-15 cron-based DingTalk/WeCom sync with logging and incremental sync
- Add @nestjs/schedule dependency
- Create SyncLog entity (platform, syncType, status, recordsCount, errorMessage, timestamps)
- Create SyncState entity for tracking lastSyncAt per platform
- SyncService with @Cron('0 2 * * *') daily scheduled sync
- Incremental sync: tracks last_sync_at per platform, passes to integration APIs
- Full/incremental mode determined by existence of prior sync
- SyncController: POST /sync/trigger (manual), GET /sync/logs (history)
- Register SyncModule in AppModule with ScheduleModule
2026-07-05 20:48:43 +08:00
ab4adf1174 P2-14: Deposit installment tracking + refund approval flow
- Add DepositInstallment entity (id, depositId, amount, dueDate, paidDate, status, createdAt)
- Add installments OneToMany relation to Deposit entity with cascade+eager
- Add refund approval fields: refundStatus, refundRequestedAt, refundApprovedBy, refundApprovedAt
- Add installment DTOs (CreateInstallmentDto, UpdateInstallmentDto)
- Add refund approval DTOs (ApproveRefundDto, CreateDepositWithInstallmentsDto)
- Service: add/create/update/delete installments, requestRefund, approveRefund, findPendingRefunds
- Controller: GET deposits/:id, GET pending-refunds, POST :id/installments, PUT installments/:id, DELETE installments/:id, POST :id/request-refund, PUT :id/approve-refund
- Frontend: detail modal with installment list, refund request button, pending refunds tab with approve actions
2026-07-05 20:46:05 +08:00
5df70a8af0 feat: P2-12 Teacher profile/workspace + P2-13 Multi-class comparison
P2-12 Teacher Management:
- Add profile JSON field (subjects, joinedAt, qualifications) to User entity
- Add GET/PUT /rbac/users/:id/profile endpoints with UpdateProfileDto
- Add GET /rbac/teacher-workspace endpoint returning assignedClasses,
  todaySchedules, and myStudents
- Create /teacher-workspace page with tabs (My Classes, Today's Schedule,
  My Students)
- Add route with PermissionRoute and menu item in MainLayout

P2-13 Student Archive Multi-class:
- Add GET /students/:id/compare-classes endpoint returning side-by-side
  enrollment data with per-class attendance statistics
- Students module now includes ClassStudent and AttendanceRecord entities
- No 2-enrollment cap existed in the codebase; student enrollments
  already return all records via class-student table
2026-07-05 20:42:27 +08:00
80ce911b88 fix: add studentNo field to Student entity 2026-07-05 20:35:47 +08:00
194f25c3ad feat: add class roster export and attendance stats export
- GET /classes/:id/roster/export — Excel export with 姓名/学号/加入日期/状态
- GET /attendance-records/export — Excel export with 姓名/班级/日期/时段/状态/来源/备注/打卡时间
- Add findAllForExport to AttendanceService (no pagination)
- Both use ExcelJS following classrooms controller downloadTemplate pattern
2026-07-05 20:35:11 +08:00
66aadfe3ff fix: I2 add studentNo to class listing, I4 replace attendance edit placeholder with working edit modal 2026-07-05 20:31:53 +08:00
b7117ddf2d fix: review blockers — entity registration, session enum, conflict date-range, @Type decorators 2026-07-05 20:20:43 +08:00
d317cb4fc1 feat(dashboard): add classroom/attendance/income stats to dashboard API
- Add classroomCount, classroomOccupancyRate from Classroom + ClassSchedule
- Add todayAttendanceRate, attendanceTrend from AttendanceRecord
- Add monthlyIncome, incomeTrend from Bill
- Register Classroom, ClassSchedule, AttendanceRecord in dashboard module
2026-07-05 19:51:16 +08:00
41f381e941 feat: attendance frontend page + backend list/classes endpoints
- Create AttendancePage with filter bar, table, calendar view toggle, batch add modal
- Register /attendance route with PermissionRoute (attendance:view)
- Add menu item in MainLayout with CheckCircleOutlined icon
- Add GET /attendance-records with pagination and filters
- Add GET /attendance-records/classes for class dropdown
- Add source column to AttendanceRecord entity (default: manual)
- Frontend tsc --noEmit: clean; backend: only pre-existing test errors
2026-07-05 19:49:53 +08:00
b6e308ae2a feat: add Attendance module with batch, summary, calendar, and dingtalk endpoints 2026-07-05 19:44:10 +08:00
4ededb0338 feat: add CLASS/SCHEDULE/ATTENDANCE permission nodes 2026-07-05 19:39:03 +08:00
f962633f67 fix: normalize operation log module names across controllers 2026-07-05 19:38:18 +08:00
efe13fe664 feat: add long-term rental independent billing in generate logic 2026-07-05 19:33:45 +08:00
881e9c6175 feat: add rental_category/rate to Room, rental_type/tenant_id to Occupancy, tenant_id to Student 2026-07-05 19:31:03 +08:00
037c0e07e0 feat: add Schedules module with conflict detection and weekly view 2026-07-05 19:21:37 +08:00
78320b8682 feat: add ClassSchedule entity 2026-07-05 19:18:31 +08:00
ec26cb5f5e feat(classes): add ClassesController with operation logging and permission guards 2026-07-05 19:05:18 +08:00
786aa2ba2d fix: add @IsEnum validation to Classes DTOs 2026-07-05 19:02:54 +08:00
c378cc45f8 feat: add ClassesService with CRUD + student/teacher management 2026-07-05 18:59:09 +08:00
e1d9ce9709 feat: add Class, ClassStudent, ClassTeacher entities 2026-07-05 18:53:12 +08:00
4f4cee157a chore: commit oxfmt formatting changes and verify artifacts 2026-07-02 15:55:09 +08:00
e13de5fef4 chore(task6): complete turborepo migration verification 2026-07-02 15:49:14 +08:00
46a817503e feat(task1): restructure directories for turborepo monorepo
- Move backend/ to apps/server/ via git mv
- Move frontend/ to apps/admin/ via git mv
- Create packages/typescript-config/ with base, nestjs, and react-vite presets
2026-07-02 15:05:12 +08:00