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

Switch to the updated emseries record type

This commit is contained in:
Savanni D'Gerinel 2023-12-27 17:14:47 -05:00
parent 04a48574d3
commit 6d9e2ea382
4 changed files with 49 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fitnesstrax/app/src/app.rs
View File

@ -18,7 +18,7 @@ use chrono::NaiveDate;
use emseries::{time_range, Record, RecordId, Series, Timestamp}; use emseries::{time_range, Record, RecordId, Series, Timestamp};
use ft_core::TraxRecord; use ft_core::TraxRecord;
use std::{ use std::{
path::{Path, PathBuf}, path::PathBuf,
sync::{Arc, RwLock}, sync::{Arc, RwLock},
}; };
use tokio::runtime::Runtime; use tokio::runtime::Runtime;

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

@ -157,10 +157,10 @@ impl DayDetail {
}); });
let weight_view = match weight_record { let weight_view = match weight_record {
Some((unique_id, record)) => WeightView::new(Some(record), move |weight| { Some((id, record)) => WeightView::new(Some(record.clone()), move |weight| {
println!( println!(
"on_blur on the weight view. Need to record {:?}, {:?}", "on_blur on the weight view. Need to record {:?}, {:?}",
unique_id, weight id, weight
); );
}), }),
None => WeightView::new(None, |weight| { None => WeightView::new(None, |weight| {

76
fitnesstrax/app/src/views/historical_view.rs
View File

@ -173,7 +173,6 @@ impl From<Vec<Record<TraxRecord>>> for GroupedRecords {
mod test { mod test {
use super::GroupedRecords; use super::GroupedRecords;
use chrono::{FixedOffset, NaiveDate, TimeZone}; use chrono::{FixedOffset, NaiveDate, TimeZone};
use chrono_tz::America::Anchorage;
use dimensioned::si::{KG, M, S}; use dimensioned::si::{KG, M, S};
use emseries::{Record, RecordId}; use emseries::{Record, RecordId};
use ft_core::{Steps, TimeDistance, TraxRecord, Weight}; use ft_core::{Steps, TimeDistance, TraxRecord, Weight};
@ -181,36 +180,51 @@ mod test {
#[test] #[test]
fn groups_records() { fn groups_records() {
let records = vec![ let records = vec![
TraxRecord::Steps(Steps { Record {
date: NaiveDate::from_ymd_opt(2023, 10, 13).unwrap(), id: RecordId::default(),
count: 1500, data: TraxRecord::Steps(Steps {
}), date: NaiveDate::from_ymd_opt(2023, 10, 13).unwrap(),
TraxRecord::Weight(Weight { count: 1500,
date: NaiveDate::from_ymd_opt(2023, 10, 13).unwrap(), }),
weight: 85. * KG, },
}), Record {
TraxRecord::Weight(Weight { id: RecordId::default(),
date: NaiveDate::from_ymd_opt(2023, 10, 14).unwrap(), data: TraxRecord::Weight(Weight {
weight: 86. * KG, date: NaiveDate::from_ymd_opt(2023, 10, 13).unwrap(),
}), weight: 85. * KG,
TraxRecord::BikeRide(TimeDistance { }),
datetime: FixedOffset::west_opt(10 * 60 * 60) },
.unwrap() Record {
.with_ymd_and_hms(2019, 6, 15, 12, 0, 0) id: RecordId::default(),
.unwrap(), data: TraxRecord::Weight(Weight {
distance: Some(1000. * M), date: NaiveDate::from_ymd_opt(2023, 10, 14).unwrap(),
duration: Some(150. * S), weight: 86. * KG,
comments: Some("Test Comments".to_owned()), }),
}), },
TraxRecord::BikeRide(TimeDistance { Record {
datetime: FixedOffset::west_opt(10 * 60 * 60) id: RecordId::default(),
.unwrap() data: TraxRecord::BikeRide(TimeDistance {
.with_ymd_and_hms(2019, 6, 15, 23, 0, 0) datetime: FixedOffset::west_opt(10 * 60 * 60)
.unwrap(), .unwrap()
distance: Some(1000. * M), .with_ymd_and_hms(2019, 6, 15, 12, 0, 0)
duration: Some(150. * S), .unwrap(),
comments: Some("Test Comments".to_owned()), distance: Some(1000. * M),
}), duration: Some(150. * S),
comments: Some("Test Comments".to_owned()),
}),
},
Record {
id: RecordId::default(),
data: TraxRecord::BikeRide(TimeDistance {
datetime: FixedOffset::west_opt(10 * 60 * 60)
.unwrap()
.with_ymd_and_hms(2019, 6, 15, 23, 0, 0)
.unwrap(),
distance: Some(1000. * M),
duration: Some(150. * S),
comments: Some("Test Comments".to_owned()),
}),
},
]; ];
let groups = GroupedRecords::from(records).0; let groups = GroupedRecords::from(records).0;

1
fitnesstrax/core/src/lib.rs
View File

@ -1,3 +1,4 @@
mod legacy; mod legacy;
mod types; mod types;
pub use types::{RecordType, Steps, TimeDistance, TraxRecord, Weight}; pub use types::{RecordType, Steps, TimeDistance, TraxRecord, Weight};