Change table to show total result see BT#13099

main/admin/gradebook_dependency.php

@@ -57,7 +57,8 @@ $courseList = [];
 
 /*$mandatoryList = api_get_configuration_value('gradebook_dependency_mandatory_courses');
 $mandatoryList = isset($mandatoryList['courses']) ? $mandatoryList['courses'] : [];*/
-
+$userResult  = [];
+$totalDependencies = count($dependencies);
 foreach ($dependencies as $courseId) {
     $courseInfo = api_get_course_info_by_id($courseId);
     $courseCode = $courseInfo['code'];
@@ -70,16 +71,23 @@ foreach ($dependencies as $courseId) {
     $userList = CourseManager::get_student_list_from_course_code($courseCode);
     $users = [];
     foreach ($userList as $user) {
-        $userInfo = api_get_user_info($user['user_id']);
+        $userId = $user['user_id'];
+        $userInfo = api_get_user_info($userId);
         $result = Category::userFinishedCourse(
-            $user['user_id'],
+            $userId,
             $subCategory,
             true
         );
         $userInfo['result'] = $result;
-        $users[] = $userInfo;
+        //$users[] = $userInfo;
+        $userResult[$userId]['result'][$courseCode] = $result;
+        $userResult[$userId]['user_info'] = $userInfo;
+    }
+
+    foreach ($userResult as $userId => &$userData) {
+        $userData['final_result'] = count(array_filter($userData['result'])) == $totalDependencies;
     }
-    $courseInfo['users'] = $users;
+    //$courseInfo['users'] = $users;
     //$courseInfo['is_mandatory'] = in_array($courseCode, $mandatoryList);
     $courseList[] = $courseInfo;
 }
@@ -96,5 +104,6 @@ $tpl->assign(
 
 $tpl->assign('gradebook_category', $category);
 $tpl->assign('courses', $courseList);
+$tpl->assign('users', $userResult);
 $layout = $tpl->get_template('admin/gradebook_dependency.tpl');
 $tpl->display($layout);

main/template/default/admin/gradebook_dependency.tpl

@@ -2,37 +2,44 @@
 
 {% block content %}
     <h3>
-    {{ gradebook_category.name }}
+        {{ gradebook_category.name }}
         {% if gradebook_category.courseCode is not empty %}
             ({{ gradebook_category.courseCode }})
         {% endif %}
     </h3>
     <hr>
-    {% for course in courses %}
+    <table class="table">
-        <h4>
+     <thead class="title">
-            {{ course.title }} ({{ course.code }})
+        <tr>
-        </h4>
+            <th>{{ 'Users' | get_lang }}</th>
+            {% for course in courses %}
+                <th>
+                    {{ course.title }} ({{ course.code }})
+                </th>
+            {% endfor %}
+            <th>{{ 'Total' | get_lang }}</th>
+        </tr>
+    </thead>
+    {% for user in users %}
+        <tr>
+            <td>{{ user.user_info.complete_name }}</td>
 
-        {% if course.users %}
+            {% for course in courses %}
-            <table class="table">
+            <td>
-             <thead class="title">
+                {% if user.result[course.code] %}
-                <tr>
+                    <img src="{{ 'check-circle.png'|icon(22) }}" />
-                    <th>{{ 'Users' | get_lang }}</th>
+                {% endif %}
-                    <th>{{ 'Result' | get_lang }}</th>
+            </td>
-                </tr>
-            </thead>
-            {% for user in course.users %}
-                <tr>
-                    <td>{{ user.complete_name }}</td>
-                    <td>
-                        {% if user.result %}
-                            <img src="{{ 'check-circle.png'|icon(22) }}" />
-                        {% else %}
-                        {% endif %}
-                    </td>
-                </tr>
             {% endfor %}
-            </table>
+
-        {% endif %}
+            <td>
+                {% if user.final_result %}
+                    <img src="{{ 'check-circle.png'|icon(22) }}" />
+                {% else %}
+                    <img src="{{ 'warning.png'|icon(22) }}" />
+                {% endif %}
+            </td>
+        </tr>
     {% endfor %}
+    </table>
 {% endblock %}