diff --git a/usr-backend/src/scheduler.rs b/usr-backend/src/scheduler.rs index 80f7059..75f1576 100644 --- a/usr-backend/src/scheduler.rs +++ b/usr-backend/src/scheduler.rs @@ -141,7 +141,7 @@ async fn get_schedule(State(state): State>) -> Response { Json(Schedule { availabilities: { - let mut out: Box<[Vec]> = std::iter::from_fn(|| Some(Vec::default())).take(7 * 8 * 4).collect(); + let mut out: Box<[Vec]> = std::iter::from_fn(|| Some(Vec::default())).take(7 * 10 * 4).collect(); for model in availabilities { out[model.time as usize].push(model.name); } diff --git a/usr-web/src/routes/(apps)/scheduler/+page.svelte b/usr-web/src/routes/(apps)/scheduler/+page.svelte index 63115f1..30293c7 100644 --- a/usr-web/src/routes/(apps)/scheduler/+page.svelte +++ b/usr-web/src/routes/(apps)/scheduler/+page.svelte @@ -167,7 +167,7 @@ for (let y = Math.min(dragStartY, dragEndY); y <= Math.max(dragStartY, dragEndY); y++) { for (let x = Math.min(dragStartX, dragEndX); x <= Math.max(dragStartX, dragEndX); x++) { - times.push(y + x * 32); + times.push(y + x * 10 * 4); } } @@ -229,7 +229,7 @@ } function isPositionInsideAvailabilities(x: number, y: number, name: string) { - return availabilities[y + x * 32]?.includes(name) ?? false; + return availabilities[y + x * 10 * 4]?.includes(name) ?? false; } function isUpdateCellGreen(x: number, y: number) { @@ -275,7 +275,7 @@ for (const [team, names] of Object.entries(teams)) { const newSubteam = names.filter( - (name) => availabilities[y + x * 32]?.includes(name) ?? false + (name) => availabilities[y + x * 10 * 4]?.includes(name) ?? false ); newTeams[team] = newSubteam; for (const name of newSubteam) { @@ -442,7 +442,7 @@ - {#each { length: 32 } as _, y} + {#each { length: 40 } as _, y} {timeString(y)} {#each DAYS as _, x}