smtech / advisor-dashboard

common.inc.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use smtech\AdvisorDashboard\Toolbox;
 use smtech\ReflexiveCanvasLTI\LTI\ToolProvider;
-use smtech\ReflexiveCanvasLTI\Exception\ConfigurationException;
 use Battis\DataUtilities;
 
 define('CONFIG_FILE', __DIR__ . '/config.xml');

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 if (empty($_SESSION[Toolbox::class])) {
     $_SESSION[Toolbox::class] = Toolbox::fromConfiguration(CONFIG_FILE);
 }
-$toolbox =& $_SESSION[Toolbox::class];
+$toolbox = & $_SESSION[Toolbox::class];
 $toolbox->smarty_assign('category', DataUtilities::titleCase(preg_replace('/[\-_]+/', ' ', basename(__DIR__))));
 
 /* set the Tool Consumer's instance URL, if present */

src/Toolbox.php

Doc Comments +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
     /**
      * Configure course and account navigation placements
      *
-     * @return Generator
+     * @return \smtech\LTI\Configuration\Generator
      */
     public function getGenerator()
     {

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace smtech\AdvisorDashboard;
 
 use smtech\LTI\Configuration\Option;
-use Battis\DataUtilities;
 use Battis\HierarchicalSimpleCache;
 
 /**

js/relative-grades.js.php

Indentation +28 added lines, -28 removed lines

@@ -21,10 +21,10 @@ 
 
 $points = 0;
 function normalize($numerator, $denominator = false) {
-	global $points;
-	$denominator = ($denominator !== false ? $denominator : $points);
-	$points = $denominator;
-	return min(100, $numerator / $denominator * 100);
+    global $points;
+    $denominator = ($denominator !== false ? $denominator : $points);
+    $points = $denominator;
+    return min(100, $numerator / $denominator * 100);
 }
 
 header('Content-Type: application/javascript');
@@ -34,7 +34,7 @@ 
 
 $analytics = $toolbox->cache_get('analytics');
 if ($analytics === false) {
-	exit;
+    exit;
 }
 
 ?>
@@ -47,29 +47,29 @@ 
 
 	<?php
 
-		$labels = array();
-		$max_scores = array();
-		$min_scores = array();
-		$medians = array();
-		$first_quartiles = array();
-		$third_quartiles = array();
-		$scores = array();
-		foreach($analytic as $data) {
-			if ($data['points_possible'] > 0 && $data['max_score'] > 0) {
-				$labels[] = ''; // htmlentities($data['title']);
-				$max_scores[] = normalize($data['max_score'], $data['points_possible']);
-				$min_scores[] = normalize($data['min_score']);
-				$medians[] = normalize($data['median']);
-				$first_quartiles[] = normalize($data['first_quartile']);
-				$third_quartiles[] = normalize($data['third_quartile']);
-				if (empty($data['submission'])) {
-					$scores[] = '""'; /* some assignments may not have grades */
-				} else {
-					$scores[] = normalize($data['submission']['score']);
-				}
-			}
-		}
-	?>
+        $labels = array();
+        $max_scores = array();
+        $min_scores = array();
+        $medians = array();
+        $first_quartiles = array();
+        $third_quartiles = array();
+        $scores = array();
+        foreach($analytic as $data) {
+            if ($data['points_possible'] > 0 && $data['max_score'] > 0) {
+                $labels[] = ''; // htmlentities($data['title']);
+                $max_scores[] = normalize($data['max_score'], $data['points_possible']);
+                $min_scores[] = normalize($data['min_score']);
+                $medians[] = normalize($data['median']);
+                $first_quartiles[] = normalize($data['first_quartile']);
+                $third_quartiles[] = normalize($data['third_quartile']);
+                if (empty($data['submission'])) {
+                    $scores[] = '""'; /* some assignments may not have grades */
+                } else {
+                    $scores[] = normalize($data['submission']['score']);
+                }
+            }
+        }
+    ?>
 
 	var data = {
 		labels: [<?= '"' . implode('", "', $labels) . '"' ?>],

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 define('MEDIAN_STROKE', '#fff'); // white
 define('MEDIAN_FILL', THIRD_QUARTILE_FILL);
 define('FIRST_QUARTILE_STROKE', TRANSPARENT);
-define('FIRST_QUARTILE_FILL', '#ffe399');  // light yellow
+define('FIRST_QUARTILE_FILL', '#ffe399'); // light yellow
 define('LOW_STROKE', '#ff3f0c'); // medium red
 define('LOW_FILL', '#fff'); // white
 define('SCORE_STROKE', '#000'); // black
@@ -54,7 +54,7 @@ 
 		$first_quartiles = array();
 		$third_quartiles = array();
 		$scores = array();
-		foreach($analytic as $data) {
+		foreach ($analytic as $data) {
 			if ($data['points_possible'] > 0 && $data['max_score'] > 0) {
 				$labels[] = ''; // htmlentities($data['title']);
 				$max_scores[] = normalize($data['max_score'], $data['points_possible']);

account/rename-advisory-groups.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
                         'course[course_code]' => $courseName
                     ]);
                     $sections = $toolbox->api_get("courses/{$course['id']}/sections");
-                    foreach($sections as $section) {
+                    foreach ($sections as $section) {
                         if ($section['name'] == $course['name']) {
                             $toolbox->api_put("sections/{$sections[0]['id']}", [
                                 'course_section[name]' => $courseName

account/create-advisor-observers.php

Spacing +5 added lines, -5 removed lines

@@ -64,7 +64,7 @@ 
             $created = 0;
             $reset = 0;
 
-            foreach($advisories as $advisory) {
+            foreach ($advisories as $advisory) {
                 /* cache the teacher */
                 $advisors = $toolbox->api_get("courses/{$advisory['id']}/users", [
                     'enrollment_role' => 'TeacherEnrollment'
@@ -75,7 +75,7 @@ 
                 } else {
                     $toolbox->smarty_addMessage(
                         "{$advisory['name']}",
-                        "No teacher was found in <a target=\"_parent\" href=\"" . $_SESSION[CANVAS_INSTANCE_URL]. "/courses/{$advisory['id']}\">this advisory</a> and it was skipped.",
+                        "No teacher was found in <a target=\"_parent\" href=\"" . $_SESSION[CANVAS_INSTANCE_URL] . "/courses/{$advisory['id']}\">this advisory</a> and it was skipped.",
                         NotificationMessage::ERROR
                     );
                     break;
@@ -87,7 +87,7 @@ 
                     'enrollment_role' => 'StudentEnrollment'
                 ]);
 
-                foreach($advisees as $advisee) {
+                foreach ($advisees as $advisee) {
 
                     /* generate what the advisor account info should be */
                     $observer = [
@@ -125,7 +125,7 @@ 
                         $communicationChannels = $toolbox->api_get("users/{$existing['id']}/communication_channels");
                         $emailExists = false;
                         $channelsToDelete = [];
-                        foreach($communicationChannels as $communicationChannel) {
+                        foreach ($communicationChannels as $communicationChannel) {
                             if ($communicationChannel['address'] != $observer['email']) {
                                 $channelsToDelete[] = $communicationChannel['id'];
                             } else {
@@ -140,7 +140,7 @@ 
                                 'position' => 1
                             ]);
                         }
-                        foreach($channelsToDelete as $channelToDelete) {
+                        foreach ($channelsToDelete as $channelToDelete) {
                             $toolbox->api_delete("users/{$existing['id']}/communication_channels/{$channelToDelete}");
                         }
 

index.php

Spacing +4 added lines, -6 removed lines

@@ -13,8 +13,7 @@ 
 
 /* store any requested actions for future handling */
 $action = (empty($_REQUEST['action']) ?
-    ACTION_UNSPECIFIED :
-    strtolower($_REQUEST['action'])
+    ACTION_UNSPECIFIED : strtolower($_REQUEST['action'])
 );
 
 /* action requests only come from outside the LTI! */
@@ -30,7 +29,7 @@ 
     @session_unset();
     @session_start();
     @session_regenerate_id(true);
-    $_SESSION[Toolbox::class] =& $toolbox;
+    $_SESSION[Toolbox::class] = & $toolbox;
     session_write_close();
     $toolbox->lti_authenticate();
     exit;
@@ -49,8 +48,7 @@ 
 /* if not authenticated, default to showing credentials */
 } else {
     $action = (empty($action) ?
-        ACTION_CONFIG :
-        $action
+        ACTION_CONFIG : $action
     );
 }
 
@@ -60,7 +58,7 @@ 
     /* reset cached install data from config file */
     case ACTION_INSTALL: {
         $_SESSION['toolbox'] = Toolbox::fromConfiguration(CONFIG_FILE, true);
-        $toolbox =& $_SESSION['toolbox'];
+        $toolbox = & $_SESSION['toolbox'];
 
         /* test to see if we can connect to the API */
         try {

course/common.inc.php

Indentation +8 added lines, -8 removed lines

@@ -11,14 +11,14 @@
 /* get and cache ID of first student in the advisory group */
 $firstStudent = $toolbox->cache_get('first-student');
 if (empty($firstStudent)) {
-	$enrollments = $toolbox->api_get(
-		'courses/' . $_SESSION[ToolProvider::class]['canvas']['course_id'] . '/enrollments',
-		[
-			'role[]' => 'StudentEnrollment'
-		]
-	);
-	$firstStudent = $enrollments[0]['user']['id'];
-	$toolbox->cache_set('first-student', $firstStudent);
+    $enrollments = $toolbox->api_get(
+        'courses/' . $_SESSION[ToolProvider::class]['canvas']['course_id'] . '/enrollments',
+        [
+            'role[]' => 'StudentEnrollment'
+        ]
+    );
+    $firstStudent = $enrollments[0]['user']['id'];
+    $toolbox->cache_set('first-student', $firstStudent);
 }
 
 /* generate faculty journal URL for use by `smtech/canvashack-plugin-faculty-journal` */

course/index.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
 <?php
 
-header ('Location: relative-grades.php');
+header('Location: relative-grades.php');
 exit;

course/relative-grades.php

Indentation +38 added lines, -38 removed lines

@@ -7,14 +7,14 @@ 
 
 $accounts = $toolbox->getAccountList();
 function isAcademic($account) {
-	global $accounts;
-	if ($account == 132) { // FIXME really, hard-coded values? Really?
-		return true;
-	} elseif ($account == 1 || !is_integer($account)) {
-		return false;
-	} else {
-		return isAcademic($accounts[$account]['parent_account_id']);
-	}
+    global $accounts;
+    if ($account == 132) { // FIXME really, hard-coded values? Really?
+        return true;
+    } elseif ($account == 1 || !is_integer($account)) {
+        return false;
+    } else {
+        return isAcademic($accounts[$account]['parent_account_id']);
+    }
 }
 
 $toolbox->cache_pushKey(basename(__FILE__, '.php'));
@@ -24,12 +24,12 @@ 
 
 $advisees = $toolbox->cache_get('advisees');
 if ($advisees === false) {
-	$advisees = $toolbox->api_get(
-		'courses/' . $_SESSION[COURSE_ID] . '/enrollments', [
-			'role[]' => 'StudentEnrollment' // FIXME this shouldn't require the faux-array
-		]
-	);
-	$toolbox->cache_set('advisees', $advisees);
+    $advisees = $toolbox->api_get(
+        'courses/' . $_SESSION[COURSE_ID] . '/enrollments', [
+            'role[]' => 'StudentEnrollment' // FIXME this shouldn't require the faux-array
+        ]
+    );
+    $toolbox->cache_set('advisees', $advisees);
 }
 
 $advisee = (isset($_REQUEST['advisee']) ? $_REQUEST['advisee'] : $advisees[0]['user']['id']);
@@ -38,40 +38,40 @@ 
 
 $courses = $toolbox->cache_get('courses');
 if ($courses === false) {
-	$allCourses = $toolbox->api_get("users/$advisee/courses");
-
-	$courses = [];
-	foreach ($allCourses as $course) {
-		if (
-			!empty($course['account_id']) &&
-			isAcademic($course['account_id'])
-		) {
-
-			$courses[$course['id']] = $course;
-		}
-	}
-	$toolbox->cache_set('courses', $courses);
+    $allCourses = $toolbox->api_get("users/$advisee/courses");
+
+    $courses = [];
+    foreach ($allCourses as $course) {
+        if (
+            !empty($course['account_id']) &&
+            isAcademic($course['account_id'])
+        ) {
+
+            $courses[$course['id']] = $course;
+        }
+    }
+    $toolbox->cache_set('courses', $courses);
 }
 
 $analytics = $toolbox->cache_get('analytics');
 if ($analytics === false) {
-	$analytics = [];
-	foreach ($courses as $course) {
-		$analytics[$course['id']] = $toolbox->api_get("courses/{$course['id']}/analytics/users/$advisee/assignments");
-	}
-	$toolbox->cache_set('analytics', $analytics);
+    $analytics = [];
+    foreach ($courses as $course) {
+        $analytics[$course['id']] = $toolbox->api_get("courses/{$course['id']}/analytics/users/$advisee/assignments");
+    }
+    $toolbox->cache_set('analytics', $analytics);
 }
 
 $toolbox->cache_popKey();
 $toolbox->cache_popKey();
 
 $toolbox->smarty_assign([
-	'advisee' => $advisee,
-	'advisees' => $advisees,
-	'terms' => $terms,
-	'courses' => $courses,
-	'analytics' => $analytics,
-	'canvasInstanceUrl' => $_SESSION[CANVAS_INSTANCE_URL]
+    'advisee' => $advisee,
+    'advisees' => $advisees,
+    'terms' => $terms,
+    'courses' => $courses,
+    'analytics' => $analytics,
+    'canvasInstanceUrl' => $_SESSION[CANVAS_INSTANCE_URL]
 ]);
 
 /*