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

Fixing survey layouts

Browse Source
skala
Julio Montoya 13 years ago
parent 781ebed20c
commit 0d86e8fc34
5 changed files with 93 additions and 81 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/create_new_survey.php
  2. 6
      main/survey/fillsurvey.php
  3. 9
      main/survey/preview.php
  4. 125
      main/survey/survey.lib.php
  5. 16
      main/survey/survey.php

18
main/survey/create_new_survey.php
Unescape View File

@ -25,7 +25,6 @@ $this_section = SECTION_COURSES;
//require_once api_get_path(LIBRARY_PATH).'survey.lib.php';
require_once 'survey.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php';
$htmlHeadXtra[] = '<script type="text/javascript">
@ -74,10 +73,12 @@ $course_id = api_get_course_id();
$session_id = api_get_session_id();
$gradebook_link_type = 8; // LINK_SURVEY
$urlname = strip_tags(api_substr(api_html_entity_decode($survey_data['title'], ENT_QUOTES), 0, 40));
/*$urlname = strip_tags(api_substr(api_html_entity_decode($survey_data['title'], ENT_QUOTES), 0, 40));
if (api_strlen(strip_tags($survey_data['title'])) > 40) {
$urlname .= '...';
}
}*/
$urlname = $survey_data['title'];
// Breadcrumbs
if ($_GET['action'] == 'add') {
@ -163,15 +164,8 @@ $form->addElement('html_editor', 'survey_introduction', get_lang('SurveyIntroduc
$form->addElement('html_editor', 'survey_thanks', get_lang('SurveyThanks'), null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '130', 'ToolbarStartExpanded' => false));
// Aditional Parameters
$form->addElement('html', '
<div class="row">
<div class="label">
</div>
<div class="formw">
<a href="javascript: void(0);" onclick="javascript: advanced_parameters();" >
<span id="plus_minus">&nbsp;'.Display::return_icon('div_show.gif',null,array('style'=>'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedParameters').'</span></a>
</div>
</div>');
$form->addElement('advanced_settings','<a href="javascript: void(0);" onclick="javascript: advanced_parameters();" >
<span id="plus_minus">&nbsp;'.Display::return_icon('div_show.gif',null,array('style'=>'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedParameters').'</span></a>');
$form -> addElement('html', '<div id="options" style="display: none;">');

6
main/survey/fillsurvey.php
Unescape View File

@ -444,8 +444,10 @@ if ($survey_data['form_fields'] && $survey_data['anonymous'] == 0 && is_array($u
}
// Displaying the survey thanks message
if (isset($_POST['finish_survey'])) {
echo '<div id="survey_content" class="survey_content"><strong>'.get_lang('SurveyFinished').'</strong> <br />'.$survey_data['survey_thanks'].'</div>';
if (isset($_POST['finish_survey'])) {
Display::display_confirmation_message(get_lang('SurveyFinished'));
echo $survey_data['survey_thanks'];
survey_manager::update_survey_answered($survey_data['survey_id'], $survey_invitation['user'], $survey_invitation['survey_code']);
unset($_SESSION['paged_questions']);
unset($_SESSION['page_questions_sec']);

9
main/survey/preview.php
Unescape View File

@ -48,10 +48,12 @@ if (empty($survey_data)) {
exit;
}
$urlname = strip_tags(api_substr(api_html_entity_decode($survey_data['title'], ENT_QUOTES), 0, 40));
/*$urlname = strip_tags(api_substr(api_html_entity_decode($survey_data['title'], ENT_QUOTES), 0, 40));
if (api_strlen(strip_tags($survey_data['title'])) > 40) {
$urlname .= '...';
}
}*/
$urlname = strip_tags($survey_data['title']);
// Breadcrumbs
$interbreadcrumb[] = array('url' => 'survey_list.php', 'name' => get_lang('SurveyList'));
@ -85,7 +87,8 @@ if (api_is_course_admin() || (api_is_course_admin() && $_GET['isStudentView'] ==
// Displaying the survey thanks message
if (isset($_POST['finish_survey'])) {
echo '<div id="survey_content" class="survey_content"><strong>'.get_lang('SurveyFinished').' </strong>'.$survey_data['survey_thanks'].'</div>';
Display::display_confirmation_message(get_lang('SurveyFinished'));
echo $survey_data['survey_thanks'];
Display :: display_footer();
exit;
}

125
main/survey/survey.lib.php
Unescape View File

@ -1289,7 +1289,7 @@ class survey_question {
$tool_name .= ': '.get_lang(api_ucfirst(Security::remove_XSS($_GET['type'])));
}
$this->html .= '<form id="question_form" name="question_form" method="post" action="'.api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&type='.Security::remove_XSS($_GET['type']).'&survey_id='.Security::remove_XSS($_GET['survey_id']).'&question_id='.Security::remove_XSS($_GET['question_id']).'">';
$this->html .= '<form class="form-horizontal" id="question_form" name="question_form" method="post" action="'.api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&type='.Security::remove_XSS($_GET['type']).'&survey_id='.Security::remove_XSS($_GET['survey_id']).'&question_id='.Security::remove_XSS($_GET['question_id']).'">';
$this->html .= '<legend>'.$tool_name.'</legend>';
$this->html .= ' <input type="hidden" name="survey_id" id="survey_id" value="'.Security::remove_XSS($_GET['survey_id']).'"/>';
$this->html .= ' <input type="hidden" name="question_id" id="question_id" value="'.Security::remove_XSS($_GET['question_id']).'"/>';
@ -1297,11 +1297,11 @@ class survey_question {
$this->html .= ' <input type="hidden" name="type" id="type" value="'.Security::remove_XSS($_GET['type']).'"/>';
// question field
$this->html .= ' <div class="row">';
$this->html .= ' <div class="label">';
$this->html .= ' <div class="control-group">';
$this->html .= ' <label class="control-label">';
$this->html .= ' <span class="form_required">*</span> '.get_lang('Question');
$this->html .= ' </div>';
$this->html .= ' <div class="formw">';
$this->html .= ' </label>';
$this->html .= ' <div class="controls">';
$this->html .= api_return_html_area('question', Security::remove_XSS(stripslashes($form_content['question']), STUDENT), '', '', null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120'));
$this->html .= ' </div>';
$this->html .= ' </div>';
@ -1377,10 +1377,8 @@ class survey_question {
}
if ($_GET['type'] == 'yesno' || $_GET['type'] == 'open'|| $_GET['type'] == 'percentage' || $_GET['type'] == 'comment' || $_GET['type'] == 'pagebreak') {
$this->html .= ' <div class="row">';
$this->html .= ' <div class="label">';
$this->html .= ' </div>';
$this->html .= ' <div class="formw">';
$this->html .= ' <div class="control-group">';
$this->html .= ' <div class="controls">';
}
$this->html .= ' <button class="'.$class.'"type="submit" name="save_question">'.$text.'</button>';
$this->html .= ' </div>';
@ -1498,9 +1496,7 @@ class survey_question {
$remove_answer_attribute = 'disabled="disabled"';
}
$return .= ' <div class="row">';
$return .= ' <div class="label">';
$return .= ' </div>';
$return .= ' <div class="row">';
$return .= ' <div class="formw">';
$return .= ' <input type="hidden" name="is_executable" id="is_executable" value="-" />';
$return .= ' <button class="minus" type="submit" name="remove_answer" "'.$remove_answer_attribute.'">'.get_lang('RemoveAnswer').' </button>';
@ -1535,30 +1531,30 @@ class ch_yesno extends survey_question {
function create_form($form_content) {
$this->html = parent::create_form($form_content);
// Horizontal or vertical
$this->html .= ' <div class="row">';
$this->html .= ' <div class="label">';
$this->html .= ' <div class="control-group">';
$this->html .= ' <label class="control-label">';
$this->html .= get_lang('DisplayAnswersHorVert');
$this->html .= ' </div>';
$this->html .= ' <div class="formw">';
$this->html .= ' </label>';
$this->html .= ' <div class="controls">';
$this->html .= ' <input name="horizontalvertical" type="radio" value="horizontal" ';
if (empty($form_content['horizontalvertical']) or $form_content['horizontalvertical'] == 'horizontal') {
$this->html .= 'checked="checked"';
}
$this->html .= '/>'.get_lang('Horizontal').'</label><br />';
$this->html .= '/>'.get_lang('Horizontal').'<br />';
$this->html .= ' <input name="horizontalvertical" type="radio" value="vertical" ';
if ($form_content['horizontalvertical'] == 'vertical') {
$this->html .= 'checked="checked"';
}
$this->html .= ' />'.get_lang('Vertical').'</label>';
$this->html .= ' />'.get_lang('Vertical').'';
$this->html .= ' </div>';
$this->html .= ' </div>';
// The options
$this->html .= ' <div class="row">';
$this->html .= ' <div class="label">';
$this->html .= ' <label class="control-label">';
$this->html .= get_lang('AnswerOptions');
$this->html .= ' </div>';
$this->html .= ' </label>';
$this->html .= ' <div class="formw">';
$this->html .= ' <table>';
$this->html .= ' <tr>';
@ -1591,27 +1587,38 @@ class ch_yesno extends survey_question {
if (is_array($form_content['options'])) { // Check if data is correct
foreach ($form_content['options'] as $key => & $value) {
$this->html .= '<label><input name="question'.$form_content['question_id'].'" type="radio" value="'.$key.'"';
$this->html .= '<label class="radio">';
$value_to_show = $value;
if (substr_count($value, '<p>') == 1) {
$value_to_show = substr($value, 3, (strlen($value) - 7));
}
$this->html .= '<input name="question'.$form_content['question_id'].'" type="radio" value="'.$key.'"';
if (is_array($answers)) {
if (in_array($key,$answers)) {
$this->html .= 'checked="checked"';
}
}
if (substr_count($value, '<p>') == 1) {
$this->html .= '/>'.substr($value, 3, (strlen($value) - 7)).'</label>';
if ($form_content['display'] == 'vertical') {
$this->html .= '<br />';
}
} else {
$this->html .= '/>'.$value.'</label>';
}
$this->html .= '/>';
$this->html .= $value_to_show.'</label>';
if ($form_content['display'] == 'vertical') {
//$this->html .= '<br />';
}
}
}
echo '<div class="survey_question_wrapper">';
echo '<div class="survey_question">'.$form_content['survey_question'].'</div>';
echo '<div class="survey_question_options">';
echo $this->html;
echo '</div>';
echo '<div class="survey_question">'.$form_content['survey_question'].'</div>';
echo $this->html;
echo '</div>';
}
@ -1630,9 +1637,9 @@ class ch_multiplechoice extends survey_question {
$this->html = parent::create_form($form_content);
// Horizontal or vertical
$this->html .= ' <div class="row">';
$this->html .= ' <div class="label">';
$this->html .= ' <label class="control-label">';
$this->html .= get_lang('DisplayAnswersHorVert');
$this->html .= ' </div>';
$this->html .= ' </label>';
$this->html .= ' <div class="formw">';
$this->html .= ' <input name="horizontalvertical" type="radio" value="horizontal" ';
if (empty($form_content['horizontalvertical']) or $form_content['horizontalvertical'] == 'horizontal') {
@ -1649,9 +1656,9 @@ class ch_multiplechoice extends survey_question {
// The Options
$this->html .= ' <div class="row">';
$this->html .= ' <div class="label">';
$this->html .= ' <label class="control-label">';
$this->html .= get_lang('AnswerOptions');
$this->html .= ' </div>';
$this->html .= ' </label>';
$this->html .= ' <div class="formw">';
$total_number_of_answers = count($form_content['answers']);
$this->html .= ' <table>';
@ -1807,9 +1814,9 @@ class ch_multipleresponse extends survey_question {
$this->html = parent::create_form($form_content);
// Horizontal or vertical
$this->html .= ' <div class="row">';
$this->html .= ' <div class="label">';
$this->html .= ' <label class="control-label">';
$this->html .= get_lang('DisplayAnswersHorVert');
$this->html .= ' </div>';
$this->html .= ' </label>';
$this->html .= ' <div class="formw">';
$this->html .= ' <input name="horizontalvertical" type="radio" value="horizontal" ';
if (empty($form_content['horizontalvertical']) || $form_content['horizontalvertical'] == 'horizontal') {
@ -1826,9 +1833,9 @@ class ch_multipleresponse extends survey_question {
// The options
$this->html .= ' <div class="row">';
$this->html .= ' <div class="label">';
$this->html .= ' <label class="control-label">';
$this->html .= get_lang('AnswerOptions');
$this->html .= ' </div>';
$this->html .= ' </label>';
$this->html .= ' <div class="formw">';
$total_number_of_answers = count($form_content['answers']);
$this->html .= ' <table>';
@ -1871,7 +1878,7 @@ class ch_multipleresponse extends survey_question {
*/
function render_question($form_content, $answers = array()) {
foreach ($form_content['options'] as $key => & $value) {
$this->html .= '<label><input name="question'.$form_content['question_id'].'[]" type="checkbox" value="'.$key.'"';
$this->html .= '<label class="checkbox"><input name="question'.$form_content['question_id'].'[]" type="checkbox" value="'.$key.'"';
if (is_array($answers)) {
if (in_array($key, $answers)) {
$this->html .= 'checked="checked"';
@ -1888,7 +1895,7 @@ class ch_multipleresponse extends survey_question {
}
echo '<div class="survey_question_wrapper">';
echo '<div class="survey_question">'.$form_content['survey_question'].'</div>';
echo '<div class="survey_question_options">';
echo '<div class="control-group">';
echo $this->html;
echo '</div>';
echo '</div>';
@ -1908,9 +1915,9 @@ class ch_dropdown extends survey_question {
$this->html = parent::create_form($form_content);
// The answers
$this->html .= ' <div class="row">';
$this->html .= ' <div class="label">';
$this->html .= ' <label class="control-label">';
$this->html .= get_lang('AnswerOptions');
$this->html .= ' </div>';
$this->html .= ' </label>';
$this->html .= ' <div class="formw">';
$total_number_of_answers = count($form_content['answers']);
$this->html .= ' <table>';
@ -2094,20 +2101,20 @@ class ch_score extends survey_question {
function create_form($form_content) {
$this->html = parent::create_form($form_content);
// The maximum score that can be given
$this->html .= ' <div class="row">';
$this->html .= ' <div class="label">';
$this->html .= ' <div class="control-group">';
$this->html .= ' <label class="control-label">';
$this->html .= ' <span class="form_required">*</span>'.get_lang('MaximumScore');
$this->html .= ' </div>';
$this->html .= ' <div class="formw">';
$this->html .= ' </label>';
$this->html .= ' <div class="controls">';
$this->html .= ' <input type="text" name="maximum_score" value="'.$form_content['maximum_score'].'">';
$this->html .= ' </div>';
$this->html .= ' </div>';
// The answers
$this->html .= ' <div class="row">';
$this->html .= ' <div class="label">';
$this->html .= ' <label class="control-label">';
$this->html .= get_lang('AnswerOptions');
$this->html .= ' </div>';
$this->html .= ' </label>';
$this->html .= ' <div class="formw">';
$total_number_of_answers = count($form_content['answers']);
$this->html .= ' <table>';
@ -4018,25 +4025,25 @@ class SurveyUtil {
echo '<form method="get" action="survey_list.php?search=advanced">';
echo '<div class="row"><div class="form_header">'.get_lang('SearchASurvey').'</div></div>';
echo ' <div class="row">
<div class="label">
<label class="control-label">
'.get_lang('Title').'
</div>
</label>
<div class="formw">
<input type="text" id="search_title" name="keyword_title"/>
</div>
</div>';
echo ' <div class="row">
<div class="label">
<label class="control-label">
'.get_lang('Code').'
</div>
</label>
<div class="formw">
<input type="text" name="keyword_code"/>
</div>
</div>';
echo ' <div class="row">
<div class="label">
<label class="control-label">
'.get_lang('Language').'
</div>
</label>
<div class="formw">';
echo ' <select name="keyword_language"><option value="%">'.get_lang('All').'</option>';
$languages = api_get_languages();
@ -4048,8 +4055,8 @@ class SurveyUtil {
</div>';
echo '<input type="hidden" name="cidReq" value="'.api_get_course_id().'"/>';
echo ' <div class="row">
<div class="label">
</div>
<label class="control-label">
</label>
<div class="formw">
<button class="search" type="submit" name="do_search">'.get_lang('Search').'</button>
</div>

16
main/survey/survey.php
Unescape View File

@ -63,11 +63,15 @@ if (isset($_GET['survey_id'])) {
}
}
$tool_name = strip_tags($survey_data['title']);
/*
if (api_substr($survey_data['title'], 0, 3) != '<p>') {
$tool_name = strip_tags(api_substr(api_html_entity_decode($survey_data['title'], ENT_QUOTES), 0, 40));
} else {
$tool_name = strip_tags(api_substr(api_html_entity_decode($survey_data['title'], ENT_QUOTES), 0, 40));
} else {
$tool_name = strip_tags(api_substr(api_html_entity_decode(api_substr($survey_data['title'], 3, -4), ENT_QUOTES), 0, 40));
}
}*/
$is_survey_type_1 = $survey_data['survey_type'] == 1;
@ -100,7 +104,8 @@ if ($is_survey_type_1 && $_GET['action'] == 'addgroup' || $_GET['action'] == 'de
}
// Displaying the header
Display::display_header($tool_name,'Survey');
Display::display_header($tool_name, 'Survey');
// Action handling
$my_action_survey = Security::remove_XSS($_GET['action']);
@ -213,7 +218,7 @@ while ($row = Database::fetch_array($result, 'ASSOC')) {
} else if ($row['type'] == 'multiplechoice') {
$tool_name = get_lang('UniqueSelect');
} else {
$tool_name = get_lang(api_ucfirst(Security::remove_XSS($row['type'])));
$tool_name = get_lang(api_ucfirst(Security::remove_XSS($row['type'])));
}
echo '</td>';
@ -241,6 +246,7 @@ while ($row = Database::fetch_array($result, 'ASSOC')) {
}
echo '</tr>';
}
echo '</table>';
if ($is_survey_type_1) {

Write Preview
Loading…
Cancel
Save