Anri/cal8tor
Archived
1
0
Fork 2
Code Issues 6 Pull requests Releases 9 Activity

wip

Browse source
This commit is contained in:
Mylloon 2022-08-23 16:58:22 +02:00
parent 8b1d7c5b57
commit b7581584dc
Signed by: Anri
GPG key ID: A82D63DFF8D1317F
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/timetable.rs
View file

@ -367,21 +367,25 @@ pub fn display(timetable: (Vec<String>, (usize, Vec<models::Day>))) {
// For all the days // For all the days
for (j, day) in (&timetable.1 .1).iter().enumerate() { for (j, day) in (&timetable.1 .1).iter().enumerate() {
// True if we found something about the slot we are looking for
let mut info_slot = false;
// For all the courses of each days // For all the courses of each days
for (k, course_opt) in (&day.courses).iter().enumerate() { for (k, course_opt) in (&day.courses).iter().enumerate() {
match course_opt { match course_opt {
// If there is a course // If there is a course
Some(course) => { Some(course) => {
// Check if the course's hour // Check the course's hour
if i == k { if i == k {
if course.size != 1 { if course.size > 1 {
// If the course uses more than one time slot // If the course uses more than one time slot
next_skip.insert(course.start, &course.name); next_skip.insert(course.start, &course.name);
print!("{}{:^cl$}", sep, ""); print!("{}{:^cl$}", sep, "");
info_slot = true;
break; break;
} else { } else {
// Else simply print the course // Else simply print the course
print!("{}{:^cl$}", sep, &course.name); print!("{}{:^cl$}", sep, &course.name);
info_slot = true;
break; break;
} }
} }
@ -390,14 +394,19 @@ pub fn display(timetable: (Vec<String>, (usize, Vec<models::Day>))) {
None => { None => {
// Verify the "no course" is in the correct day and hour // Verify the "no course" is in the correct day and hour
if *days.get(&j).unwrap() == &day.name.to_string() && k == i { if *days.get(&j).unwrap() == &day.name.to_string() && k == i {
// If yes print empty row // If yes print empty row because there is no course
print!("{}{:^cl$}", sep, ""); print!("{}{:^cl$}", sep, "");
info_slot = true;
break; break;
} }
// Else it was a course of another day/time // Else it was a course of another day/time
} }
}; };
} }
if !info_slot {
// We found nothing about the slot because the precedent course
// takes more place than one slot
}
} }
print!("{}", sep); print!("{}", sep);
} }