Implement the Edit Cancel button

fitnesstrax/app/src/components/day.rs

@@ -231,48 +231,9 @@ impl DayEdit {
 
         *s.imp().on_finished.borrow_mut() = Box::new(on_finished);
 
-        s.append(
+        s.append(&control_buttons(&s, &view_model));
-            &ActionGroup::builder()
-                .primary_action("Save", {
-                    let s = s.clone();
-                    let view_model = view_model.clone();
-                    move || {
-                        view_model.save();
-                        s.finish();
-                    }
-                })
-                .secondary_action("Cancel", {
-                    let s = s.clone();
-                    let view_model = view_model.clone();
-                    move || {
-                        view_model.revert();
-                        s.finish();
-                    }
-                })
-                .build(),
-        );
 
-        let top_row = gtk::Box::builder()
+        s.append(&weight_and_steps_row(&view_model));
-            .orientation(gtk::Orientation::Horizontal)
-            .build();
-        top_row.append(
-            &weight_editor(view_model.weight(), {
-                let view_model = view_model.clone();
-                move |w| {
-                    view_model.set_weight(w);
-                }
-            })
-            .widget(),
-        );
-
-        top_row.append(
-            &steps_editor(view_model.steps(), {
-                let view_model = view_model.clone();
-                move |s| view_model.set_steps(s)
-            })
-            .widget(),
-        );
-        s.append(&top_row);
 
         s
     }
@@ -281,3 +242,49 @@ impl DayEdit {
         (self.imp().on_finished.borrow())()
     }
 }
+
+fn control_buttons(s: &DayEdit, view_model: &DayDetailViewModel) -> ActionGroup {
+    ActionGroup::builder()
+        .primary_action("Save", {
+            let s = s.clone();
+            let view_model = view_model.clone();
+            move || {
+                view_model.save();
+                s.finish();
+            }
+        })
+        .secondary_action("Cancel", {
+            let s = s.clone();
+            let view_model = view_model.clone();
+            move || {
+                view_model.revert();
+                s.finish();
+            }
+        })
+        .build()
+}
+
+fn weight_and_steps_row(view_model: &DayDetailViewModel) -> gtk::Box {
+    let row = gtk::Box::builder()
+        .orientation(gtk::Orientation::Horizontal)
+        .build();
+    row.append(
+        &weight_editor(view_model.weight(), {
+            let view_model = view_model.clone();
+            move |w| {
+                view_model.set_weight(w);
+            }
+        })
+        .widget(),
+    );
+
+    row.append(
+        &steps_editor(view_model.steps(), {
+            let view_model = view_model.clone();
+            move |s| view_model.set_steps(s)
+        })
+        .widget(),
+    );
+
+    row
+}

fitnesstrax/app/src/view_models/day_detail.rs

@@ -95,43 +95,24 @@ pub struct DayDetailViewModel {
     weight: Arc<RwLock<Option<RecordState<ft_core::Weight>>>>,
     steps: Arc<RwLock<Option<RecordState<ft_core::Steps>>>>,
     records: Arc<RwLock<HashMap<RecordId, RecordState<TraxRecord>>>>,
+
+    original_records: Vec<Record<TraxRecord>>,
 }
 
 impl DayDetailViewModel {
     pub fn new(date: chrono::NaiveDate, records: Vec<Record<TraxRecord>>, app: App) -> Self {
-        let (weight_records, records): (Vec<Record<TraxRecord>>, Vec<Record<TraxRecord>>) =
+        let s = Self {
-            records.into_iter().partition(|r| r.data.is_weight());
-        let (step_records, records): (Vec<Record<TraxRecord>>, Vec<Record<TraxRecord>>) =
-            records.into_iter().partition(|r| r.data.is_steps());
-        Self {
             app: Some(app),
             date,
-            weight: Arc::new(RwLock::new(
-                weight_records
-                    .first()
-                    .and_then(|r| match r.data {
-                        TraxRecord::Weight(ref w) => Some((r.id.clone(), w.clone())),
-                        _ => None,
-                    })
-                    .map(|(id, w)| RecordState::Original(Record { id, data: w })),
-            )),
-            steps: Arc::new(RwLock::new(
-                step_records
-                    .first()
-                    .and_then(|r| match r.data {
-                        TraxRecord::Steps(ref w) => Some((r.id.clone(), w.clone())),
-                        _ => None,
-                    })
-                    .map(|(id, w)| RecordState::Original(Record { id, data: w })),
-            )),
 
-            records: Arc::new(RwLock::new(
+            weight: Arc::new(RwLock::new(None)),
-                records
+            steps: Arc::new(RwLock::new(None)),
-                    .into_iter()
+            records: Arc::new(RwLock::new(HashMap::new())),
-                    .map(|r| (r.id.clone(), RecordState::Original(r)))
+
-                    .collect::<HashMap<RecordId, RecordState<TraxRecord>>>(),
+            original_records: records,
-            )),
+        };
-        }
+        s.populate_records();
+        s
     }
 
     pub fn weight(&self) -> Option<si::Kilogram<f64>> {
@@ -273,7 +254,37 @@ impl DayDetailViewModel {
     }
 
     pub fn revert(&self) {
-        unimplemented!();
+        self.populate_records();
+    }
+
+    fn populate_records(&self) {
+        let records = self.original_records.clone();
+
+        let (weight_records, records): (Vec<Record<TraxRecord>>, Vec<Record<TraxRecord>>) =
+            records.into_iter().partition(|r| r.data.is_weight());
+        let (step_records, records): (Vec<Record<TraxRecord>>, Vec<Record<TraxRecord>>) =
+            records.into_iter().partition(|r| r.data.is_steps());
+
+        *self.weight.write().unwrap() = weight_records
+            .first()
+            .and_then(|r| match r.data {
+                TraxRecord::Weight(ref w) => Some((r.id.clone(), w.clone())),
+                _ => None,
+            })
+            .map(|(id, w)| RecordState::Original(Record { id, data: w }));
+
+        *self.steps.write().unwrap() = step_records
+            .first()
+            .and_then(|r| match r.data {
+                TraxRecord::Steps(ref w) => Some((r.id.clone(), w.clone())),
+                _ => None,
+            })
+            .map(|(id, w)| RecordState::Original(Record { id, data: w }));
+
+        *self.records.write().unwrap() = records
+            .into_iter()
+            .map(|r| (r.id.clone(), RecordState::Original(r)))
+            .collect::<HashMap<RecordId, RecordState<TraxRecord>>>();
     }
 }