Reports: updated report writing to show left class enrolments with th…

…e Show Left Students tool
GibbonEdu · Apr 25, 2024 · 9e16540 · 9e16540
1 parent e6b44b4
commit 9e16540
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -54,6 +54,7 @@ v27.0.00
         Library: updated child records to use the same Vendor field as parent records in Manage Catalogue
         Messenger: added search form and school year navigator to Manage Groups page for quicker group browsing
         Messenger: added an index to the Message Target table to speed up the recipients query
+        Reports: updated report writing to also show left class enrolments with the Show Left Students tool
         Reports: added uploadable Image as a field type in Manage Criteria Types
         Reports: added a check for the correct .twig.html extension in Manage Assets
         School Admin: added the ability to toggle facilities between active and inactive

diff --git a/modules/Reports/src/Domain/ReportingAccessGateway.php b/modules/Reports/src/Domain/ReportingAccessGateway.php
@@ -310,8 +310,9 @@ public function selectReportingProgressByScope($gibbonReportingScopeID, $scopeTy
                 ->where('gibbonStudentEnrolment.gibbonFormGroupID=:scopeTypeID')
                 ->groupBy(['gibbonStudentEnrolment.gibbonPersonID']);
         } elseif ($scopeType == 'Course') {
-            $query->innerJoin('gibbonCourseClass', 'gibbonCourseClass.gibbonCourseID=gibbonReportingCriteria.gibbonCourseID')
-                ->innerJoin('gibbonCourseClassPerson', "gibbonCourseClassPerson.gibbonCourseClassID=gibbonCourseClass.gibbonCourseClassID AND gibbonCourseClassPerson.role='Student'")
+            $query->cols(['gibbonCourseClassPerson.role'])
+                ->innerJoin('gibbonCourseClass', 'gibbonCourseClass.gibbonCourseID=gibbonReportingCriteria.gibbonCourseID')
+                ->innerJoin('gibbonCourseClassPerson', "gibbonCourseClassPerson.gibbonCourseClassID=gibbonCourseClass.gibbonCourseClassID AND ".($allStudents ? "(gibbonCourseClassPerson.role='Student' OR gibbonCourseClassPerson.role='Student - Left')" : "gibbonCourseClassPerson.role='Student'"))
                 ->innerJoin('gibbonPerson', 'gibbonPerson.gibbonPersonID=gibbonCourseClassPerson.gibbonPersonID')
                 ->leftJoin('gibbonReportingProgress', 'gibbonReportingProgress.gibbonReportingScopeID=gibbonReportingCriteria.gibbonReportingScopeID AND gibbonReportingProgress.gibbonCourseClassID=gibbonCourseClass.gibbonCourseClassID AND gibbonReportingProgress.gibbonPersonIDStudent=gibbonPerson.gibbonPersonID')
                 ->where('gibbonCourseClass.gibbonCourseClassID=:scopeTypeID')

diff --git a/modules/Reports/templates/ui/writingQueue.twig.html b/modules/Reports/templates/ui/writingQueue.twig.html
@@ -59,6 +59,10 @@ <h4>
             {% if student.status != 'Full' %}
                 <span class="tag error ml-2 text-xxs">{{ student.status }}</span>
             {% endif %}
+
+            {% if student.role == 'Student - Left' %}
+                <span class="tag error ml-2 text-xxs">{{ __('Left') }}</span>
+            {% endif %}
         </div>
     </a>
 {% endmacro studentLink %}
diff --git a/modules/Reports/templates/ui/writingSidebar.twig.html b/modules/Reports/templates/ui/writingSidebar.twig.html
@@ -38,6 +38,10 @@
                 {% if student.status != 'Full' %}
                     <span class="tag error ml-2 text-xxs">{{ student.status }}</span>
                 {% endif %}
+
+                {% if student.role == 'Student - Left' %}
+                    <span class="tag error ml-2 text-xxs">{{ __('Left') }}</span>
+                {% endif %}
             </div>
 
             {% if student.progress == 'Complete' %}