Merge pull request #230 from woocommerce/feature/177-dashboard-mark5

Dashboard Mark 5: Paged UI + Live data

Author: bummytime

Networking/Networking/Model/Stats/OrderStats.swift

@@ -8,14 +8,14 @@ public struct OrderStats: Decodable {
     public let granularity: StatGranularity
     public let quantity: String
     public let fields: [String]
-    public let totalGrossSales: Float
-    public let totalNetSales: Float
+    public let totalGrossSales: Double
+    public let totalNetSales: Double
     public let totalOrders: Int
     public let totalProducts: Int
-    public let averageGrossSales: Float
-    public let averageNetSales: Float
-    public let averageOrders: Float
-    public let averageProducts: Float
+    public let averageGrossSales: Double
+    public let averageNetSales: Double
+    public let averageOrders: Double
+    public let averageProducts: Double
     public let items: [OrderStatsItem]?
 
 
@@ -31,15 +31,15 @@ public struct OrderStats: Decodable {
         let fields = try container.decode([String].self, forKey: .fields)
         let rawData: [[AnyCodable]] = try container.decode([[AnyCodable]].self, forKey: .data)
 
-        let totalGrossSales = try container.decode(Float.self, forKey: .totalGrossSales)
-        let totalNetSales = try container.decode(Float.self, forKey: .totalNetSales)
+        let totalGrossSales = try container.decode(Double.self, forKey: .totalGrossSales)
+        let totalNetSales = try container.decode(Double.self, forKey: .totalNetSales)
         let totalOrders = try container.decode(Int.self, forKey: .totalOrders)
         let totalProducts = try container.decode(Int.self, forKey: .totalProducts)
 
-        let averageGrossSales = try container.decode(Float.self, forKey: .averageGrossSales)
-        let averageNetSales = try container.decode(Float.self, forKey: .averageNetSales)
-        let averageOrders = try container.decode(Float.self, forKey: .averageOrders)
-        let averageProducts = try container.decode(Float.self, forKey: .averageProducts)
+        let averageGrossSales = try container.decode(Double.self, forKey: .averageGrossSales)
+        let averageNetSales = try container.decode(Double.self, forKey: .averageNetSales)
+        let averageOrders = try container.decode(Double.self, forKey: .averageOrders)
+        let averageProducts = try container.decode(Double.self, forKey: .averageProducts)
 
         let items = rawData.map({ OrderStatsItem(fieldNames: fields, rawData: $0) })
 
@@ -49,7 +49,7 @@ public struct OrderStats: Decodable {
 
     /// OrderStats struct initializer.
     ///
-    public init(date: String, granularity: StatGranularity, quantity: String, fields: [String], items: [OrderStatsItem]?, totalGrossSales: Float, totalNetSales: Float, totalOrders: Int, totalProducts: Int, averageGrossSales: Float, averageNetSales: Float, averageOrders: Float, averageProducts: Float) {
+    public init(date: String, granularity: StatGranularity, quantity: String, fields: [String], items: [OrderStatsItem]?, totalGrossSales: Double, totalNetSales: Double, totalOrders: Int, totalProducts: Int, averageGrossSales: Double, averageNetSales: Double, averageOrders: Double, averageProducts: Double) {
         self.date = date
         self.granularity = granularity
         self.quantity = quantity

Networking/Networking/Model/Stats/SiteVisitStats.swift

@@ -34,6 +34,12 @@ public struct SiteVisitStats: Decodable {
         self.fields = fields
         self.items = items
     }
+
+    // MARK: Computed Properties
+
+    public var totalVisitors: Int {
+        return items?.map({ $0.visitors }).reduce(0, +) ?? 0
+    }
 }
 
 

Networking/Networking/Model/Stats/StatGranularity.swift

@@ -8,6 +8,20 @@ public enum StatGranularity: String, Decodable {
     case week
     case month
     case year
+
+    public var pluralizedString: String {
+        switch self {
+        case .day:
+            return NSLocalizedString("Days", comment: "Plural of 'day' — a statistical unit")
+        case .week:
+            return NSLocalizedString("Weeks", comment: "Plural of 'week' — a statistical unit")
+        case .month:
+            return NSLocalizedString("Months", comment: "Plural of 'month' — a statistical unit")
+        case .year:
+            return NSLocalizedString("Years", comment: "Plural of 'year' — a statistical unit")
+        }
+    }
+
 }
 
 // MARK: - StringConvertible Conformance
@@ -19,13 +33,13 @@ extension StatGranularity: CustomStringConvertible {
     public var description: String {
         switch self {
         case .day:
-            return NSLocalizedString("Day", comment: "Order statistics unit - a single day")
+            return NSLocalizedString("Day", comment: "Statistical unit - a single day")
         case .week:
-            return NSLocalizedString("Week", comment: "Order statistics unit - a single week")
+            return NSLocalizedString("Week", comment: "Statistical unit - a single week")
         case .month:
-            return NSLocalizedString("Month", comment: "Order statistics unit - a single week")
+            return NSLocalizedString("Month", comment: "Statistical unit - a single week")
         case .year:
-            return NSLocalizedString("Year", comment: "Order statistics unit - a single year")
+            return NSLocalizedString("Year", comment: "Statistical unit - a single year")
         }
     }
 }

Networking/NetworkingTests/Mapper/OrderStatsMapperTests.swift

@@ -84,7 +84,7 @@ class OrderStatsMapperTests: XCTestCase {
         XCTAssertEqual(weekStats.totalOrders, 65)
         XCTAssertEqual(weekStats.totalProducts, 87)
         XCTAssertEqual(weekStats.totalGrossSales, 2858.52)
-        XCTAssertEqual(weekStats.totalNetSales, 2833.55)
+        XCTAssertEqual(weekStats.totalNetSales, 2833.5499999999997)
         XCTAssertEqual(weekStats.averageGrossSales, 92.2103)
         XCTAssertEqual(weekStats.averageNetSales, 91.4048)
         XCTAssertEqual(weekStats.averageOrders, 2.0968)

Networking/NetworkingTests/Mapper/SiteVisitStatsMapperTests.swift

@@ -18,6 +18,7 @@ class SiteVisitStatsMapperTests: XCTestCase {
         XCTAssertEqual(dayStats.date, "2018-08-06")
         XCTAssertEqual(dayStats.fields.count, 7)
         XCTAssertEqual(dayStats.items!.count, 12)
+        XCTAssertEqual(dayStats.totalVisitors, 105)
 
         let sampleItem1 = dayStats.items![0]
         XCTAssertEqual(sampleItem1.period, "2018-07-26")
@@ -50,6 +51,7 @@ class SiteVisitStatsMapperTests: XCTestCase {
         XCTAssertEqual(weekStats.date, "2018-08-06")
         XCTAssertEqual(weekStats.fields.count, 7)
         XCTAssertEqual(weekStats.items!.count, 12)
+        XCTAssertEqual(weekStats.totalVisitors, 123123241)
 
         let sampleItem1 = weekStats.items![0]
         XCTAssertEqual(sampleItem1.period, "2018W05W21")
@@ -83,11 +85,12 @@ class SiteVisitStatsMapperTests: XCTestCase {
         XCTAssertEqual(monthStats.date, "2018-08-06")
         XCTAssertEqual(monthStats.fields.count, 7)
         XCTAssertEqual(monthStats.items!.count, 12)
+        XCTAssertEqual(monthStats.totalVisitors, 292)
 
         let sampleItem1 = monthStats.items![0]
         XCTAssertEqual(sampleItem1.period, "2017-09-01")
         XCTAssertEqual(sampleItem1.views, 36)
-        XCTAssertEqual(sampleItem1.visitors, 24)
+        XCTAssertEqual(sampleItem1.visitors, 224)
         XCTAssertEqual(sampleItem1.likes, 1)
         XCTAssertEqual(sampleItem1.reblogs, 0)
         XCTAssertEqual(sampleItem1.comments, 3)
@@ -115,11 +118,12 @@ class SiteVisitStatsMapperTests: XCTestCase {
         XCTAssertEqual(yearStats.date, "2018-08-06")
         XCTAssertEqual(yearStats.fields.count, 7)
         XCTAssertEqual(yearStats.items!.count, 5)
+        XCTAssertEqual(yearStats.totalVisitors, 3336)
 
         let sampleItem1 = yearStats.items![0]
         XCTAssertEqual(sampleItem1.period, "2014-01-01")
         XCTAssertEqual(sampleItem1.views, 12821)
-        XCTAssertEqual(sampleItem1.visitors, 1135)
+        XCTAssertEqual(sampleItem1.visitors, 1145)
         XCTAssertEqual(sampleItem1.likes, 1094)
         XCTAssertEqual(sampleItem1.reblogs, 0)
         XCTAssertEqual(sampleItem1.comments, 1611)

Networking/NetworkingTests/Responses/site-visits-month.json

@@ -14,7 +14,7 @@
              [
               "2017-09-01",
               36,
-              24,
+              224,
               1,
               0,
               3,

Networking/NetworkingTests/Responses/site-visits-week.json

@@ -104,7 +104,7 @@
              [
               "2018W07W30",
               2,
-              2,
+              100,
               0,
               0,
               0,

Networking/NetworkingTests/Responses/site-visits-year.json

@@ -14,7 +14,7 @@
              [
               "2014-01-01",
               12821,
-              1135,
+              1145,
               1094,
               0,
               1611,

Podfile

@@ -29,6 +29,7 @@ target 'WooCommerce' do
   pod 'Crashlytics', '~> 3.10'
   pod 'KeychainAccess', '~> 3.1'
   pod 'CocoaLumberjack/Swift', '~> 3.4'
+  pod 'XLPagerTabStrip', '~> 8.0'
 
   # Unit Tests
   # ==========

Podfile.lock

@@ -64,6 +64,7 @@ PODS:
     - FormatterKit/TimeIntervalFormatter (= 1.8.2)
   - WordPressUI (1.0.6)
   - wpxmlrpc (0.8.3)
+  - XLPagerTabStrip (8.0.1)
 
 DEPENDENCIES:
   - Alamofire (~> 4.7)
@@ -74,6 +75,7 @@ DEPENDENCIES:
   - KeychainAccess (~> 3.1)
   - WordPressAuthenticator (= 1.0.5)
   - WordPressShared (= 1.0.8)
+  - XLPagerTabStrip (~> 8.0)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
@@ -98,6 +100,7 @@ SPEC REPOS:
     - WordPressShared
     - WordPressUI
     - wpxmlrpc
+    - XLPagerTabStrip
 
 EXTERNAL SOURCES:
   Automattic-Tracks-iOS:
@@ -132,7 +135,8 @@ SPEC CHECKSUMS:
   WordPressShared: 063e1e8b1a7aaf635abf17f091a2d235a068abdc
   WordPressUI: af141587ec444f9af753a00605bd0d3f14d8d8a3
   wpxmlrpc: bfc572f62ce7ee897f6f38b098d2ba08732ecef4
+  XLPagerTabStrip: c908b17cbf42fcd2598ee1adfc49bae25444d88a
 
-PODFILE CHECKSUM: 9c0f38b4e1f7d6de164e2c4279a5112a7f95f936
+PODFILE CHECKSUM: fad8937db279e4bf9807a4985a2418c4832c9b35
 
 COCOAPODS: 1.5.3