Merge remote-tracking branch 'origin/1.1'

Burgundy-Labs · Jan 18, 2018 · 98a67f3 · 98a67f3
2 parents 3940e03 + e2ea097
commit 98a67f3
Showing 1 changed file with 15 additions and 16 deletions.
diff --git a/app/views/dashboard.scala.html b/app/views/dashboard.scala.html
@@ -4,7 +4,6 @@
         UserController.getCurrentUser
     }
     @main("Dashboard", "Your Dashboard") {
-
             <script type="text/javascript">
                 $(document).ready(function(){
                     if (Cookies.get('newUser') === "true") {
@@ -39,6 +38,18 @@ <h4>Hello, @{
                         </div>
                     </div>
                 </div>
+                <div class="mb-3 col-md-4">
+                    <div class="card text-center">
+                        <div class="card-header">
+                            <h4>Quick-Schedule</h4>
+                        </div>
+                        <div class="card-block">
+                            <button onclick="createNewAppointment()" class="btn btn-primary mb-3 col-12">
+                                Schedule New Appointment
+                            </button>
+                        </div>
+                    </div>
+                </div>
                 <div class="mb-3 col-md-4">
                     <div class="card">
                         <div class="card-header">
@@ -59,18 +70,6 @@ <h6>Notifications:</h6>
                         </div>
                     </div>
                 </div>
-                <div class="mb-3 col-md-4">
-                    <div class="card text-center">
-                        <div class="card-header">
-                            <h4>Quick-Schedule</h4>
-                        </div>
-                        <div class="card-block">
-                            <button onclick="createNewAppointment()" class="btn btn-primary mb-3 col-12">
-                                Schedule New Appointment
-                            </button>
-                        </div>
-                    </div>
-                </div>
             </div>
             <br/>
             <div class="row">
@@ -139,9 +138,9 @@ <h4 class="float-left">Next Five Appointments</h4>
                                 success: function (response) {
                                     const events = [];
                                     $(response).each(function () {
-                                        var userID = '@currentUser.getUid';
-                                        var role = '@currentUser.getRole';
-                                        var title = "";
+                                        const userID = '@currentUser.getUid';
+                                        const role = '@currentUser.getRole';
+                                        let title = "";
                                         if (userID === $(this).attr("studentId")) {
                                             if (role !== "Student") {
                                                 title = $(this).attr("studentName")