fix initial picker registration

DailyDozen/DailyDozen/Database/RealmProvider.swift

@@ -49,6 +49,30 @@ class RealmProvider {
  return (amWeightRecord, pmWeightRecord)
  }
 
+ func getDailyWeights(fromDate: Date, toDate: Date) -> (am: [DataWeightRecord], pm: [DataWeightRecord]) {
+ var amRecords = [DataWeightRecord]()
+ var pmRecords = [DataWeightRecord]()
+ let weightResults = realm.objects(DataWeightRecord.self)
+ let weightResultsById = weightResults.sorted(byKeyPath: "pid")
+
+ let fromDateKey = fromDate.datestampKey
+ let toDateKey = toDate.datestampKey
+
+ for dataWeightRecord in weightResultsById {
+ let pidKeys = dataWeightRecord.pidKeys
+ if pidKeys.datestampKey >= fromDateKey &&
+ pidKeys.datestampKey <= toDateKey {
+ if pidKeys.typeKey == "am" {
+ amRecords.append(dataWeightRecord)
+ } else {
+ pmRecords.append(dataWeightRecord)
+ }
+ }
+ }
+
+ return (amRecords, pmRecords)
+ }
+
  /// :REPLACES: getDozeLegacy(Date)
  func getDailyTracker(date: Date) -> DailyTracker {
  let datestampKey = date.datestampKey

DailyDozen/DailyDozen/Weight/WeightViewController.swift

@@ -147,16 +147,19 @@ class WeightViewController: UIViewController {
  // MARK: - UIViewController
  override func viewDidLoad() {
  super.viewDidLoad()
+
  weightPM.delegate = self
  weightAM.delegate = self
- setViewModel(viewDate: Date())
+ timeAMInput.delegate = self
+ timePMInput.delegate = self
 
  guard let appDelegate = UIApplication.shared.delegate as? AppDelegate else {
  return
  }
  appDelegate.realmDelegate = self
 
  // AM Morning
+ // :===: timePickerAM = UIDatePicker() // may need contraints?
  timePickerAM = UIDatePicker(frame: CGRect())
  timePickerAM?.datePickerMode = .time
  timePickerAM?.addTarget(self, action: #selector(WeightViewController.timeChangedAM(timePicker:)), for: .valueChanged)
@@ -169,6 +172,8 @@ class WeightViewController: UIViewController {
  timePickerPM?.addTarget(self, action: #selector(WeightViewController.timeChangedPM(timePicker:)), for: .valueChanged)
  timePMInput.inputView = timePickerPM
 
+ setViewModel(viewDate: Date())
+
  // Unit Type
  if isImperial() {
  weightAMLabel.text = "lbs."
@@ -185,6 +190,7 @@ class WeightViewController: UIViewController {
  }
 
  override func viewWillDisappear(_ animated: Bool) {
+ super.viewWillDisappear(animated)
  // Update stored values
  saveWeightAM()
  saveWeightPM()
@@ -252,6 +258,7 @@ class WeightViewController: UIViewController {
  } else {
  timeAMInput.text = ""
  weightAM.text = ""
+ timePickerAM?.setDate(Date(), animated: false)
  }
 
  if let pmRecord = records.pm {
@@ -267,6 +274,7 @@ class WeightViewController: UIViewController {
  } else {
  timePMInput.text = ""
  weightPM.text = ""
+ timePickerPM?.setDate(Date(), animated: false)
  }
  }
 
@@ -312,6 +320,18 @@ extension WeightViewController: UITextFieldDelegate {
  // :1:
  func textFieldShouldBeginEditing(_ textField: UITextField) -> Bool {
  print("textFieldShouldBeginEditing")
+
+ // :===: should solve initial picker registration
+ if textField.text == nil || textField.text!.isEmpty {
+ let dateFormatter = DateFormatter()
+ dateFormatter.dateFormat = "hh:mm a"
+ if textField == timeAMInput {
+ timeAMInput.text = dateFormatter.string(from: Date())
+ }
+ if textField == timePMInput {
+ timePMInput.text = dateFormatter.string(from: Date())
+ }
+ }
  return true // return NO to disallow editing.
  }
  // :2:

DailyDozen/DailyDozen/WeightHistory/WeightHistoryViewController.swift

@@ -43,11 +43,12 @@ class WeightHistoryViewController: UIViewController {
  // MARK: - Properties
  private var weightViewModel: WeightHistoryViewModel! // :???:
  private var currentTimeScale = TimeScale.day
+ private let realm = RealmProvider()
 
  private var chartSettings: (year: Int, month: Int)! {
  didSet {
  lineChartView.clear()
-
+ 
  if currentTimeScale == .day {
  controlPanel.isHidden = false
  controlPanel.superview?.isHidden = false
@@ -144,20 +145,53 @@ class WeightHistoryViewController: UIViewController {
  }
 
  func updateChart(from: Date, to: Date) {
- var dataEntriesAM = [
- ChartDataEntry(x: 1.0, y: 144.3),
- ChartDataEntry(x: 3.0, y: 143.5),
- ]
- dataEntriesAM.append(ChartDataEntry(x: 4.0, y: 144.5))
+ //var dataEntriesAM = [
+ // ChartDataEntry(x: 1.0, y: 144.3),
+ // ChartDataEntry(x: 3.0, y: 143.5),
+ //]
+ //dataEntriesAM.append(ChartDataEntry(x: 4.0, y: 144.5))
+ var dataEntriesAM = [ChartDataEntry]()
+
+ //let dataEntriesPM = [
+ // ChartDataEntry(x: 2.0, y: 144.9),
+ // ChartDataEntry(x: 3.0, y: 144.0),
+ // ChartDataEntry(x: 5.0, y: 144.0)
+ //]
+ var dataEntriesPM = [ChartDataEntry]()
+
+ let records = realm.getDailyWeights(fromDate: from, toDate: to)
+
+ for item in records.am {
+ guard let datetime = item.datetime else { continue }
+ let x: TimeInterval = datetime.timeIntervalSince1970
+ var y = item.kg
+ if isImperial() {
+ y = item.lbs
+ }
+ let chartDataEntry = ChartDataEntry(x: x, y: y)
+ if item.pidKeys.typeKey == "am" {
+ dataEntriesAM.append(chartDataEntry)
+ } else {
+ dataEntriesPM.append(chartDataEntry)
+ }
+ }
 
- let dataEntriesPM = [
- ChartDataEntry(x: 2.0, y: 144.9),
- ChartDataEntry(x: 3.0, y: 144.0),
- ChartDataEntry(x: 5.0, y: 144.0)
- ]
  updateChartWithData(am: dataEntriesAM, pm: dataEntriesPM)
  }
 
+ private func isImperial() -> Bool {
+ guard
+ let unitsTypePrefStr = UserDefaults.standard.string(forKey: SettingsKeys.unitsTypePref),
+ let currentUnitsType = UnitsType(rawValue: unitsTypePrefStr)
+ else {
+ return true
+ }
+ if currentUnitsType == .imperial {
+ return true
+ }
+ return false
+ }
+
  // -------------------------
 
  private func setViewModel() {