|
@@ -70,6 +70,35 @@ if (!empty($selectedCourse)) {
|
|
|
$course = api_get_course_info($selectedCourse);
|
|
|
|
|
|
$reportTitle = sprintf(get_lang('TimeReportForCourseX'), $course['title']);
|
|
|
+
|
|
|
+ $teachers = CourseManager::get_teacher_list_from_course_code($selectedCourse);
|
|
|
+
|
|
|
+ foreach ($teachers as $teacher) {
|
|
|
+ $totalTime = UserManager::getExpendedTimeInCourses(
|
|
|
+ $teacher['user_id'],
|
|
|
+ $selectedCourse,
|
|
|
+ 0,
|
|
|
+ $selectedFrom,
|
|
|
+ $selectedUntil
|
|
|
+ );
|
|
|
+ $formatedTime = api_format_time($totalTime);
|
|
|
+
|
|
|
+ $timeReport->data[] = array(
|
|
|
+ 'session' => null,
|
|
|
+ 'course' => array(
|
|
|
+ 'id' => $course['real_id'],
|
|
|
+ 'name' => $course['title']
|
|
|
+ ),
|
|
|
+ 'coach' => array(
|
|
|
+ 'userId' => $teacher['user_id'],
|
|
|
+ 'lastname' => $teacher['lastname'],
|
|
|
+ 'firstname' => $teacher['firstname'],
|
|
|
+ 'username' => $teacher['username'],
|
|
|
+ 'completeName' => api_get_person_name($teacher['firstname'], $teacher['lastname'])
|
|
|
+ ),
|
|
|
+ 'totalTime' => $formatedTime
|
|
|
+ );
|
|
|
+ }
|
|
|
|
|
|
$sessionsByCourse = SessionManager::get_session_by_course($selectedCourse);
|
|
|
|
|
@@ -78,13 +107,14 @@ if (!empty($selectedCourse)) {
|
|
|
|
|
|
if ($coaches) {
|
|
|
foreach ($coaches as $coach) {
|
|
|
- $totalTime = SessionManager::getUserTimeInCourse(
|
|
|
+ $totalTime = UserManager::getExpendedTimeInCourses(
|
|
|
$coach['user_id'],
|
|
|
$selectedCourse,
|
|
|
$session['id'],
|
|
|
$selectedFrom,
|
|
|
$selectedUntil
|
|
|
);
|
|
|
+ $formatedTime = api_format_time($totalTime);
|
|
|
|
|
|
$timeReport->data[] = array(
|
|
|
'session' => array(
|
|
@@ -102,7 +132,7 @@ if (!empty($selectedCourse)) {
|
|
|
'username' => $coach['username'],
|
|
|
'completeName' => api_get_person_name($coach['firstname'], $coach['lastname'])
|
|
|
),
|
|
|
- 'totalTime' => $totalTime
|
|
|
+ 'totalTime' => $formatedTime
|
|
|
);
|
|
|
}
|
|
|
}
|
|
@@ -113,33 +143,37 @@ if (!empty($selectedSession)) {
|
|
|
$withFilter = true;
|
|
|
|
|
|
$session = api_get_session_info($selectedSession);
|
|
|
+ $sessionData = array(
|
|
|
+ 'id' => $session['id'],
|
|
|
+ 'name' => $session['name']
|
|
|
+ );
|
|
|
|
|
|
$reportTitle = sprintf(get_lang('TimeReportForSessionX'), $session['name']);
|
|
|
|
|
|
$courses = SessionManager::get_course_list_by_session_id($selectedSession);
|
|
|
|
|
|
foreach ($courses as $course) {
|
|
|
+ $courseData = array(
|
|
|
+ 'id' => $course['id'],
|
|
|
+ 'name' => $course['title']
|
|
|
+ );
|
|
|
+
|
|
|
$coaches = CourseManager::get_coachs_from_course($selectedSession, $course['code']);
|
|
|
|
|
|
if ($coaches) {
|
|
|
foreach ($coaches as $coach) {
|
|
|
- $totalTime = SessionManager::getUserTimeInCourse(
|
|
|
+ $totalTime = UserManager::getExpendedTimeInCourses(
|
|
|
$coach['user_id'],
|
|
|
$course['code'],
|
|
|
$selectedSession,
|
|
|
$selectedFrom,
|
|
|
$selectedUntil
|
|
|
);
|
|
|
+ $formatedTime = api_format_time($totalTime);
|
|
|
|
|
|
$timeReport->data[] = array(
|
|
|
- 'session' => array(
|
|
|
- 'id' => $session['id'],
|
|
|
- 'name' => $session['name']
|
|
|
- ),
|
|
|
- 'course' => array(
|
|
|
- 'id' => $course['id'],
|
|
|
- 'name' => $course['title']
|
|
|
- ),
|
|
|
+ 'session' => $sessionData,
|
|
|
+ 'course' => $courseData,
|
|
|
'coach' => array(
|
|
|
'userId' => $coach['user_id'],
|
|
|
'lastname' => $coach['lastname'],
|
|
@@ -147,7 +181,7 @@ if (!empty($selectedSession)) {
|
|
|
'username' => $coach['username'],
|
|
|
'completeName' => api_get_person_name($coach['firstname'], $coach['lastname'])
|
|
|
),
|
|
|
- 'totalTime' => $totalTime
|
|
|
+ 'totalTime' => $formatedTime
|
|
|
);
|
|
|
}
|
|
|
}
|
|
@@ -157,42 +191,73 @@ if (!empty($selectedSession)) {
|
|
|
if (!empty($selectedTeacher)) {
|
|
|
$withFilter = true;
|
|
|
|
|
|
- $coach = api_get_user_info($selectedTeacher);
|
|
|
-
|
|
|
- $reportTitle = sprintf(get_lang('TimeReportForTeacherX'), $coach['complete_name']);
|
|
|
+ $teacher = api_get_user_info();
|
|
|
+
|
|
|
+ $teacherData = array(
|
|
|
+ 'userId' => $teacher['user_id'],
|
|
|
+ 'lastname' => $teacher['lastname'],
|
|
|
+ 'firstname' => $teacher['firstname'],
|
|
|
+ 'username' => $teacher['username'],
|
|
|
+ 'completeName' => $teacher['complete_name']
|
|
|
+ );
|
|
|
+
|
|
|
+ $reportTitle = sprintf(get_lang('TimeReportForTeacherX'), $teacher['complete_name']);
|
|
|
+
|
|
|
+ $courses = CourseManager::get_courses_list_by_user_id($selectedTeacher, false);
|
|
|
+
|
|
|
+ if (!empty($courses)) {
|
|
|
+ foreach ($courses as $course) {
|
|
|
+ $courseInfo = api_get_course_info($course['code']);
|
|
|
+
|
|
|
+ $totalTime = UserManager::getExpendedTimeInCourses(
|
|
|
+ $selectedTeacher,
|
|
|
+ $course['code'],
|
|
|
+ 0,
|
|
|
+ $selectedFrom,
|
|
|
+ $selectedUntil
|
|
|
+ );
|
|
|
+ $formatedTime = api_format_time($totalTime);
|
|
|
+
|
|
|
+ $timeReport->data[] = array(
|
|
|
+ 'session' => null,
|
|
|
+ 'course' => array(
|
|
|
+ 'id' => $courseInfo['real_id'],
|
|
|
+ 'name' => $courseInfo['title']
|
|
|
+ ),
|
|
|
+ 'coach' => $teacherData,
|
|
|
+ 'totalTime' => $formatedTime
|
|
|
+ );
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
- $courses = SessionManager::getCoursesListByCourseCoach($selectedTeacher);
|
|
|
+ $coursesInSession = SessionManager::getCoursesListByCourseCoach($selectedTeacher);
|
|
|
|
|
|
- foreach ($courses as $course) {
|
|
|
+ foreach ($coursesInSession as $course) {
|
|
|
$session = api_get_session_info($course['id_session']);
|
|
|
+ $sessionData = array(
|
|
|
+ 'id' => $session['id'],
|
|
|
+ 'name' => $session['name']
|
|
|
+ );
|
|
|
|
|
|
$courseInfo = api_get_course_info($course['course_code']);
|
|
|
|
|
|
- $totalTime = SessionManager::getUserTimeInCourse(
|
|
|
+ $totalTime = UserManager::getExpendedTimeInCourses(
|
|
|
$selectedTeacher,
|
|
|
$course['course_code'],
|
|
|
$session['id'],
|
|
|
$selectedFrom,
|
|
|
$selectedUntil
|
|
|
);
|
|
|
+ $formatedTime = api_format_time($totalTime);
|
|
|
|
|
|
$timeReport->data[] = array(
|
|
|
- 'session' => array(
|
|
|
- 'id' => $session['id'],
|
|
|
- 'name' => $session['name']
|
|
|
- ),
|
|
|
+ 'session' => $sessionData,
|
|
|
'course' => array(
|
|
|
'id' => $courseInfo['real_id'],
|
|
|
'name' => $courseInfo['title']
|
|
|
),
|
|
|
- 'coach' => array(
|
|
|
- 'userId' => $coach['user_id'],
|
|
|
- 'lastname' => $coach['lastname'],
|
|
|
- 'firstname' => $coach['firstname'],
|
|
|
- 'username' => $coach['username'],
|
|
|
- 'completeName' => $coach['complete_name']
|
|
|
- ),
|
|
|
- 'totalTime' => $totalTime
|
|
|
+ 'coach' => $teacherData,
|
|
|
+ 'totalTime' => $formatedTime
|
|
|
);
|
|
|
}
|
|
|
}
|
|
@@ -234,7 +299,6 @@ if (isset($_GET['export'])) {
|
|
|
Export::export_html_to_pdf($pdfContent, $params);
|
|
|
break;
|
|
|
case 'xls':
|
|
|
-
|
|
|
array_unshift($dataToExport, array(
|
|
|
$reportTitle
|
|
|
), array(
|