From c1b514c2bc815b4a474b9a39efae5ae8364bddf5 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 26 Nov 2021 13:03:17 -0500 Subject: [PATCH] Lp: Implement surveys in lps with reporting - refs BT#19049 --- main/survey/surveyUtil.class.php | 61 ++++++++++++++++++++------------ 1 file changed, 39 insertions(+), 22 deletions(-) diff --git a/main/survey/surveyUtil.class.php b/main/survey/surveyUtil.class.php index 5400da27ce..ca4835104e 100755 --- a/main/survey/surveyUtil.class.php +++ b/main/survey/surveyUtil.class.php @@ -151,7 +151,7 @@ class SurveyUtil } // To select the answers by session $sessionCondition = ''; - if (true === api_get_configuration_value('show_surveys_base_in_sessions')) { + if (api_get_configuration_value('show_surveys_base_in_sessions')) { $sessionCondition = " , session_id = $sessionId"; } @@ -340,7 +340,7 @@ class SurveyUtil // To delete or update the answer by session $sessionCondition = ''; - if (true === api_get_configuration_value('show_surveys_base_in_sessions')) { + if (api_get_configuration_value('show_surveys_base_in_sessions')) { $sessionId = api_get_session_id(); $sessionCondition = api_get_session_condition($sessionId); } @@ -484,9 +484,11 @@ class SurveyUtil } // To select the answers by session $sessionCondition = ''; + $sessionId = api_get_session_id(); if (true === api_get_configuration_value('show_surveys_base_in_sessions')) { - $sessionId = api_get_session_id(); - $sessionCondition = api_get_session_condition($sessionId); + if (!empty($sessionId)) { + $sessionCondition = api_get_session_condition($sessionId); + } } // To select the answers by Lp item @@ -723,10 +725,13 @@ class SurveyUtil // To select the answers by session $sessionCondition = ''; - if (true === api_get_configuration_value('show_surveys_base_in_sessions')) { - $sessionCondition = api_get_session_condition($sessionId); + if (api_get_configuration_value('show_surveys_base_in_sessions')) { + if (!empty($sessionId)) { + $sessionCondition = api_get_session_condition($sessionId); + } } + // To select the aswers by lp item $lpItemCondition = ''; $urlParams = ''; if (api_get_configuration_value('allow_survey_tool_in_lp')) { @@ -1038,12 +1043,14 @@ class SurveyUtil $table_survey_answer = Database::get_course_table(TABLE_SURVEY_ANSWER); $course_id = api_get_course_int_id(); $surveyId = $survey_data['survey_id']; + $sessionId = api_get_session_id(); // To select the answers by session $sessionCondition = ''; - if (true === api_get_configuration_value('show_surveys_base_in_sessions')) { - $sessionId = api_get_session_id(); - $sessionCondition = api_get_session_condition($sessionId); + if (api_get_configuration_value('show_surveys_base_in_sessions')) { + if (!empty($sessionId)) { + $sessionCondition = api_get_session_condition($sessionId); + } } // Getting the options @@ -1172,13 +1179,17 @@ class SurveyUtil $surveyId = (int) $survey_data['survey_id']; $course_id = (int) $survey_data['c_id']; + $sessionId = api_get_session_id(); // To select the answers by session $sessionCondition = ''; - if (true === api_get_configuration_value('show_surveys_base_in_sessions')) { - $sessionId = api_get_session_id(); - $sessionCondition = api_get_session_condition($sessionId); + if (api_get_configuration_value('show_surveys_base_in_sessions')) { + if (!empty($sessionId)) { + $sessionCondition = api_get_session_condition($sessionId); + } } + + // To select the answers by lp item $lpItemCondition = ''; if (true === api_get_configuration_value('allow_survey_tool_in_lp')) { $lpItemCondition = " AND c_lp_item_id = $lpItemId"; @@ -1629,12 +1640,14 @@ class SurveyUtil $course = api_get_course_info(); $course_id = $course['real_id']; + $sessionId = api_get_session_id(); // To select the answers by session $sessionCondition = ''; - if (true === api_get_configuration_value('show_surveys_base_in_sessions')) { - $sessionId = api_get_session_id(); - $sessionCondition = api_get_session_condition($sessionId); + if (api_get_configuration_value('show_surveys_base_in_sessions')) { + if (!empty($sessionId)) { + $sessionCondition = api_get_session_condition($sessionId); + } } $table_survey_question = Database::get_course_table(TABLE_SURVEY_QUESTION); @@ -2016,10 +2029,12 @@ class SurveyUtil $table_survey_answer = Database::get_course_table(TABLE_SURVEY_ANSWER); // To select the answers by session + $sessionId = api_get_session_id(); $sessionCondition = ''; - if (true === api_get_configuration_value('show_surveys_base_in_sessions')) { - $sessionId = api_get_session_id(); - $sessionCondition = api_get_session_condition($sessionId); + if (api_get_configuration_value('show_surveys_base_in_sessions')) { + if (!empty($sessionId)) { + $sessionCondition = api_get_session_condition($sessionId); + } } // First line (questions) @@ -2575,7 +2590,9 @@ class SurveyUtil // To select the answers by session $sessionCondition = ''; if (api_get_configuration_value('show_surveys_base_in_sessions')) { - $sessionCondition = api_get_session_condition($sessionId); + if (!empty($sessionId)) { + $sessionCondition = api_get_session_condition($sessionId); + } } // To select the answers by Lp item $lpItemCondition = ''; @@ -3624,7 +3641,7 @@ class SurveyUtil } // To list the surveys base too $sessionCondition = ''; - if (true === api_get_configuration_value('show_surveys_base_in_sessions')) { + if (api_get_configuration_value('show_surveys_base_in_sessions')) { $sessionCondition = api_get_session_condition(api_get_session_id(), true, true); } @@ -3690,8 +3707,8 @@ class SurveyUtil // To list the surveys base too $sessionCondition = ''; - if (true === api_get_configuration_value('show_surveys_base_in_sessions')) { - $sessionId = api_get_session_id(); + $sessionId = api_get_session_id(); + if (api_get_configuration_value('show_surveys_base_in_sessions')) { $sessionCondition = api_get_session_condition($sessionId, true, true); } $course_id = api_get_course_int_id();