Compare commits
3 Commits
copilot/up
...
208dddeeb3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
208dddeeb3 | ||
| b597453fac | |||
|
|
696e1b9c9f |
@@ -68,7 +68,6 @@ if (!carCols.includes('sort_order')) {
|
|||||||
db.exec('ALTER TABLE cars ADD COLUMN sort_order INTEGER DEFAULT 0');
|
db.exec('ALTER TABLE cars ADD COLUMN sort_order INTEGER DEFAULT 0');
|
||||||
db.exec('UPDATE cars SET sort_order = id');
|
db.exec('UPDATE cars SET sort_order = id');
|
||||||
}
|
}
|
||||||
db.prepare("UPDATE cars SET tire_type = 'スタッドレス' WHERE tire_type = 'スタットレス'").run();
|
|
||||||
|
|
||||||
// Migrate: add period fields to reservations if they don't exist yet
|
// Migrate: add period fields to reservations if they don't exist yet
|
||||||
const resCols = db.prepare("PRAGMA table_info(reservations)").all().map((c) => c.name);
|
const resCols = db.prepare("PRAGMA table_info(reservations)").all().map((c) => c.name);
|
||||||
@@ -100,17 +99,13 @@ function broadcast(message) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizeTireType(value) {
|
// for future use
|
||||||
return value === 'スタットレス' ? 'スタッドレス' : value;
|
|
||||||
}
|
|
||||||
|
|
||||||
function normalizeCar(car) {
|
function normalizeCar(car) {
|
||||||
if (!car) {
|
if (!car) {
|
||||||
return car;
|
return car;
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
...car,
|
...car,
|
||||||
tire_type: normalizeTireType(car.tire_type),
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { useState, useEffect, useRef, useCallback } from 'react';
|
import { useState, useEffect, useRef, useCallback } from 'react';
|
||||||
import { format, addDays, startOfWeek, parseISO, differenceInDays } from 'date-fns';
|
import { format, addDays, parseISO, differenceInDays } from 'date-fns';
|
||||||
import { ja } from 'date-fns/locale';
|
import { ja } from 'date-fns/locale';
|
||||||
import { api } from '../api.js';
|
import { api } from '../api.js';
|
||||||
import { isInspectionExpirySoon, formatDateRange, formatReservationTooltip } from '../utils/carUtils.js';
|
import { isInspectionExpirySoon, formatDateRange, formatReservationTooltip } from '../utils/carUtils.js';
|
||||||
@@ -43,10 +43,8 @@ export default function ScheduleView({ reloadKey = 0 }) {
|
|||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
const [error, setError] = useState(null);
|
const [error, setError] = useState(null);
|
||||||
|
|
||||||
// The first date shown in the grid
|
// The first date shown in the grid (start from today)
|
||||||
const [viewStart, setViewStart] = useState(() =>
|
const [viewStart, setViewStart] = useState(() => new Date());
|
||||||
startOfWeek(new Date(), { weekStartsOn: 1 })
|
|
||||||
);
|
|
||||||
|
|
||||||
// Drag-to-create state
|
// Drag-to-create state
|
||||||
const [creating, setCreating] = useState(null);
|
const [creating, setCreating] = useState(null);
|
||||||
@@ -92,7 +90,7 @@ export default function ScheduleView({ reloadKey = 0 }) {
|
|||||||
// --- Navigation ---
|
// --- Navigation ---
|
||||||
const prevWeek = () => setViewStart((d) => addDays(d, -7));
|
const prevWeek = () => setViewStart((d) => addDays(d, -7));
|
||||||
const nextWeek = () => setViewStart((d) => addDays(d, 7));
|
const nextWeek = () => setViewStart((d) => addDays(d, 7));
|
||||||
const goToday = () => setViewStart(startOfWeek(new Date(), { weekStartsOn: 1 }));
|
const goToday = () => setViewStart(new Date());
|
||||||
|
|
||||||
// --- Grid position helpers ---
|
// --- Grid position helpers ---
|
||||||
// Given a mouse clientX within the grid scroll area, get the half-day slot index (0-based)
|
// Given a mouse clientX within the grid scroll area, get the half-day slot index (0-based)
|
||||||
|
|||||||
@@ -136,9 +136,9 @@ export default function TimelineView({ reloadKey = 0 }) {
|
|||||||
const carColorMap = {};
|
const carColorMap = {};
|
||||||
cars.forEach((car, i) => { carColorMap[car.id] = getColor(i); });
|
cars.forEach((car, i) => { carColorMap[car.id] = getColor(i); });
|
||||||
|
|
||||||
// Sort reservations by start_date then car
|
// Sort reservations by start_date descending (newest first) then car
|
||||||
const sortedReservations = [...reservations].sort((a, b) => {
|
const sortedReservations = [...reservations].sort((a, b) => {
|
||||||
if (a.start_date !== b.start_date) return a.start_date < b.start_date ? -1 : 1;
|
if (a.start_date !== b.start_date) return a.start_date > b.start_date ? -1 : 1;
|
||||||
return a.car_id - b.car_id;
|
return a.car_id - b.car_id;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user