From 5649362ecd8812b1f0f6a5807bba833c920389bb Mon Sep 17 00:00:00 2001
From: Sophia Liu <sophialiu7436@gmail.com>
Date: Sat, 17 Feb 2024 00:19:08 -0600
Subject: [PATCH] added staff shifts to schedule page

---
 HIAPI/Models/Staff.swift                      |   4 +-
 HackIllinois.xcodeproj/project.pbxproj        |   8 +-
 .../GrayPotion.imageset/Contents.json         |  23 +++
 .../GrayPotion.imageset/GrayPotion1x.png      | Bin 0 -> 1803 bytes
 .../GrayPotion.imageset/GrayPotion2x.png      | Bin 0 -> 3254 bytes
 .../GrayPotion.imageset/GrayPotion3x.png      | Bin 0 -> 4803 bytes
 .../GreenPotion.imageset/Contents.json        |  23 +++
 .../GreenPotion.imageset/greenPotion.png      | Bin 0 -> 1813 bytes
 .../GreenPotion.imageset/greenPotion2x.png    | Bin 0 -> 3316 bytes
 .../GreenPotion.imageset/greenPotion3x.png    | Bin 0 -> 4896 bytes
 .../HIScheduleViewController.swift            | 145 +++++++++++++++++-
 11 files changed, 191 insertions(+), 12 deletions(-)
 create mode 100644 HackIllinois/Assets.xcassets/GrayPotion.imageset/Contents.json
 create mode 100644 HackIllinois/Assets.xcassets/GrayPotion.imageset/GrayPotion1x.png
 create mode 100644 HackIllinois/Assets.xcassets/GrayPotion.imageset/GrayPotion2x.png
 create mode 100644 HackIllinois/Assets.xcassets/GrayPotion.imageset/GrayPotion3x.png
 create mode 100644 HackIllinois/Assets.xcassets/GreenPotion.imageset/Contents.json
 create mode 100644 HackIllinois/Assets.xcassets/GreenPotion.imageset/greenPotion.png
 create mode 100644 HackIllinois/Assets.xcassets/GreenPotion.imageset/greenPotion2x.png
 create mode 100644 HackIllinois/Assets.xcassets/GreenPotion.imageset/greenPotion3x.png

diff --git a/HIAPI/Models/Staff.swift b/HIAPI/Models/Staff.swift
index 20d1c983..3a088cc8 100644
--- a/HIAPI/Models/Staff.swift
+++ b/HIAPI/Models/Staff.swift
@@ -39,10 +39,10 @@ public struct Staff: Codable {
         case isPrivate
         case displayOnStaffCheckIn
     }
-    public let isPro: String
+    public let isPro: Bool
     public let eventId: String
     public let isStaff: Bool
-    public let name: Int
+    public let name: String
     public let description: String
     public let startTime: Date
     public let endTime: Date
diff --git a/HackIllinois.xcodeproj/project.pbxproj b/HackIllinois.xcodeproj/project.pbxproj
index 2779e95b..f63fe346 100644
--- a/HackIllinois.xcodeproj/project.pbxproj
+++ b/HackIllinois.xcodeproj/project.pbxproj
@@ -140,11 +140,11 @@
 		D158EC312B5A2D440003D799 /* HIQRAttendeeScannerSelection.swift in Sources */ = {isa = PBXBuildFile; fileRef = D158EC302B5A2D440003D799 /* HIQRAttendeeScannerSelection.swift */; };
 		D158EC332B5A2DFE0003D799 /* HIScanPointsShopViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D158EC322B5A2DFE0003D799 /* HIScanPointsShopViewController.swift */; };
 		D187BF582B781A1100AD7356 /* HIShiftCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D187BF572B781A1100AD7356 /* HIShiftCell.swift */; };
-		D1BBA5682B70AB940017BD13 /* Staff.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1BBA5672B70AB940017BD13 /* Staff.swift */; };
-		D1BBA56A2B70ACCC0017BD13 /* StaffService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1BBA5692B70ACCC0017BD13 /* StaffService.swift */; };
 		D187BF5A2B78317600AD7356 /* Mentor.swift in Sources */ = {isa = PBXBuildFile; fileRef = D187BF592B78317600AD7356 /* Mentor.swift */; };
 		D187BF5C2B78318000AD7356 /* MentorService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D187BF5B2B78318000AD7356 /* MentorService.swift */; };
 		D19D4C932B794F9100376E1B /* HIScanMentorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D19D4C922B794F9100376E1B /* HIScanMentorViewController.swift */; };
+		D1BBA5682B70AB940017BD13 /* Staff.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1BBA5672B70AB940017BD13 /* Staff.swift */; };
+		D1BBA56A2B70ACCC0017BD13 /* StaffService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1BBA5692B70ACCC0017BD13 /* StaffService.swift */; };
 		D1BE81172AC8FC680042C078 /* HIAPI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 95E3142A21FAD5B30092C22E /* HIAPI.framework */; };
 		D1BE81182AC8FC690042C078 /* HIAPI.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 95E3142A21FAD5B30092C22E /* HIAPI.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D1C5B6582B732E44000E766D /* refresh.json in Resources */ = {isa = PBXBuildFile; fileRef = D1C5B6572B732E44000E766D /* refresh.json */; };
@@ -358,11 +358,11 @@
 		D158EC302B5A2D440003D799 /* HIQRAttendeeScannerSelection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HIQRAttendeeScannerSelection.swift; sourceTree = "<group>"; };
 		D158EC322B5A2DFE0003D799 /* HIScanPointsShopViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HIScanPointsShopViewController.swift; sourceTree = "<group>"; };
 		D187BF572B781A1100AD7356 /* HIShiftCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HIShiftCell.swift; sourceTree = "<group>"; };
-		D1BBA5672B70AB940017BD13 /* Staff.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Staff.swift; sourceTree = "<group>"; };
-		D1BBA5692B70ACCC0017BD13 /* StaffService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StaffService.swift; sourceTree = "<group>"; };
 		D187BF592B78317600AD7356 /* Mentor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Mentor.swift; sourceTree = "<group>"; };
 		D187BF5B2B78318000AD7356 /* MentorService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MentorService.swift; sourceTree = "<group>"; };
 		D19D4C922B794F9100376E1B /* HIScanMentorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HIScanMentorViewController.swift; sourceTree = "<group>"; };
+		D1BBA5672B70AB940017BD13 /* Staff.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Staff.swift; sourceTree = "<group>"; };
+		D1BBA5692B70ACCC0017BD13 /* StaffService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StaffService.swift; sourceTree = "<group>"; };
 		D1C5B6572B732E44000E766D /* refresh.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = refresh.json; sourceTree = "<group>"; };
 		D1F146392B605C57004E7FC9 /* Hack_Mushroom_Loading.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = Hack_Mushroom_Loading.json; sourceTree = "<group>"; };
 		D3A309BA221116A600CBA351 /* HackIllinois.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = HackIllinois.entitlements; sourceTree = "<group>"; };
diff --git a/HackIllinois/Assets.xcassets/GrayPotion.imageset/Contents.json b/HackIllinois/Assets.xcassets/GrayPotion.imageset/Contents.json
new file mode 100644
index 00000000..75944daa
--- /dev/null
+++ b/HackIllinois/Assets.xcassets/GrayPotion.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "GrayPotion1x.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "GrayPotion2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "GrayPotion3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/HackIllinois/Assets.xcassets/GrayPotion.imageset/GrayPotion1x.png b/HackIllinois/Assets.xcassets/GrayPotion.imageset/GrayPotion1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e2445204d0b54e6b85f503115d1fd0a78217b9c
GIT binary patch
literal 1803
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
IvGAk(7r=%_h5!Hn

literal 0
HcmV?d00001

diff --git a/HackIllinois/Assets.xcassets/GrayPotion.imageset/GrayPotion2x.png b/HackIllinois/Assets.xcassets/GrayPotion.imageset/GrayPotion2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..28724cb08548385aca2c32458916989189909a78
GIT binary patch
literal 3254
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
Id0-#?Uz}!B-v9sr

literal 0
HcmV?d00001

diff --git a/HackIllinois/Assets.xcassets/GrayPotion.imageset/GrayPotion3x.png b/HackIllinois/Assets.xcassets/GrayPotion.imageset/GrayPotion3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0c3da79da01021908238459a10b41c6b4ad718e
GIT binary patch
literal 4803
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
S?f>050s1<|+LcI$=>Gsy497(P

literal 0
HcmV?d00001

diff --git a/HackIllinois/Assets.xcassets/GreenPotion.imageset/Contents.json b/HackIllinois/Assets.xcassets/GreenPotion.imageset/Contents.json
new file mode 100644
index 00000000..c7479437
--- /dev/null
+++ b/HackIllinois/Assets.xcassets/GreenPotion.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "greenPotion.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "greenPotion2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "greenPotion3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/HackIllinois/Assets.xcassets/GreenPotion.imageset/greenPotion.png b/HackIllinois/Assets.xcassets/GreenPotion.imageset/greenPotion.png
new file mode 100644
index 0000000000000000000000000000000000000000..7783e5e065a592a0ae27c3117663ebd1c2a43d41
GIT binary patch
literal 1813
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
E9|ERfEdT%j

literal 0
HcmV?d00001

diff --git a/HackIllinois/Assets.xcassets/GreenPotion.imageset/greenPotion2x.png b/HackIllinois/Assets.xcassets/GreenPotion.imageset/greenPotion2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e77a4c177f661fb65b23c3cf5b331770b62ad8a
GIT binary patch
literal 3316
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

literal 0
HcmV?d00001

diff --git a/HackIllinois/Assets.xcassets/GreenPotion.imageset/greenPotion3x.png b/HackIllinois/Assets.xcassets/GreenPotion.imageset/greenPotion3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..743a1bb09ad9dca4bd91988c5a5eac1ef2a47745
GIT binary patch
literal 4896
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

literal 0
HcmV?d00001

diff --git a/HackIllinois/ViewControllers/HIScheduleViewController.swift b/HackIllinois/ViewControllers/HIScheduleViewController.swift
index 85ea1672..31750b72 100644
--- a/HackIllinois/ViewControllers/HIScheduleViewController.swift
+++ b/HackIllinois/ViewControllers/HIScheduleViewController.swift
@@ -18,6 +18,9 @@ import HIAPI
 class HIScheduleViewController: HIEventListViewController {
     // MARK: - Properties
     var staffShifts: [Staff] = []
+    private var labelColor: UIColor = .white // Default color
+    var hasSelectedShift = false
+    var segmentedControl: HIScheduleSegmentedControl!
     
     lazy var fetchedResultsController: NSFetchedResultsController<Event> = {
         let fetchRequest: NSFetchRequest<Event> = Event.fetchRequest()
@@ -85,6 +88,10 @@ class HIScheduleViewController: HIEventListViewController {
 // MARK: - Actions
 extension HIScheduleViewController {
     @objc func didSelectTab(_ sender: HISegmentedControl) {
+        if hasSelectedShift {
+            removeStaffShiftContainerViews()
+            setUpShiftCells()
+        }
         currentTab = sender.selectedIndex
         updatePredicate()
         animateReload()
@@ -137,7 +144,7 @@ extension HIScheduleViewController {
         super.loadView()
 
         let items = dataStore.map { $0.displayText }
-        let segmentedControl = HIScheduleSegmentedControl(titles: items, nums: [23, 24, 25])
+        segmentedControl = HIScheduleSegmentedControl(titles: items, nums: [23, 24, 25])
         segmentedControl.addTarget(self, action: #selector(didSelectTab(_:)), for: .valueChanged)
         segmentedControl.translatesAutoresizingMaskIntoConstraints = false
         view.addSubview(segmentedControl)
@@ -155,9 +162,11 @@ extension HIScheduleViewController {
         let now = Date()
         if now > HITimeDataSource.shared.eventTimes.sundayStart {
             segmentedControl.selectedIndex = 2
+            currentTab = 2
         }
         else if now > HITimeDataSource.shared.eventTimes.saturdayStart {
             segmentedControl.selectedIndex = 1
+            currentTab = 1
         }
         
         let tableView = HITableView()
@@ -191,6 +200,7 @@ extension HIScheduleViewController {
 }
 
 // MARK: - Staff Shifts Control Setup
+
 extension HIScheduleViewController {
     @objc func setStaffShiftsControl() {
         let customFontSize = UIDevice.current.userInterfaceIdiom == .pad ? 44 : 24
@@ -202,7 +212,7 @@ extension HIScheduleViewController {
         let flexibleSpaceLeft3 = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
 
         let scheduleButton = UIBarButtonItem(title: "SCHEDULE", style: .plain, target: self, action: #selector(scheduleButtonTapped(_:)))
-        scheduleButton.setTitleTextAttributes([NSAttributedString.Key.font: customFont], for: .normal)
+        scheduleButton.setTitleTextAttributes([NSAttributedString.Key.font: customFont, NSAttributedString.Key.foregroundColor: labelColor], for: .normal)
 
         // Add the flexible space items and custom button to the leftBarButtonItems array
         navigationItem.leftBarButtonItems = [flexibleSpaceLeft1, flexibleSpaceLeft2, flexibleSpaceLeft3, scheduleButton]
@@ -213,30 +223,49 @@ extension HIScheduleViewController {
 
         // Create custom right bar button item
         let customButton = UIBarButtonItem(title: "SHIFTS", style: .plain, target: self, action: #selector(shiftsButtonTapped(_:)))
-        customButton.setTitleTextAttributes([NSAttributedString.Key.font: customFont], for: .normal)
+        customButton.setTitleTextAttributes([NSAttributedString.Key.font: customFont, NSAttributedString.Key.foregroundColor: labelColor], for: .normal)
 
         // Add the flexible space items and custom button to the rightBarButtonItems array
         navigationItem.rightBarButtonItems = [flexibleSpaceRight1, flexibleSpaceRight2, customButton]
 
         self.navigationItem.leftItemsSupplementBackButton = true
     }
-
+    
+    func removeStaffShiftContainerViews() {
+        // Iterate through all subviews and remove container views for staff shifts
+        for subview in self.view.subviews {
+            if let containerView = subview as? UIView, containerView.backgroundColor == #colorLiteral(red: 1, green: 0.9803921569, blue: 0.8, alpha: 1) {
+                containerView.removeFromSuperview()
+            }
+        }
+    }
+    
     // Actions for left and right buttons
     @objc func scheduleButtonTapped(_ sender: UIButton) {
         if onlyShifts {
             onlyShifts = false
             backgroundView.image = #imageLiteral(resourceName: "PurpleBackground")
+            if UIDevice.current.userInterfaceIdiom != .pad {
+                labelColor = .white // Set label color to brown
+                setStaffShiftsControl()
+            }
+            // Call removeStaffShiftContainerViews to remove container views for staff shifts
+            hasSelectedShift = false
+            removeStaffShiftContainerViews()
             updatePredicate()
             animateReload()
         }
     }
 
-
     @objc func shiftsButtonTapped(_ sender: UIButton) {
         if !onlyShifts {
             onlyShifts = !onlyShifts
             backgroundView.image = #imageLiteral(resourceName: "Pink Background")
-            //let label = HILabel(style: (UIDevice.current.userInterfaceIdiom == .pad) ? .viewTitle : .viewTitleBrown)
+            hasSelectedShift = true
+            if UIDevice.current.userInterfaceIdiom != .pad {
+                labelColor = #colorLiteral(red: 0.337254902, green: 0.1411764706, blue: 0.06666666667, alpha: 1) // Set label color to brown
+                setStaffShiftsControl()
+            }
 
             guard let user = HIApplicationStateController.shared.user else { return }
 
@@ -248,9 +277,13 @@ extension HIScheduleViewController {
                         print("Staff shifts: ", self.staffShifts)
 
                         DispatchQueue.main.async {
+                            // Set up shift cells
+                            self.setUpShiftCells()
+                            // Update predicate and animate reload
                             self.updatePredicate()
                             self.animateReload()
                         }
+
                     } catch {
                         print("An error has occurred in getting staff shifts \(error)")
                     }
@@ -258,6 +291,106 @@ extension HIScheduleViewController {
                 .launch()
         }
     }
+    
+    func setUpShiftCells() {
+        // Get filtered events by date
+        let sundayStart = HITimeDataSource.shared.eventTimes.sundayStart
+        let saturdayStart = HITimeDataSource.shared.eventTimes.saturdayStart
+        
+        // Iterate through all subviews and remove container views for staff shifts
+        var padding = 0.0
+        // Iterate through each staff shift and add a label to the container view
+        for (index, staffShift) in self.staffShifts.enumerated() {
+            let dateFormatter = DateFormatter()
+            dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss Z"
+            let dateString = staffShift.startTime
+            let calendar = Calendar.current
+            let dayComponent = calendar.component(.day, from: dateString)
+            var curr_idx = segmentedControl.selectedIndex
+            print("Day:", dayComponent)
+            print("Current tab:", curr_idx)
+            if curr_idx == 0 && dayComponent != 23 {
+                continue
+            } else if curr_idx == 1 && dayComponent != 24 {
+                continue
+            } else if curr_idx == 2 && dayComponent != 25 {
+                continue
+            }
+            // Set fixed width and height for the container view
+            let containerViewWidth: CGFloat = 340.0
+            let containerViewHeight: CGFloat = 130.0
+
+            // Create a container view with a yellow background
+            let containerView = UIView()
+            containerView.translatesAutoresizingMaskIntoConstraints = false
+            containerView.backgroundColor = #colorLiteral(red: 1, green: 0.9803921569, blue: 0.8, alpha: 1)
+            containerView.layer.cornerRadius = 20.0
+            containerView.layer.masksToBounds = true
+
+            // Add the container view to the main view
+            self.view.addSubview(containerView)
+
+            // Set up constraints for the fixed width and height
+            NSLayoutConstraint.activate([
+                containerView.widthAnchor.constraint(equalToConstant: containerViewWidth),
+                containerView.heightAnchor.constraint(equalToConstant: containerViewHeight),
+                containerView.centerXAnchor.constraint(equalTo: self.view.centerXAnchor),
+                containerView.topAnchor.constraint(equalTo: self.view.topAnchor, constant: 275 + padding)
+            ])
+            let label = UILabel()
+            label.text = staffShift.name
+            label.font = HIAppearance.Font.eventTitle!
+            label.translatesAutoresizingMaskIntoConstraints = false
+
+            // Add the label to the container view
+            containerView.addSubview(label)
+
+            // Set up constraints for the labels within the container view
+            NSLayoutConstraint.activate([
+                label.topAnchor.constraint(equalTo: containerView.topAnchor, constant: 15.0),
+                label.leadingAnchor.constraint(equalTo: containerView.leadingAnchor, constant: 20.0)
+            ])
+            
+            // Add time, location, and description labels to shift cells
+            // Time label set up
+            var eventCellSpacing: CGFloat = 8.0
+            var locationImageView = UIImageView(image: #imageLiteral(resourceName: "LocationSign")); var timeImageView = UIImageView(image: #imageLiteral(resourceName: "Clock"))
+            let timeLabel = HILabel(style: .time)
+            timeLabel.text = Formatter.simpleTime.string(from: staffShift.startTime) + " - " + Formatter.simpleTime.string(from: staffShift.endTime)
+            containerView.addSubview(timeImageView)
+            timeImageView.translatesAutoresizingMaskIntoConstraints = false
+            timeImageView.leadingAnchor.constraint(equalTo: label.leadingAnchor).isActive = true
+            timeImageView.bottomAnchor.constraint(equalTo: label.bottomAnchor, constant: 25.0).isActive = true
+            containerView.addSubview(timeLabel)
+            timeLabel.leadingAnchor.constraint(equalTo: timeImageView.trailingAnchor, constant: eventCellSpacing + 1).isActive = true
+            timeLabel.centerYAnchor.constraint(equalTo: timeImageView.centerYAnchor).isActive = true
+            
+            // Location label set up
+            let locationLabel = HILabel(style: .newLocation)
+            if staffShift.locations.count > 0 {
+                locationLabel.text = staffShift.locations.map { $0.name }.joined(separator: ", ")
+            } else {
+                locationLabel.text = "No Location"
+            }
+            containerView.addSubview(locationImageView)
+            locationImageView.translatesAutoresizingMaskIntoConstraints = false
+            containerView.addSubview(locationLabel)
+            locationImageView.leadingAnchor.constraint(equalTo: timeImageView.leadingAnchor, constant: 1.0).isActive = true
+            locationImageView.bottomAnchor.constraint(equalTo: timeImageView.bottomAnchor, constant: 25.0).isActive = true
+            locationLabel.leadingAnchor.constraint(equalTo: timeLabel.leadingAnchor).isActive = true
+            locationLabel.centerYAnchor.constraint(equalTo: locationImageView.centerYAnchor).isActive = true
+            
+            // Description label set up
+            let descriptionLabel = HILabel(style: .cellDescription)
+            descriptionLabel.numberOfLines = 1
+            descriptionLabel.text = "\(staffShift.description)"
+            containerView.addSubview(descriptionLabel)
+            descriptionLabel.translatesAutoresizingMaskIntoConstraints = false
+            descriptionLabel.leadingAnchor.constraint(equalTo: locationImageView.leadingAnchor).isActive = true
+            descriptionLabel.bottomAnchor.constraint(equalTo: locationImageView.bottomAnchor, constant: 25.0).isActive = true
+            padding += 150.0
+        }
+    }
 }