|
|
|
@ -456,9 +456,7 @@ class SurveyUtil |
|
|
|
} |
|
|
|
} |
|
|
|
break; |
|
|
|
break; |
|
|
|
case 'multipleresponse': |
|
|
|
case 'multipleresponse': |
|
|
|
$finalAnswer = isset($answers[$question['question_id']]) |
|
|
|
$finalAnswer = isset($answers[$question['question_id']]) ? $answers[$question['question_id']] : ''; |
|
|
|
? $answers[$question['question_id']] |
|
|
|
|
|
|
|
: ''; |
|
|
|
|
|
|
|
break; |
|
|
|
break; |
|
|
|
default: |
|
|
|
default: |
|
|
|
$finalAnswer = ''; |
|
|
|
$finalAnswer = ''; |
|
|
|
@ -629,7 +627,7 @@ class SurveyUtil |
|
|
|
$sql = "SELECT * FROM $table_survey_question |
|
|
|
$sql = "SELECT * FROM $table_survey_question |
|
|
|
WHERE |
|
|
|
WHERE |
|
|
|
c_id = $course_id AND |
|
|
|
c_id = $course_id AND |
|
|
|
survey_id='".$surveyId."' AND |
|
|
|
survey_id = $surveyId AND |
|
|
|
survey_question NOT LIKE '%{{%' AND |
|
|
|
survey_question NOT LIKE '%{{%' AND |
|
|
|
type <>'pagebreak' |
|
|
|
type <>'pagebreak' |
|
|
|
ORDER BY sort ASC |
|
|
|
ORDER BY sort ASC |
|
|
|
@ -1280,7 +1278,8 @@ class SurveyUtil |
|
|
|
|
|
|
|
|
|
|
|
$content .= '<th> |
|
|
|
$content .= '<th> |
|
|
|
<a href="'.$url.'&action=userreport&user='.$user.'">' |
|
|
|
<a href="'.$url.'&action=userreport&user='.$user.'">' |
|
|
|
.$user_displayed.'</a> |
|
|
|
.$user_displayed.' |
|
|
|
|
|
|
|
</a> |
|
|
|
</th>'; // the user column |
|
|
|
</th>'; // the user column |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
$content .= '<th>'.$user.'</th>'; // the user column |
|
|
|
$content .= '<th>'.$user.'</th>'; // the user column |
|
|
|
@ -1354,8 +1353,14 @@ class SurveyUtil |
|
|
|
* Quite similar to display_complete_report(), returns an HTML string |
|
|
|
* Quite similar to display_complete_report(), returns an HTML string |
|
|
|
* that can be used in a csv file. |
|
|
|
* that can be used in a csv file. |
|
|
|
* |
|
|
|
* |
|
|
|
|
|
|
|
* @param array $survey_data The basic survey data as initially obtained by SurveyManager::get_survey() |
|
|
|
|
|
|
|
* @param int $user_id The ID of the user asking for the report |
|
|
|
|
|
|
|
* @param bool $compact Whether to present the long (v marks with multiple columns per question) or compact (one column per question) answers format |
|
|
|
|
|
|
|
* |
|
|
|
* @todo consider merging this function with display_complete_report |
|
|
|
* @todo consider merging this function with display_complete_report |
|
|
|
* |
|
|
|
* |
|
|
|
|
|
|
|
* @throws Exception |
|
|
|
|
|
|
|
* |
|
|
|
* @return string The contents of a csv file |
|
|
|
* @return string The contents of a csv file |
|
|
|
* |
|
|
|
* |
|
|
|
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University |
|
|
|
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University |
|
|
|
@ -1429,7 +1434,7 @@ class SurveyUtil |
|
|
|
is_array($_POST['questions_filter']) && |
|
|
|
is_array($_POST['questions_filter']) && |
|
|
|
in_array($row['question_id'], $_POST['questions_filter'])) |
|
|
|
in_array($row['question_id'], $_POST['questions_filter'])) |
|
|
|
) { |
|
|
|
) { |
|
|
|
if ($row['number_of_options'] == 0 or $compact) { |
|
|
|
if ($row['number_of_options'] == 0 || $compact) { |
|
|
|
$return .= str_replace( |
|
|
|
$return .= str_replace( |
|
|
|
"\r\n", |
|
|
|
"\r\n", |
|
|
|
' ', |
|
|
|
' ', |
|
|
|
@ -1526,7 +1531,7 @@ class SurveyUtil |
|
|
|
survey_id = $surveyId |
|
|
|
survey_id = $surveyId |
|
|
|
"; |
|
|
|
"; |
|
|
|
if ($user_id != 0) { |
|
|
|
if ($user_id != 0) { |
|
|
|
$user_id = intval($user_id); |
|
|
|
$user_id = (int) $user_id; |
|
|
|
$sql .= " AND user = $user_id "; |
|
|
|
$sql .= " AND user = $user_id "; |
|
|
|
} |
|
|
|
} |
|
|
|
$sql .= ' ORDER BY user ASC '; |
|
|
|
$sql .= ' ORDER BY user ASC '; |
|
|
|
@ -1550,8 +1555,8 @@ class SurveyUtil |
|
|
|
$answers_of_user = []; |
|
|
|
$answers_of_user = []; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if ('open' == $possible_answers_type[$row['question_id']] || |
|
|
|
if ('open' === $possible_answers_type[$row['question_id']] || |
|
|
|
'comment' == $possible_answers_type[$row['question_id']] |
|
|
|
'comment' === $possible_answers_type[$row['question_id']] |
|
|
|
) { |
|
|
|
) { |
|
|
|
$temp_id = 'open'.$open_question_iterator; |
|
|
|
$temp_id = 'open'.$open_question_iterator; |
|
|
|
$answers_of_user[$row['question_id']][$temp_id] = $row; |
|
|
|
$answers_of_user[$row['question_id']][$temp_id] = $row; |
|
|
|
@ -1578,10 +1583,12 @@ class SurveyUtil |
|
|
|
/** |
|
|
|
/** |
|
|
|
* Add a line to the csv file. |
|
|
|
* Add a line to the csv file. |
|
|
|
* |
|
|
|
* |
|
|
|
* @param array Possible answers |
|
|
|
* @param array $survey_data Basic survey data (we're mostly interested in the 'anonymous' index) |
|
|
|
* @param array User's answers |
|
|
|
* @param array $possible_options Possible answers |
|
|
|
* @param mixed User ID or user details as string - Used as a string in the result string |
|
|
|
* @param array $answers_of_user User's answers |
|
|
|
* @param bool Whether to display user fields or not |
|
|
|
* @param mixed $user User ID or user details as string - Used as a string in the result string |
|
|
|
|
|
|
|
* @param bool $display_extra_user_fields Whether to display user fields or not |
|
|
|
|
|
|
|
* @param bool $compact Whether to show answers as different column values (true) or one column per option (false, default) |
|
|
|
* |
|
|
|
* |
|
|
|
* @return string One line of the csv file |
|
|
|
* @return string One line of the csv file |
|
|
|
* |
|
|
|
* |
|
|
|
@ -2350,10 +2357,11 @@ class SurveyUtil |
|
|
|
* and additional users in the database |
|
|
|
* and additional users in the database |
|
|
|
* and sends the invitations by email. |
|
|
|
* and sends the invitations by email. |
|
|
|
* |
|
|
|
* |
|
|
|
* @param $users_array Users $array array can be both a list of course uids AND a list of additional emailaddresses |
|
|
|
* @param int $surveyId |
|
|
|
* @param $invitation_title Title $string of the invitation, used as the title of the mail |
|
|
|
* @param array $users_array Users array can be both a list of course uids AND a list of additional email addresses |
|
|
|
* @param $invitation_text Text $string of the invitation, used as the text of the mail. |
|
|
|
* @param string $invitation_title title of the mail |
|
|
|
* The text has to contain a **link** string or this will automatically be added to the end |
|
|
|
* @param string $invitation_text text of the mail has to contain a **link** string or |
|
|
|
|
|
|
|
* this will automatically be added to the end |
|
|
|
* @param int $reminder |
|
|
|
* @param int $reminder |
|
|
|
* @param bool $sendmail |
|
|
|
* @param bool $sendmail |
|
|
|
* @param int $remindUnAnswered |
|
|
|
* @param int $remindUnAnswered |
|
|
|
@ -2366,6 +2374,7 @@ class SurveyUtil |
|
|
|
* @version January 2007 |
|
|
|
* @version January 2007 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public static function saveInvitations( |
|
|
|
public static function saveInvitations( |
|
|
|
|
|
|
|
$surveyId, |
|
|
|
$users_array, |
|
|
|
$users_array, |
|
|
|
$invitation_title, |
|
|
|
$invitation_title, |
|
|
|
$invitation_text, |
|
|
|
$invitation_text, |
|
|
|
@ -2375,12 +2384,13 @@ class SurveyUtil |
|
|
|
$isAdditionalEmail = false, |
|
|
|
$isAdditionalEmail = false, |
|
|
|
$hideLink = false |
|
|
|
$hideLink = false |
|
|
|
) { |
|
|
|
) { |
|
|
|
|
|
|
|
$surveyId = (int) $surveyId; |
|
|
|
if (!is_array($users_array)) { |
|
|
|
if (!is_array($users_array)) { |
|
|
|
return 0; |
|
|
|
return 0; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Getting the survey information |
|
|
|
// Getting the survey information |
|
|
|
$survey_data = SurveyManager::get_survey($_GET['survey_id']); |
|
|
|
$survey_data = SurveyManager::get_survey($surveyId); |
|
|
|
$survey_invitations = self::get_invitations($survey_data['survey_code']); |
|
|
|
$survey_invitations = self::get_invitations($survey_data['survey_code']); |
|
|
|
$already_invited = self::get_invited_users($survey_data['code']); |
|
|
|
$already_invited = self::get_invited_users($survey_data['code']); |
|
|
|
|
|
|
|
|
|
|
|
@ -2389,7 +2399,7 @@ class SurveyUtil |
|
|
|
if (1 == $remindUnAnswered) { |
|
|
|
if (1 == $remindUnAnswered) { |
|
|
|
// Remind only unanswered users |
|
|
|
// Remind only unanswered users |
|
|
|
$reminder = 1; |
|
|
|
$reminder = 1; |
|
|
|
$exclude_users = SurveyManager::get_people_who_filled_survey($_GET['survey_id']); |
|
|
|
$exclude_users = SurveyManager::get_people_who_filled_survey($surveyId); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
$counter = 0; // Nr of invitations "sent" (if sendmail option) |
|
|
|
$counter = 0; // Nr of invitations "sent" (if sendmail option) |
|
|
|
@ -2891,8 +2901,6 @@ class SurveyUtil |
|
|
|
$table->set_header(2, get_lang('SurveyCourse code')); |
|
|
|
$table->set_header(2, get_lang('SurveyCourse code')); |
|
|
|
$table->set_header(3, get_lang('Questions')); |
|
|
|
$table->set_header(3, get_lang('Questions')); |
|
|
|
$table->set_header(4, get_lang('Author')); |
|
|
|
$table->set_header(4, get_lang('Author')); |
|
|
|
//$table->set_header(5, get_lang('Language')); |
|
|
|
|
|
|
|
//$table->set_header(6, get_lang('Shared')); |
|
|
|
|
|
|
|
$table->set_header(5, get_lang('Available from')); |
|
|
|
$table->set_header(5, get_lang('Available from')); |
|
|
|
$table->set_header(6, get_lang('Until')); |
|
|
|
$table->set_header(6, get_lang('Until')); |
|
|
|
$table->set_header(7, get_lang('Invite')); |
|
|
|
$table->set_header(7, get_lang('Invite')); |
|
|
|
@ -2909,7 +2917,13 @@ class SurveyUtil |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
$table->set_column_filter(8, 'anonymous_filter'); |
|
|
|
$table->set_column_filter(8, 'anonymous_filter'); |
|
|
|
$table->set_form_actions(['delete' => get_lang('Delete survey')]); |
|
|
|
$actions = [ |
|
|
|
|
|
|
|
'export_all' => get_lang('ExportResults'), |
|
|
|
|
|
|
|
'send_to_tutors' => get_lang('SendToGroupTutors'), |
|
|
|
|
|
|
|
'multiplicate' => get_lang('MultiplicateQuestions'), |
|
|
|
|
|
|
|
'delete' => get_lang('DeleteSurvey'), |
|
|
|
|
|
|
|
]; |
|
|
|
|
|
|
|
$table->set_form_actions($actions); |
|
|
|
$table->display(); |
|
|
|
$table->display(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -2990,14 +3004,10 @@ class SurveyUtil |
|
|
|
* @param int $survey_id the id of the survey |
|
|
|
* @param int $survey_id the id of the survey |
|
|
|
* @param bool $drh |
|
|
|
* @param bool $drh |
|
|
|
* |
|
|
|
* |
|
|
|
* @throws \Doctrine\ORM\ORMException |
|
|
|
* @return string html code that are the actions that can be performed on any survey |
|
|
|
* @throws \Doctrine\ORM\OptimisticLockException |
|
|
|
|
|
|
|
* @throws \Doctrine\ORM\TransactionRequiredException |
|
|
|
|
|
|
|
* |
|
|
|
* |
|
|
|
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University |
|
|
|
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University |
|
|
|
* |
|
|
|
* |
|
|
|
* @return string html code that are the actions that can be performed on any survey |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* @version January 2007 |
|
|
|
* @version January 2007 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public static function modify_filter($survey_id, $drh = false) |
|
|
|
public static function modify_filter($survey_id, $drh = false) |
|
|
|
@ -3033,13 +3043,13 @@ class SurveyUtil |
|
|
|
$type = $survey->getSurveyType(); |
|
|
|
$type = $survey->getSurveyType(); |
|
|
|
|
|
|
|
|
|
|
|
// Coach can see that only if the survey is in his session |
|
|
|
// Coach can see that only if the survey is in his session |
|
|
|
if (api_is_allowed_to_edit() || |
|
|
|
if (api_is_allowed_to_edit() || api_is_element_in_the_session(TOOL_SURVEY, $survey_id)) { |
|
|
|
api_is_element_in_the_session(TOOL_SURVEY, $survey_id) |
|
|
|
$configUrl = $codePath.'survey/create_new_survey.php?'. |
|
|
|
) { |
|
|
|
|
|
|
|
$editUrl = $codePath.'survey/create_new_survey.php?'. |
|
|
|
|
|
|
|
http_build_query($params + ['action' => 'edit', 'survey_id' => $survey_id]); |
|
|
|
http_build_query($params + ['action' => 'edit', 'survey_id' => $survey_id]); |
|
|
|
|
|
|
|
$editUrl = $codePath.'survey/survey.php?'. |
|
|
|
|
|
|
|
http_build_query($params + ['survey_id' => $survey_id]); |
|
|
|
if (3 == $survey->getSurveyType()) { |
|
|
|
if (3 == $survey->getSurveyType()) { |
|
|
|
$editUrl = $codePath.'survey/edit_meeting.php?'. |
|
|
|
$configUrl = $codePath.'survey/edit_meeting.php?'. |
|
|
|
http_build_query($params + ['action' => 'edit', 'survey_id' => $survey_id]); |
|
|
|
http_build_query($params + ['action' => 'edit', 'survey_id' => $survey_id]); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -3047,6 +3057,10 @@ class SurveyUtil |
|
|
|
Display::return_icon('edit.png', get_lang('Edit')), |
|
|
|
Display::return_icon('edit.png', get_lang('Edit')), |
|
|
|
$editUrl |
|
|
|
$editUrl |
|
|
|
); |
|
|
|
); |
|
|
|
|
|
|
|
$actions[] = Display::url( |
|
|
|
|
|
|
|
Display::return_icon('settings.png', get_lang('Configure')), |
|
|
|
|
|
|
|
$configUrl |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
if (SurveyManager::survey_generation_hash_available()) { |
|
|
|
if (SurveyManager::survey_generation_hash_available()) { |
|
|
|
$actions[] = Display::url( |
|
|
|
$actions[] = Display::url( |
|
|
|
@ -3604,17 +3618,18 @@ class SurveyUtil |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
echo '<tr>'; |
|
|
|
echo '<tr>'; |
|
|
|
if (0 == $row['answered']) { |
|
|
|
if ($row['answered'] == 0) { |
|
|
|
echo '<td>'; |
|
|
|
echo '<td>'; |
|
|
|
echo Display::return_icon( |
|
|
|
$url = self::generateFillSurveyLink($row['invitation_code'], $_course, $row['session_id']); |
|
|
|
'statistics.png', |
|
|
|
$icon = Display::return_icon( |
|
|
|
get_lang('Create survey'), |
|
|
|
'survey.png', |
|
|
|
[], |
|
|
|
get_lang('ClickHereToAnswerTheSurvey'), |
|
|
|
|
|
|
|
['style' => 'margin-top: -4px'], |
|
|
|
ICON_SIZE_TINY |
|
|
|
ICON_SIZE_TINY |
|
|
|
); |
|
|
|
); |
|
|
|
$url = self::generateFillSurveyLink($row['invitation_code'], $_course, $row['session_id']); |
|
|
|
|
|
|
|
echo '<a href="'.$url.'"> |
|
|
|
echo '<a href="'.$url.'"> |
|
|
|
'.$row['title'] |
|
|
|
'.$icon |
|
|
|
|
|
|
|
.$row['title'] |
|
|
|
.'</a></td>'; |
|
|
|
.'</a></td>'; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
$isDrhOfCourse = CourseManager::isUserSubscribedInCourseAsDrh( |
|
|
|
$isDrhOfCourse = CourseManager::isUserSubscribedInCourseAsDrh( |
|
|
|
@ -3622,8 +3637,8 @@ class SurveyUtil |
|
|
|
$_course |
|
|
|
$_course |
|
|
|
); |
|
|
|
); |
|
|
|
$icon = Display::return_icon( |
|
|
|
$icon = Display::return_icon( |
|
|
|
'statistics_na.png', |
|
|
|
'survey_na.png', |
|
|
|
get_lang('Survey'), |
|
|
|
get_lang('SurveysDone'), |
|
|
|
[], |
|
|
|
[], |
|
|
|
ICON_SIZE_TINY |
|
|
|
ICON_SIZE_TINY |
|
|
|
); |
|
|
|
); |
|
|
|
|
Julio Montoya
5 years ago