savanni
/
monorepo
1
0
Fork 0
Code Issues 68 Pull Requests Projects 6 Releases Wiki Activity

Add the ability to edit the time of a workout and the associated activity. #183

Merged
savanni merged 5 commits from fitnesstrax/edit-time-and-activity into main 2024-02-09 13:31:40 +00:00
Conversation 0 Commits 5 Files Changed 5 +23 -10
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 291dc32fe5 - Show all commits

17
fitnesstrax/app/src/components/day.rs
View File

@ -24,7 +24,7 @@ use crate::{
view_models::DayDetailViewModel, view_models::DayDetailViewModel,
}; };
use emseries::{Record, RecordId}; use emseries::{Record, RecordId};
use ft_core::{TimeDistanceActivity, TraxRecord}; use ft_core::{TimeDistanceActivity, TraxRecord, TIME_DISTANCE_ACTIVITIES};
use glib::Object; use glib::Object;
use gtk::{prelude::*, subclass::prelude::*}; use gtk::{prelude::*, subclass::prelude::*};
use std::{cell::RefCell, rc::Rc}; use std::{cell::RefCell, rc::Rc};
@ -105,12 +105,15 @@ impl DaySummary {
row.append(&label); row.append(&label);
self.append(&row); self.append(&row);
let biking_summary = view_model.time_distance_summary(TimeDistanceActivity::BikeRide); for activity in TIME_DISTANCE_ACTIVITIES {
if let Some(label) = time_distance_summary( let summary = view_model.time_distance_summary(activity);
DistanceFormatter::from(biking_summary.0), if let Some(label) = time_distance_summary(
DurationFormatter::from(biking_summary.1), activity,
) { DistanceFormatter::from(summary.0),
self.append(&label); DurationFormatter::from(summary.1),
) {
self.append(&label);
}
} }
} }
} }

16
fitnesstrax/app/src/components/time_distance.rs
View File

@ -25,17 +25,27 @@ use gtk::{prelude::*, subclass::prelude::*};
use std::{cell::RefCell, rc::Rc}; use std::{cell::RefCell, rc::Rc};
pub fn time_distance_summary( pub fn time_distance_summary(
activity: TimeDistanceActivity,
distance: DistanceFormatter, distance: DistanceFormatter,
duration: DurationFormatter, duration: DurationFormatter,
) -> Option<gtk::Label> { ) -> Option<gtk::Label> {
let text = match (*distance > si::M, *duration > si::S) { let text = match (*distance > si::M, *duration > si::S) {
(true, true) => Some(format!( (true, true) => Some(format!(
"{} of biking in {}", "{} of {:?} in {}",
distance.format(FormatOption::Full), distance.format(FormatOption::Full),
activity,
duration.format(FormatOption::Full) duration.format(FormatOption::Full)
)), )),
(true, false) => Some(format!("{} of biking", distance.format(FormatOption::Full))), (true, false) => Some(format!(
(false, true) => Some(format!("{} of biking", duration.format(FormatOption::Full))), "{} of {:?}",
distance.format(FormatOption::Full),
activity
)),
(false, true) => Some(format!(
"{} of {:?}",
duration.format(FormatOption::Full),
activity
)),
(false, false) => None, (false, false) => None,
}; };