filter TP/TD

This commit is contained in:
Mylloon 2023-09-29 00:03:45 +02:00
parent 6e13936980
commit 54317e2356
Signed by: Anri
GPG key ID: A82D63DFF8D1317F

View file

@ -5,6 +5,7 @@ use dialoguer::MultiSelect;
use crate::timetable::models::Course; use crate::timetable::models::Course;
use crate::timetable::models::Timetable; use crate::timetable::models::Timetable;
use crate::timetable::models::Type; use crate::timetable::models::Type;
use crate::utils::fill_hours;
const DISCLAIMER: &str = "(selection avec ESPACE, ENTRER pour valider)"; const DISCLAIMER: &str = "(selection avec ESPACE, ENTRER pour valider)";
@ -12,7 +13,7 @@ const DISCLAIMER: &str = "(selection avec ESPACE, ENTRER pour valider)";
pub fn timetable(timetable: Timetable) -> Timetable { pub fn timetable(timetable: Timetable) -> Timetable {
let mut my_timetable = timetable; let mut my_timetable = timetable;
/* courses(&mut my_timetable); */ courses(&mut my_timetable);
tdtp(&mut my_timetable); tdtp(&mut my_timetable);
my_timetable my_timetable
@ -57,16 +58,37 @@ fn courses(timetable: &mut Timetable) {
/// Filter the multiples TD/TP /// Filter the multiples TD/TP
fn tdtp(timetable: &mut Timetable) { fn tdtp(timetable: &mut Timetable) {
// Entry's name used for finding duplicates
let get_entry = |course: &Course| format!("{} - {:?}", course.name, course.typee); let get_entry = |course: &Course| format!("{} - {:?}", course.name, course.typee);
let mut hours = vec![];
fill_hours(&mut hours);
// Names showed to the users
let get_selection = |data: &(&Course, String)| {
format!(
"{} - {} {}-{}",
data.0.name,
data.1,
hours[data.0.start].split_once('-').unwrap().0,
hours[data.0.start + data.0.size - 1]
.split_once('-')
.unwrap()
.1
)
};
// List of courses who will be TP/TD
let mut td_or_tp = vec![]; let mut td_or_tp = vec![];
// Counter of appearing of TP/TD to know if a TP/TD have multiple possible course
let mut counts = HashMap::new(); let mut counts = HashMap::new();
timetable.1 .1.iter().for_each(|day| { timetable.1 .1.iter().for_each(|day| {
day.courses.iter().for_each(|course_opt| { day.courses.iter().for_each(|course_opt| {
if let Some(course) = course_opt { if let Some(course) = course_opt {
match course.typee { match course.typee {
Type::TD | Type::TP => { Type::TD | Type::TP => {
td_or_tp.push(course); td_or_tp.push((course, day.name.to_owned()));
let count = counts.entry(get_entry(course)).or_insert(0); let count = counts.entry(get_entry(course)).or_insert(0);
*count += 1; *count += 1;
} }
@ -75,13 +97,12 @@ fn tdtp(timetable: &mut Timetable) {
} }
}) })
}); });
// Keep only elements who have multiples TD/TP
td_or_tp.retain(|&course| *counts.get(&get_entry(course)).unwrap() > 1);
let multiselected = td_or_tp // Keep only elements who have multiples TD/TP
.iter() td_or_tp.retain(|course| *counts.get(&get_entry(course.0)).unwrap() > 1);
.map(|el| format!("{} - {}", el.name, el.size))
.collect::<Vec<String>>(); let mut multiselected: Vec<String> = td_or_tp.iter().map(|el| get_selection(el)).collect();
multiselected.sort();
let defaults = vec![true; multiselected.len()]; let defaults = vec![true; multiselected.len()];
let selections = MultiSelect::new() let selections = MultiSelect::new()
@ -91,12 +112,23 @@ fn tdtp(timetable: &mut Timetable) {
.interact() .interact()
.unwrap(); .unwrap();
// Keep only wanted courses
for day in &mut timetable.1 .1 { for day in &mut timetable.1 .1 {
day.courses.retain(|course_opt| { day.courses.retain(|course_opt| {
if let Some(course) = course_opt { if let Some(course) = course_opt {
// Keep if it's a course
if course.typee == Type::Cours {
return true;
}
// Keep if its an -only one course- TD/TP
if *counts.get(&get_entry(course)).unwrap() == 1 {
return true;
}
// Remove courses not followed // Remove courses not followed
for i in &selections { for i in &selections {
if course.name == multiselected[*i] { if get_selection(&(course, day.name.to_owned())) == multiselected[*i] {
return true; return true;
} }
} }