From cc25aebd79c469965d12575e547da8211a5d6d5b Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 27 Nov 2015 16:39:36 +0300 Subject: [PATCH 01/15] re-fix duplicated rows --- admin/displayappointments.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/displayappointments.php b/admin/displayappointments.php index 2ae5a1df..8880e71a 100644 --- a/admin/displayappointments.php +++ b/admin/displayappointments.php @@ -306,7 +306,7 @@ else { WHERE q.enabled=1 AND si.enabled=1 AND a.end >= CONVERT_TZ(NOW(),'System','UTC') AND c.current_outcome_id !=10 AND (qsq.quota_reached IS NULL OR qsq.quota_reached != 1) AND (qsqr.quota_reached IS NULL OR qsqr.quota_reached != 1) - ORDER BY a.start ASC"; + GROUP BY c.case_id ORDER BY a.start ASC"; $rs = $db->GetAll($sql); if (!empty($rs)) { From 300787d5c61850ef4b6f5630f08192f62113dc5d Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 30 Nov 2015 23:00:06 +0300 Subject: [PATCH 02/15] remove redundant file --- include/tabber.zip | Bin 15364 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 include/tabber.zip diff --git a/include/tabber.zip b/include/tabber.zip deleted file mode 100644 index 39677f39e86e6d9e2a142a671795fb30bfbbf778..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15364 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 Date: Mon, 30 Nov 2015 23:03:46 +0300 Subject: [PATCH 03/15] display operator lastname too (as firstnames might be the same) --- admin/callhistory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/callhistory.php b/admin/callhistory.php index 6ac3d177..25082f7e 100644 --- a/admin/callhistory.php +++ b/admin/callhistory.php @@ -82,7 +82,7 @@ if ($operator_id) { if (isset($_GET['questionnaire_id'])) $qid = $_GET['questionnaire_id']; if (isset($_GET['sample_import_id'])) $sid = $_GET['sample_import_id']; - $sql = "SELECT DATE_FORMAT(CONVERT_TZ(c.start,'UTC',op.Time_zone_name),'".DATE_FORMAT."') as start_date, DATE_FORMAT(CONVERT_TZ(c.start,'UTC',op.Time_zone_name),'".TIME_FORMAT."') as start_time, DATE_FORMAT(CONVERT_TZ(c.end,'UTC',op.Time_zone_name),'".TIME_FORMAT."') as end, o.description as descr, (CONCAT(r.firstName,' ',r.lastName)) as firstName, opp.firstName as opname, + $sql = "SELECT DATE_FORMAT(CONVERT_TZ(c.start,'UTC',op.Time_zone_name),'".DATE_FORMAT."') as start_date, DATE_FORMAT(CONVERT_TZ(c.start,'UTC',op.Time_zone_name),'".TIME_FORMAT."') as start_time, DATE_FORMAT(CONVERT_TZ(c.end,'UTC',op.Time_zone_name),'".TIME_FORMAT."') as end, o.description as descr, (CONCAT(r.firstName,' ',r.lastName)) as firstName, CONCAT(opp.firstName, ' ', opp.lastName) as opname, (SELECT GROUP_CONCAT(cn1.note SEPARATOR '
¶ ' ) FROM `case_note` as cn1 WHERE c.case_id = cn1.case_id GROUP BY cn1.case_id)as casenotes,"; if (isset($_GET['csv'])) $sql .= " c.case_id "; From 87a44c868f3bee57bb8bc289fabe62060974b2a1 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 30 Nov 2015 23:07:14 +0300 Subject: [PATCH 04/15] re-fix: list cases with "appointment" outcome only --- admin/displayappointments.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/displayappointments.php b/admin/displayappointments.php index 8880e71a..04164974 100644 --- a/admin/displayappointments.php +++ b/admin/displayappointments.php @@ -303,7 +303,7 @@ else { LEFT JOIN operator AS ao ON ao.operator_id = a.require_operator_id LEFT JOIN (questionnaire_sample_quota as qsq) on (s.import_id = qsq.sample_import_id and c.questionnaire_id = qsq.questionnaire_id) LEFT JOIN (questionnaire_sample_quota_row as qsqr) on (s.import_id = qsqr.sample_import_id and c.questionnaire_id = qsqr.questionnaire_id) - WHERE q.enabled=1 AND si.enabled=1 AND a.end >= CONVERT_TZ(NOW(),'System','UTC') AND c.current_outcome_id !=10 + WHERE q.enabled=1 AND si.enabled=1 AND a.end >= CONVERT_TZ(NOW(),'System','UTC') AND c.current_outcome_id IN (19,20,21,22) AND (qsq.quota_reached IS NULL OR qsq.quota_reached != 1) AND (qsqr.quota_reached IS NULL OR qsqr.quota_reached != 1) GROUP BY c.case_id ORDER BY a.start ASC"; @@ -326,7 +326,7 @@ else { LEFT JOIN (`call` as ca) ON (ca.call_id = a.completed_call_id) LEFT JOIN (questionnaire_sample_quota as qsq) on (s.import_id = qsq.sample_import_id and c.questionnaire_id = qsq.questionnaire_id) LEFT JOIN (questionnaire_sample_quota_row as qsqr) on (s.import_id = qsqr.sample_import_id and c.questionnaire_id = qsqr.questionnaire_id) - WHERE q.enabled=1 AND si.enabled=1 AND a.end < CONVERT_TZ(NOW(),'System','UTC') AND a.completed_call_id IS NULL AND c.current_outcome_id !=10 + WHERE q.enabled=1 AND si.enabled=1 AND a.end < CONVERT_TZ(NOW(),'System','UTC') AND a.completed_call_id IS NULL AND c.current_outcome_id IN (19,20,21,22) AND (qsq.quota_reached IS NULL OR qsq.quota_reached != 1 ) AND (qsqr.quota_reached IS NULL OR qsqr.quota_reached != 1) GROUP BY c.case_id From f4cab6dc5b3b67401e0b84461816c0573dd0ed5b Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 30 Nov 2015 23:09:16 +0300 Subject: [PATCH 05/15] FIX: translate downloaded outcome descriptions --- admin/dataoutput.php | 1 + 1 file changed, 1 insertion(+) diff --git a/admin/dataoutput.php b/admin/dataoutput.php index 07af58ba..f7cd3a82 100644 --- a/admin/dataoutput.php +++ b/admin/dataoutput.php @@ -149,6 +149,7 @@ if (isset($_GET['key']) || isset($_GET['sample'])) } if (isset($_GET['sample'])) { + $l['description'] = T_($l['description']); echo "," . str_replace(","," ",$l['description']) . "," .$l['callattempts']."," .$l['calls']."," .$l['casenotes'].",".$l['interviewtimec'].",".$l['interviewtimel'].",".$l['lastnumber'].",".$l['lastcallstart'].",".$l['operatoru'].",".$l['shiftr'].",". $l['aapor_id']; } echo "\n"; From f8331fffe4150abd090f8696dc457e88c6651158 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 30 Nov 2015 23:13:57 +0300 Subject: [PATCH 06/15] add files claimed as "missing" in queXS template --- .../templates/quexs/print_img_checkbox.png | Bin 0 -> 105 bytes .../templates/quexs/print_img_radio.png | Bin 0 -> 170 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 include/limesurvey/templates/quexs/print_img_checkbox.png create mode 100644 include/limesurvey/templates/quexs/print_img_radio.png diff --git a/include/limesurvey/templates/quexs/print_img_checkbox.png b/include/limesurvey/templates/quexs/print_img_checkbox.png new file mode 100644 index 0000000000000000000000000000000000000000..4f23dfb6a11ffd45705975ffa4f9c219007ff94d GIT binary patch literal 105 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uo3?x>arRC?e?T;uyjqo1Bu6ux7nVkAwun*OlDsXWst}GL*s7)z4*}Q$iB}@a`Pc literal 0 HcmV?d00001 diff --git a/include/limesurvey/templates/quexs/print_img_radio.png b/include/limesurvey/templates/quexs/print_img_radio.png new file mode 100644 index 0000000000000000000000000000000000000000..d52293b26f36dfdfe9c305a321e374b671ed269e GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~jKx9jP7LeL$-D$|L<4+6T+`Ch zva+(Wv$LCpK{7`H^CitSJYAUz3P%`(*t`rjG`?i9;1zCP+5ED3CbO}47C%F%mCV;Hc4Jkb OaSWcWelF{r5}E)Gh&AE> literal 0 HcmV?d00001 From 08ffe6f809d4032d2311d4b49d97c421e1d56df7 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 30 Nov 2015 23:15:42 +0300 Subject: [PATCH 07/15] display operator lastname in selector too (as firstnames might be the same) --- admin/extensionstatus.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/extensionstatus.php b/admin/extensionstatus.php index baf4c0a5..4c9e32bf 100644 --- a/admin/extensionstatus.php +++ b/admin/extensionstatus.php @@ -250,7 +250,7 @@ else if (!empty($rs)) { - $sql = "SELECT o.operator_id as value, o.firstName as description + $sql = "SELECT o.operator_id as value, CONCAT(o.firstName,' ',o.lastname) as description FROM `operator` as o LEFT JOIN `extension` as e ON (e.current_operator_id = o.operator_id) WHERE e.extension_id IS NULL"; From e40495d4682ab7820a2c7726395f82068ef7c330 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 30 Nov 2015 23:27:53 +0300 Subject: [PATCH 08/15] fix: selector container too short, sort samples in slelector by name --- admin/samplesearch.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/samplesearch.php b/admin/samplesearch.php index 11b458de..3fb41ca8 100644 --- a/admin/samplesearch.php +++ b/admin/samplesearch.php @@ -107,12 +107,12 @@ xhtml_head(T_("Search the sample"),true,$css,$js_head); echo " " . T_("Go back") . ""; $sql = "SELECT sample_import_id as value,description, CASE WHEN sample_import_id = '$sample_import_id' THEN 'selected=\'selected\'' ELSE '' END AS selected - FROM sample_import"; + FROM sample_import ORDER BY description ASC"; $r = $db->GetAll($sql); if(!empty($r)) - print "

" . T_("Select sample ") . " 

"; + print "

" . T_("Select sample ") . "

"; display_chooser($r,"sample_import_id","sample_import_id",true,false,true,false); print "
"; From 4e34b1ebc50d92c9b2b1a95a46adba99ee59547d Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 1 Dec 2015 19:00:09 +0300 Subject: [PATCH 09/15] fix unchanged querry to fit branch --- call_interface2.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/call_interface2.php b/call_interface2.php index b0865a1a..c2f9864f 100644 --- a/call_interface2.php +++ b/call_interface2.php @@ -131,7 +131,9 @@ function display_outcomes($contacted,$ca,$case_id) $sql = "SELECT outcome_id,description,contacted FROM outcome WHERE contacted = '$contacted' - AND outcome_id NOT IN(5,10,19,21,40,41,42,43,44,45)"; + AND outcome_type_id != '5' + AND outcome_id IN ($outcomes) + AND outcome_id NOT IN(10,42,43,44,45)"; } } $rs = $db->GetAll($sql); From 50f5c33a9f8392f13e35e5bbf5f784cbf6a8281e Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 2 Dec 2015 00:28:13 +0300 Subject: [PATCH 10/15] FIX duplicated rows appear in selctor/result list If more than 1 quota set per questionnaire/ sample --- admin/casestatus.php | 3 +-- admin/displayappointments.php | 8 +++----- admin/supervisor.php | 3 +-- functions/functions.display.php | 3 +-- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/admin/casestatus.php b/admin/casestatus.php index 72bbee47..9b5f5b3b 100644 --- a/admin/casestatus.php +++ b/admin/casestatus.php @@ -110,8 +110,7 @@ function case_status_report($questionnaire_id = false, $sample_id = false, $outc LEFT JOIN outcome as co ON (co.outcome_id = ca.outcome_id) LEFT JOIN case_queue as cq ON (cq.case_id = c.case_id) LEFT JOIN operator as oq ON (cq.operator_id = oq.operator_id) - LEFT JOIN (questionnaire_sample_quota as qsq) on (s.import_id = qsq.sample_import_id and c.questionnaire_id = qsq.questionnaire_id) - LEFT JOIN (questionnaire_sample_quota_row as qsqr) on (s.import_id = qsqr.sample_import_id and c.questionnaire_id = qsqr.questionnaire_id) + LEFT JOIN (questionnaire_sample_quota as qsq, questionnaire_sample_quota_row as qsqr) on (s.import_id = qsq.sample_import_id and c.questionnaire_id = qsq.questionnaire_id and s.import_id = qsqr.sample_import_id and c.questionnaire_id = qsqr.questionnaire_id) WHERE c.current_operator_id IS NULL $q $o AND (qsq.quota_reached IS NULL OR qsq.quota_reached != 1 ) AND (qsqr.quota_reached IS NULL OR qsqr.quota_reached != 1) diff --git a/admin/displayappointments.php b/admin/displayappointments.php index 04164974..857cd15f 100644 --- a/admin/displayappointments.php +++ b/admin/displayappointments.php @@ -301,9 +301,8 @@ else { JOIN (`case` as c, respondent as r, questionnaire as q, operator as oo, call_attempt as cc, `sample` as s, sample_import as si) on (c.sample_id = s.sample_id and a.case_id = c.case_id and a.respondent_id = r.respondent_id and q.questionnaire_id = c.questionnaire_id and a.call_attempt_id = cc.call_attempt_id and cc.operator_id = oo.operator_id and si.sample_import_id = s.import_id) LEFT JOIN (`call` as ca, outcome as ou, operator as ooo) ON (ca.call_id = a.completed_call_id and ou.outcome_id = ca.outcome_id and ca.operator_id = ooo.operator_id) LEFT JOIN operator AS ao ON ao.operator_id = a.require_operator_id - LEFT JOIN (questionnaire_sample_quota as qsq) on (s.import_id = qsq.sample_import_id and c.questionnaire_id = qsq.questionnaire_id) - LEFT JOIN (questionnaire_sample_quota_row as qsqr) on (s.import_id = qsqr.sample_import_id and c.questionnaire_id = qsqr.questionnaire_id) - WHERE q.enabled=1 AND si.enabled=1 AND a.end >= CONVERT_TZ(NOW(),'System','UTC') AND c.current_outcome_id IN (19,20,21,22) + LEFT JOIN (questionnaire_sample_quota as qsq, questionnaire_sample_quota_row as qsqr) on (s.import_id = qsq.sample_import_id and c.questionnaire_id = qsq.questionnaire_id and s.import_id = qsqr.sample_import_id and c.questionnaire_id = qsqr.questionnaire_id) + WHERE q.enabled=1 AND si.enabled=1 AND a.end >= CONVERT_TZ(NOW(),'System','UTC') AND ou.outcome_type IN (19,20,21,22) AND (qsq.quota_reached IS NULL OR qsq.quota_reached != 1) AND (qsqr.quota_reached IS NULL OR qsqr.quota_reached != 1) GROUP BY c.case_id ORDER BY a.start ASC"; @@ -324,8 +323,7 @@ else { FROM appointment as a JOIN (`case` as c, respondent as r, questionnaire as q, `sample` as s, sample_import as si) on (a.case_id = c.case_id and a.respondent_id = r.respondent_id and q.questionnaire_id = c.questionnaire_id and s.sample_id = c.sample_id and s.import_id= si.sample_import_id) LEFT JOIN (`call` as ca) ON (ca.call_id = a.completed_call_id) - LEFT JOIN (questionnaire_sample_quota as qsq) on (s.import_id = qsq.sample_import_id and c.questionnaire_id = qsq.questionnaire_id) - LEFT JOIN (questionnaire_sample_quota_row as qsqr) on (s.import_id = qsqr.sample_import_id and c.questionnaire_id = qsqr.questionnaire_id) + LEFT JOIN (questionnaire_sample_quota as qsq, questionnaire_sample_quota_row as qsqr) on (s.import_id = qsq.sample_import_id and c.questionnaire_id = qsq.questionnaire_id and s.import_id = qsqr.sample_import_id and c.questionnaire_id = qsqr.questionnaire_id) WHERE q.enabled=1 AND si.enabled=1 AND a.end < CONVERT_TZ(NOW(),'System','UTC') AND a.completed_call_id IS NULL AND c.current_outcome_id IN (19,20,21,22) AND (qsq.quota_reached IS NULL OR qsq.quota_reached != 1 ) AND (qsqr.quota_reached IS NULL OR qsqr.quota_reached != 1) diff --git a/admin/supervisor.php b/admin/supervisor.php index 524e1388..c3d1107b 100644 --- a/admin/supervisor.php +++ b/admin/supervisor.php @@ -137,8 +137,7 @@ xhtml_head(T_("Assign outcomes to cases"),true,$css,$js_head); Date: Wed, 2 Dec 2015 02:11:04 +0300 Subject: [PATCH 11/15] fix mistake from rev. 540 --- admin/displayappointments.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/displayappointments.php b/admin/displayappointments.php index 857cd15f..7c448717 100644 --- a/admin/displayappointments.php +++ b/admin/displayappointments.php @@ -302,7 +302,7 @@ else { LEFT JOIN (`call` as ca, outcome as ou, operator as ooo) ON (ca.call_id = a.completed_call_id and ou.outcome_id = ca.outcome_id and ca.operator_id = ooo.operator_id) LEFT JOIN operator AS ao ON ao.operator_id = a.require_operator_id LEFT JOIN (questionnaire_sample_quota as qsq, questionnaire_sample_quota_row as qsqr) on (s.import_id = qsq.sample_import_id and c.questionnaire_id = qsq.questionnaire_id and s.import_id = qsqr.sample_import_id and c.questionnaire_id = qsqr.questionnaire_id) - WHERE q.enabled=1 AND si.enabled=1 AND a.end >= CONVERT_TZ(NOW(),'System','UTC') AND ou.outcome_type IN (19,20,21,22) + WHERE q.enabled=1 AND si.enabled=1 AND a.end >= CONVERT_TZ(NOW(),'System','UTC') AND c.current_outcome_id IN (19,20,21,22) AND (qsq.quota_reached IS NULL OR qsq.quota_reached != 1) AND (qsqr.quota_reached IS NULL OR qsqr.quota_reached != 1) GROUP BY c.case_id ORDER BY a.start ASC"; From 946ad86fb06ed8d32f849b8fdccb13d7a66d25be Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 2 Dec 2015 02:12:58 +0300 Subject: [PATCH 12/15] cosmetics --- admin/dataoutput.php | 6 +++--- admin/quotarow.php | 2 +- functions/functions.operator.php | 28 ++++++++++++++-------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/admin/dataoutput.php b/admin/dataoutput.php index f7cd3a82..a1e7cb32 100644 --- a/admin/dataoutput.php +++ b/admin/dataoutput.php @@ -202,7 +202,7 @@ xhtml_head(T_("Data output"),true,array("../include/bootstrap/css/bootstrap.min. print "

" . T_("Please select a questionnaire") . ": 

"; $questionnaire_id = false; if (isset($_GET['questionnaire_id'])) $questionnaire_id = bigintval($_GET['questionnaire_id']); -display_questionnaire_chooser($questionnaire_id,false,"form-inline col-sm-3 pull-left", "form-control"); +display_questionnaire_chooser($questionnaire_id,false,"form-inline col-lg-4 pull-left", "form-control"); if ($questionnaire_id) { @@ -218,7 +218,7 @@ if ($questionnaire_id) print "

" . T_("Please select a sample") . ": 

"; $sample_import_id = false; if (isset($_GET['sample_import_id'])) $sample_import_id = bigintval($_GET['sample_import_id']); - display_sample_chooser($questionnaire_id,$sample_import_id,false,"form-inline col-sm-3 pull-left", "form-control"); + display_sample_chooser($questionnaire_id,$sample_import_id,false,"form-inline col-lg-4 pull-left", "form-control"); if ($sample_import_id) { @@ -232,7 +232,7 @@ if ($questionnaire_id) //download a key file linking the caseid to the sample print "

" . T_("Download key file: select sample var") . ": 

"; - display_chooser($rs,"sample_var","sample_var",true,"questionnaire_id=$questionnaire_id&sample_import_id=$sample_import_id",true,true,false,true,"form-inline col-sm-3 pull-left"); + display_chooser($rs,"sample_var","sample_var",true,"questionnaire_id=$questionnaire_id&sample_import_id=$sample_import_id",true,true,false,true,"form-inline col-lg-4 pull-left"); print "
"; diff --git a/admin/quotarow.php b/admin/quotarow.php index 4f8e087c..bbddd079 100755 --- a/admin/quotarow.php +++ b/admin/quotarow.php @@ -309,7 +309,7 @@ if ($questionnaire_id != false) AND s.enabled = 1"; $s = $db->GetAll($sql); if (!empty($s)){ - print "

   " . T_("Sample") . ": 

"; + print "

 " . T_("Sample") . ": 

"; display_chooser($s,"sample","sample_import_id",true,"questionnaire_id=$questionnaire_id",true,true,false,true,"pull-left"); } else { diff --git a/functions/functions.operator.php b/functions/functions.operator.php index 83758839..6aa06819 100644 --- a/functions/functions.operator.php +++ b/functions/functions.operator.php @@ -57,9 +57,9 @@ function sRandomChars($length = 15,$pattern="23456789abcdefghijkmnpqrstuvwxyz") for($i=0;$i<$length;$i++) { if(isset($key)) - $key .= $pattern{mt_rand(0,$patternlength)}; + $key .= $pattern{mt_rand(0,$patternlength)}; else - $key = $pattern{mt_rand(0,$patternlength)}; + $key = $pattern{mt_rand(0,$patternlength)}; } return $key; } @@ -354,19 +354,19 @@ function add_case($sample_id,$questionnaire_id,$operator_id = "NULL",$testing = { global $db; - $ttries = 0; - - do { + $ttries = 0; + + do { $token = sRandomChars(); - $sql = "SELECT count(*) as c - FROM `case` - WHERE token = '$token'"; - - $ttries++; - } while ($db->GetOne($sql) > 0 && $ttries < 10); - - + $sql = "SELECT count(*) as c + FROM `case` + WHERE token = '$token'"; + + $ttries++; + } while ($db->GetOne($sql) > 0 && $ttries < 10); + + $sql = "INSERT INTO `case` (case_id, sample_id, questionnaire_id, last_call_id, current_operator_id, current_call_id, current_outcome_id,token) VALUES (NULL, $sample_id, $questionnaire_id, NULL, $operator_id, NULL, '$current_outcome_id','$token')"; @@ -727,7 +727,7 @@ function get_case_id($operator_id, $create = false) } $r2 = $db->GetRow($sql); - + if (empty($r2)) { From 660c14db88e23470ebd43365b77603b8cd71b1bb Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 2 Dec 2015 02:18:23 +0300 Subject: [PATCH 13/15] export sample column names instead of attribute_ in dounloaded csv file, TRANSLATE outcome descriptions when short question codes export selected --- include/limesurvey/admin/exportresults.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/limesurvey/admin/exportresults.php b/include/limesurvey/admin/exportresults.php index aff094f5..06a38897 100644 --- a/include/limesurvey/admin/exportresults.php +++ b/include/limesurvey/admin/exportresults.php @@ -671,7 +671,7 @@ for ($i=0; $i<$fieldcount; $i++) } elseif (substr($fieldinfo,0,10)=="attribute_") { - if ($type == "csv") {$firstline .= CSVEscape($fieldinfo)."$separator";} + if ($type == "csv") {$firstline .= "\"".$attributeFieldAndNames[$fieldinfo] ."\"$separator";} else {$firstline .= $attributeFieldAndNames[$fieldinfo]."$separator";} } elseif ($fieldinfo == "id") @@ -838,7 +838,7 @@ if ($answers == "short") //Nice and easy. Just dump the data straight $rowcounter=0; while ($drow = $dresult->FetchRow()) { - $drow=array_map('strip_tags_full',$drow); + $drow=array_map('strip_tags_full',$drow); if (isset($drow['caseoutcome'])) $drow['caseoutcome'] = T_($drow['caseoutcome']); if($convertyto1 == "Y") //Converts "Y" to "1" in export { From 18753ad05b906c16a904d6960710d44ed4af8176 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 2 Dec 2015 23:43:46 +0300 Subject: [PATCH 14/15] INITIAL BUG? -> Fixed --- call_interface2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/call_interface2.php b/call_interface2.php index c2f9864f..00454a63 100644 --- a/call_interface2.php +++ b/call_interface2.php @@ -269,7 +269,7 @@ if (isset($_POST['submit'])) $newtext = T_("Start REC"); $js = "js/window_interface2.js"; if (browser_ie()) $js = "js/window_ie6_interface2.js"; - xhtml_head(T_("Call"),true,array("css/call.css"),array($js),"parent.closePopup();'"); + xhtml_head(T_("Call"),true,array("css/call.css"),array($js),"onload='parent.closePopup();'"); } From 47340844ea373d324f4b16ea9786455ebb83144d Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 3 Dec 2015 00:13:07 +0300 Subject: [PATCH 15/15] filter outcome_id=32 if not limesurvey_is_quota_full (checked before) --- call.php | 2 +- call_interface2.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/call.php b/call.php index fabb6cea..745cb53d 100644 --- a/call.php +++ b/call.php @@ -132,7 +132,7 @@ function display_outcomes($contacted,$ca,$case_id) WHERE outcome_type_id != '5' $ctd AND outcome_id IN ($outcomes) - AND outcome_id NOT IN(10,42,43,44,45)"; //don't show completed if not, hide max calls as the supposed to be automatic or admin + AND outcome_id NOT IN(10,32,42,43,44,45)"; //don't show completed if not, Lime_Quota_full if not, hide max calls as they supposed to be automatic or admin-privileged } } $rs = $db->GetAll($sql); diff --git a/call_interface2.php b/call_interface2.php index c2f9864f..6524597b 100644 --- a/call_interface2.php +++ b/call_interface2.php @@ -133,7 +133,7 @@ function display_outcomes($contacted,$ca,$case_id) WHERE contacted = '$contacted' AND outcome_type_id != '5' AND outcome_id IN ($outcomes) - AND outcome_id NOT IN(10,42,43,44,45)"; + AND outcome_id NOT IN(10,32,42,43,44,45)"; //don't show completed if not, Lime_Quota_full if not, hide max calls as they supposed to be automatic or admin-privileged } } $rs = $db->GetAll($sql);