stefiosif/rota
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor duplicate code, lints, correct engine status render

Browse Source
This commit is contained in:
stefiosif
2026-03-14 20:18:51 +02:00
parent 756c1cdc47
commit d7fd717c95
8 changed files with 52 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
src-tauri/src/config.rs
View File

@@ -60,17 +60,10 @@ pub struct UserConfig {
impl UserConfig {
pub fn new(month: u8, year: i32) -> Self {
let month = Month::try_from(month).unwrap();
let total_days = month.num_days(year).unwrap();
let total_slots = (1..=total_days)
.map(|d| if Day(d).is_open_shift() { 2 } else { 1 })
.sum();
let total_holiday_slots = (1..=total_days)
.filter(|&d| Day(d).is_weekend(month.number_from_month(), year))
.map(|d| if Day(d).is_open_shift() { 2 } else { 1 })
.sum();
let total_slots = compute_total_slots(total_days);
let total_holiday_slots =
compute_total_holiday_slots(total_days, month.number_from_month(), year, &[]);
Self {
month,
@@ -86,7 +79,12 @@ impl UserConfig {
pub fn with_holidays(mut self, holidays: Vec<u8>) -> Self {
self.holidays = holidays;
self.total_holiday_slots = self.total_holiday_slots();
self.total_holiday_slots = compute_total_holiday_slots(
self.total_days,
self.month.number_from_month(),
self.year,
&self.holidays,
);
self
}
@@ -106,21 +104,14 @@ impl UserConfig {
pub fn update_month(&mut self, month: u8) {
self.month = Month::try_from(month).unwrap();
self.total_days = self.month.num_days(self.year).unwrap();
self.total_slots = (1..=self.total_days)
.map(|d| if Day(d).is_open_shift() { 2 } else { 1 })
.sum();
self.total_holiday_slots = self.total_holiday_slots()
}
fn total_holiday_slots(&self) -> u8 {
(1..=self.total_days)
.filter(|&d| self.is_holiday_or_weekend(Day(d)))
.map(|d| if Day(d).is_open_shift() { 2 } else { 1 })
.sum()
self.total_slots = compute_total_slots(self.total_days);
self.total_holiday_slots = compute_total_holiday_slots(
self.total_days,
self.month.number_from_month(),
self.year,
&self.holidays,
);
}
pub fn is_holiday_or_weekend(&self, day: Day) -> bool {
@@ -159,17 +150,10 @@ impl UserConfig {
impl Default for UserConfig {
fn default() -> Self {
let month = Month::try_from(MONTH).unwrap();
let total_days = month.num_days(YEAR).unwrap();
let total_slots = (1..=total_days)
.map(|d| if Day(d).is_open_shift() { 2 } else { 1 })
.sum();
let total_holiday_slots = (1..=total_days)
.filter(|&d| Day(d).is_weekend(month.number_from_month(), YEAR))
.map(|d| if Day(d).is_open_shift() { 2 } else { 1 })
.sum();
let total_slots = compute_total_slots(total_days);
let total_holiday_slots =
compute_total_holiday_slots(total_days, month.number_from_month(), YEAR, &[]);
Self {
month,
@@ -189,20 +173,14 @@ impl TryFrom<UserConfigDTO> for UserConfig {
fn try_from(value: UserConfigDTO) -> Result<Self, Self::Error> {
let month = Month::try_from(value.month)?;
let total_days = month.num_days(value.year).context("Failed to parse")?;
let total_slots = (1..=total_days)
.map(|d| if Day(d).is_open_shift() { 2 } else { 1 })
.sum();
let total_holiday_slots = (1..=total_days)
.filter(|&d| {
Day(d).is_weekend(month.number_from_month(), value.year)
|| value.holidays.contains(&d)
})
.map(|d| if Day(d).is_open_shift() { 2 } else { 1 })
.sum();
let total_slots = compute_total_slots(total_days);
let total_holiday_slots = compute_total_holiday_slots(
total_days,
month.number_from_month(),
value.year,
&value.holidays,
);
Ok(Self {
month,
@@ -221,6 +199,19 @@ impl TryFrom<UserConfigDTO> for UserConfig {
}
}
fn compute_total_slots(total_days: u8) -> u8 {
(1..=total_days)
.map(|d| if Day(d).is_open_shift() { 2 } else { 1 })
.sum()
}
fn compute_total_holiday_slots(total_days: u8, month_num: u32, year: i32, holidays: &[u8]) -> u8 {
(1..=total_days)
.filter(|&d| Day(d).is_weekend(month_num, year) || holidays.contains(&d))
.map(|d| if Day(d).is_open_shift() { 2 } else { 1 })
.sum()
}
#[cfg(test)]
mod tests {
use crate::{

2
src-tauri/src/export.rs
View File

@@ -181,6 +181,6 @@ fn month_to_greek(month: u32) -> &'static str {
10 => "Οκτώβριος",
11 => "Νοέμβριος",
12 => "Δεκέμβριος",
_ => panic!("Unable to find translation for month {}", month),
_ => unreachable!("Invalid month: {}", month),
}
}

4
src-tauri/src/scheduler.rs
View File

@@ -65,7 +65,7 @@ impl Scheduler {
let solved_in_thread = AtomicBool::new(false);
let sovled_state = valid_resident_ids.par_iter().find_map_any(|&id| {
let solved_state = valid_resident_ids.par_iter().find_map_any(|&id| {
let mut local_schedule = schedule.clone();
let mut local_tracker = tracker.clone();
@@ -90,7 +90,7 @@ impl Scheduler {
}
});
if let Some((solved_schedule, solved_tracker)) = sovled_state {
if let Some((solved_schedule, solved_tracker)) = solved_state {
*schedule = solved_schedule;
*tracker = solved_tracker;
return Ok(true);

6
src-tauri/src/workload.rs
View File

@@ -30,7 +30,7 @@ impl WorkloadBounds {
bounds
}
pub fn calculate_max_workloads(&mut self, residents: &Vec<Resident>, total_slots: u8) {
pub fn calculate_max_workloads(&mut self, residents: &[Resident], total_slots: u8) {
let non_manual_residents: Vec<_> = residents
.iter()
.filter(|r| r.max_shifts.is_none())
@@ -64,7 +64,7 @@ impl WorkloadBounds {
pub fn calculate_max_holiday_shifts(
&mut self,
residents: &Vec<Resident>,
residents: &[Resident],
total_holiday_slots: u8,
) {
let total_residents = residents.len();
@@ -74,7 +74,7 @@ impl WorkloadBounds {
}
}
pub fn calculate_max_by_shift_type(&mut self, residents: &Vec<Resident>) {
pub fn calculate_max_by_shift_type(&mut self, residents: &[Resident]) {
let mut upper_limits = HashMap::new();
let shift_types = [
ShiftType::OpenFirst,

4
src/routes/+page.svelte
View File

@@ -72,7 +72,7 @@
{#if rota.metrics.length > 0}
<div class="h-px w-full bg-zinc-200"></div>
<div class="flex flex-1 flex-col py-4">
<div class="flex flex-col py-4">
<p class="px-6 pb-2 text-[10px] font-black tracking-widest text-zinc-400 uppercase">
Δικαιωσυνη
</p>
@@ -169,7 +169,7 @@
</div>
{/if}
<div class="h-px w-full bg-zinc-200"></div>
<div class="mt-auto h-px w-full bg-zinc-200"></div>
<div class="space-y-4 p-4">
<div
class="border-l-2 py-2 pl-3 transition-colors

6
src/routes/components/configurations/basic.svelte
View File

@@ -12,10 +12,10 @@
{ value: 6, label: "Ιούνιος" },
{ value: 7, label: "Ιούλιος" },
{ value: 8, label: "Αύγουστος" },
{ value: 9, label: "Σεπτέμβιος" },
{ value: 9, label: "Σεπτέμβριος" },
{ value: 10, label: "Οκτώβριος" },
{ value: 11, label: "Νοέμβριος" },
{ value: 12, label: "Δεκέμβιος" }
{ value: 12, label: "Δεκέμβριος" }
];
const yearOptions = [2026, 2027];
@@ -44,7 +44,6 @@
<div class="relative">
<select
bind:value={rota.selectedMonth}
onchange={() => rota.syncProjectMonth()}
class="w-full appearance-none rounded-xl border border-zinc-200 bg-white px-4 py-3 font-semibold text-zinc-700 transition-all outline-none focus:border-zinc-400 focus:ring-4 focus:ring-zinc-100"
>
{#each monthOptions as month}
@@ -72,7 +71,6 @@
<div class="relative">
<select
bind:value={rota.selectedYear}
onchange={() => rota.syncProjectMonth()}
class="w-full appearance-none rounded-xl border border-zinc-200 bg-white px-4 py-3 font-semibold text-zinc-700 transition-all outline-none focus:border-zinc-400 focus:ring-4 focus:ring-zinc-100"
>
{#each yearOptions as year}

1
src/routes/components/schedule/generate.svelte
View File

@@ -50,6 +50,7 @@
let config = rota.toDTO();
rota.engineStatus = EngineStatus.Running;
rota.lastMessage = "";
await new Promise((resolve) => setTimeout(resolve, 50));
try {
rota.solution = await invoke<MonthlyScheduleDTO>("generate", { config });

8
src/routes/state.svelte.ts
View File

@@ -39,13 +39,9 @@ export class RotaState {
metrics: ResidentMetrics[] = $state([]);
projectMonth = $state(new CalendarDate(2026, 2, 1));
syncProjectMonth() {
this.projectMonth = new CalendarDate(this.selectedYear, this.selectedMonth, 1);
}
projectMonth = $derived(new CalendarDate(this.selectedYear, this.selectedMonth, 1));
projectMonthDays = $derived(this.projectMonth.calendar.getDaysInMonth(this.projectMonth));
daysArray = $derived(Array.from({ length: this.projectMonthDays }, (_, i) => i + 1));
emptySlots = $derived(Array.from({ length: getDayOfWeek(this.projectMonth, "en-GB") }));