Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Separate exercise list into current/previous exercises #69

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+108 −56
Open

Separate exercise list into current/previous exercises #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0eb5713
Separate exercise list into current/previous exercises
senier Dec 19, 2024
4827fbd
Fix typo
senier Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
162 changes: 107 additions & 55 deletions frontend/src/ui/component/exercise_list.rs
View file
Open in desktop
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a changelog entry for this change.

Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
use chrono::{Duration, Local};
use seed::{prelude::*, *};
use std::collections::BTreeSet;

use crate::{
domain,
ui::{common, data},
};

const CURRENT_EXERCISE_CUTOFF_DAYS: i64 = 31;

// ------ ------
// Model
// ------ ------
Expand Down Expand Up @@ -120,20 +124,49 @@ pub fn update(msg: Msg, model: &mut Model, _orders: &mut impl Orders<Msg>) -> Ou
// ------ ------

pub fn view(model: &Model, loading: bool, data_model: &data::Model) -> Vec<Node<Msg>> {
let cutoff = Local::now().date_naive() - Duration::days(CURRENT_EXERCISE_CUTOFF_DAYS);
let muscle_filter = domain::Muscle::iter()
.map(|m| (m, model.filter.muscles.contains(m)))
.collect::<Vec<_>>();

let current_exercise_ids = data_model
.training_sessions
.iter()
.filter(|(_, s)| s.date >= cutoff)
.flat_map(|(_, session)| session.exercises())
.collect::<BTreeSet<_>>();

let previous_exercise_ids = data_model
.training_sessions
.iter()
.filter(|(_, s)| s.date < cutoff)
.flat_map(|(_, session)| session.exercises())
.collect::<BTreeSet<_>>();

let exercises = data_model.exercises(&model.filter);
let mut exercises = exercises

let mut current_exercises = exercises
.iter()
.filter(|e| {
e.name
.to_lowercase()
.contains(model.search_term.to_lowercase().trim())
&& (current_exercise_ids.contains(&e.id) || !previous_exercise_ids.contains(&e.id))
})
.collect::<Vec<_>>();
exercises.sort_by(|a, b| a.name.cmp(&b.name));
current_exercises.sort_by(|a, b| a.name.cmp(&b.name));

let mut previous_exercises = exercises
.iter()
.filter(|e| {
e.name
.to_lowercase()
.contains(model.search_term.to_lowercase().trim())
&& !current_exercise_ids.contains(&e.id)
&& previous_exercise_ids.contains(&e.id)
})
.collect::<Vec<_>>();
previous_exercises.sort_by(|a, b| a.name.cmp(&b.name));

nodes![
IF![model.view_filter_dialog => view_filter_dialog(&muscle_filter, exercises.len())],
Expand All @@ -154,7 +187,7 @@ pub fn view(model: &Model, loading: bool, data_model: &data::Model) -> Vec<Node<
if model.view_create {
let disabled = loading
|| model.search_term.is_empty()
|| exercises
|| current_exercises
.iter()
.any(|e| e.name == *model.search_term.trim());
div![
Expand Down Expand Up @@ -202,61 +235,80 @@ pub fn view(model: &Model, loading: bool, data_model: &data::Model) -> Vec<Node<
})
],
],
div![
C!["table-container"],
C!["mt-2"],
table![
C!["table"],
C!["is-fullwidth"],
C!["is-hoverable"],
tbody![exercises.iter().map(|e| {
tr![td![
C!["is-flex"],
C!["is-justify-content-space-between"],
C!["has-text-link"],
span![
ev(Ev::Click, {
let exercise_id = e.id;
move |_| Msg::Selected(exercise_id)
}),
e.name.to_string(),
],
p![
C!["is-flex is-flex-wrap-nowrap"],
if model.view_edit {
a![
C!["icon"],
C!["mr-1"],
ev(Ev::Click, {
let exercise_id = e.id;
move |_| Msg::EditClicked(exercise_id)
}),
i![C!["fas fa-edit"]]
]
} else {
empty![]
},
if model.view_delete {
a![
C!["icon"],
C!["ml-1"],
ev(Ev::Click, {
let exercise_id = e.id;
move |_| Msg::DeleteClicked(exercise_id)
}),
i![C!["fas fa-times"]]
]
} else {
empty![]
}
]
]]
})],
]
],
view_exercises(model, &current_exercises),
IF![!previous_exercises.is_empty() => nodes!(
div![
C!["container"],
C!["has-text-centered"],
C![format!("mb-3")],
common::view_element_with_description(
h1![C!["title"], C!["is-5"], "Previous exercises"],
&format!("Exercises not performed within the last {CURRENT_EXERCISE_CUTOFF_DAYS} days")
),
],
view_exercises(model, &previous_exercises))
]
]
}

fn view_exercises(model: &Model, exercises: &[&&domain::Exercise]) -> Vec<Node<Msg>> {
if exercises.is_empty() {
return vec![];
}
nodes![div![
C!["table-container"],
C!["mt-2"],
table![
C!["table"],
C!["is-fullwidth"],
C!["is-hoverable"],
tbody![exercises.iter().map(|e| {
tr![td![
C!["is-flex"],
C!["is-justify-content-space-between"],
C!["has-text-link"],
span![
ev(Ev::Click, {
let exercise_id = e.id;
move |_| Msg::Selected(exercise_id)
}),
e.name.to_string(),
],
p![
C!["is-flex is-flex-wrap-nowrap"],
if model.view_edit {
a![
C!["icon"],
C!["mr-1"],
ev(Ev::Click, {
let exercise_id = e.id;
move |_| Msg::EditClicked(exercise_id)
}),
i![C!["fas fa-edit"]]
]
} else {
empty![]
},
if model.view_delete {
a![
C!["icon"],
C!["ml-1"],
ev(Ev::Click, {
let exercise_id = e.id;
move |_| Msg::DeleteClicked(exercise_id)
}),
i![C!["fas fa-times"]]
]
} else {
empty![]
}
]
]]
})],
]
]]
}

fn view_filter_dialog(
muscle_filter: &[(&domain::Muscle, bool)],
exercise_count: usize,
Expand Down
2 changes: 1 addition & 1 deletion valens/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def main() -> int:
parser_demo.add_argument(
"--public",
action="store_true",
help="make the server publicly available (sould be only used on a trusted network)",
help="make the server publicly available (should only be used on a trusted network)",
)
parser_demo.add_argument(
"--port",
Expand Down
Loading