From 761743961cfd01556bd1abbb359cd916bd8f6295 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 20 Jul 2017 10:51:48 -0500
Subject: [PATCH] Improve template for teacher time report - ref BT#13109

---
 main/admin/teacher_time_report.php            | 29 +++++++++++++++++++
 .../default/admin/teacher_time_report.tpl     | 17 -----------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/main/admin/teacher_time_report.php b/main/admin/teacher_time_report.php
index de6eb7e053..45f75c83b7 100644
--- a/main/admin/teacher_time_report.php
+++ b/main/admin/teacher_time_report.php
@@ -368,6 +368,33 @@ $form->setDefaults([
     'until' => $selectedUntil
 ]);
 
+$leftActions = Display::url(
+    Display::return_icon('session.png', get_lang('Sessions'), [], ICON_SIZE_MEDIUM),
+    api_get_path(WEB_CODE_PATH).'admin/teachers_time_by_session_report.php'
+);
+$rightActions = Display::url(
+    Display::return_icon('pdf.png', get_lang('ExportToPDF'), [], ICON_SIZE_MEDIUM),
+    api_get_self().'?'.http_build_query([
+        'export' => 'pdf',
+        'from' => $selectedFrom,
+        'until' => $selectedUntil,
+        'course' => $selectedCourse,
+        'session' => $selectedSession,
+        'teacher' => $selectedTeacher
+    ])
+);
+$rightActions .= Display::url(
+    Display::return_icon('export_excel.png', get_lang('ExportExcel'), [], ICON_SIZE_MEDIUM),
+    api_get_self().'?'.http_build_query([
+        'export' => 'xls',
+        'from' => $selectedFrom,
+        'until' => $selectedUntil,
+        'course' => $selectedCourse,
+        'session' => $selectedSession,
+        'teacher' => $selectedTeacher
+    ])
+);
+
 $tpl = new Template($toolName);
 $tpl->assign('report_title', $reportTitle);
 $tpl->assign('report_sub_title', $reportSubTitle);
@@ -385,5 +412,7 @@ $tpl->assign('rows', $timeReport->data);
 $templateName = $tpl->get_template('admin/teacher_time_report.tpl');
 
 $contentTemplate = $tpl->fetch($templateName);
+$tpl->assign('header', get_lang('TeacherTimeReport'));
+$tpl->assign('actions', Display::toolbarAction('teacher_time_report_actions', [$leftActions, $rightActions]));
 $tpl->assign('content', $contentTemplate);
 $tpl->display_one_col_template();
diff --git a/main/template/default/admin/teacher_time_report.tpl b/main/template/default/admin/teacher_time_report.tpl
index c626bc7b39..c2cc7c706c 100644
--- a/main/template/default/admin/teacher_time_report.tpl
+++ b/main/template/default/admin/teacher_time_report.tpl
@@ -24,23 +24,6 @@ $(document).on('ready', function () {
 });
 </script>
 
-<div class="col-md-12">
-    <div class="actions">
-        <a href="{{ _p.web_main }}admin/teachers_time_by_session_report.php">
-            {{ 'session.png'|img(32, 'Sessions'|get_lang) }}
-        </a>
-        <div class="pull-right">
-            <a href="{{ _p.web_self ~ '?' ~ {'export':'pdf','from':selected_from,'until':selected_until,'course':selected_course,'session':selected_session,'teacher':selected_teacher } | url_encode }}">
-                {{ 'pdf.png' | img(32, 'ExportToPDF'|get_lang ) }}
-            </a>
-            <a href="{{ _p.web_self ~ '?' ~ {'export':'xls','from':selected_from,'until':selected_until,'course':selected_course,'session':selected_session,'teacher':selected_teacher } | url_encode }}">
-                {{ 'export_excel.png' | img(32, 'ExportExcel'|get_lang ) }}
-            </a>
-        </div>
-    </div>
-</div>
-
-<h1 class="page-header">{{ 'TeacherTimeReport' | get_lang }}</h1>
 {{ form }}
 <h2 class="page-header">{{ report_title }} <small>{{ report_sub_title }}</small></h2>