Current timeline parsing fixed!

TimelineEvents struct->class for modification in the timeline update logic
Each section header now shows short name (e.g., “Sat 6:00pm”

Author: peterkos

BrickHack-Mobile/Controllers/ScheduleTableViewController.swift

@@ -12,7 +12,6 @@ import SwiftMessages
 
 class ScheduleTableViewController: UITableViewController {
 
-
     // MARK: Ivars
     var scheduleTimer = Timer()
 
@@ -24,7 +23,7 @@ class ScheduleTableViewController: UITableViewController {
     // Custom wrapper struct around an Event, to store additional UI parameters. Namely:
     // timelinePoint: whether or not the event has a dot to the left
     // allColor: a defined color for the timeline, for this event
-    struct TimelineEvent: CustomStringConvertible {
+    class TimelineEvent: CustomStringConvertible {
         var timelinePoint: TimelinePoint?
         var isFavorite: Bool
         var allColor: UIColor
@@ -37,16 +36,16 @@ class ScheduleTableViewController: UITableViewController {
             self.event = event
         }
 
-        init(allColor: UIColor, event: Event) {
+        convenience init(allColor: UIColor, event: Event) {
             self.init(timelinePoint: nil, isFavorite: false, allColor: allColor, event: event)
         }
 
-        init() {
+        convenience init() {
             self.init(timelinePoint: nil, isFavorite: false, allColor: UIColor.clear, event: Event())
         }
 
         var description: String {
-            return "\(event.title)| \(event.time) |\(event.timeString) |\(event.description)"
+            return "\(event)"
         }
     }
     var timelineEvents = [TimelineEvent]()
@@ -81,6 +80,7 @@ class ScheduleTableViewController: UITableViewController {
     override func numberOfSections(in tableView: UITableView) -> Int {
         // This property is stored in the ScheduleParser,
         // as this is pretty much the only time it's needed here.
+        print("from sec num: \(ScheduleParser.sectionCount)")
         return ScheduleParser.sectionCount
     }
 
@@ -240,7 +240,6 @@ class ScheduleTableViewController: UITableViewController {
         // Otherwise set proper date
         cell.textLabel!.text = sectionDate
 
-
         return cell
 
     }
@@ -263,45 +262,55 @@ class ScheduleTableViewController: UITableViewController {
 
         // First, get an updated verison of the schedule
         // (Handles UI, threaded)
-        updateSchedule()
+        updateSchedule() {
 
-        // @FIXME: Update to reflect new model
-        // Start at -1 as we look at the next index to see if the current is over yet
-        /*
-        for sectionIndex in -1..<ScheduleParser.sectionCount {
+            // Don't parse if no sections available
+            // (Sanity guard, shouldn't happen)
+            guard ScheduleParser.sectionCount >= 1 else {
+                print("nope")
+                return
+            }
 
-            // Grab the next section's date
-            let sectionDate = self.sampleData[sectionIndex + 1]!.first!.date
+            // Start at -1 as we look at the next index to see if the current is over yet
+            print("sectionCount: \(ScheduleParser.sectionCount)")
+            for sectionIndex in 0..<ScheduleParser.sectionCount {
 
-            // If greater, STOP. We are at the current section.
-            if (sectionDate > Date(timeIntervalSinceNow: 0)) {
-                break
-            }
+                // Grab the next section's date
+                print(self.timelineEvents)
+                let events = self.timelineEvents.filter({ $0.event.section == sectionIndex })
+                print(events)
+                let sectionDate = events.first!.event.time
+
+                // If greater, STOP. We are at the current section.
+                if (sectionDate > Date(timeIntervalSinceNow: 0)) {
+                    break
+                }
 
-            // Otherwise, go on to configure this current section as "passed"
-            var currentSection = self.sampleData[sectionIndex]!
-            for eventIndex in 0..<currentSection.count {
+                // Otherwise, go on to configure this current section as "passed"
+                self.timelineEvents.filter({ $0.event.section == sectionIndex }).forEach { timelineEvent in
 
-                currentSection[eventIndex].allColor = self.backColor
+                    print("updated \(timelineEvent)")
+                    timelineEvent.allColor = self.backColor
 
-                // Only "fill" timeline point if it's defined for that cell
-                if (currentSection[eventIndex].timelinePoint != nil) {
-                    currentSection[eventIndex].timelinePoint = TimelinePoint(color: self.backColor, filled: true)
+                    if timelineEvent.timelinePoint != nil {
+                        timelineEvent.timelinePoint = TimelinePoint(color: self.backColor, filled: true)
+                    }
                 }
+
+                // @TODO: Set the current event with a TimelinePoint
+                
             }
-        }
-         */
 
+            DispatchQueue.main.async {
+                self.tableView.reloadData()
+            }
 
-        // And of course, reload the table.
-        DispatchQueue.main.async {
-            self.tableView.reloadData()
         }
 
     }
 
     // Updates the listing of events from the Google Sheet
-    func updateSchedule() {
+    func updateSchedule(completion: @escaping () -> ()) {
 
         // Create custom toast to use for alerting the user
         let toastView = MessageView.viewFromNib(layout: .messageView)
@@ -336,14 +345,16 @@ class ScheduleTableViewController: UITableViewController {
                 self.timelineEvents.append(TimelineEvent(allColor: self.frontColor, event: event))
             }
 
+            completion()
+
             // Finally, update the table now that our model is full
             DispatchQueue.main.async {
 
                 self.tableView.reloadData()
 
                 print("EVENTS AFTER REFRESH: ")
                 for event in self.timelineEvents {
-                    print(event)
+//                    print(event)
                 }
 
                 // Show toast to user

BrickHack-Mobile/Models/ScheduleParser.swift

@@ -28,7 +28,7 @@ struct Event: CustomDebugStringConvertible {
     var time: Date
     var timeString: String {
         let dateFormatter = DateFormatter()
-        dateFormatter.dateFormat = "hh:mm a"
+        dateFormatter.dateFormat = "E hh:mm a"
         dateFormatter.timeZone = TimeZone(identifier: "UTC") // Already in ET, dont convert again
         return dateFormatter.string(from: time)
     }
@@ -200,7 +200,7 @@ class ScheduleParser {
             for columnIndex in 0..<rowData.columns.count {
 
                 // Skip section day header title ("Saturday", "Sunday").
-                // "section" 0 is Saturday, 1 is sunday, etc.
+                // "section" 0 is Saturday, 1 is sunday
                 // Note that this is NOT the same as Table View sections -- remember, we are only in the model!
                 // (and that's how it was named on the spreadsheet)
                 if skip {
@@ -228,7 +228,7 @@ class ScheduleParser {
                     currentEvent.section = dayIndex
                     dayIndex += 1
 
-                    // Skip the next iteration, whic just has the section day title.
+                    // Skip the next iteration, which just has the section day title.
                     skip = true
                     continue
 
@@ -300,7 +300,7 @@ class ScheduleParser {
 
         // Construct the proper day
         // 0: sat, 1: sun
-        if sectionIndex == 0 {
+        if dayIndex <= 0 {
             dateComponents.day = 8
         } else {
             dateComponents.day = 9