Merge pull request #257 from woocommerce/feature/138-section-dates

Order List: Date grouping and sections

Author: mindgraffiti

WooCommerce/Classes/Model/Order+Woo.swift

@@ -14,4 +14,37 @@ extension Order {
 
         return NSLocale(localeIdentifier: identifier).currencySymbol
     }
+
+    /// Translates a Section Identifier into a Human-Readable String.
+    ///
+    static func descriptionForSectionIdentifier(_ identifier: String) -> String {
+        guard let age = Age(rawValue: identifier) else {
+            return String()
+        }
+
+        return age.description
+    }
+}
+
+enum Age: String {
+    case months     = "0"
+    case weeks      = "2"
+    case days       = "4"
+    case yesterday  = "5"
+    case today      = "6"
+
+    var description: String {
+        switch self {
+        case .months:
+            return NSLocalizedString("Older than a Month", comment: "Notifications Months Section Header")
+        case .weeks:
+            return NSLocalizedString("Older than a Week", comment: "Notifications Weeks Section Header")
+        case .days:
+            return NSLocalizedString("Older than 2 days", comment: "Notifications +2 Days Section Header")
+        case .yesterday:
+            return NSLocalizedString("Yesterday", comment: "Notifications Yesterday Section Header")
+        case .today:
+            return NSLocalizedString("Today", comment: "Notifications Today Section Header")
+        }
+    }
 }

WooCommerce/Classes/Model/StorageOrder+Woo.swift

@@ -0,0 +1,40 @@
+import Foundation
+import WordPressShared
+import Yosemite
+
+extension StorageOrder {
+    /// Returns a Section Identifier that can be sorted. Note that this string is not human readable, and
+    /// you should use the *descriptionForSectionIdentifier* method as well!.
+    ///
+    @objc func normalizedAgeAsString() -> String {
+        // Normalize Dates: Time must not be considered. Just the raw dates
+        guard let fromDate = dateCreated?.normalizedDate() else {
+            return ""
+        }
+
+        let toDate = Date().normalizedDate()
+
+        // Analyze the Delta-Components
+        let calendar = Calendar.current
+        let components = [.day, .weekOfYear, .month] as Set<Calendar.Component>
+        let dateComponents = calendar.dateComponents(components, from: fromDate, to: toDate)
+        let identifier: Age
+
+        // Months
+        if let month = dateComponents.month, month >= 1 {
+            identifier = .months
+            // Weeks
+        } else if let week = dateComponents.weekOfYear, week >= 1 {
+            identifier = .weeks
+            // Days
+        } else if let day = dateComponents.day, day > 1 {
+            identifier = .days
+        } else if let day = dateComponents.day, day == 1 {
+            identifier = .yesterday
+        } else {
+            identifier = .today
+        }
+
+        return identifier.rawValue
+    }
+}

WooCommerce/Classes/ViewRelated/Orders/OrdersViewController.swift

@@ -26,7 +26,7 @@ class OrdersViewController: UIViewController {
         let storageManager = AppDelegate.shared.storageManager
         let descriptor = NSSortDescriptor(keyPath: \StorageOrder.dateCreated, ascending: false)
 
-        return ResultsController<StorageOrder>(storageManager: storageManager, sortedBy: [descriptor])
+        return ResultsController<StorageOrder>(storageManager: storageManager, sectionNameKeyPath: "normalizedAgeAsString", sortedBy: [descriptor])
     }()
 
     /// Indicates if there are any Objects matching the criteria (or not).
@@ -236,9 +236,7 @@ extension OrdersViewController: UITableViewDataSource {
     }
 
     func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
-        // FIXME: this is hard-coded data. Will fix when WordPressShared date helpers are available to make fuzzy dates.
-        // return NSLocalizedString("Today", comment: "Title for header section")
-        return nil
+        return Order.descriptionForSectionIdentifier(resultsController.sections[section].name)
     }
 }
 

WooCommerce/WooCommerce.xcodeproj/project.pbxproj

@@ -130,6 +130,7 @@
 		CE21B3E020FFC59700A259D5 /* ProductDetailsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE21B3DE20FFC59700A259D5 /* ProductDetailsTableViewCell.swift */; };
 		CE21B3E120FFC59700A259D5 /* ProductDetailsTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE21B3DF20FFC59700A259D5 /* ProductDetailsTableViewCell.xib */; };
 		CE22571B20E16FBC0037F478 /* LeftImageTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE1EC8EB20B8A3FF009762BF /* LeftImageTableViewCell.xib */; };
+		CE24BCD8212F25D4001CD12E /* StorageOrder+Woo.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE24BCD7212F25D4001CD12E /* StorageOrder+Woo.swift */; };
 		CE263DE6206ACD220015A693 /* NotificationsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE263DE5206ACD220015A693 /* NotificationsViewController.swift */; };
 		CE263DE8206ACE3E0015A693 /* MainTabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE263DE7206ACE3E0015A693 /* MainTabBarController.swift */; };
 		CE32B10B20BEDE05006FBCF4 /* TwoColumnSectionHeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE32B10A20BEDE05006FBCF4 /* TwoColumnSectionHeaderView.xib */; };
@@ -316,6 +317,7 @@
 		CE21B3DC20FF9BC200A259D5 /* ProductListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductListViewController.swift; sourceTree = "<group>"; };
 		CE21B3DE20FFC59700A259D5 /* ProductDetailsTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductDetailsTableViewCell.swift; sourceTree = "<group>"; };
 		CE21B3DF20FFC59700A259D5 /* ProductDetailsTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ProductDetailsTableViewCell.xib; sourceTree = "<group>"; };
+		CE24BCD7212F25D4001CD12E /* StorageOrder+Woo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "StorageOrder+Woo.swift"; sourceTree = "<group>"; };
 		CE263DE5206ACD220015A693 /* NotificationsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationsViewController.swift; sourceTree = "<group>"; };
 		CE263DE7206ACE3E0015A693 /* MainTabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabBarController.swift; sourceTree = "<group>"; };
 		CE32B10A20BEDE05006FBCF4 /* TwoColumnSectionHeaderView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TwoColumnSectionHeaderView.xib; sourceTree = "<group>"; };
@@ -569,6 +571,7 @@
 				B57B678B2107638C00AF8905 /* Order+Woo.swift */,
 				748C777F211E18A600814F2C /* OrderStats+Woo.swift */,
 				B5E96B3721137AA100DF68D0 /* OrderStatus+Woo.swift */,
+				CE24BCD7212F25D4001CD12E /* StorageOrder+Woo.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -1157,6 +1160,7 @@
 				7421344A210A323C00C13890 /* WooAnalyticsStat.swift in Sources */,
 				CE1EC8D120B6FE39009762BF /* FootnoteView.swift in Sources */,
 				B58B4AB82108F14700076FDD /* NoticeNotificationInfo.swift in Sources */,
+				CE24BCD8212F25D4001CD12E /* StorageOrder+Woo.swift in Sources */,
 				B557DA1520979904005962F4 /* CustomerNoteTableViewCell.swift in Sources */,
 				CE855366209BA6A700938BDC /* CustomerInfoTableViewCell.swift in Sources */,
 				B5A8532220BDBFAF00FAAB4D /* CircularImageView.swift in Sources */,