Merge pull request #1918 from aragonc/1.11.x

1.11.x
pull/2487/head
Alex Aragon Calixto 8 years ago committed by GitHub
commit 167fe49633
  1. 7
      main/course_progress/thematic_controller.php
  2. 6
      main/template/default/course_progress/pdf_general_thematic.tpl

@ -204,7 +204,7 @@ class ThematicController
$list = $thematic->get_thematic_list(); $list = $thematic->get_thematic_list();
$item = array(); $item = array();
$listFinish = array();
foreach ($list as $theme) { foreach ($list as $theme) {
$dataPlan = $thematic->get_thematic_plan_data($theme['id']); $dataPlan = $thematic->get_thematic_plan_data($theme['id']);
if (!empty($dataPlan)) { if (!empty($dataPlan)) {
@ -220,16 +220,11 @@ class ThematicController
$theme['thematic_plan'] = $item; $theme['thematic_plan'] = $item;
} }
$dataAdvance = $thematic->get_thematic_advance_by_thematic_id($theme['id']); $dataAdvance = $thematic->get_thematic_advance_by_thematic_id($theme['id']);
//var_dump($dataAdvance);
if (!empty($dataAdvance)) { if (!empty($dataAdvance)) {
$theme['thematic_advance'] = $dataAdvance; $theme['thematic_advance'] = $dataAdvance;
} }
$listFinish[] = $theme; $listFinish[] = $theme;
//var_dump($theme['thematic_advance']);
//exit();
} }
$view = new Template('', false, false, false, true, false, false); $view = new Template('', false, false, false, true, false, false);

@ -3,13 +3,13 @@
<thead> <thead>
<tr> <tr>
<th width="30%" style="display:inline-block; padding: 10px; text-align: center; background-color: #E5E5E5;"> <th width="30%" style="display:inline-block; padding: 10px; text-align: center; background-color: #E5E5E5;">
{{ "Thematic" | get_lang }} {{ "Thematic"|get_lang }}
</th> </th>
<th width="50%" style="display:inline-block; padding: 10px; text-align: center; background-color: #E5E5E5;"> <th width="50%" style="display:inline-block; padding: 10px; text-align: center; background-color: #E5E5E5;">
{{ "ThematicPlan" | get_lang }} {{ "ThematicPlan"|get_lang }}
</th> </th>
<th width="20%" style="display:inline-block; padding: 10px; text-align: center; background-color: #E5E5E5;"> <th width="20%" style="display:inline-block; padding: 10px; text-align: center; background-color: #E5E5E5;">
{{ "ThematicAdvance" | get_lang }} {{ "ThematicAdvance"|get_lang }}
</th> </th>
</tr> </tr>
</thead> </thead>

Loading…
Cancel
Save