chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - UI fixes BT#18008

Browse Source
pull/3512/head
Julio Montoya 5 years ago
parent f64bfb23ac
commit 7fd802a200
1 changed files with 9 additions and 9 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 18
      main/survey/survey_list.php

18
main/survey/survey_list.php
Unescape View File

@ -102,7 +102,7 @@ if (isset($_POST['action']) && $_POST['action'] && isset($_POST['id']) && is_arr
if (empty($surveyData)) { if (empty($surveyData)) {
continue; continue;
} }
$surveyData['title'] = trim(strip_tags($surveyData['title'])); $surveyData['title'] = api_html_entity_decode(trim(strip_tags($surveyData['title'])));
$groupData = $extraFieldValue->get_values_by_handler_and_field_variable( $groupData = $extraFieldValue->get_values_by_handler_and_field_variable(
$surveyId, $surveyId,
'group_id' 'group_id'
@ -111,7 +111,7 @@ if (isset($_POST['action']) && $_POST['action'] && isset($_POST['id']) && is_arr
if ($groupData && !empty($groupData['value'])) { if ($groupData && !empty($groupData['value'])) {
$groupInfo = GroupManager::get_group_properties($groupData['value']); $groupInfo = GroupManager::get_group_properties($groupData['value']);
if ($groupInfo['name']) { if ($groupInfo['name']) {
$groupTitle = ' - '.$groupInfo['name']; $groupTitle = api_html_entity_decode($groupInfo['name']);
} }
} }
$surveyData['group_title'] = $groupTitle; $surveyData['group_title'] = $groupTitle;
@ -200,12 +200,12 @@ if (isset($_POST['action']) && $_POST['action'] && isset($_POST['id']) && is_arr
foreach ($finalAnswer as $option) { foreach ($finalAnswer as $option) {
foreach ($question['options'] as $optionId => $text) { foreach ($question['options'] as $optionId => $text) {
if ($option == $optionId) { if ($option == $optionId) {
$items[] = strip_tags($text); $items[] = api_html_entity_decode(strip_tags($text));
} }
} }
} }
$finalAnswer = implode(', ', $items); $finalAnswer = implode(' - ', $items);
} }
break; break;
default: default:
@ -214,7 +214,7 @@ if (isset($_POST['action']) && $_POST['action'] && isset($_POST['id']) && is_arr
$finalAnswer = $all_answers[$userIdItem][$question['question_id']][0]['option_id']; $finalAnswer = $all_answers[$userIdItem][$question['question_id']][0]['option_id'];
foreach ($question['options'] as $optionId => $text) { foreach ($question['options'] as $optionId => $text) {
if ($finalAnswer == $optionId) { if ($finalAnswer == $optionId) {
$finalAnswer = strip_tags($text); $finalAnswer = api_html_entity_decode(strip_tags($text));
break; break;
} }
} }
@ -253,7 +253,8 @@ if (isset($_POST['action']) && $_POST['action'] && isset($_POST['id']) && is_arr
$cell = @$page->setCellValueByColumnAndRow( $cell = @$page->setCellValueByColumnAndRow(
$column, $column,
1, 1,
$survey['title'].$survey['group_title'].' - '.$userAnswer['complete_name'] //$survey['title'].$survey['group_title'].' - '.$userAnswer['complete_name']
$survey['group_title'].' - '.$userAnswer['complete_name']
); );
$coordinate = $page->getCellByColumnAndRow($column, 1)->getCoordinate(); $coordinate = $page->getCellByColumnAndRow($column, 1)->getCoordinate();
/*if (!empty($coordinate)) { /*if (!empty($coordinate)) {
@ -353,16 +354,15 @@ if (isset($_POST['action']) && $_POST['action'] && isset($_POST['id']) && is_arr
} }
} }
} }
$row = 3;
} }
$row = 3; $row = 2;
foreach ($users as $user) { foreach ($users as $user) {
$userId = $user['id']; $userId = $user['id'];
$columnUser = 0; $columnUser = 0;
@$page->setCellValueByColumnAndRow($columnUser++, $row, $user['lastname']); @$page->setCellValueByColumnAndRow($columnUser++, $row, $user['lastname']);
@$page->setCellValueByColumnAndRow($columnUser++, $row, $user['firstname']); @$page->setCellValueByColumnAndRow($columnUser++, $row, $user['firstname']);
@$page->setCellValueByColumnAndRow($columnUser++, $row, $user['username']); //@$page->setCellValueByColumnAndRow($columnUser++, $row, $user['username']);
$row++; $row++;
} }
$counter++; $counter++;

Write Preview
Loading…
Cancel
Save