From f83fda44e0c319b5d48e4c958688dbf5dbfb3873 Mon Sep 17 00:00:00 2001 From: Nikos Date: Sun, 18 Jun 2017 00:23:31 +0300 Subject: [PATCH] bug fixed in Completenesss Report --- drupal/modules/epal/src/Controller/ReportsCreator.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drupal/modules/epal/src/Controller/ReportsCreator.php b/drupal/modules/epal/src/Controller/ReportsCreator.php index 03f039e..81439d3 100644 --- a/drupal/modules/epal/src/Controller/ReportsCreator.php +++ b/drupal/modules/epal/src/Controller/ReportsCreator.php @@ -207,6 +207,8 @@ class ReportsCreator extends ControllerBase { ->condition('eStudent.id', $studentIds, 'NOT IN'); $numNoAllocated = $sCon->countQuery()->execute()->fetchField(); */ + + $sCon = $this->connection->select('epal_student', 'epalStudent'); $sCon->leftJoin('epal_student_class', 'eStudent', 'eStudent.student_id = epalStudent.id'); $sCon->fields('eStudent', array('student_id')) @@ -363,8 +365,8 @@ class ReportsCreator extends ControllerBase { $sCon = $this->connection->select('epal_student_class', 'eStudent') ->fields('eStudent', array('id', 'epal_id', 'currentclass')) ->condition('eStudent.epal_id', $epalSchool->id , '=') - ->condition('eStudent.currentclass', $classId , '=') - ->condition('eStudent.finalized', 1 , '='); + ->condition('eStudent.currentclass', $classId , '='); + //->condition('eStudent.finalized', 1 , '='); array_push( $num, $sCon->countQuery()->execute()->fetchField() ); //βρες ποσοστά συμπλήρωσης array_push( $perc, number_format($num[$classId-1] / $capacity[$classId-1] * 100, 2)); -- GitLab