v5.25.01

GibbonEdu · Dec 2, 2024 · 2f1019b · 2f1019b
1 parent 056aec5
commit 2f1019b
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 16 deletions.
diff --git a/Free Learning/CHANGEDB.php b/Free Learning/CHANGEDB.php
@@ -2329,4 +2329,9 @@
 //v5.25.00
 ++$count;
 $sql[$count][0] = '5.25.00';
+$sql[$count][1] = "";
+
+//v5.25.01
+++$count;
+$sql[$count][0] = '5.25.01';
 $sql[$count][1] = "";
diff --git a/Free Learning/CHANGELOG.txt b/Free Learning/CHANGELOG.txt
@@ -1,5 +1,9 @@
 CHANGELOG
 =========
+v2.25.01
+-------
+Added new pink label colour for student units with status Exempt
+
 v2.25.00
 -------
 Added (v28 dependent) ability for teachers to edit their own comments within 48 hours

diff --git a/Free Learning/css/module.css b/Free Learning/css/module.css
@@ -36,6 +36,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     color: #B3801B;
 }
 
+.exempt {
+    border-color: #e520b7;
+    background-color: #f9dbf2;
+    color: #e520b7;
+}
+
 .vis-tooltip {
     margin-top: 4.5rem;
     margin-left: 0.5rem;

diff --git a/Free Learning/manifest.php b/Free Learning/manifest.php
@@ -27,7 +27,7 @@
 $entryURL = 'units_browse.php';
 $type = 'Additional';
 $category = 'Learn';
-$version = '5.25.00';
+$version = '5.25.01';
 $author = "Gibbon Foundation";
 $url = "https://gibbonedu.org";
 

diff --git a/Free Learning/report_mentorshipOverview.php b/Free Learning/report_mentorshipOverview.php
@@ -180,11 +180,11 @@
                     'position' => 'right',
                 ]
             ])
-            ->setLabels([__m('Current - Pending'), __m('Current'), __m('Complete - Pending'), __m('Evidence Not Yet Approved'), __m('Complete - Approved')])
-            ->setColors(['#FAF089', '#BAE6FD', '#DCC5f4', '#FFD2A8', '#6EE7B7']);
+            ->setLabels([__m('Current - Pending'), __m('Current'), __m('Complete - Pending'), __m('Evidence Not Yet Approved'), __m('Complete - Approved'), __m('Exempt')])
+            ->setColors(['#FAF089', '#BAE6FD', '#DCC5f4', '#FFD2A8', '#6EE7B7', '#f9dbf2']);
 
         $chart->addDataset('pie')
-            ->setData([$unitStats['Current - Pending'], $unitStats['Current'], $unitStats['Complete - Pending'], $unitStats['Evidence Not Yet Approved'], $unitStats['Complete - Approved']]);
+            ->setData([$unitStats['Current - Pending'], $unitStats['Current'], $unitStats['Complete - Pending'], $unitStats['Evidence Not Yet Approved'], $unitStats['Complete - Approved'], $unitStats['Exempt']]);
 
         echo $chart->render();
 
@@ -204,7 +204,7 @@
         if ($student['status'] == 'Evidence Not Yet Approved') $row->addClass('warning');
         if ($student['status'] == 'Complete - Pending') $row->addClass('pending');
         if ($student['status'] == 'Complete - Approved') $row->addClass('success');
-        if ($student['status'] == 'Exempt') $row->addClass('success');
+        if ($student['status'] == 'Exempt') $row->addClass('exempt');
         return $row;
     });
 

diff --git a/Free Learning/report_studentProgressByClass.php b/Free Learning/report_studentProgressByClass.php
@@ -119,7 +119,7 @@
 
             $table->addColumn('exemptCount', __('Exempt'))
                 ->width('11%')
-                ->addClass('success');
+                ->addClass('exempt');
 
             $table->addColumn('totalCount', __('Total'))
                 ->width('11%');

diff --git a/Free Learning/src/Tables/UnitHistory.php b/Free Learning/src/Tables/UnitHistory.php
@@ -75,6 +75,7 @@ public function create($gibbonPersonID, $summary = false, $canBrowse = true, $di
                     "Current" => [],
                     "Current - Pending" => [],
                     "Incomplete" => [],
+                    "Exempt" => [],
                 ];
 
                 $statuses = array_keys($unitStats);
@@ -89,8 +90,6 @@ public function create($gibbonPersonID, $summary = false, $canBrowse = true, $di
                         foreach ($units as $unit) {
                             if ($unit['status'] != $status) continue;
 
-                            if ($unit['status'] == 'Exempt') $unit['status'] = 'Complete - Approved';
-
                             if ($unit['flCourse'] == $course['name']) {
                                 $unitStats[$unit['status']][$index]++;
                                 $unitTotal++;
@@ -140,11 +139,11 @@ public function create($gibbonPersonID, $summary = false, $canBrowse = true, $di
                             'position' => 'right',
                         ]
                     ])
-                    ->setLabels([__m('Current - Pending'), __m('Current'), __m('Complete - Pending'), __m('Evidence Not Yet Approved'), __m('Complete - Approved')])
-                    ->setColors(['#FAF089', '#BAE6FD', '#DCC5f4', '#FFD2A8', '#6EE7B7']);
+                    ->setLabels([__m('Current - Pending'), __m('Current'), __m('Complete - Pending'), __m('Evidence Not Yet Approved'), __m('Complete - Approved'), __m('Exempt')])
+                    ->setColors(['#FAF089', '#BAE6FD', '#DCC5f4', '#FFD2A8', '#6EE7B7', '#f9dbf2']);
 
                 $chart->addDataset('pie')
-                    ->setData([$unitStats['Current - Pending'], $unitStats['Current'], $unitStats['Complete - Pending'], $unitStats['Evidence Not Yet Approved'], $unitStats['Complete - Approved']]);
+                    ->setData([$unitStats['Current - Pending'], $unitStats['Current'], $unitStats['Complete - Pending'], $unitStats['Evidence Not Yet Approved'], $unitStats['Complete - Approved'], $unitStats['Exempt']]);
             }
 
             $output .= $chart->render();
@@ -158,7 +157,7 @@ public function create($gibbonPersonID, $summary = false, $canBrowse = true, $di
             if ($student['status'] == 'Evidence Not Yet Approved') $row->setClass('warning');
             if ($student['status'] == 'Complete - Pending') $row->setClass('pending');
             if ($student['status'] == 'Complete - Approved') $row->setClass('success');
-            if ($student['status'] == 'Exempt') $row->setClass('success');
+            if ($student['status'] == 'Exempt') $row->setClass('exempt');
             return $row;
         });
 
@@ -168,6 +167,7 @@ public function create($gibbonPersonID, $summary = false, $canBrowse = true, $di
             'status:complete - pending'        => __('Status') .': '.__m('Complete - Pending'),
             'status:evidence not yet approved' => __('Status') .': '.__m('Evidence Not Yet Approved'),
             'status:complete - approved'       => __('Status') .': '.__m('Complete - Approved'),
+            'status:exempt'                    => __('Status') .': '.__m('Exempt'),
         ];
 
         $learningAreas = $this->unitStudentGateway->selectLearningAreasByStudent($gibbonPersonID)->fetchKeyPair();

diff --git a/Free Learning/templates/unitLegend.twig.html b/Free Learning/templates/unitLegend.twig.html
@@ -13,4 +13,5 @@
     <span class="tag pending mr-2">{{ __m('Complete - Pending') }}</span>
     <span class="tag warning mr-2">{{ __m('Evidence Not Yet Approved') }}</span>
     <span class="tag success mr-2">{{ __m('Complete - Approved') }}</span>
+    <span class="tag exempt mr-2">{{ __m('Exempt') }}</span>
 </div>
diff --git a/Free Learning/units_browse.php b/Free Learning/units_browse.php
@@ -266,7 +266,7 @@
                 switch ($unit['status']) {
                     case 'Complete - Approved':
                     case 'Exempt':
-                        $unit['statusClass'] = 'success';
+                        $unit['statusClass'] = 'exempt';
                         break;
                     case 'Current':
                         $unit['statusClass'] = 'currentUnit';
@@ -499,7 +499,7 @@
                         }
 
                         if ($unit['status'] == 'Complete - Approved' or $unit['status'] == 'Exempt') {
-                            $nodeList .= '{id: '.$countNodes.", shape: 'circularImage', image: 'undefined', label: '".addSlashes($unit['name'])."', title: '".$title."', color: {border:'#390', background:'#D4F6DC'}, borderWidth: 2},";
+                            $nodeList .= '{id: '.$countNodes.", shape: 'circularImage', image: 'undefined', label: '".addSlashes($unit['name'])."', title: '".$title."', color: {border:'#e520b7', background:'#f9dbf2'}, borderWidth: 2},";
                         } elseif ($unit['status'] == 'Current') {
                             $nodeList .= '{id: '.$countNodes.", shape: 'circularImage', image: 'undefined', label: '".addSlashes($unit['name'])."', title: '".$title."', color: {border:'#0EA5E9', background:'#BAE6FD'}, borderWidth: 2},";
                         } elseif ($unit['status'] == 'Current - Pending') {

diff --git a/Free Learning/units_browse_details.php b/Free Learning/units_browse_details.php
@@ -431,7 +431,7 @@
                                 if ($student['status'] == 'Evidence Not Yet Approved') $row->addClass('warning');
                                 if ($student['status'] == 'Complete - Pending') $row->addClass('pending');
                                 if ($student['status'] == 'Complete - Approved') $row->addClass('success');
-                                if ($student['status'] == 'Exempt') $row->addClass('success');
+                                if ($student['status'] == 'Exempt') $row->addClass('exempt');
                                 return $row;
                             });
 

diff --git a/Free Learning/version.php b/Free Learning/version.php
@@ -22,5 +22,5 @@
 /**
  * Sets version information.
  */
-$moduleVersion = '5.25.00';
+$moduleVersion = '5.25.01';
 $coreVersion = '28.0.00';