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

[svn r13007] fix a bug when answering / previewing a survey : the options were not sorted

Browse Source
skala
Eric Marguin 17 years ago
parent aaf76c3ade
commit 5cd7f2cc12
2 changed files with 3 additions and 4 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. 2
      main/survey/fillsurvey.php
  2. 5
      main/survey/preview.php

2
main/survey/fillsurvey.php
Unescape View File

@ -252,7 +252,7 @@ if (isset($_GET['show']))
ON survey_question.question_id = survey_question_option.question_id ON survey_question.question_id = survey_question_option.question_id
WHERE survey_question.survey_id = '".Database::escape_string($survey_invitation['survey_id'])."' WHERE survey_question.survey_id = '".Database::escape_string($survey_invitation['survey_id'])."'
AND survey_question.question_id IN (".implode(',',$paged_questions[$_GET['show']]).") AND survey_question.question_id IN (".implode(',',$paged_questions[$_GET['show']]).")
ORDER BY survey_question.sort ASC"; ORDER BY survey_question.sort, survey_question_option.sort ASC";
$result = api_sql_query($sql, __FILE__, __LINE__); $result = api_sql_query($sql, __FILE__, __LINE__);
$question_counter_max = mysql_num_rows($result); $question_counter_max = mysql_num_rows($result);

5
main/survey/preview.php
Unescape View File

@ -129,7 +129,7 @@ else
ON survey_question.question_id = survey_question_option.question_id ON survey_question.question_id = survey_question_option.question_id
WHERE survey_question.survey_id = '".Database::escape_string($_GET['survey_id'])."' WHERE survey_question.survey_id = '".Database::escape_string($_GET['survey_id'])."'
AND survey_question.question_id IN (".implode(',',$paged_questions[$_GET['show']]).") AND survey_question.question_id IN (".implode(',',$paged_questions[$_GET['show']]).")
ORDER BY survey_question.sort ASC"; ORDER BY survey_question.sort, survey_question_option.sort ASC";
$result = api_sql_query($sql, __FILE__, __LINE__); $result = api_sql_query($sql, __FILE__, __LINE__);
$question_counter_max = mysql_num_rows($result); $question_counter_max = mysql_num_rows($result);
@ -146,7 +146,7 @@ else
$questions[$row['sort']]['survey_question'] = $row['survey_question']; $questions[$row['sort']]['survey_question'] = $row['survey_question'];
$questions[$row['sort']]['display'] = $row['display']; $questions[$row['sort']]['display'] = $row['display'];
$questions[$row['sort']]['type'] = $row['type']; $questions[$row['sort']]['type'] = $row['type'];
$questions[$row['sort']]['options'][$row['option_sort']] = $row['option_text']; $questions[$row['sort']]['options'][intval($row['option_sort'])] = $row['option_text'];
$questions[$row['sort']]['maximum_score'] = $row['max_value']; $questions[$row['sort']]['maximum_score'] = $row['max_value'];
} }
// if the type is a pagebreak we are finished loading the questions for this page // if the type is a pagebreak we are finished loading the questions for this page
@ -158,7 +158,6 @@ else
} }
} }
} }
// selecting the maximum number of pages // selecting the maximum number of pages
$sql = "SELECT * FROM $table_survey_question WHERE type='".Database::escape_string('pagebreak')."' AND survey_id='".Database::escape_string($_GET[survey_id])."'"; $sql = "SELECT * FROM $table_survey_question WHERE type='".Database::escape_string('pagebreak')."' AND survey_id='".Database::escape_string($_GET[survey_id])."'";
$result = api_sql_query($sql, __FILE__, __LINE__); $result = api_sql_query($sql, __FILE__, __LINE__);

Write Preview
Loading…
Cancel
Save