{t('vacay.legend')}
- {plan?.holidays_enabled && }
+ {plan?.holidays_enabled && (plan?.holiday_calendars ?? []).length === 0 && (
+
+ )}
+ {plan?.holidays_enabled && (plan?.holiday_calendars ?? []).map(cal => (
+
+ ))}
{plan?.company_holidays_enabled && }
{plan?.block_weekends && }
diff --git a/client/src/store/vacayStore.ts b/client/src/store/vacayStore.ts
index c58e3a3..f1d7ef7 100644
--- a/client/src/store/vacayStore.ts
+++ b/client/src/store/vacayStore.ts
@@ -1,7 +1,7 @@
import { create } from 'zustand'
import apiClient from '../api/client'
import type { AxiosResponse } from 'axios'
-import type { VacayPlan, VacayUser, VacayEntry, VacayStat, HolidaysMap, HolidayInfo } from '../types'
+import type { VacayPlan, VacayUser, VacayEntry, VacayStat, HolidaysMap, HolidayInfo, VacayHolidayCalendar } from '../types'
const ax = apiClient
@@ -65,6 +65,9 @@ interface VacayApi {
updateStats: (year: number, days: number, targetUserId?: number) => Promise
getCountries: () => Promise<{ countries: string[] }>
getHolidays: (year: number, country: string) => Promise
+ addHolidayCalendar: (data: { region: string; color?: string; label?: string | null }) => Promise<{ calendar: VacayHolidayCalendar }>
+ updateHolidayCalendar: (id: number, data: { region?: string; color?: string; label?: string | null }) => Promise<{ calendar: VacayHolidayCalendar }>
+ deleteHolidayCalendar: (id: number) => Promise
}
const api: VacayApi = {
@@ -87,6 +90,9 @@ const api: VacayApi = {
updateStats: (year, days, targetUserId) => ax.put(`/addons/vacay/stats/${year}`, { vacation_days: days, target_user_id: targetUserId }).then((r: AxiosResponse) => r.data),
getCountries: () => ax.get('/addons/vacay/holidays/countries').then((r: AxiosResponse) => r.data),
getHolidays: (year, country) => ax.get(`/addons/vacay/holidays/${year}/${country}`).then((r: AxiosResponse) => r.data),
+ addHolidayCalendar: (data) => ax.post('/addons/vacay/plan/holiday-calendars', data).then((r: AxiosResponse) => r.data),
+ updateHolidayCalendar: (id, data) => ax.put(`/addons/vacay/plan/holiday-calendars/${id}`, data).then((r: AxiosResponse) => r.data),
+ deleteHolidayCalendar: (id) => ax.delete(`/addons/vacay/plan/holiday-calendars/${id}`).then((r: AxiosResponse) => r.data),
}
interface VacayState {
@@ -124,6 +130,9 @@ interface VacayState {
loadStats: (year?: number) => Promise
updateVacationDays: (year: number, days: number, targetUserId?: number) => Promise
loadHolidays: (year?: number) => Promise
+ addHolidayCalendar: (data: { region: string; color?: string; label?: string | null }) => Promise
+ updateHolidayCalendar: (id: number, data: { region?: string; color?: string; label?: string | null }) => Promise
+ deleteHolidayCalendar: (id: number) => Promise
loadAll: () => Promise
}
@@ -247,29 +256,47 @@ export const useVacayStore = create((set, get) => ({
loadHolidays: async (year?: number) => {
const y = year || get().selectedYear
const plan = get().plan
- if (!plan?.holidays_enabled || !plan?.holidays_region) {
+ const calendars = plan?.holiday_calendars ?? []
+ if (!plan?.holidays_enabled || calendars.length === 0) {
set({ holidays: {} })
return
}
- const country = plan.holidays_region.split('-')[0]
- const region = plan.holidays_region.includes('-') ? plan.holidays_region : null
- try {
- const data = await api.getHolidays(y, country)
- const hasRegions = data.some((h: VacayHolidayRaw) => h.counties && h.counties.length > 0)
- if (hasRegions && !region) {
- set({ holidays: {} })
- return
- }
- const map: HolidaysMap = {}
- data.forEach((h: VacayHolidayRaw) => {
- if (h.global || !h.counties || (region && h.counties.includes(region))) {
- map[h.date] = { name: h.name, localName: h.localName }
- }
- })
- set({ holidays: map })
- } catch {
- set({ holidays: {} })
+ const map: HolidaysMap = {}
+ for (const cal of calendars) {
+ const country = cal.region.split('-')[0]
+ const region = cal.region.includes('-') ? cal.region : null
+ try {
+ const data = await api.getHolidays(y, country)
+ const hasRegions = data.some((h: VacayHolidayRaw) => h.counties && h.counties.length > 0)
+ if (hasRegions && !region) continue
+ data.forEach((h: VacayHolidayRaw) => {
+ if (h.global || !h.counties || (region && h.counties.includes(region))) {
+ if (!map[h.date]) {
+ map[h.date] = { name: h.name, localName: h.localName, color: cal.color, label: cal.label }
+ }
+ }
+ })
+ } catch { /* API error, skip */ }
}
+ set({ holidays: map })
+ },
+
+ addHolidayCalendar: async (data) => {
+ await api.addHolidayCalendar(data)
+ await get().loadPlan()
+ await get().loadHolidays()
+ },
+
+ updateHolidayCalendar: async (id, data) => {
+ await api.updateHolidayCalendar(id, data)
+ await get().loadPlan()
+ await get().loadHolidays()
+ },
+
+ deleteHolidayCalendar: async (id) => {
+ await api.deleteHolidayCalendar(id)
+ await get().loadPlan()
+ await get().loadHolidays()
},
loadAll: async () => {
diff --git a/client/src/types.ts b/client/src/types.ts
index 761ae47..b0c7a32 100644
--- a/client/src/types.ts
+++ b/client/src/types.ts
@@ -281,10 +281,23 @@ export interface WebSocketEvent {
}
// Vacay types
+export interface VacayHolidayCalendar {
+ id: number
+ plan_id: number
+ region: string
+ label: string | null
+ color: string
+ sort_order: number
+}
+
export interface VacayPlan {
id: number
holidays_enabled: boolean
holidays_region: string | null
+ holiday_calendars: VacayHolidayCalendar[]
+ block_weekends: boolean
+ carry_over_enabled: boolean
+ company_holidays_enabled: boolean
name?: string
year?: number
owner_id?: number
@@ -301,6 +314,9 @@ export interface VacayUser {
export interface VacayEntry {
date: string
user_id: number
+ plan_id?: number
+ person_color?: string
+ person_name?: string
}
export interface VacayStat {
@@ -312,6 +328,8 @@ export interface VacayStat {
export interface HolidayInfo {
name: string
localName: string
+ color: string
+ label: string | null
}
export interface HolidaysMap {
diff --git a/server/src/db/schema.ts b/server/src/db/schema.ts
index 40f3d44..9670ecb 100644
--- a/server/src/db/schema.ts
+++ b/server/src/db/schema.ts
@@ -281,6 +281,15 @@ function createTables(db: Database.Database): void {
UNIQUE(plan_id, date)
);
+ CREATE TABLE IF NOT EXISTS vacay_holiday_calendars (
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ plan_id INTEGER NOT NULL REFERENCES vacay_plans(id) ON DELETE CASCADE,
+ region TEXT NOT NULL,
+ label TEXT,
+ color TEXT NOT NULL DEFAULT '#fecaca',
+ sort_order INTEGER NOT NULL DEFAULT 0
+ );
+
CREATE TABLE IF NOT EXISTS day_accommodations (
id INTEGER PRIMARY KEY AUTOINCREMENT,
trip_id INTEGER NOT NULL REFERENCES trips(id) ON DELETE CASCADE,
diff --git a/server/src/routes/vacay.ts b/server/src/routes/vacay.ts
index 02b13d9..ba0cbe3 100644
--- a/server/src/routes/vacay.ts
+++ b/server/src/routes/vacay.ts
@@ -43,9 +43,59 @@ interface Holiday {
counties?: string[] | null;
}
+interface VacayHolidayCalendar {
+ id: number;
+ plan_id: number;
+ region: string;
+ label: string | null;
+ color: string;
+ sort_order: number;
+}
+
const holidayCache = new Map();
const CACHE_TTL = 24 * 60 * 60 * 1000;
+async function applyHolidayCalendars(planId: number): Promise {
+ const plan = db.prepare('SELECT holidays_enabled FROM vacay_plans WHERE id = ?').get(planId) as { holidays_enabled: number } | undefined;
+ if (!plan?.holidays_enabled) return;
+ const calendars = db.prepare('SELECT * FROM vacay_holiday_calendars WHERE plan_id = ? ORDER BY sort_order, id').all(planId) as VacayHolidayCalendar[];
+ if (calendars.length === 0) return;
+ const years = db.prepare('SELECT year FROM vacay_years WHERE plan_id = ?').all(planId) as { year: number }[];
+ for (const cal of calendars) {
+ const country = cal.region.split('-')[0];
+ const region = cal.region.includes('-') ? cal.region : null;
+ for (const { year } of years) {
+ try {
+ const cacheKey = `${year}-${country}`;
+ let holidays = holidayCache.get(cacheKey)?.data as Holiday[] | undefined;
+ if (!holidays) {
+ const resp = await fetch(`https://date.nager.at/api/v3/PublicHolidays/${year}/${country}`);
+ holidays = await resp.json() as Holiday[];
+ holidayCache.set(cacheKey, { data: holidays, time: Date.now() });
+ }
+ const hasRegions = holidays.some((h: Holiday) => h.counties && h.counties.length > 0);
+ if (hasRegions && !region) continue;
+ for (const h of holidays) {
+ if (h.global || !h.counties || (region && h.counties.includes(region))) {
+ db.prepare('DELETE FROM vacay_entries WHERE plan_id = ? AND date = ?').run(planId, h.date);
+ db.prepare('DELETE FROM vacay_company_holidays WHERE plan_id = ? AND date = ?').run(planId, h.date);
+ }
+ }
+ } catch { /* API error, skip */ }
+ }
+ }
+}
+
+async function migrateHolidayCalendars(planId: number, plan: VacayPlan): Promise {
+ const existing = db.prepare('SELECT id FROM vacay_holiday_calendars WHERE plan_id = ?').get(planId);
+ if (existing) return;
+ if (plan.holidays_enabled && plan.holidays_region) {
+ db.prepare(
+ 'INSERT INTO vacay_holiday_calendars (plan_id, region, label, color, sort_order) VALUES (?, ?, NULL, ?, 0)'
+ ).run(planId, plan.holidays_region, '#fecaca');
+ }
+}
+
const router = express.Router();
router.use(authenticate);
@@ -124,6 +174,8 @@ router.get('/plan', (req: Request, res: Response) => {
WHERE m.user_id = ? AND m.status = 'pending'
`).all(authReq.user.id);
+ const holidayCalendars = db.prepare('SELECT * FROM vacay_holiday_calendars WHERE plan_id = ? ORDER BY sort_order, id').all(activePlanId) as VacayHolidayCalendar[];
+
res.json({
plan: {
...plan,
@@ -131,6 +183,7 @@ router.get('/plan', (req: Request, res: Response) => {
holidays_enabled: !!plan.holidays_enabled,
company_holidays_enabled: !!plan.company_holidays_enabled,
carry_over_enabled: !!plan.carry_over_enabled,
+ holiday_calendars: holidayCalendars,
},
users,
pendingInvites,
@@ -166,30 +219,8 @@ router.put('/plan', async (req: Request, res: Response) => {
}
const updatedPlan = db.prepare('SELECT * FROM vacay_plans WHERE id = ?').get(planId) as VacayPlan;
- if (updatedPlan.holidays_enabled && updatedPlan.holidays_region) {
- const country = updatedPlan.holidays_region.split('-')[0];
- const region = updatedPlan.holidays_region.includes('-') ? updatedPlan.holidays_region : null;
- const years = db.prepare('SELECT year FROM vacay_years WHERE plan_id = ?').all(planId) as { year: number }[];
- for (const { year } of years) {
- try {
- const cacheKey = `${year}-${country}`;
- let holidays = holidayCache.get(cacheKey)?.data as Holiday[] | undefined;
- if (!holidays) {
- const resp = await fetch(`https://date.nager.at/api/v3/PublicHolidays/${year}/${country}`);
- holidays = await resp.json() as Holiday[];
- holidayCache.set(cacheKey, { data: holidays, time: Date.now() });
- }
- const hasRegions = (holidays as Holiday[]).some((h: Holiday) => h.counties && h.counties.length > 0);
- if (hasRegions && !region) continue;
- for (const h of holidays) {
- if (h.global || !h.counties || (region && h.counties.includes(region))) {
- db.prepare('DELETE FROM vacay_entries WHERE plan_id = ? AND date = ?').run(planId, h.date);
- db.prepare('DELETE FROM vacay_company_holidays WHERE plan_id = ? AND date = ?').run(planId, h.date);
- }
- }
- } catch { /* API error, skip */ }
- }
- }
+ await migrateHolidayCalendars(planId, updatedPlan);
+ await applyHolidayCalendars(planId);
if (carry_over_enabled === false) {
db.prepare('UPDATE vacay_user_years SET carried_over = 0 WHERE plan_id = ?').run(planId);
@@ -217,11 +248,58 @@ router.put('/plan', async (req: Request, res: Response) => {
notifyPlanUsers(planId, req.headers['x-socket-id'] as string, 'vacay:settings');
const updated = db.prepare('SELECT * FROM vacay_plans WHERE id = ?').get(planId) as VacayPlan;
+ const updatedCalendars = db.prepare('SELECT * FROM vacay_holiday_calendars WHERE plan_id = ? ORDER BY sort_order, id').all(planId) as VacayHolidayCalendar[];
res.json({
- plan: { ...updated, block_weekends: !!updated.block_weekends, holidays_enabled: !!updated.holidays_enabled, company_holidays_enabled: !!updated.company_holidays_enabled, carry_over_enabled: !!updated.carry_over_enabled }
+ plan: { ...updated, block_weekends: !!updated.block_weekends, holidays_enabled: !!updated.holidays_enabled, company_holidays_enabled: !!updated.company_holidays_enabled, carry_over_enabled: !!updated.carry_over_enabled, holiday_calendars: updatedCalendars }
});
});
+router.post('/plan/holiday-calendars', (req: Request, res: Response) => {
+ const authReq = req as AuthRequest;
+ const { region, label, color, sort_order } = req.body;
+ if (!region) return res.status(400).json({ error: 'region required' });
+ const planId = getActivePlanId(authReq.user.id);
+ const result = db.prepare(
+ 'INSERT INTO vacay_holiday_calendars (plan_id, region, label, color, sort_order) VALUES (?, ?, ?, ?, ?)'
+ ).run(planId, region, label || null, color || '#fecaca', sort_order ?? 0);
+ const cal = db.prepare('SELECT * FROM vacay_holiday_calendars WHERE id = ?').get(result.lastInsertRowid) as VacayHolidayCalendar;
+ notifyPlanUsers(planId, req.headers['x-socket-id'] as string, 'vacay:settings');
+ res.json({ calendar: cal });
+});
+
+router.put('/plan/holiday-calendars/:id', (req: Request, res: Response) => {
+ const authReq = req as AuthRequest;
+ const id = parseInt(req.params.id);
+ const planId = getActivePlanId(authReq.user.id);
+ const cal = db.prepare('SELECT * FROM vacay_holiday_calendars WHERE id = ? AND plan_id = ?').get(id, planId) as VacayHolidayCalendar | undefined;
+ if (!cal) return res.status(404).json({ error: 'Calendar not found' });
+ const { region, label, color, sort_order } = req.body;
+ const updates: string[] = [];
+ const params: (string | number | null)[] = [];
+ if (region !== undefined) { updates.push('region = ?'); params.push(region); }
+ if (label !== undefined) { updates.push('label = ?'); params.push(label); }
+ if (color !== undefined) { updates.push('color = ?'); params.push(color); }
+ if (sort_order !== undefined) { updates.push('sort_order = ?'); params.push(sort_order); }
+ if (updates.length > 0) {
+ params.push(id);
+ db.prepare(`UPDATE vacay_holiday_calendars SET ${updates.join(', ')} WHERE id = ?`).run(...params);
+ }
+ const updated = db.prepare('SELECT * FROM vacay_holiday_calendars WHERE id = ?').get(id) as VacayHolidayCalendar;
+ notifyPlanUsers(planId, req.headers['x-socket-id'] as string, 'vacay:settings');
+ res.json({ calendar: updated });
+});
+
+router.delete('/plan/holiday-calendars/:id', (req: Request, res: Response) => {
+ const authReq = req as AuthRequest;
+ const id = parseInt(req.params.id);
+ const planId = getActivePlanId(authReq.user.id);
+ const cal = db.prepare('SELECT * FROM vacay_holiday_calendars WHERE id = ? AND plan_id = ?').get(id, planId);
+ if (!cal) return res.status(404).json({ error: 'Calendar not found' });
+ db.prepare('DELETE FROM vacay_holiday_calendars WHERE id = ?').run(id);
+ notifyPlanUsers(planId, req.headers['x-socket-id'] as string, 'vacay:settings');
+ res.json({ success: true });
+});
+
router.put('/color', (req: Request, res: Response) => {
const authReq = req as AuthRequest;
const { color, target_user_id } = req.body;