Show and edit the details of a day #133

Merged
savanni merged 9 commits from fitnesstrax/day-detail into main 2023-12-29 16:01:36 +00:00
4 changed files with 83 additions and 55 deletions
Showing only changes of commit 04a48574d3 - Show all commits

View File

@ -178,7 +178,7 @@ impl fmt::Display for RecordId {
/// directly, as the database will create them. /// directly, as the database will create them.
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] #[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
pub struct Record<T: Clone + Recordable> { pub struct Record<T: Clone + Recordable> {
pub(crate) id: RecordId, pub id: RecordId,
pub data: T, pub data: T,
} }

View File

@ -32,7 +32,6 @@ use std::{cell::RefCell, path::PathBuf, rc::Rc};
#[derive(Clone)] #[derive(Clone)]
pub struct AppWindow { pub struct AppWindow {
app: App, app: App,
app_id: String,
layout: gtk::Box, layout: gtk::Box,
current_view: Rc<RefCell<View>>, current_view: Rc<RefCell<View>>,
settings: gio::Settings, settings: gio::Settings,
@ -106,7 +105,6 @@ impl AppWindow {
let s = Self { let s = Self {
app: ft_app, app: ft_app,
app_id: app_id.to_owned(),
layout, layout,
current_view: Rc::new(RefCell::new(initial_view)), current_view: Rc::new(RefCell::new(initial_view)),
settings: gio::Settings::new(app_id), settings: gio::Settings::new(app_id),

View File

@ -17,10 +17,11 @@ You should have received a copy of the GNU General Public License along with Fit
// use chrono::NaiveDate; // use chrono::NaiveDate;
// use ft_core::TraxRecord; // use ft_core::TraxRecord;
use dimensioned::si; use dimensioned::si;
use emseries::Record;
use ft_core::{RecordType, TimeDistance, TraxRecord, Weight}; use ft_core::{RecordType, TimeDistance, TraxRecord, Weight};
use glib::Object; use glib::Object;
use gtk::{prelude::*, subclass::prelude::*}; use gtk::{prelude::*, subclass::prelude::*};
use std::cell::RefCell; use std::{cell::RefCell, rc::Rc};
pub struct DaySummaryPrivate { pub struct DaySummaryPrivate {
date: gtk::Label, date: gtk::Label,
@ -66,7 +67,7 @@ impl DaySummary {
s s
} }
pub fn set_data(&self, date: chrono::NaiveDate, records: Vec<TraxRecord>) { pub fn set_data(&self, date: chrono::NaiveDate, records: Vec<Record<TraxRecord>>) {
self.imp() self.imp()
.date .date
.set_text(&date.format("%Y-%m-%d").to_string()); .set_text(&date.format("%Y-%m-%d").to_string());
@ -75,8 +76,10 @@ impl DaySummary {
self.remove(weight_label); self.remove(weight_label);
} }
if let Some(TraxRecord::Weight(weight_record)) = if let Some(Record {
records.iter().filter(|f| f.is_weight()).next() data: TraxRecord::Weight(weight_record),
..
}) = records.iter().filter(|f| f.data.is_weight()).next()
{ {
let label = gtk::Label::builder() let label = gtk::Label::builder()
.halign(gtk::Align::Start) .halign(gtk::Align::Start)
@ -128,37 +131,71 @@ glib::wrapper! {
} }
impl DayDetail { impl DayDetail {
pub fn new(date: chrono::NaiveDate, records: Vec<TraxRecord>) -> Self { pub fn new(date: chrono::NaiveDate, records: Vec<Record<TraxRecord>>) -> Self {
let s: Self = Object::builder().build(); let s: Self = Object::builder().build();
s.set_orientation(gtk::Orientation::Vertical); s.set_orientation(gtk::Orientation::Vertical);
let click_controller = gtk::GestureClick::new();
click_controller.connect_released({
let s = s.clone();
move |_, _, _, _| {
println!("clicked outside of focusable entity");
if let Some(widget) = s.focus_child().and_downcast_ref::<WeightView>() {
println!("focused child is the weight view");
widget.blur();
}
}
});
s.add_controller(click_controller);
let weight_record = records.iter().find_map(|record| match record { let weight_record = records.iter().find_map(|record| match record {
TraxRecord::Weight(record) => Some(record.clone()), Record {
id,
data: TraxRecord::Weight(record),
} => Some((id.clone(), record.clone())),
_ => None, _ => None,
}); });
let weight_view = WeightView::new(weight_record, |weight| { let weight_view = match weight_record {
println!("on_blur on the weight view: {:?}", weight) Some((unique_id, record)) => WeightView::new(Some(record), move |weight| {
}); println!(
"on_blur on the weight view. Need to record {:?}, {:?}",
unique_id, weight
);
}),
None => WeightView::new(None, |weight| {
println!(
"on_blur on the weight view. Need to create a new record for {:?}",
weight
);
}),
};
s.append(&weight_view); s.append(&weight_view);
records.into_iter().for_each(|record| { records.into_iter().for_each(|record| {
let record_view = match record { let record_view = match record {
TraxRecord::BikeRide(record) => Some( Record {
data: TraxRecord::BikeRide(record),
..
} => Some(
TimeDistanceView::new(RecordType::BikeRide, record).upcast::<gtk::Widget>(), TimeDistanceView::new(RecordType::BikeRide, record).upcast::<gtk::Widget>(),
), ),
TraxRecord::Row(record) => { Record {
Some(TimeDistanceView::new(RecordType::Row, record).upcast::<gtk::Widget>()) data: TraxRecord::Row(record),
} ..
TraxRecord::Run(record) => { } => Some(TimeDistanceView::new(RecordType::Row, record).upcast::<gtk::Widget>()),
Some(TimeDistanceView::new(RecordType::Row, record).upcast::<gtk::Widget>()) Record {
} data: TraxRecord::Run(record),
TraxRecord::Swim(record) => { ..
Some(TimeDistanceView::new(RecordType::Row, record).upcast::<gtk::Widget>()) } => Some(TimeDistanceView::new(RecordType::Row, record).upcast::<gtk::Widget>()),
} Record {
TraxRecord::Walk(record) => { data: TraxRecord::Swim(record),
Some(TimeDistanceView::new(RecordType::Row, record).upcast::<gtk::Widget>()) ..
} } => Some(TimeDistanceView::new(RecordType::Row, record).upcast::<gtk::Widget>()),
Record {
data: TraxRecord::Walk(record),
..
} => Some(TimeDistanceView::new(RecordType::Row, record).upcast::<gtk::Widget>()),
_ => None, _ => None,
}; };
@ -179,6 +216,7 @@ pub struct WeightViewPrivate {
view: RefCell<gtk::Label>, view: RefCell<gtk::Label>,
edit: RefCell<gtk::Entry>, edit: RefCell<gtk::Entry>,
current: RefCell<gtk::Widget>, current: RefCell<gtk::Widget>,
on_edit_finished: RefCell<Box<dyn Fn(si::Kilogram<f64>)>>,
} }
impl Default for WeightViewPrivate { impl Default for WeightViewPrivate {
@ -197,6 +235,7 @@ impl Default for WeightViewPrivate {
view: RefCell::new(view), view: RefCell::new(view),
edit: RefCell::new(edit), edit: RefCell::new(edit),
current: RefCell::new(current.upcast()), current: RefCell::new(current.upcast()),
on_edit_finished: RefCell::new(Box::new(|_| {})),
} }
} }
} }
@ -217,12 +256,14 @@ glib::wrapper! {
} }
impl WeightView { impl WeightView {
pub fn new<OnBlur>(weight: Option<Weight>, on_blur: OnBlur) -> Self pub fn new<OnEditFinished>(weight: Option<Weight>, on_edit_finished: OnEditFinished) -> Self
where where
OnBlur: Fn(si::Kilogram<f64>), OnEditFinished: Fn(si::Kilogram<f64>) + 'static,
{ {
let s: Self = Object::builder().build(); let s: Self = Object::builder().build();
*s.imp().on_edit_finished.borrow_mut() = Box::new(on_edit_finished);
*s.imp().record.borrow_mut() = weight; *s.imp().record.borrow_mut() = weight;
s.view(); s.view();
@ -234,16 +275,7 @@ impl WeightView {
} }
}); });
let edit_click_controller = gtk::GestureClick::new();
edit_click_controller.connect_released({
let s = s.clone();
move |_, _, _, _| {
s.view();
}
});
s.imp().view.borrow().add_controller(view_click_controller); s.imp().view.borrow().add_controller(view_click_controller);
s.imp().edit.borrow().add_controller(edit_click_controller);
s s
} }
@ -278,6 +310,13 @@ impl WeightView {
self.append(&new_view); self.append(&new_view);
*current = new_view; *current = new_view;
} }
fn blur(&self) {
if *self.imp().current.borrow() == *self.imp().edit.borrow() {
self.imp().on_edit_finished.borrow()(0. * si::KG);
self.view();
}
}
} }
#[derive(Default)] #[derive(Default)]

View File

@ -48,18 +48,13 @@ glib::wrapper! {
impl HistoricalView { impl HistoricalView {
pub fn new<SelectFn>(records: Vec<Record<TraxRecord>>, on_select_day: Rc<SelectFn>) -> Self pub fn new<SelectFn>(records: Vec<Record<TraxRecord>>, on_select_day: Rc<SelectFn>) -> Self
where where
SelectFn: Fn(chrono::NaiveDate, Vec<TraxRecord>) + 'static, SelectFn: Fn(chrono::NaiveDate, Vec<Record<TraxRecord>>) + 'static,
{ {
let s: Self = Object::builder().build(); let s: Self = Object::builder().build();
s.set_orientation(gtk::Orientation::Vertical); s.set_orientation(gtk::Orientation::Vertical);
s.set_css_classes(&["historical"]); s.set_css_classes(&["historical"]);
let day_records: GroupedRecords = GroupedRecords::from( let day_records: GroupedRecords = GroupedRecords::from(records);
records
.into_iter()
.map(|r| r.data)
.collect::<Vec<TraxRecord>>(),
);
let model = gio::ListStore::new::<DayRecords>(); let model = gio::ListStore::new::<DayRecords>();
model.extend_from_slice(&day_records.0); model.extend_from_slice(&day_records.0);
@ -116,7 +111,7 @@ impl HistoricalView {
#[derive(Default)] #[derive(Default)]
pub struct DayRecordsPrivate { pub struct DayRecordsPrivate {
date: RefCell<chrono::NaiveDate>, date: RefCell<chrono::NaiveDate>,
records: RefCell<Vec<TraxRecord>>, records: RefCell<Vec<Record<TraxRecord>>>,
} }
#[glib::object_subclass] #[glib::object_subclass]
@ -132,7 +127,7 @@ glib::wrapper! {
} }
impl DayRecords { impl DayRecords {
pub fn new(date: chrono::NaiveDate, records: Vec<TraxRecord>) -> Self { pub fn new(date: chrono::NaiveDate, records: Vec<Record<TraxRecord>>) -> Self {
let s: Self = Object::builder().build(); let s: Self = Object::builder().build();
*s.imp().date.borrow_mut() = date; *s.imp().date.borrow_mut() = date;
@ -145,30 +140,26 @@ impl DayRecords {
self.imp().date.borrow().clone() self.imp().date.borrow().clone()
} }
pub fn records(&self) -> Vec<TraxRecord> { pub fn records(&self) -> Vec<Record<TraxRecord>> {
self.imp().records.borrow().clone() self.imp().records.borrow().clone()
} }
pub fn add_record(&self, record: TraxRecord) { pub fn add_record(&self, record: Record<TraxRecord>) {
self.imp().records.borrow_mut().push(record); self.imp().records.borrow_mut().push(record);
} }
} }
struct GroupedRecords(Vec<DayRecords>); struct GroupedRecords(Vec<DayRecords>);
impl From<Vec<TraxRecord>> for GroupedRecords { impl From<Vec<Record<TraxRecord>>> for GroupedRecords {
fn from(records: Vec<TraxRecord>) -> GroupedRecords { fn from(records: Vec<Record<TraxRecord>>) -> GroupedRecords {
GroupedRecords( GroupedRecords(
records records
.into_iter() .into_iter()
.fold(HashMap::new(), |mut acc, rec| { .fold(HashMap::new(), |mut acc, rec| {
let date = match rec.timestamp() { acc.entry(rec.date())
Timestamp::DateTime(dtz) => dtz.date_naive(),
Timestamp::Date(date) => date,
};
acc.entry(date)
.and_modify(|entry: &mut DayRecords| (*entry).add_record(rec.clone())) .and_modify(|entry: &mut DayRecords| (*entry).add_record(rec.clone()))
.or_insert(DayRecords::new(date, vec![rec])); .or_insert(DayRecords::new(rec.date(), vec![rec]));
acc acc
}) })
.values() .values()