Merge pull request #12 from NYPL-Simplified/data_persistence_#2

Created UserInfo class to hold In-Progress information for Patron dur…

Author: Aferdita

NYPLCardCreator/Classes/AddressViewController.swift

@@ -46,6 +46,7 @@ final class AddressViewController: FormTableViewController {
 
     self.navigationItem.rightBarButtonItem?.isEnabled = false
     self.prepareTableViewCells()
+    self.checkToPrefillForm()
   }
 
   @available(*, unavailable)
@@ -115,6 +116,32 @@ final class AddressViewController: FormTableViewController {
                                      for: .allEditingEvents)
   }
 
+  func checkToPrefillForm() {
+    switch self.addressStep {
+    case .home:
+      if let address = self.configuration.user.homeAddress {
+        self.preFillFormWithAddress(address)
+      }
+    case .work:
+      if let address = self.configuration.user.workAddress {
+        self.preFillFormWithAddress(address)
+      }
+    case .school:
+      if let address = self.configuration.user.schoolAddress {
+        self.preFillFormWithAddress(address)
+      }
+    }
+  }
+  
+  func preFillFormWithAddress(_ address: Address) {
+    self.street1Cell.textField.text = address.street1
+    self.street2Cell.textField.text = address.street2
+    self.cityCell.textField.text = address.city
+    self.regionCell.textField.text = address.region
+    self.zipCell.textField.text = address.zip
+    textFieldDidChange()
+  }
+  
   // MARK: UITextFieldDelegate
 
   @objc func textField(_ textField: UITextField,
@@ -136,6 +163,20 @@ final class AddressViewController: FormTableViewController {
 
   // MARK: -
 
+  override func viewWillDisappear(_ animated: Bool) {
+    super.viewWillDisappear(animated)
+    if isMovingFromParentViewController {
+      switch self.addressStep {
+      case .home:
+        self.configuration.user.homeAddress = self.currentAddress()
+      case .work:
+        self.configuration.user.workAddress = self.currentAddress()
+      case .school:
+        self.configuration.user.schoolAddress = self.currentAddress()
+      }
+    }
+  }
+  
   @objc override func didSelectNext() {
     self.view.endEditing(false)
     self.submit()

NYPLCardCreator/Classes/CardCreatorConfiguration.swift

@@ -16,6 +16,8 @@ import Foundation
   /// This will always be called on the main thread. It will only be called in the event
   /// of a successful registration.
   let completionHandler: (_ username: String, _ PIN: String, _ userInitiated: Bool) -> Void
+  /// Saves in-progress data entered by User/Patron
+  var user: UserInfo
 
   public init(
     endpointURL: URL,
@@ -30,6 +32,20 @@ import Foundation
     self.endpointPassword = endpointPassword
     self.requestTimeoutInterval = requestTimeoutInterval
     self.completionHandler = completionHandler
+    self.user = UserInfo()
     super.init()
   }
 }
+
+final class UserInfo {
+  var homeAddress: Address?
+  var workAddress: Address?
+  var schoolAddress: Address?
+  
+  var firstName: String?
+  var middleName: String?
+  var lastName: String?
+  var email: String?
+  
+  var username: String?
+}

NYPLCardCreator/Classes/NameAndEmailViewController.swift

@@ -45,6 +45,7 @@ final class NameAndEmailViewController: FormTableViewController {
     self.navigationItem.rightBarButtonItem?.isEnabled = false
 
     self.prepareTableViewCells()
+    self.checkToPrefillForm()
   }
 
   @available(*, unavailable)
@@ -82,8 +83,30 @@ final class NameAndEmailViewController: FormTableViewController {
     self.emailCell.textField.autocorrectionType = .no
   }
 
+  func checkToPrefillForm() {
+    let user = self.configuration.user
+    if let firstName = user.firstName {
+      self.firstNameCell.textField.text = firstName
+      self.middleInitialCell.textField.text = user.middleName
+      self.lastNameCell.textField.text = user.lastName
+      self.emailCell.textField.text = user.email
+      textFieldDidChange()
+    }
+  }
+  
   // MARK: -
 
+  override func viewWillDisappear(_ animated: Bool) {
+    super.viewWillDisappear(animated)
+    if isMovingFromParentViewController {
+      let user = self.configuration.user
+      user.firstName = self.firstNameCell.textField.text
+      user.middleName = self.middleInitialCell.textField.text
+      user.lastName = self.lastNameCell.textField.text
+      user.email = self.emailCell.textField.text
+    }
+  }
+  
   @objc override func didSelectNext() {
     self.view.endEditing(false)
 

NYPLCardCreator/Classes/UsernameAndPINViewController.swift

@@ -48,6 +48,7 @@ final class UsernameAndPINViewController: FormTableViewController {
     self.navigationItem.rightBarButtonItem?.isEnabled = false
 
     self.prepareTableViewCells()
+    self.checkToPrefillForm()
   }
 
   required init?(coder aDecoder: NSCoder) {
@@ -80,6 +81,21 @@ final class UsernameAndPINViewController: FormTableViewController {
     self.pinCell.textField.inputAccessoryView = self.returnToolbar()
   }
 
+  func checkToPrefillForm() {
+    let user = self.configuration.user
+    if let username = user.username {
+      self.usernameCell.textField.text = username
+      textFieldDidChange()
+    }
+  }
+  
+  override func viewWillDisappear(_ animated: Bool) {
+    super.viewWillDisappear(animated)
+    if isMovingFromParentViewController {
+      self.configuration.user.username = self.usernameCell.textField.text
+    }
+  }
+  
   // MARK: UITableViewDataSource
 
   func tableView(_ tableView: UITableView, titleForFooterInSection section: Int) -> String? {