forked from wangziqi/gongxue-base
feat: refine admin forms, attendance and finance workflows
Squash merge PR #23. Included changes: - complete occupancy check-in required fields/default payload - improve responsive admin management pages - fix attendance edge cases and attendance period config - refine wallet/finance-related workflow handling Checks: - npm run typecheck -w apps/admin - npm run typecheck -w apps/server
This commit is contained in:
@@ -143,6 +143,26 @@ const DEPRECATED_PERMISSION_CODES = [
|
||||
|
||||
const DEPRECATED_PERMISSION_CODE_SET = new Set<string>(DEPRECATED_PERMISSION_CODES);
|
||||
|
||||
function getChinaDateParts(date = new Date()): { date: string; weekDay: number } {
|
||||
const parts = Object.fromEntries(
|
||||
new Intl.DateTimeFormat('en-CA', {
|
||||
timeZone: 'Asia/Shanghai',
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
weekday: 'short',
|
||||
})
|
||||
.formatToParts(date)
|
||||
.filter((part) => part.type !== 'literal')
|
||||
.map((part) => [part.type, part.value]),
|
||||
);
|
||||
const weekDays: Record<string, number> = { Mon: 1, Tue: 2, Wed: 3, Thu: 4, Fri: 5, Sat: 6, Sun: 7 };
|
||||
return {
|
||||
date: `${parts.year}-${parts.month}-${parts.day}`,
|
||||
weekDay: weekDays[parts.weekday],
|
||||
};
|
||||
}
|
||||
|
||||
export const PRESET_ROLES: Array<{
|
||||
name: string;
|
||||
code: string;
|
||||
@@ -684,11 +704,8 @@ export class RbacService {
|
||||
subject: t.subject,
|
||||
}));
|
||||
|
||||
// Get today's day of week (1=Monday, 7=Sunday)
|
||||
const today = new Date();
|
||||
const weekDay = today.getDay(); // 0=Sun → convert to 1-7
|
||||
const adjustedWeekDay = weekDay === 0 ? 7 : weekDay;
|
||||
const todayStr = today.toISOString().slice(0, 10);
|
||||
// Get today's China business date and day of week (1=Monday, 7=Sunday)
|
||||
const { date: todayStr, weekDay: adjustedWeekDay } = getChinaDateParts();
|
||||
|
||||
// Get today's schedules for assigned classes
|
||||
const todaySchedules = await this.classScheduleRepo
|
||||
|
||||
Reference in New Issue
Block a user