Talenttic_survey/CATI_Tool
2
0
Fork 0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00
Code Issues Releases Activity

Fixed issue: Data output including shift reports failing

Browse Source
This commit is contained in:
Adam Zammit
2017-08-16 14:53:12 +10:00
parent bed64ed0cb
commit b1ff02a5b9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/dataoutput.php
View File

@@ -106,7 +106,7 @@ if (isset($_GET['key']) || isset($_GET['sample']))
(SELECT cp1.phone FROM `call` as cl4, `contact_phone` as cp1 WHERE cl4.call_id = c.last_call_id AND cp1.contact_phone_id = cl4.contact_phone_id ) as lastnumber, (SELECT cp1.phone FROM `call` as cl4, `contact_phone` as cp1 WHERE cl4.call_id = c.last_call_id AND cp1.contact_phone_id = cl4.contact_phone_id ) as lastnumber,
(SELECT cl55.start FROM `call` as cl55 WHERE cl55.call_id = c.last_call_id ) as lastcallstart, (SELECT cl55.start FROM `call` as cl55 WHERE cl55.call_id = c.last_call_id ) as lastcallstart,
(SELECT op1.username FROM `call` as cl5, `operator` as op1 WHERE cl5.call_id = c.last_call_id AND op1.operator_id = cl5.operator_id) as operatoru, (SELECT op1.username FROM `call` as cl5, `operator` as op1 WHERE cl5.call_id = c.last_call_id AND op1.operator_id = cl5.operator_id) as operatoru,
(SELECT GROUP_CONCAT(DISTINCT sr1.report SEPARATOR '|') FROM `call` as cl6, `shift` as sh1, `shift_report` as sr1 WHERE cl6.case_id = c.case_id AND sr1.shift_id = sh1.shift_id AND sh1.questionnaire_id = c.questionnaire_id AND cl6.start >= sh1.start AND cl6.end < sh1.end GROUP BY sr1.shift_id) as shiftr, (SELECT GROUP_CONCAT(DISTINCT sr1.report SEPARATOR '|') FROM `call` as cl6, `shift` as sh1, `shift_report` as sr1 WHERE cl6.case_id = c.case_id AND sr1.shift_id = sh1.shift_id AND sh1.questionnaire_id = c.questionnaire_id AND cl6.start >= sh1.start AND cl6.end < sh1.end GROUP BY cl6.case_id) as shiftr,
o.aapor_id "; o.aapor_id ";
$i = 0; $i = 0;

4
include/limesurvey/admin/exportresults.php
View File

@@ -518,7 +518,7 @@ if ($tokenTableExists && $thissurvey['anonymized']=='N' && isset($_POST['attribu
AND sh1.questionnaire_id = ca8.questionnaire_id AND sh1.questionnaire_id = ca8.questionnaire_id
AND cl6.start >= sh1.start AND cl6.start >= sh1.start
AND cl6.end < sh1.end AND cl6.end < sh1.end
GROUP BY sr1.shift_id) as shiftr "; GROUP BY cl6.case_id) as shiftr ";
} }
if (in_array('token',$_POST['attribute_select'])) if (in_array('token',$_POST['attribute_select']))
{ {
@@ -1379,4 +1379,4 @@ function strip_tags_full($string) {
$string=str_replace('-oth-','',$string); $string=str_replace('-oth-','',$string);
return FlattenText($string,true,'UTF-8',false); return FlattenText($string,true,'UTF-8',false);
} }
?> ?>