diff --git a/app/Resources/public/css/print.css b/app/Resources/public/css/print.css index 31926a91b8..34f753e8c7 100644 --- a/app/Resources/public/css/print.css +++ b/app/Resources/public/css/print.css @@ -680,10 +680,14 @@ table td { } table.full-width { width: 100%; - border-collapse: collapse; } table.border-thin, table.border-thin th, table.border-thin td { - border: 1px solid #000000; + border: 1px solid #000; + border-collapse: collapse; +} + +.text-center { + text-align: center; } diff --git a/main/admin/teacher_time_report.php b/main/admin/teacher_time_report.php index 200090cf66..7a28ede02a 100644 --- a/main/admin/teacher_time_report.php +++ b/main/admin/teacher_time_report.php @@ -299,7 +299,6 @@ if (isset($_GET['export'])) { switch ($_GET['export']) { case 'pdf': $params = array( - 'add_signatures' => false, 'filename' => $fileName, 'pdf_title' => "$reportTitle - $reportSubTitle", 'pdf_description' => get_lang('TeacherTimeReport'), diff --git a/main/attendance/attendance_controller.php b/main/attendance/attendance_controller.php index e093e7b357..cc2abe6dae 100755 --- a/main/attendance/attendance_controller.php +++ b/main/attendance/attendance_controller.php @@ -599,7 +599,7 @@ class AttendanceController 'filename' => get_lang('Attendance').'-'.api_get_local_time(), 'pdf_title' => $courseInfo['title'], 'course_code' => $courseInfo['code'], - 'add_signatures' => true, + 'add_signatures' => ['Drh', 'Teacher', 'Date'], 'orientation' => 'landscape', 'pdf_teachers' => $teacherName, 'pdf_course_category' => $courseCategory['name'], diff --git a/main/course_progress/thematic_controller.php b/main/course_progress/thematic_controller.php index aa54413ef0..0d07916bfa 100755 --- a/main/course_progress/thematic_controller.php +++ b/main/course_progress/thematic_controller.php @@ -230,7 +230,7 @@ class ThematicController $params = array( 'filename' => get_lang('Thematic').'-'.api_get_local_time(), 'pdf_title' => get_lang('Thematic'), - 'add_signatures' => true, + 'add_signatures' => ['Drh', 'Teacher', 'Date'], 'format' => 'A4-L', 'orientation' => 'L' ); @@ -253,7 +253,7 @@ class ThematicController [ 'filename' => get_lang('Thematic').'-'.api_get_local_time(), 'pdf_title' => get_lang('Thematic'), - 'add_signatures' => true, + 'add_signatures' => ['Drh', 'Teacher', 'Date'], 'format' => 'A4-L', 'orientation' => 'L' ] diff --git a/main/gradebook/gradebook_display_summary.php b/main/gradebook/gradebook_display_summary.php index 350ed82b1a..4e79e134eb 100644 --- a/main/gradebook/gradebook_display_summary.php +++ b/main/gradebook/gradebook_display_summary.php @@ -61,7 +61,6 @@ switch ($action) { 'course_info' => '', 'pdf_date' => '', 'course_code' => api_get_course_id(), - 'add_signatures' => false, 'student_info' => null, 'show_grade_generated_date' => true, 'show_real_course_teachers' => false, diff --git a/main/gradebook/index.php b/main/gradebook/index.php index 0e96217562..ecf376d396 100755 --- a/main/gradebook/index.php +++ b/main/gradebook/index.php @@ -950,7 +950,6 @@ if (isset($first_time) && $first_time == 1 && api_is_allowed_to_edit(null,true)) 'session_info' => '', 'course_info' => '', 'pdf_date' => '', - 'add_signatures' => false, 'student_info' => api_get_user_info(), 'show_grade_generated_date' => true, 'show_real_course_teachers' => false, diff --git a/main/gradebook/lib/GradebookUtils.php b/main/gradebook/lib/GradebookUtils.php index bff12d1ffe..dc68f17cd8 100644 --- a/main/gradebook/lib/GradebookUtils.php +++ b/main/gradebook/lib/GradebookUtils.php @@ -958,7 +958,7 @@ class GradebookUtils 'filename' => get_lang('FlatView') . '_' . api_get_utc_datetime(), 'pdf_title' => $title, 'course_code' => $course_code, - 'add_signatures' => true + 'add_signatures' => ['Drh', 'Teacher', 'Date'] ); $page_format = $params['orientation'] == 'landscape' ? 'A4-L' : 'A4'; @@ -1419,7 +1419,6 @@ class GradebookUtils 'course_info' => '', 'pdf_date' => '', 'course_code' => api_get_course_id(), - 'add_signatures' => false, 'student_info' => $userInfo, 'show_grade_generated_date' => true, 'show_real_course_teachers' => false, diff --git a/main/inc/lib/pdf.lib.php b/main/inc/lib/pdf.lib.php index 74f9adb370..ca7172f1e1 100755 --- a/main/inc/lib/pdf.lib.php +++ b/main/inc/lib/pdf.lib.php @@ -48,7 +48,7 @@ class PDF $this->params['course_info'] = isset($params['course_info']) ? $params['course_info'] : api_get_course_info(); $this->params['session_info'] = isset($params['session_info']) ? $params['session_info'] : api_get_session_info(api_get_session_id()); $this->params['course_code'] = isset($params['course_code']) ? $params['course_code'] : api_get_course_id(); - $this->params['add_signatures'] = isset($params['add_signatures']) ? $params['add_signatures'] : false; + $this->params['add_signatures'] = isset($params['add_signatures']) ? $params['add_signatures'] : []; $this->params['show_real_course_teachers'] = isset($params['show_real_course_teachers']) ? $params['show_real_course_teachers'] : false; $this->params['student_info'] = isset($params['student_info']) ? $params['student_info'] : false; $this->params['show_grade_generated_date'] = isset($params['show_grade_generated_date']) ? $params['show_grade_generated_date'] : false; diff --git a/main/template/default/export/table_pdf.tpl b/main/template/default/export/table_pdf.tpl index 47603e8f84..f8fd4ac14d 100755 --- a/main/template/default/export/table_pdf.tpl +++ b/main/template/default/export/table_pdf.tpl @@ -81,27 +81,19 @@ {{ pdf_content }} -{% if add_signatures == true %} +{% if not add_signatures is empty %}

- +
- - - + {% for signature in add_signatures %} + + {% endfor %}
- _____________________________ -
- {{ "Drh" | get_lang }} - 		- _____________________________ -
- {{ "Teacher" | get_lang }} - 		- _____________________________ -
- {{ "Date" | get_lang }} - 		+ _____________________________ +
+ {{ signature|get_lang }} +
{% endif %} diff --git a/main/user/user.php b/main/user/user.php index a713fe1055..d80a2c1904 100755 --- a/main/user/user.php +++ b/main/user/user.php @@ -397,7 +397,6 @@ if (api_is_allowed_to_edit(null, true)) { array('style' => 'width:500px') ); $params = array( - 'add_signatures' => false, 'filename' => $fileName, 'pdf_title' => $pdfTitle, 'header_attributes' => $header_attributes diff --git a/main/work/work.lib.php b/main/work/work.lib.php index 11440d434d..ab55c8e42e 100755 --- a/main/work/work.lib.php +++ b/main/work/work.lib.php @@ -5255,7 +5255,6 @@ function exportAllStudentWorkFromPublication( 'filename' => $workData['title'] . '_' . api_get_local_time(), 'pdf_title' => api_replace_dangerous_char($workData['title']), 'course_code' => $courseInfo['code'], - 'add_signatures' => false ); $pdf = new PDF('A4', null, $params); $pdf->html_to_pdf_with_template($content);