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

Add column to show when survey is mandatory or not - refs BT#12915

Browse Source
pull/2487/head
Angel Fernando Quiroz Campos 7 years ago
parent a5e7b6e536
commit 50333afd40
1 changed files with 63 additions and 7 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. 70
      main/survey/surveyUtil.class.php

70
main/survey/surveyUtil.class.php
Unescape View File

@ -2511,9 +2511,18 @@ class SurveyUtil
$table->set_header(6, get_lang('AvailableUntil'));
$table->set_header(7, get_lang('Invite'));
$table->set_header(8, get_lang('Anonymous'));
$table->set_header(9, get_lang('Modify'), false, 'width="150"');
if (api_get_configuration_value('allow_mandatory_survey')) {
$table->set_header(9, get_lang('IsMandatory'));
$table->set_header(10, get_lang('Modify'), false, 'width="150"');
$table->set_column_filter(9, 'anonymous_filter');
$table->set_column_filter(10, 'modify_filter_drh');
} else {
$table->set_header(9, get_lang('Modify'), false, 'width="150"');
$table->set_column_filter(9, 'modify_filter_drh');
}
$table->set_column_filter(8, 'anonymous_filter');
$table->set_column_filter(9, 'modify_filter_drh');
$table->display();
}
@ -2554,9 +2563,18 @@ class SurveyUtil
$table->set_header(6, get_lang('AvailableUntil'));
$table->set_header(7, get_lang('Invite'));
$table->set_header(8, get_lang('Anonymous'));
$table->set_header(9, get_lang('Modify'), false, 'width="150"');
if (api_get_configuration_value('allow_mandatory_survey')) {
$table->set_header(9, get_lang('IsMandatory'));
$table->set_header(10, get_lang('Modify'), false, 'width="150"');
$table->set_column_filter(9, 'anonymous_filter');
$table->set_column_filter(10, 'modify_filter');
} else {
$table->set_header(9, get_lang('Modify'), false, 'width="150"');
$table->set_column_filter(9, 'modify_filter');
}
$table->set_column_filter(8, 'anonymous_filter');
$table->set_column_filter(9, 'modify_filter');
$table->set_form_actions(array('delete' => get_lang('DeleteSurvey')));
$table->display();
}
@ -2593,9 +2611,18 @@ class SurveyUtil
$table->set_header(6, get_lang('AvailableUntil'));
$table->set_header(7, get_lang('Invite'));
$table->set_header(8, get_lang('Anonymous'));
$table->set_header(9, get_lang('Modify'), false, 'width="130"');
if (api_get_configuration_value('allow_mandatory_survey')) {
$table->set_header(9, get_lang('Modify'), false, 'width="130"');
$table->set_header(10, get_lang('Modify'), false, 'width="130"');
$table->set_column_filter(9, 'anonymous_filter');
$table->set_column_filter(10, 'modify_filter_for_coach');
} else {
$table->set_header(9, get_lang('Modify'), false, 'width="130"');
$table->set_column_filter(9, 'modify_filter_for_coach');
}
$table->set_column_filter(8, 'anonymous_filter');
$table->set_column_filter(9, 'modify_filter_for_coach');
$table->display();
}
@ -2766,6 +2793,7 @@ class SurveyUtil
$table_survey = Database::get_course_table(TABLE_SURVEY);
$table_user = Database::get_main_table(TABLE_MAIN_USER);
$table_survey_question = Database::get_course_table(TABLE_SURVEY_QUESTION);
$mandatoryAllowed = api_get_configuration_value('allow_mandatory_survey');
$_user = api_get_user_info();
// Searching
@ -2814,6 +2842,8 @@ class SurveyUtil
$res = Database::query($sql);
$surveys = array();
$array = array();
$efv = new ExtraFieldValue('survey');
while ($survey = Database::fetch_array($res)) {
$array[0] = $survey[0];
$array[1] = Display::url(
@ -2839,7 +2869,15 @@ class SurveyUtil
);
$array[8] = $survey[8];
$array[9] = $survey[9];
if ($mandatoryAllowed) {
$efvMandatory = $efv->get_values_by_handler_and_field_variable($survey[9], 'is_mandatory');
$array[9] = $efvMandatory ? $efvMandatory['value'] : 0;
$array[10] = $survey[9];
} else {
$array[9] = $survey[9];
}
if ($isDrh) {
$array[1] = $survey[1];
@ -2860,6 +2898,7 @@ class SurveyUtil
*/
public static function get_survey_data_for_coach($from, $number_of_items, $column, $direction)
{
$mandatoryAllowed = api_get_configuration_value('allow_mandatory_survey');
$survey_tree = new SurveyTree();
//$last_version_surveys = $survey_tree->get_last_children_from_branch($survey_tree->surveylist);
$last_version_surveys = $survey_tree->surveylist;
@ -2884,6 +2923,7 @@ class SurveyUtil
$table_survey_question = Database::get_course_table(TABLE_SURVEY_QUESTION);
$table_user = Database::get_main_table(TABLE_MAIN_USER);
$course_id = api_get_course_int_id();
$efv = new ExtraFieldValue('survey');
$sql = "SELECT
survey.survey_id AS col0,
@ -2908,6 +2948,11 @@ class SurveyUtil
$res = Database::query($sql);
$surveys = array();
while ($survey = Database::fetch_array($res)) {
if ($mandatoryAllowed) {
$survey['col10'] = $survey['col9'];
$efvMandatory = $efv->get_values_by_handler_and_field_variable($survey['col9'], 'is_mandatory');
$survey['col9'] = $efvMandatory['value'];
}
$surveys[] = $survey;
}
@ -2928,6 +2973,7 @@ class SurveyUtil
$course_id = $_course['real_id'];
$user_id = intval($user_id);
$sessionId = api_get_session_id();
$mandatoryAllowed = api_get_configuration_value('allow_mandatory_survey');
// Database table definitions
$table_survey_question = Database::get_course_table(TABLE_SURVEY_QUESTION);
@ -2949,6 +2995,9 @@ class SurveyUtil
echo '<tr>';
echo ' <th>'.get_lang('SurveyName').'</th>';
echo ' <th class="text-center">'.get_lang('Anonymous').'</th>';
if ($mandatoryAllowed) {
echo '<th class="text-center">'.get_lang('IsMandatory').'</th>';
}
echo '</tr>';
echo '</thead>';
echo '<tbody>';
@ -2972,6 +3021,8 @@ class SurveyUtil
";
$result = Database::query($sql);
$efv = new ExtraFieldValue('survey');
while ($row = Database::fetch_array($result, 'ASSOC')) {
echo '<tr>';
if ($row['answered'] == 0) {
@ -2999,6 +3050,11 @@ class SurveyUtil
echo '<td class="text-center">';
echo ($row['anonymous'] == 1) ? get_lang('Yes') : get_lang('No');
echo '</td>';
if ($mandatoryAllowed) {
$efvMandatory = $efv->get_values_by_handler_and_field_variable($row['survey_id'], 'is_mandatory');
echo '<td class="text-center">'.($efvMandatory['value'] ? get_lang('Yes') : get_lang('No')).'</td>';
}
echo '</tr>';
}
echo '</tbody>';

Write Preview
Loading…
Cancel
Save