Skip to content

Commit

Permalink
Add option to prefer exercise in training session
Browse files Browse the repository at this point in the history
  • Loading branch information
@treiher
treiher committed Oct 19, 2024
1 parent ebf3ae8 commit febc0bf
Show file tree
Hide file tree
Showing 2 changed files with 282 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Archiving of routines
- Button for saving changes during guided training session
- Settings for hiding UI elements related to RPE and TUT
- Option to prefer exercise in training session

### Changed

Expand Down
281 changes: 281 additions & 0 deletions frontend/src/page/training_session.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,7 @@ pub enum Msg {
FilterChanged(usize),
CreateExercise,
ReplaceExercise(usize, usize, u32),
PreferExercise(usize),
DeferExercise(usize),
AddSet(usize),
AddExercise(usize, usize, u32),
Expand Down Expand Up @@ -1192,6 +1193,13 @@ pub fn update(
.send_msg(Msg::SaveTrainingSession)
.send_msg(Msg::CloseDialog);
}
Msg::PreferExercise(element_idx) => {
prefer_exercise(&mut model.form.elements, element_idx);
update_metronome(model, orders, data_model.settings.automatic_metronome);
orders
.send_msg(Msg::SaveTrainingSession)
.send_msg(Msg::CloseDialog);
}
Msg::DeferExercise(element_idx) => {
defer_exercise(&mut model.form.elements, element_idx);
update_metronome(model, orders, data_model.settings.automatic_metronome);
Expand Down Expand Up @@ -1511,6 +1519,25 @@ fn replace_exercise(
}
}

fn prefer_exercise(elements: &mut [FormElement], element_idx: usize) {
let sections = determine_sections(elements);
let Some(preferred_section) = sections.iter().find(|s| (s.0..=s.1).contains(&element_idx))
else {
return;
};
if preferred_section.0 == 0 {
return;
}
let Some(deferred_section) = sections
.iter()
.find(|s| (s.0..=s.1).contains(&(preferred_section.0 - 1)))
else {
return;
};
elements[deferred_section.0..=preferred_section.1]
.rotate_right(preferred_section.1 - preferred_section.0 + 1);
}

fn defer_exercise(elements: &mut Vec<FormElement>, element_idx: usize) {
let mut deferred_ids = vec![];
let mut deferred_elements = 0;
Expand Down Expand Up @@ -2634,6 +2661,22 @@ fn view_options_dialog(element_idx: usize, exercise_idx: usize) -> Vec<Node<Msg>
span!["Replace exercise"],
]
]],
IF![exercise_idx == 0 =>
p![
C!["mt-3"],
a![
C!["has-text-weight-bold"],
ev(Ev::Click, move |_| Msg::PreferExercise(
element_idx
)),
span![
C!["icon-text"],
span![C!["icon"], i![C!["fas fa-arrow-turn-up"]]],
span!["Prefer exercise"],
]
]
]
],
IF![exercise_idx == 0 =>
p![
C!["mt-3"],
Expand Down Expand Up @@ -3046,6 +3089,208 @@ mod tests {
);
}

#[test]
fn test_prefer_exercise_first_set() {
let mut elements = vec![
set(vec![exercise(0, 0)]),
rest(0),
set(vec![exercise(1, 1)]),
rest(1),
set(vec![exercise(2, 2)]),
rest(2),
];
prefer_exercise(&mut elements, 0);
assert_eq!(
elements,
vec![
set(vec![exercise(0, 0)]),
rest(0),
set(vec![exercise(1, 1)]),
rest(1),
set(vec![exercise(2, 2)]),
rest(2),
]
);
}

#[test]
fn test_prefer_exercise_penultimate_set() {
let mut elements = vec![
set(vec![exercise(0, 0)]),
rest(0),
set(vec![exercise(1, 1)]),
rest(1),
set(vec![exercise(2, 2)]),
rest(2),
];
prefer_exercise(&mut elements, 2);
assert_eq!(
elements,
vec![
set(vec![exercise(1, 1)]),
rest(1),
set(vec![exercise(0, 0)]),
rest(0),
set(vec![exercise(2, 2)]),
rest(2),
]
);
}

#[test]
fn test_prefer_exercise_penultimate_set_without_trailing_rest() {
let mut elements = vec![
set(vec![exercise(0, 0)]),
rest(0),
set(vec![exercise(1, 1)]),
rest(1),
set(vec![exercise(2, 2)]),
];
prefer_exercise(&mut elements, 2);
assert_eq!(
elements,
vec![
set(vec![exercise(1, 1)]),
rest(1),
set(vec![exercise(0, 0)]),
rest(0),
set(vec![exercise(2, 2)]),
]
);
}

#[test]
fn test_prefer_exercise_last_set() {
let mut elements = vec![
set(vec![exercise(0, 0)]),
rest(0),
set(vec![exercise(1, 1)]),
rest(1),
set(vec![exercise(2, 2)]),
rest(2),
];
prefer_exercise(&mut elements, 4);
assert_eq!(
elements,
vec![
set(vec![exercise(0, 0)]),
rest(0),
set(vec![exercise(2, 2)]),
rest(2),
set(vec![exercise(1, 1)]),
rest(1),
]
);
}

#[test]
fn test_prefer_exercise_multiple_sets() {
let mut elements = vec![
set(vec![exercise(0, 0)]),
rest(0),
set(vec![exercise(1, 0)]),
rest(1),
set(vec![exercise(2, 1)]),
rest(2),
set(vec![exercise(3, 1)]),
rest(3),
set(vec![exercise(4, 2)]),
rest(4),
set(vec![exercise(5, 2)]),
rest(5),
];
prefer_exercise(&mut elements, 4);
assert_eq!(
elements,
vec![
set(vec![exercise(2, 1)]),
rest(2),
set(vec![exercise(3, 1)]),
rest(3),
set(vec![exercise(0, 0)]),
rest(0),
set(vec![exercise(1, 0)]),
rest(1),
set(vec![exercise(4, 2)]),
rest(4),
set(vec![exercise(5, 2)]),
rest(5),
]
);
}

#[test]
fn test_prefer_exercise_multiple_sets_last_set() {
let mut elements = vec![
set(vec![exercise(0, 0)]),
rest(0),
set(vec![exercise(1, 0)]),
rest(1),
set(vec![exercise(2, 1)]),
rest(2),
set(vec![exercise(3, 1)]),
rest(3),
set(vec![exercise(4, 2)]),
rest(4),
set(vec![exercise(5, 2)]),
rest(5),
];
prefer_exercise(&mut elements, 6);
assert_eq!(
elements,
vec![
set(vec![exercise(2, 1)]),
rest(2),
set(vec![exercise(3, 1)]),
rest(3),
set(vec![exercise(0, 0)]),
rest(0),
set(vec![exercise(1, 0)]),
rest(1),
set(vec![exercise(4, 2)]),
rest(4),
set(vec![exercise(5, 2)]),
rest(5),
]
);
}

#[test]
fn test_prefer_exercise_supersets() {
let mut elements = vec![
set(vec![exercise(0, 0), exercise(1, 1)]),
rest(0),
set(vec![exercise(2, 0), exercise(3, 1)]),
rest(1),
set(vec![exercise(4, 0), exercise(5, 2)]),
rest(2),
set(vec![exercise(6, 0), exercise(7, 2)]),
rest(3),
set(vec![exercise(8, 1), exercise(9, 2)]),
rest(4),
set(vec![exercise(10, 1), exercise(11, 2)]),
rest(5),
];
prefer_exercise(&mut elements, 4);
assert_eq!(
elements,
vec![
set(vec![exercise(4, 0), exercise(5, 2)]),
rest(2),
set(vec![exercise(6, 0), exercise(7, 2)]),
rest(3),
set(vec![exercise(0, 0), exercise(1, 1)]),
rest(0),
set(vec![exercise(2, 0), exercise(3, 1)]),
rest(1),
set(vec![exercise(8, 1), exercise(9, 2)]),
rest(4),
set(vec![exercise(10, 1), exercise(11, 2)]),
rest(5),
]
);
}

#[test]
fn test_defer_exercise_first_set() {
let mut elements = vec![
Expand Down Expand Up @@ -3177,6 +3422,42 @@ mod tests {
);
}

#[test]
fn test_defer_exercise_multiple_sets_last_set() {
let mut elements = vec![
set(vec![exercise(0, 0)]),
rest(0),
set(vec![exercise(1, 0)]),
rest(1),
set(vec![exercise(2, 1)]),
rest(2),
set(vec![exercise(3, 1)]),
rest(3),
set(vec![exercise(4, 2)]),
rest(4),
set(vec![exercise(5, 2)]),
rest(5),
];
defer_exercise(&mut elements, 2);
assert_eq!(
elements,
vec![
set(vec![exercise(0, 0)]),
rest(0),
set(vec![exercise(2, 1)]),
rest(2),
set(vec![exercise(3, 1)]),
rest(3),
set(vec![exercise(1, 0)]),
rest(1),
set(vec![exercise(4, 2)]),
rest(4),
set(vec![exercise(5, 2)]),
rest(5),
]
);
}

#[test]
fn test_defer_exercise_supersets() {
let mut elements = vec![
Expand Down

0 comments on commit febc0bf

Please sign in to comment.