diff --git a/ProjectClock/AlarmActivationViewController.swift b/ProjectClock/AlarmActivationViewController.swift
index 81e4eea..e1f5a64 100644
--- a/ProjectClock/AlarmActivationViewController.swift
+++ b/ProjectClock/AlarmActivationViewController.swift
@@ -23,6 +23,9 @@ class AlarmActivationViewController: UIViewController
@IBOutlet weak var rpsView: UIView!
@IBOutlet weak var rpsResult: UILabel!
+ //Other Outlets
+ @IBOutlet weak var timeLabel: UILabel!
+ @IBOutlet weak var dateLabel: UILabel!
init?(coder: NSCoder, currentAlarm: Alarm)
{
@@ -38,6 +41,17 @@ class AlarmActivationViewController: UIViewController
override func viewDidLoad()
{
super.viewDidLoad()
+ //Set the time and date
+ let date = Date()
+ let dateFormatter = DateFormatter()
+ dateFormatter.dateFormat = "MMM d, Y"
+
+ dateLabel.text = dateFormatter.string(from: date)
+
+ dateFormatter.dateFormat = "hh:mm"
+ timeLabel.text = dateFormatter.string(from: date)
+
+
//Hide all inactive wakemethods
puzzleView.isHidden = true
rpsView.isHidden = true
diff --git a/ProjectClock/Base.lproj/Main.storyboard b/ProjectClock/Base.lproj/Main.storyboard
index 3973fc4..277a7de 100644
--- a/ProjectClock/Base.lproj/Main.storyboard
+++ b/ProjectClock/Base.lproj/Main.storyboard
@@ -716,11 +716,13 @@
+
+