From 6a455e76d071e957e73496a02b5c5a6deb477f49 Mon Sep 17 00:00:00 2001
From: marcantoinem <marc-antoine.m@outlook.com>
Date: Thu, 8 Aug 2024 00:46:35 -0400
Subject: [PATCH] feat: Add more B1 / B2 indicator
---
.../frontend/components/options/courses_selector.rs | 1 +
.../src/frontend/components/schedule.rs | 12 +++++++++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/aep-schedule-website/src/frontend/components/options/courses_selector.rs b/aep-schedule-website/src/frontend/components/options/courses_selector.rs
index fa0d7df..162309c 100644
--- a/aep-schedule-website/src/frontend/components/options/courses_selector.rs
+++ b/aep-schedule-website/src/frontend/components/options/courses_selector.rs
@@ -46,6 +46,7 @@ where
<div class="flex group-text w-full justify-between">
<span>{p.day.to_string()}</span>
<span class="period-group">{p.hours.to_string()}</span>
+ <span>{p.week_nb.to_string()}</span>
</div>
}
}).collect_view()}
diff --git a/aep-schedule-website/src/frontend/components/schedule.rs b/aep-schedule-website/src/frontend/components/schedule.rs
index 22d93e5..75d5094 100644
--- a/aep-schedule-website/src/frontend/components/schedule.rs
+++ b/aep-schedule-website/src/frontend/components/schedule.rs
@@ -47,7 +47,7 @@ fn PeriodEvent<'a>(
course: &'a TakenCourse,
period_type: &'static str,
) -> impl IntoView {
- let location = period.hours.to_string() + " - " + period.room.as_str();
+ let mut location = period.hours.to_string() + " - " + period.room.as_str();
let sigle = course.sigle.to_string() + " - " + period_type;
let mut class = match i % 8 {
0 => " color1".to_string(),
@@ -60,8 +60,14 @@ fn PeriodEvent<'a>(
_ => " color8".to_string(),
};
match period.week_nb {
- WeekNumber::B1 => class.push_str(" b1"),
- WeekNumber::B2 => class.push_str(" b2"),
+ WeekNumber::B1 => {
+ class.push_str(" b1");
+ location.push_str(" B1");
+ }
+ WeekNumber::B2 => {
+ class.push_str(" b2");
+ location.push_str(" B2");
+ }
_ => (),
}
--
GitLab