');
+ $parent = $question['parent_id'];
+ $parentClass = '';
+
+ if (!empty($parent)) {
+ $parentClass = ' with_parent with_parent_'.$question['question_id'];
+ $parents = survey_question::getParents($question['question_id']);
+ if (!empty($parents)) {
+ foreach($parents as $parentId) {
+ $parentClass .= ' with_parent_only_hide_'.$parentId;
+ }
+ }
+ }
+
+ $js .= survey_question::getQuestionJs($question);
+
+ $form->addHtml('
');
diff --git a/main/survey/question.php b/main/survey/question.php
index 9e8fb1a20e..f4bd1eed11 100755
--- a/main/survey/question.php
+++ b/main/survey/question.php
@@ -141,7 +141,6 @@ if (isset($_GET['question_id']) && !empty($_GET['question_id'])) {
}
$formData = $surveyQuestion->preSave($formData);
-
$surveyQuestion->createForm($surveyData, $formData);
$surveyQuestion->getForm()->setDefaults($formData);
$surveyQuestion->renderForm();
diff --git a/main/survey/survey.lib.php b/main/survey/survey.lib.php
index aa42682352..18c4e6921f 100755
--- a/main/survey/survey.lib.php
+++ b/main/survey/survey.lib.php
@@ -993,8 +993,12 @@ class SurveyManager
$course_id = api_get_course_int_id();
$question_id = (int) $question_id;
+ if (empty($question_id)) {
+ return [];
+ }
+
$sql = "SELECT * FROM $tbl_survey_question
- WHERE c_id = $course_id AND question_id='".$question_id."'
+ WHERE c_id = $course_id AND question_id = $question_id
ORDER BY `sort` ";
$sqlOption = " SELECT * FROM $table_survey_question_option
@@ -1006,10 +1010,10 @@ class SurveyManager
$table_survey_question_option = Database::get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION_OPTION);
$sql = "SELECT * FROM $tbl_survey_question
- WHERE question_id='".$question_id."'
+ WHERE question_id = $question_id
ORDER BY `sort` ";
$sqlOption = "SELECT * FROM $table_survey_question_option
- WHERE question_id='".$question_id."'
+ WHERE question_id = $question_id
ORDER BY `sort` ";
}
@@ -1018,6 +1022,8 @@ class SurveyManager
$row = Database::fetch_array($result, 'ASSOC');
$return['survey_id'] = $row['survey_id'];
+ $return['parent_id'] = isset($row['parent_id']) ? $row['parent_id'] : 0;
+ $return['parent_option_id'] = isset($row['parent_option_id']) ? $row['parent_option_id'] : 0;
$return['question_id'] = $row['question_id'];
$return['type'] = $row['type'];
$return['question'] = $row['survey_question'];
@@ -1044,10 +1050,8 @@ class SurveyManager
/** @todo this should be renamed to options instead of answers */
$return['answers'][] = $row['option_text'];
$return['values'][] = $row['value'];
-
$return['answer_data'][$counter]['data'] = $row['option_text'];
$return['answer_data'][$counter]['iid'] = $row['iid'];
-
/** @todo this can be done more elegantly (used in reporting) */
$return['answersid'][] = $row['question_option_id'];
$counter++;
@@ -1163,9 +1167,10 @@ class SurveyManager
if (!$empty_answer) {
// Table definitions
$tbl_survey_question = Database::get_course_table(TABLE_SURVEY_QUESTION);
+ $surveyId = (int) $form_content['survey_id'];
// Getting all the information of the survey
- $survey_data = self::get_survey($form_content['survey_id']);
+ $survey_data = self::get_survey($surveyId);
// Storing the question in the shared database
if (is_numeric($survey_data['survey_share']) && $survey_data['survey_share'] != 0) {
@@ -1178,7 +1183,7 @@ class SurveyManager
// Finding the max sort order of the questions in the given survey
$sql = "SELECT max(sort) AS max_sort
FROM $tbl_survey_question
- WHERE c_id = $course_id AND survey_id='".intval($form_content['survey_id'])."'";
+ WHERE c_id = $course_id AND survey_id = $surveyId ";
$result = Database::query($sql);
$row = Database::fetch_array($result, 'ASSOC');
$max_sort = $row['max_sort'];
@@ -1200,7 +1205,7 @@ class SurveyManager
$params = [
'c_id' => $course_id,
- 'survey_id' => $form_content['survey_id'],
+ 'survey_id' => $surveyId,
'survey_question' => $form_content['question'],
'survey_question_comment' => $questionComment,
'type' => $form_content['type'],
@@ -1210,6 +1215,19 @@ class SurveyManager
'max_value' => $maxScore,
];
+ if (api_get_configuration_value('survey_question_dependency')) {
+ $params['parent_id'] = 0;
+ $params['parent_option_id'] = 0;
+ if (isset($form_content['parent_id']) &&
+ isset($form_content['parent_option_id']) &&
+ !empty($form_content['parent_id']) &&
+ !empty($form_content['parent_option_id'])
+ ) {
+ $params['parent_id'] = $form_content['parent_id'];
+ $params['parent_option_id'] = $form_content['parent_option_id'];
+ }
+ }
+
if (api_get_configuration_value('allow_required_survey_questions')) {
$params['is_required'] = isset($form_content['is_required']);
}
@@ -1255,6 +1273,19 @@ class SurveyManager
$params['is_required'] = isset($form_content['is_required']);
}
+ if (api_get_configuration_value('survey_question_dependency')) {
+ $params['parent_id'] = 0;
+ $params['parent_option_id'] = 0;
+ if (isset($form_content['parent_id']) &&
+ isset($form_content['parent_option_id']) &&
+ !empty($form_content['parent_id']) &&
+ !empty($form_content['parent_option_id'])
+ ) {
+ $params['parent_id'] = $form_content['parent_id'];
+ $params['parent_option_id'] = $form_content['parent_option_id'];
+ }
+ }
+
$params = array_merge($params, $extraParams);
Database::update(
$tbl_survey_question,
diff --git a/main/survey/survey_question.php b/main/survey/survey_question.php
index b0030a8830..379f646689 100644
--- a/main/survey/survey_question.php
+++ b/main/survey/survey_question.php
@@ -16,13 +16,27 @@ class survey_question
/**
* @param array $surveyData
*/
- public function addParentMenu(FormValidator $form, $surveyData)
+ public function addParentMenu($formData, FormValidator $form, $surveyData)
{
$surveyId = $surveyData['survey_id'];
+ $questionId = isset($formData['question_id']) ? $formData['question_id'] : 0;
+ $parentId = isset($formData['parent_id']) ? $formData['parent_id'] : 0;
+ $optionId = isset($formData['parent_option_id']) ? $formData['parent_option_id'] : 0;
$questions = SurveyManager::get_questions($surveyId);
- $options = [];
+ $newQuestionList = [];
foreach ($questions as $question) {
+ $newQuestionList[$question['sort']] = $question;
+ }
+ ksort($newQuestionList);
+
+ $options = [];
+ foreach ($newQuestionList as $question) {
+ if (!empty($questionId)) {
+ if ($question['question_id'] == $questionId) {
+ break;
+ }
+ }
$options[$question['question_id']] = strip_tags($question['question']);
}
$form->addSelect(
@@ -31,32 +45,52 @@ class survey_question
$options,
['id' => 'parent_id', 'placeholder' => get_lang('SelectAnOption')]
);
- $url = api_get_path(WEB_AJAX_PATH).'survey.ajax.php?'.api_get_cidreq();
+ $url = api_get_path(WEB_AJAX_PATH).
+ 'survey.ajax.php?'.api_get_cidreq().'&a=load_question_options&survey_id='.$surveyId;
$form->addHtml('
');
- $form->addHtml('
');
- $form->addHidden('option_id', 0);
+
+ $style = 'display:none';
+ $options = [ ];
+ if (!empty($optionId) && !empty($parentId)) {
+ $parentData = SurveyManager::get_question($parentId);
+ $style = '';
+ foreach ($parentData['answer_data'] as $answer) {
+ $options[$answer['iid']] = strip_tags($answer['data']);
+ }
+ }
+
+ $form->addHtml('
');
+ $form->addSelect(
+ 'parent_option_id',
+ get_lang('Option'),
+ $options,
+ ['id' => 'parent_option_id', 'disable_js' => true]
+ );
+ $form->addHtml('
');
}
/**
@@ -118,6 +152,7 @@ class survey_question
}
$questionComment = '';
+ $allowParent = false;
switch ($type) {
case 'open':
$toolName = get_lang('Open');
@@ -125,12 +160,15 @@ class survey_question
break;
case 'yesno':
$toolName = get_lang('YesNo');
+ $allowParent = true;
break;
case 'multiplechoice':
$toolName = get_lang('UniqueSelect');
+ $allowParent = true;
break;
case 'multipleresponse':
$toolName = get_lang('MultipleResponse');
+ $allowParent = true;
break;
case 'selectivedisplay':
$toolName = get_lang('SurveyQuestionSelectiveDisplay');
@@ -138,12 +176,15 @@ class survey_question
break;
case 'multiplechoiceother':
$toolName = get_lang('SurveyMultipleAnswerWithOther');
- //$questionComment = get_lang('SurveyQuestionSelectiveDisplayComment');
break;
default:
$toolName = get_lang(api_ucfirst($type));
}
+ if (false === api_get_configuration_value('survey_question_dependency')) {
+ $allowParent = false;
+ }
+
$icon = Display::return_icon(
SurveyManager::icon_question($type),
$toolName,
@@ -182,6 +223,10 @@ class survey_question
$form->addCheckBox('is_required', get_lang('IsMandatory'), get_lang('Yes'));
}
+ if ($allowParent) {
+ $this->addParentMenu($formData, $form, $surveyData);
+ }
+
if ($surveyData['survey_type'] == 1) {
$table_survey_question_group = Database::get_course_table(TABLE_SURVEY_QUESTION_GROUP);
$sql = 'SELECT id, name FROM '.$table_survey_question_group.'
@@ -477,6 +522,90 @@ class survey_question
);
}
+ public static function getJs()
+ {
+ return '
+
+ ';
+ }
+
+ public static function getParents($questionId, $list = [])
+ {
+ $courseId = api_get_course_int_id();
+ $questionId = (int) $questionId;
+
+ $table = Database::get_course_table(TABLE_SURVEY_QUESTION);
+ $sql = "SELECT parent_id FROM $table
+ WHERE c_id = $courseId AND question_id = $questionId ";
+ $result = Database::query($sql);
+ $row = Database::fetch_array($result, 'ASSOC');
+ if ($row && !empty($row['parent_id'])) {
+ $list[] = $row['parent_id'];
+ $list = self::getParents($row['parent_id'], $list);
+ }
+
+ return $list;
+ }
+
+ public static function getQuestionJs($question)
+ {
+ $list = self::getDependecy($question);
+ if (empty($list)) {
+ return '';
+ }
+
+ $js = '';
+ $questionId = $question['question_id'];
+ $newList = [];
+ foreach ($list as $child) {
+ $childQuestionId = $child['question_id'];
+ $optionId = $child['parent_option_id'];
+ $newList[$optionId] = $childQuestionId;
+ }
+
+ $js .= '
+ ';
+
+ return $js;
+ }
+
+ public static function getDependecy($question)
+ {
+ $table = Database::get_course_table(TABLE_SURVEY_QUESTION);
+ $questionId = $question['question_id'];
+ $courseId = api_get_course_int_id();
+
+ // Getting the information of the question
+ $sql = "SELECT * FROM $table
+ WHERE c_id = $courseId AND parent_id = $questionId ";
+ $result = Database::query($sql);
+ $row = Database::store_result($result, 'ASSOC');
+
+ return $row;
+ }
+
/**
* @param array $questionData
* @param array $answers