From fbd9a2c1c138275bec0f795361980a5e34365fe7 Mon Sep 17 00:00:00 2001
From: Sandra Kuipers <sandra@skuipers.com>
Date: Wed, 10 May 2017 11:55:08 +0800
Subject: [PATCH] Attendance: Usability tweaks (#230)

* Teacher dashboard My Classes links to class Attendance (if available)

* Attendance: Removed alert bar from Attendance by Class/Roll Group pages
---
 functions.php                                        | 8 ++++++--
 modules/Attendance/attendance_take_byCourseClass.php | 3 ---
 modules/Attendance/attendance_take_byRollGroup.php   | 3 ---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/functions.php b/functions.php
index cf3c6bd53b..fc31b07a22 100755
--- a/functions.php
+++ b/functions.php
@@ -3230,7 +3230,7 @@ function sidebar($gibbon, $pdo)
     if ($_SESSION[$guid]['address'] == '' and isset($_SESSION[$guid]['username'])) {
         try {
             $data = array('gibbonSchoolYearID' => $_SESSION[$guid]['gibbonSchoolYearID'], 'gibbonPersonID' => $_SESSION[$guid]['gibbonPersonID']);
-            $sql = "SELECT gibbonCourse.nameShort AS course, gibbonCourseClass.nameShort AS class, gibbonCourseClass.gibbonCourseClassID FROM gibbonCourse, gibbonCourseClass, gibbonCourseClassPerson WHERE gibbonSchoolYearID=:gibbonSchoolYearID AND gibbonCourse.gibbonCourseID=gibbonCourseClass.gibbonCourseID AND gibbonCourseClass.gibbonCourseClassID=gibbonCourseClassPerson.gibbonCourseClassID AND gibbonCourseClassPerson.gibbonPersonID=:gibbonPersonID AND NOT role LIKE '% - Left%' ORDER BY course, class";
+            $sql = "SELECT gibbonCourse.nameShort AS course, gibbonCourseClass.nameShort AS class, gibbonCourseClass.gibbonCourseClassID, gibbonCourseClass.attendance FROM gibbonCourse, gibbonCourseClass, gibbonCourseClassPerson WHERE gibbonSchoolYearID=:gibbonSchoolYearID AND gibbonCourse.gibbonCourseID=gibbonCourseClass.gibbonCourseID AND gibbonCourseClass.gibbonCourseClassID=gibbonCourseClassPerson.gibbonCourseClassID AND gibbonCourseClassPerson.gibbonPersonID=:gibbonPersonID AND NOT role LIKE '% - Left%' ORDER BY course, class";
             $result = $connection2->prepare($sql);
             $result->execute($data);
         } catch (PDOException $e) {
@@ -3292,7 +3292,11 @@ function sidebar($gibbon, $pdo)
                     echo '</td>';
                 }
                 echo "<td style='text-align: center'>";
-                echo "<a href='index.php?q=/modules/Departments/department_course_class.php&gibbonCourseClassID=".$row['gibbonCourseClassID']."#participants'><img title='".__($guid, 'Participants')."' src='./themes/".$_SESSION[$guid]['gibbonThemeName']."/img/attendance.png'/></a>";
+                if (isActionAccessible($guid, $connection2, '/modules/Attendance/attendance_take_byCourseClass.php') && $row['attendance'] == 'Y') {
+                    echo "<a href='index.php?q=/modules/Attendance/attendance_take_byCourseClass.php&gibbonCourseClassID=".$row['gibbonCourseClassID']."'><img title='".__($guid, 'Take Attendance')."' src='./themes/".$_SESSION[$guid]['gibbonThemeName']."/img/attendance.png'/></a>";
+                } else {
+                    echo "<a href='index.php?q=/modules/Departments/department_course_class.php&gibbonCourseClassID=".$row['gibbonCourseClassID']."#participants'><img title='".__($guid, 'Participants')."' src='./themes/".$_SESSION[$guid]['gibbonThemeName']."/img/attendance.png'/></a>";
+                }
                 echo '</td>';
                 if (isActionAccessible($guid, $connection2, '/modules/Planner/planner.php')) {
                     echo "<td style='text-align: center'>";
diff --git a/modules/Attendance/attendance_take_byCourseClass.php b/modules/Attendance/attendance_take_byCourseClass.php
index 70d28bffab..eff4414b09 100755
--- a/modules/Attendance/attendance_take_byCourseClass.php
+++ b/modules/Attendance/attendance_take_byCourseClass.php
@@ -356,9 +356,6 @@
 									print "<td style='border: 1px solid #ffffff; width:20%; text-align: center; vertical-align: top'>" ;
 								}
 
-									//Alerts, if permission allows
-        							echo getAlertBar($guid, $connection2, $rowCourseClass['gibbonPersonID'], $rowCourseClass['privacy']);
-
         							//User photo
 									print getUserPhoto($guid, $rowCourseClass["image_240"], 75) ;
 
diff --git a/modules/Attendance/attendance_take_byRollGroup.php b/modules/Attendance/attendance_take_byRollGroup.php
index a2d4bf8a6e..d4d8f6aa90 100755
--- a/modules/Attendance/attendance_take_byRollGroup.php
+++ b/modules/Attendance/attendance_take_byRollGroup.php
@@ -309,9 +309,6 @@ function dateCheck() {
                                         echo "<td style='border: 1px solid #ffffff; width:20%; text-align: center; vertical-align: top'>";
                                     }
 
-                                    //Alerts, if permission allows
-                                    echo getAlertBar($guid, $connection2, $rowRollGroup['gibbonPersonID'], $rowRollGroup['privacy']);
-
                                     //User photo
                                     echo getUserPhoto($guid, $rowRollGroup['image_240'], 75);