From fabc20a486100b187586ff1af81ea2f06de6991f Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Thu, 30 Jun 2016 09:44:33 -0500 Subject: [PATCH] Fix number of works and last work date in teachers time by session report - refs BT#11032 --- main/admin/teachers_time_by_session_report.php | 3 ++- .../Entity/Repository/CStudentPublicationRepository.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/main/admin/teachers_time_by_session_report.php b/main/admin/teachers_time_by_session_report.php index 39860d928e..f8018ae3de 100644 --- a/main/admin/teachers_time_by_session_report.php +++ b/main/admin/teachers_time_by_session_report.php @@ -80,7 +80,6 @@ if ($session) { $works = $em ->getRepository('ChamiloCourseBundle:CStudentPublication') ->findByTeacher($user, $course, $session->getId()); - $lastWork = array_pop($works); $usersInfo[$user->getId()][$course->getId() . '_number_of_students'] = $sessionCourse->getNbrUsers(); $usersInfo[$user->getId()][$course->getId() . '_number_of_works'] = count($works); @@ -88,6 +87,8 @@ if ($session) { Tracking::get_time_spent_on_the_course($user->getId(), $course->getId(), $session->getId()) ); + $lastWork = array_pop($works); + if (!$lastWork) { continue; } diff --git a/src/Chamilo/CourseBundle/Entity/Repository/CStudentPublicationRepository.php b/src/Chamilo/CourseBundle/Entity/Repository/CStudentPublicationRepository.php index 1ef4fb6e78..a8d3241efc 100644 --- a/src/Chamilo/CourseBundle/Entity/Repository/CStudentPublicationRepository.php +++ b/src/Chamilo/CourseBundle/Entity/Repository/CStudentPublicationRepository.php @@ -40,7 +40,7 @@ class CStudentPublicationRepository extends EntityRepository $qb->expr()->eq('w.userId', ':user') ) ) - ->orderBy('w.sentDate', 'DESC') + ->orderBy('w.sentDate', 'ASC') ->setParameters([ 'course' => intval($course->getId()), 'session' => intval($sessionId),