fixed day time testing
This commit is contained in:
@@ -106,6 +106,8 @@ class CompileScheduleRequest(BaseModel):
|
|||||||
start_date: str | None = Field(default=None, description="YYYY-MM-DD")
|
start_date: str | None = Field(default=None, description="YYYY-MM-DD")
|
||||||
rule: str = ""
|
rule: str = ""
|
||||||
daytime_testing_today: bool = False
|
daytime_testing_today: bool = False
|
||||||
|
daytime_testing_hours: int = Field(default=8, ge=0, le=8)
|
||||||
|
daytime_testing_device: str = ""
|
||||||
dual_device_weekend_start_enabled: bool = False
|
dual_device_weekend_start_enabled: bool = False
|
||||||
dual_device_weekend_start_dates: list[str] = Field(default_factory=list)
|
dual_device_weekend_start_dates: list[str] = Field(default_factory=list)
|
||||||
top_priority_tests_dut: list[str] = Field(default_factory=list)
|
top_priority_tests_dut: list[str] = Field(default_factory=list)
|
||||||
@@ -387,6 +389,12 @@ def compile_schedule_endpoint(request: CompileScheduleRequest) -> dict[str, Any]
|
|||||||
except ValueError as exc:
|
except ValueError as exc:
|
||||||
raise HTTPException(status_code=400, detail="start_date must be YYYY-MM-DD") from exc
|
raise HTTPException(status_code=400, detail="start_date must be YYYY-MM-DD") from exc
|
||||||
|
|
||||||
|
requested_daytime_device = str(request.daytime_testing_device or "").strip()
|
||||||
|
if not requested_daytime_device:
|
||||||
|
requested_daytime_device = DUT
|
||||||
|
if requested_daytime_device not in {DUT, REF}:
|
||||||
|
raise HTTPException(status_code=400, detail=f"daytime_testing_device must be {DUT} or {REF}")
|
||||||
|
|
||||||
all_tests = db.get_not_excluded_tests(DB_PATH, rule=request.rule)
|
all_tests = db.get_not_excluded_tests(DB_PATH, rule=request.rule)
|
||||||
stored_tests = db.list_schedulable_tests(DB_PATH, rule=request.rule)
|
stored_tests = db.list_schedulable_tests(DB_PATH, rule=request.rule)
|
||||||
if not stored_tests:
|
if not stored_tests:
|
||||||
@@ -444,6 +452,8 @@ def compile_schedule_endpoint(request: CompileScheduleRequest) -> dict[str, Any]
|
|||||||
start_date=request.start_date,
|
start_date=request.start_date,
|
||||||
holiday_dates=holiday_dates,
|
holiday_dates=holiday_dates,
|
||||||
daytime_testing_today=request.daytime_testing_today,
|
daytime_testing_today=request.daytime_testing_today,
|
||||||
|
daytime_testing_hours=request.daytime_testing_hours,
|
||||||
|
daytime_testing_device=requested_daytime_device,
|
||||||
dual_device_weekend_start_enabled=request.dual_device_weekend_start_enabled,
|
dual_device_weekend_start_enabled=request.dual_device_weekend_start_enabled,
|
||||||
dual_device_window_start_dates=set(item.strip() for item in request.dual_device_weekend_start_dates if item.strip()),
|
dual_device_window_start_dates=set(item.strip() for item in request.dual_device_weekend_start_dates if item.strip()),
|
||||||
)
|
)
|
||||||
|
|||||||
+36
-9
@@ -24,6 +24,7 @@ class ScheduleWindow:
|
|||||||
shifts: list[tuple[date, int]]
|
shifts: list[tuple[date, int]]
|
||||||
capacity_minutes: int
|
capacity_minutes: int
|
||||||
remaining_minutes: int
|
remaining_minutes: int
|
||||||
|
daytime_mode: bool = False
|
||||||
assigned_device: str | None = None
|
assigned_device: str | None = None
|
||||||
assigned_config: tuple[str, ...] | None = None
|
assigned_config: tuple[str, ...] | None = None
|
||||||
|
|
||||||
@@ -37,6 +38,8 @@ class Scheduler:
|
|||||||
start_date: str | None = None,
|
start_date: str | None = None,
|
||||||
holiday_dates: set[str] = set(),
|
holiday_dates: set[str] = set(),
|
||||||
daytime_testing_today: bool = False,
|
daytime_testing_today: bool = False,
|
||||||
|
daytime_testing_hours: int = 8,
|
||||||
|
daytime_testing_device: str | None = None,
|
||||||
dual_device_weekend_start_enabled: bool = False,
|
dual_device_weekend_start_enabled: bool = False,
|
||||||
dual_device_window_start_dates: set[str] | None = None,
|
dual_device_window_start_dates: set[str] | None = None,
|
||||||
priority_weight: int = 1000,
|
priority_weight: int = 1000,
|
||||||
@@ -49,6 +52,9 @@ class Scheduler:
|
|||||||
self.start_date = date.fromisoformat(start_date) if start_date else date.today()
|
self.start_date = date.fromisoformat(start_date) if start_date else date.today()
|
||||||
self.holiday_dates = holiday_dates
|
self.holiday_dates = holiday_dates
|
||||||
self.daytime_testing_today = daytime_testing_today
|
self.daytime_testing_today = daytime_testing_today
|
||||||
|
safe_daytime_hours = max(0, min(int(daytime_testing_hours), 8))
|
||||||
|
self.daytime_testing_minutes = safe_daytime_hours * 60
|
||||||
|
self.daytime_testing_device = daytime_testing_device if daytime_testing_device in {DUT, REF} else DUT
|
||||||
self.dual_device_weekend_start_enabled = dual_device_weekend_start_enabled
|
self.dual_device_weekend_start_enabled = dual_device_weekend_start_enabled
|
||||||
self.dual_device_window_start_dates = dual_device_window_start_dates or set()
|
self.dual_device_window_start_dates = dual_device_window_start_dates or set()
|
||||||
self.priority_weight = priority_weight
|
self.priority_weight = priority_weight
|
||||||
@@ -76,6 +82,7 @@ class Scheduler:
|
|||||||
|
|
||||||
window_index = 0
|
window_index = 0
|
||||||
cursor_date = self.start_date
|
cursor_date = self.start_date
|
||||||
|
daytime_window_pending = self.daytime_testing_today and self.daytime_testing_minutes > 0
|
||||||
|
|
||||||
tc_order = self.get_tc_order(self.all_tests)
|
tc_order = self.get_tc_order(self.all_tests)
|
||||||
|
|
||||||
@@ -85,7 +92,7 @@ class Scheduler:
|
|||||||
print(f"[scheduler] No bundles found for TC: {tc}. Skipping to next TC.")
|
print(f"[scheduler] No bundles found for TC: {tc}. Skipping to next TC.")
|
||||||
continue
|
continue
|
||||||
print(f"[scheduler] Scheduling bundles for TC: {tc} with {len(tc_bundles)} bundles.")
|
print(f"[scheduler] Scheduling bundles for TC: {tc} with {len(tc_bundles)} bundles.")
|
||||||
window_device = DUT
|
night_window_device = DUT
|
||||||
pending_dut: list[TestBundle] = []
|
pending_dut: list[TestBundle] = []
|
||||||
pending_ref: list[TestBundle] = []
|
pending_ref: list[TestBundle] = []
|
||||||
|
|
||||||
@@ -98,17 +105,28 @@ class Scheduler:
|
|||||||
pending_ref.append(bundle)
|
pending_ref.append(bundle)
|
||||||
|
|
||||||
while pending_dut or pending_ref:
|
while pending_dut or pending_ref:
|
||||||
active_pending = pending_dut if window_device == DUT else pending_ref
|
daytime_window_active = daytime_window_pending and not is_off_day(cursor_date, self.holiday_dates)
|
||||||
if len(active_pending) == 0:
|
window_device = self.daytime_testing_device if daytime_window_active else night_window_device
|
||||||
# If no unscheduled bundles for the current device, switch to the other device
|
|
||||||
window_device = REF if window_device == DUT else DUT
|
|
||||||
active_pending = pending_dut if window_device == DUT else pending_ref
|
|
||||||
|
|
||||||
shifts, capacity = get_shift_sequence_with_capacity(cursor_date, self.holiday_dates, self.daytime_testing_today)
|
active_pending = pending_dut if window_device == DUT else pending_ref
|
||||||
|
if len(active_pending) == 0 and not daytime_window_active:
|
||||||
|
# If no unscheduled bundles for the current device, switch to the other device
|
||||||
|
night_window_device = REF if night_window_device == DUT else DUT
|
||||||
|
window_device = night_window_device
|
||||||
|
active_pending = pending_dut if night_window_device == DUT else pending_ref
|
||||||
|
|
||||||
|
shifts, capacity = get_shift_sequence_with_capacity(
|
||||||
|
cursor_date,
|
||||||
|
self.holiday_dates,
|
||||||
|
daytime_window_active,
|
||||||
|
self.daytime_testing_minutes,
|
||||||
|
)
|
||||||
cursor_date_key = cursor_date.isoformat()
|
cursor_date_key = cursor_date.isoformat()
|
||||||
dual_device_window = cursor_date_key in self.dual_device_window_start_dates
|
dual_device_window = cursor_date_key in self.dual_device_window_start_dates
|
||||||
if not dual_device_window and self.dual_device_weekend_start_enabled:
|
if not dual_device_window and self.dual_device_weekend_start_enabled:
|
||||||
dual_device_window = self._is_weekend_start_day(cursor_date)
|
dual_device_window = self._is_weekend_start_day(cursor_date)
|
||||||
|
if daytime_window_active:
|
||||||
|
dual_device_window = False
|
||||||
|
|
||||||
selected_bundles = []
|
selected_bundles = []
|
||||||
selected_bundles = self._knapsack_select(capacity, active_pending)
|
selected_bundles = self._knapsack_select(capacity, active_pending)
|
||||||
@@ -130,6 +148,7 @@ class Scheduler:
|
|||||||
shifts=shifts,
|
shifts=shifts,
|
||||||
capacity_minutes=capacity,
|
capacity_minutes=capacity,
|
||||||
remaining_minutes=remaining_time,
|
remaining_minutes=remaining_time,
|
||||||
|
daytime_mode=daytime_window_active,
|
||||||
assigned_config=tc,
|
assigned_config=tc,
|
||||||
assigned_device=primary_device,
|
assigned_device=primary_device,
|
||||||
)
|
)
|
||||||
@@ -148,8 +167,11 @@ class Scheduler:
|
|||||||
pending_ref = [b for b in pending_ref if (b.index, b.device) not in selected_keys]
|
pending_ref = [b for b in pending_ref if (b.index, b.device) not in selected_keys]
|
||||||
|
|
||||||
window_index += 1
|
window_index += 1
|
||||||
window_device = REF if window_device == DUT else DUT
|
if not daytime_window_active:
|
||||||
|
night_window_device = REF if night_window_device == DUT else DUT
|
||||||
cursor_date = next_window_start_date(shifts)
|
cursor_date = next_window_start_date(shifts)
|
||||||
|
if daytime_window_active:
|
||||||
|
daytime_window_pending = False
|
||||||
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
@@ -250,7 +272,12 @@ class Scheduler:
|
|||||||
) -> None:
|
) -> None:
|
||||||
# Build per-shift remaining capacity
|
# Build per-shift remaining capacity
|
||||||
shift_remaining = [
|
shift_remaining = [
|
||||||
get_shift_capacity_for_date(day, self.holiday_dates, self.daytime_testing_today).get(shift_idx, 0)
|
get_shift_capacity_for_date(
|
||||||
|
day,
|
||||||
|
self.holiday_dates,
|
||||||
|
window.daytime_mode,
|
||||||
|
self.daytime_testing_minutes,
|
||||||
|
).get(shift_idx, 0)
|
||||||
for day, shift_idx in window.shifts
|
for day, shift_idx in window.shifts
|
||||||
]
|
]
|
||||||
current_shift_pos = 0
|
current_shift_pos = 0
|
||||||
|
|||||||
@@ -39,9 +39,11 @@ def get_shift_capacity_for_date(
|
|||||||
current_date: date,
|
current_date: date,
|
||||||
holiday_dates: set[str],
|
holiday_dates: set[str],
|
||||||
daytime_shift2_only: bool = False,
|
daytime_shift2_only: bool = False,
|
||||||
|
daytime_shift2_minutes: int = 480,
|
||||||
) -> dict[int, int]:
|
) -> dict[int, int]:
|
||||||
if daytime_shift2_only:
|
if daytime_shift2_only:
|
||||||
return {1: 0, 2: 480, 3: 0}
|
daytime_minutes = max(0, min(int(daytime_shift2_minutes), 480))
|
||||||
|
return {1: 0, 2: daytime_minutes, 3: 0}
|
||||||
if is_off_day(current_date, holiday_dates):
|
if is_off_day(current_date, holiday_dates):
|
||||||
return {1: 480, 2: 480, 3: 480}
|
return {1: 480, 2: 480, 3: 480}
|
||||||
return {1: 480, 2: 0, 3: 480}
|
return {1: 480, 2: 0, 3: 480}
|
||||||
@@ -51,10 +53,11 @@ def get_shift_sequence_with_capacity(
|
|||||||
current_date: date,
|
current_date: date,
|
||||||
holiday_dates: set[str],
|
holiday_dates: set[str],
|
||||||
daytime_shift2_only: bool = False,
|
daytime_shift2_only: bool = False,
|
||||||
|
daytime_shift2_minutes: int = 480,
|
||||||
) -> tuple[list[tuple[date, int]], int]:
|
) -> tuple[list[tuple[date, int]], int]:
|
||||||
shifts = get_shift_sequence(current_date, holiday_dates, daytime_shift2_only)
|
shifts = get_shift_sequence(current_date, holiday_dates, daytime_shift2_only)
|
||||||
capacity = sum(
|
capacity = sum(
|
||||||
get_shift_capacity_for_date(day, holiday_dates, daytime_shift2_only).get(shift_index, 0)
|
get_shift_capacity_for_date(day, holiday_dates, daytime_shift2_only, daytime_shift2_minutes).get(shift_index, 0)
|
||||||
for day, shift_index in shifts
|
for day, shift_index in shifts
|
||||||
)
|
)
|
||||||
return shifts, capacity
|
return shifts, capacity
|
||||||
|
|||||||
+35
-2
@@ -245,6 +245,9 @@ function sanitizeSettings(saved = {}) {
|
|||||||
export default function App() {
|
export default function App() {
|
||||||
const [settingsOpen, setSettingsOpen] = useState(false)
|
const [settingsOpen, setSettingsOpen] = useState(false)
|
||||||
const [settings, setSettings] = useState(DEFAULT_SETTINGS)
|
const [settings, setSettings] = useState(DEFAULT_SETTINGS)
|
||||||
|
const [daytimeTestingToday, setDaytimeTestingToday] = useState(false)
|
||||||
|
const [daytimeTestingHours, setDaytimeTestingHours] = useState('8')
|
||||||
|
const [daytimeTestingDevice, setDaytimeTestingDevice] = useState('CGW453')
|
||||||
const [dualDeviceWeekendWeekSelections, setDualDeviceWeekendWeekSelections] = useState({})
|
const [dualDeviceWeekendWeekSelections, setDualDeviceWeekendWeekSelections] = useState({})
|
||||||
const [topPriorityDut, setTopPriorityDut] = useState('')
|
const [topPriorityDut, setTopPriorityDut] = useState('')
|
||||||
const [topPriorityRef, setTopPriorityRef] = useState('')
|
const [topPriorityRef, setTopPriorityRef] = useState('')
|
||||||
@@ -291,6 +294,10 @@ export default function App() {
|
|||||||
if (!dualDeviceWeekendWeekEnabled) return []
|
if (!dualDeviceWeekendWeekEnabled) return []
|
||||||
return getWeekendStartDatesForWeek(weekStart, holidaySet)
|
return getWeekendStartDatesForWeek(weekStart, holidaySet)
|
||||||
}, [dualDeviceWeekendWeekEnabled, weekStart, holidaySet])
|
}, [dualDeviceWeekendWeekEnabled, weekStart, holidaySet])
|
||||||
|
const daytimeDateKey = useMemo(
|
||||||
|
() => (daytimeTestingToday ? toKey(new Date()) : null),
|
||||||
|
[daytimeTestingToday],
|
||||||
|
)
|
||||||
|
|
||||||
// Fetch schedule for the given weekStart (Monday)
|
// Fetch schedule for the given weekStart (Monday)
|
||||||
const fetchSchedule = useCallback(async (start) => {
|
const fetchSchedule = useCallback(async (start) => {
|
||||||
@@ -413,6 +420,9 @@ export default function App() {
|
|||||||
setTopPriorityRef('')
|
setTopPriorityRef('')
|
||||||
setLowestPriority('')
|
setLowestPriority('')
|
||||||
setStartDateOverride('')
|
setStartDateOverride('')
|
||||||
|
setDaytimeTestingToday(false)
|
||||||
|
setDaytimeTestingHours('8')
|
||||||
|
setDaytimeTestingDevice('CGW453')
|
||||||
setFailedTests([])
|
setFailedTests([])
|
||||||
setScheduleData({})
|
setScheduleData({})
|
||||||
setPreviousScheduleData({})
|
setPreviousScheduleData({})
|
||||||
@@ -435,9 +445,16 @@ export default function App() {
|
|||||||
setLoading(true)
|
setLoading(true)
|
||||||
setError(null)
|
setError(null)
|
||||||
try {
|
try {
|
||||||
|
const parsedDaytimeHours = Number.parseInt(String(daytimeTestingHours).trim(), 10)
|
||||||
|
const safeDaytimeHours = Number.isFinite(parsedDaytimeHours)
|
||||||
|
? Math.max(0, Math.min(8, parsedDaytimeHours))
|
||||||
|
: 8
|
||||||
const effectiveStartDate = startDateOverride.trim()
|
const effectiveStartDate = startDateOverride.trim()
|
||||||
const result = await api.compileSchedule({
|
const result = await api.compileSchedule({
|
||||||
start_date: effectiveStartDate || null,
|
start_date: effectiveStartDate || null,
|
||||||
|
daytime_testing_today: daytimeTestingToday,
|
||||||
|
daytime_testing_hours: safeDaytimeHours,
|
||||||
|
daytime_testing_device: daytimeTestingDevice,
|
||||||
dual_device_weekend_start_dates: dualDeviceWindowStartDates,
|
dual_device_weekend_start_dates: dualDeviceWindowStartDates,
|
||||||
top_priority_tests_dut: topPriorityDut.split(',').map(s => s.trim()).filter(Boolean),
|
top_priority_tests_dut: topPriorityDut.split(',').map(s => s.trim()).filter(Boolean),
|
||||||
top_priority_tests_ref: topPriorityRef.split(',').map(s => s.trim()).filter(Boolean),
|
top_priority_tests_ref: topPriorityRef.split(',').map(s => s.trim()).filter(Boolean),
|
||||||
@@ -467,7 +484,7 @@ export default function App() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleRerunDecision(_rerunDuringDay) {
|
function handleRerunDecision(rerunDuringDay) {
|
||||||
const appendUnique = (currentValue, incomingValues) => {
|
const appendUnique = (currentValue, incomingValues) => {
|
||||||
const existing = currentValue.split(',').map(s => s.trim()).filter(Boolean)
|
const existing = currentValue.split(',').map(s => s.trim()).filter(Boolean)
|
||||||
const merged = [...new Set([...existing, ...incomingValues])]
|
const merged = [...new Set([...existing, ...incomingValues])]
|
||||||
@@ -488,6 +505,15 @@ export default function App() {
|
|||||||
setTopPriorityRef(prev => appendUnique(prev, refIncoming))
|
setTopPriorityRef(prev => appendUnique(prev, refIncoming))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (rerunDuringDay) {
|
||||||
|
setDaytimeTestingToday(true)
|
||||||
|
if (dutIncoming.length > 0 && refIncoming.length === 0) {
|
||||||
|
setDaytimeTestingDevice('CGW453')
|
||||||
|
} else if (refIncoming.length > 0 && dutIncoming.length === 0) {
|
||||||
|
setDaytimeTestingDevice('CGW452')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
setFailedTests([])
|
setFailedTests([])
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -521,13 +547,14 @@ export default function App() {
|
|||||||
<FailedBanner
|
<FailedBanner
|
||||||
rerunTests={failedTests}
|
rerunTests={failedTests}
|
||||||
onDecision={handleRerunDecision}
|
onDecision={handleRerunDecision}
|
||||||
|
onClose={() => setFailedTests([])}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<main className="relative flex flex-1 gap-4 p-4 overflow-hidden">
|
<main className="relative flex flex-1 gap-4 p-4 overflow-hidden">
|
||||||
<div className="flex-1 min-w-0 flex flex-col">
|
<div className="flex-1 min-w-0 flex flex-col">
|
||||||
<Calendar
|
<Calendar
|
||||||
scheduleData={calendarScheduleData}
|
scheduleData={calendarScheduleData}
|
||||||
daytimeDateKey={null}
|
daytimeDateKey={daytimeDateKey}
|
||||||
weekStart={weekStart}
|
weekStart={weekStart}
|
||||||
onWeekChange={setWeekStart}
|
onWeekChange={setWeekStart}
|
||||||
dualDeviceWeekendWeekEnabled={dualDeviceWeekendWeekEnabled}
|
dualDeviceWeekendWeekEnabled={dualDeviceWeekendWeekEnabled}
|
||||||
@@ -545,6 +572,12 @@ export default function App() {
|
|||||||
|
|
||||||
<RightPanel
|
<RightPanel
|
||||||
completionDate={completionDate}
|
completionDate={completionDate}
|
||||||
|
daytimeTestingToday={daytimeTestingToday}
|
||||||
|
onDaytimeTestingTodayChange={setDaytimeTestingToday}
|
||||||
|
daytimeTestingHours={daytimeTestingHours}
|
||||||
|
onDaytimeTestingHoursChange={setDaytimeTestingHours}
|
||||||
|
daytimeTestingDevice={daytimeTestingDevice}
|
||||||
|
onDaytimeTestingDeviceChange={setDaytimeTestingDevice}
|
||||||
startDateOverride={startDateOverride}
|
startDateOverride={startDateOverride}
|
||||||
onStartDateOverrideChange={setStartDateOverride}
|
onStartDateOverrideChange={setStartDateOverride}
|
||||||
topPriorityDut={topPriorityDut}
|
topPriorityDut={topPriorityDut}
|
||||||
|
|||||||
@@ -18,10 +18,10 @@ export default function FailedBanner({ rerunTests, onDecision }) {
|
|||||||
.map(([device, ids]) => `${device}: ${ids.join(', ')}`)
|
.map(([device, ids]) => `${device}: ${ids.join(', ')}`)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex items-start gap-4 px-6 py-3 bg-red-900/70 border-b border-red-700 text-red-100">
|
<div className="flex items-start gap-4 px-6 py-3 bg-yellow-900/35 border-b border-yellow-700/55 text-yellow-100/85">
|
||||||
<svg
|
<svg
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
className="w-5 h-5 mt-0.5 shrink-0 text-red-300"
|
className="w-5 h-5 mt-0.5 shrink-0 text-yellow-300/80"
|
||||||
fill="none"
|
fill="none"
|
||||||
viewBox="0 0 24 24"
|
viewBox="0 0 24 24"
|
||||||
stroke="currentColor"
|
stroke="currentColor"
|
||||||
@@ -39,28 +39,10 @@ export default function FailedBanner({ rerunTests, onDecision }) {
|
|||||||
{' '}require a rerun — not completed in last overnight window:
|
{' '}require a rerun — not completed in last overnight window:
|
||||||
</p>
|
</p>
|
||||||
{deviceSummaries.map((summary) => (
|
{deviceSummaries.map((summary) => (
|
||||||
<p key={summary} className="text-sm font-mono text-red-200 mt-0.5 truncate">
|
<p key={summary} className="text-sm font-mono text-yellow-200/80 mt-0.5 truncate">
|
||||||
{summary}
|
{summary}
|
||||||
</p>
|
</p>
|
||||||
))}
|
))}
|
||||||
<p className="text-sm text-red-300 mt-0.5">
|
|
||||||
Estimated rerun time: <span className="font-semibold text-red-100">{timeStr}</span>
|
|
||||||
{' '}— Schedule rerun during daytime today?
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div className="flex gap-2 shrink-0">
|
|
||||||
<button
|
|
||||||
onClick={() => onDecision(true)}
|
|
||||||
className="px-3 py-1 text-sm font-medium bg-red-700 hover:bg-red-600 text-white rounded-md border border-red-500 transition-colors"
|
|
||||||
>
|
|
||||||
Yes
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
onClick={() => onDecision(false)}
|
|
||||||
className="px-3 py-1 text-sm font-medium bg-gray-700 hover:bg-gray-600 text-gray-100 rounded-md border border-gray-500 transition-colors"
|
|
||||||
>
|
|
||||||
No
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { useState } from 'react'
|
||||||
import cgw453Image from '../assets/CGW453.PNG'
|
import cgw453Image from '../assets/CGW453.PNG'
|
||||||
|
|
||||||
function formatCompletionDate(value) {
|
function formatCompletionDate(value) {
|
||||||
@@ -16,6 +17,12 @@ function formatCompletionDate(value) {
|
|||||||
|
|
||||||
export default function RightPanel({
|
export default function RightPanel({
|
||||||
completionDate,
|
completionDate,
|
||||||
|
daytimeTestingToday,
|
||||||
|
onDaytimeTestingTodayChange,
|
||||||
|
daytimeTestingHours,
|
||||||
|
onDaytimeTestingHoursChange,
|
||||||
|
daytimeTestingDevice,
|
||||||
|
onDaytimeTestingDeviceChange,
|
||||||
startDateOverride,
|
startDateOverride,
|
||||||
onStartDateOverrideChange,
|
onStartDateOverrideChange,
|
||||||
topPriorityDut,
|
topPriorityDut,
|
||||||
@@ -29,6 +36,7 @@ export default function RightPanel({
|
|||||||
loading = false,
|
loading = false,
|
||||||
}) {
|
}) {
|
||||||
const formattedCompletionDate = formatCompletionDate(completionDate)
|
const formattedCompletionDate = formatCompletionDate(completionDate)
|
||||||
|
const [topPriorityOpen, setTopPriorityOpen] = useState(false)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<aside className="flex flex-col gap-4 w-60 shrink-0 pt-8">
|
<aside className="flex flex-col gap-4 w-60 shrink-0 pt-8">
|
||||||
@@ -47,10 +55,101 @@ export default function RightPanel({
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Top priority */}
|
<div>
|
||||||
|
<div className="flex items-center justify-between gap-3">
|
||||||
|
<span className="text-[11px] font-semibold uppercase tracking-wider text-gray-400">
|
||||||
|
Day Time Testing Today
|
||||||
|
</span>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
role="switch"
|
||||||
|
aria-checked={daytimeTestingToday}
|
||||||
|
onClick={() => onDaytimeTestingTodayChange(!daytimeTestingToday)}
|
||||||
|
className={`relative inline-flex h-5 w-9 shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors focus:outline-none focus:ring-2 focus:ring-blue-500/70 ${
|
||||||
|
daytimeTestingToday ? 'bg-blue-600' : 'bg-gray-600'
|
||||||
|
}`}
|
||||||
|
title="Toggle daytime testing for today's compile"
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
className={`pointer-events-none inline-block h-4 w-4 rounded-full bg-white shadow transform transition-transform ${
|
||||||
|
daytimeTestingToday ? 'translate-x-4' : 'translate-x-0'
|
||||||
|
}`}
|
||||||
|
/>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
className={`overflow-hidden transition-all duration-300 ease-out ${
|
||||||
|
daytimeTestingToday
|
||||||
|
? 'max-h-56 opacity-100 translate-y-0 mt-3'
|
||||||
|
: 'max-h-0 opacity-0 -translate-y-1 mt-0 pointer-events-none'
|
||||||
|
}`}
|
||||||
|
>
|
||||||
<div>
|
<div>
|
||||||
<label className="block text-[11px] font-semibold uppercase tracking-wider text-gray-500 mb-1.5">
|
<label className="block text-[11px] font-semibold uppercase tracking-wider text-gray-500 mb-1.5">
|
||||||
Top Priority Tests (DUT - CGW453)
|
Day Time Hours (Max 8)
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
type="number"
|
||||||
|
min="0"
|
||||||
|
max="8"
|
||||||
|
step="1"
|
||||||
|
value={daytimeTestingHours}
|
||||||
|
onChange={(e) => onDaytimeTestingHoursChange(e.target.value)}
|
||||||
|
className="w-full bg-gray-900 border border-gray-600 rounded-md px-2.5 py-1.5 text-xs text-gray-200 focus:outline-none focus:border-blue-500 font-mono"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="mt-3">
|
||||||
|
<label className="block text-[11px] font-semibold uppercase tracking-wider text-gray-500 mb-1.5">
|
||||||
|
Day Time Device
|
||||||
|
</label>
|
||||||
|
<select
|
||||||
|
value={daytimeTestingDevice}
|
||||||
|
onChange={(e) => onDaytimeTestingDeviceChange(e.target.value)}
|
||||||
|
className="w-full bg-gray-900 border border-gray-600 rounded-md px-2.5 py-1.5 text-xs text-gray-200 focus:outline-none focus:border-blue-500 font-mono"
|
||||||
|
>
|
||||||
|
<option value="CGW453">DUT (CGW453)</option>
|
||||||
|
<option value="CGW452">REF (CGW452)</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Top priority */}
|
||||||
|
<div>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => setTopPriorityOpen((open) => !open)}
|
||||||
|
className="w-full flex items-center justify-between text-[11px] font-semibold uppercase tracking-wider text-gray-500 hover:text-gray-300 transition-colors"
|
||||||
|
aria-expanded={topPriorityOpen}
|
||||||
|
aria-controls="top-priority-section"
|
||||||
|
>
|
||||||
|
<span>Top Priority Tests</span>
|
||||||
|
<svg
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
className={`w-4 h-4 transition-transform duration-300 ${topPriorityOpen ? 'rotate-180' : 'rotate-0'}`}
|
||||||
|
fill="none"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
stroke="currentColor"
|
||||||
|
strokeWidth={2}
|
||||||
|
aria-hidden="true"
|
||||||
|
>
|
||||||
|
<path strokeLinecap="round" strokeLinejoin="round" d="M19 9l-7 7-7-7" />
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<div
|
||||||
|
id="top-priority-section"
|
||||||
|
className={`overflow-hidden transition-all duration-300 ease-out ${
|
||||||
|
topPriorityOpen
|
||||||
|
? 'max-h-96 opacity-100 translate-y-0 mt-2'
|
||||||
|
: 'max-h-0 opacity-0 -translate-y-1 mt-0 pointer-events-none'
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
<div>
|
||||||
|
<label className="block text-[11px] font-semibold uppercase tracking-wider text-gray-500 mb-1.5">
|
||||||
|
Top Priority DUT Tests
|
||||||
</label>
|
</label>
|
||||||
<textarea
|
<textarea
|
||||||
rows={3}
|
rows={3}
|
||||||
@@ -61,9 +160,9 @@ export default function RightPanel({
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div className="mt-3">
|
||||||
<label className="block text-[11px] font-semibold uppercase tracking-wider text-gray-500 mb-1.5">
|
<label className="block text-[11px] font-semibold uppercase tracking-wider text-gray-500 mb-1.5">
|
||||||
Top Priority Tests (REF - CGW452)
|
Top Priority REF Tests
|
||||||
</label>
|
</label>
|
||||||
<textarea
|
<textarea
|
||||||
rows={3}
|
rows={3}
|
||||||
@@ -73,6 +172,8 @@ export default function RightPanel({
|
|||||||
className="w-full bg-gray-900 border border-gray-600 rounded-md px-2.5 py-1.5 text-xs text-gray-200 placeholder-gray-600 focus:outline-none focus:border-blue-500 resize-none font-mono"
|
className="w-full bg-gray-900 border border-gray-600 rounded-md px-2.5 py-1.5 text-xs text-gray-200 placeholder-gray-600 focus:outline-none focus:border-blue-500 resize-none font-mono"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<label className="block text-[11px] font-semibold uppercase tracking-wider text-gray-500 mb-1.5">
|
<label className="block text-[11px] font-semibold uppercase tracking-wider text-gray-500 mb-1.5">
|
||||||
|
|||||||
Reference in New Issue
Block a user