diff --git a/admin/assignsample.php b/admin/assignsample.php index 53115af4..49e0460f 100644 --- a/admin/assignsample.php +++ b/admin/assignsample.php @@ -327,7 +327,7 @@ if ($questionnaire_id != false) CASE WHEN q.answering_machine_messages = 0 THEN '". TQ_("Never") . "' ELSE q.answering_machine_messages END as answering_machine_messages, CASE WHEN q.allow_new = 0 THEN '". TQ_("No") ."' ELSE '".TQ_("Yes")."' END as allow_new, CONCAT('') as edit, - CONCAT('') as unassign + CONCAT('') as unassign FROM questionnaire_sample as q, sample_import as si WHERE q.sample_import_id = si.sample_import_id AND q.questionnaire_id = '$questionnaire_id' diff --git a/admin/dataoutput.php b/admin/dataoutput.php index a1e7cb32..2d43c022 100644 --- a/admin/dataoutput.php +++ b/admin/dataoutput.php @@ -85,19 +85,19 @@ if (isset($_GET['key']) || isset($_GET['sample'])) echo("token,".T_("Case ID").""); foreach($svars as $s) { - echo("," . $s['value']); + echo("," . str_replace(","," ",$s['value'])); } if (isset($_GET['sample'])) { - echo(",".T_("Current Outcome").",".T_("Number of call attempts").",".T_("Number of calls").",".T_("Case notes").",".T_("Total interview time over all calls (mins)").",".T_("Interview time for last call (mins)").",".T_("Last number dialled").",".T_("DATE/TIME Last number dialled").",".T_("Operator username for last call").",".T_("Shift report").", AAPOR"); + echo(",".T_("Outcome ID").",".T_("Current Outcome").",".T_("Number of call attempts").",".T_("Number of calls").",".T_("Case notes").",".T_("Total interview time over all calls (mins)").",".T_("Interview time for last call (mins)").",".T_("Last number dialled").",".T_("DATE/TIME Last number dialled").",".T_("Operator username for last call").",".T_("Shift report").", AAPOR"); } echo("\n"); $sql = "SELECT c.token,c.case_id "; - if (isset($_GET['sample'])) $sql .= ", o.description, + if (isset($_GET['sample'])) $sql .= ", o.outcome_id, o.description, (SELECT COUNT(ca.call_attempt_id) FROM `call_attempt` as ca WHERE ca.case_id = c.case_id ) as callattempts, (SELECT COUNT(cl.call_id) FROM `call` as cl WHERE cl.case_id = c.case_id ) as calls, (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, @@ -149,8 +149,8 @@ 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']; + if(!empty($l['description'])) $l['description'] = T_($l['description']); + echo ",".$l['outcome_id'].",". str_replace(","," ",$l['description']).",".$l['callattempts'].",".$l['calls']."," .str_replace(","," ",$l['casenotes']).",".$l['interviewtimec'].",".$l['interviewtimel'].",".$l['lastnumber'].",".$l['lastcallstart'].",".$l['operatoru'].",".$l['shiftr'].",". $l['aapor_id']; } echo "\n"; } diff --git a/admin/displayappointments.php b/admin/displayappointments.php index b3796149..7b4fa21c 100644 --- a/admin/displayappointments.php +++ b/admin/displayappointments.php @@ -294,7 +294,7 @@ else { $sql = "SELECT q.description, si.description as smpl, CONVERT_TZ(a.start,'UTC',@@session.time_zone) as start, CONVERT_TZ(a.end,'UTC',@@session.time_zone) as end,CONCAT(r.firstName, ' ', r.lastName) as resp, IFNULL(ou.description,'" . TQ_("Not yet called") . "') as outcome, oo.firstName as makerName, ooo.firstName as callerName, CONCAT('', c.case_id, '') as case_id, - CONCAT('  ') as link, + CONCAT('  ') as link, CONCAT('  ') as edit,IFNULL(ao.firstName,'" . TQ_("Any operator") . "') as witho FROM appointment as a 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) @@ -318,7 +318,7 @@ else { $sql = "SELECT q.description, si.description as smpl, CONVERT_TZ(a.start,'UTC',@@session.time_zone) as start, CONVERT_TZ(a.end,'UTC',@@session.time_zone) as end, CONCAT(r.firstName, ' ', r.lastName) as resp, CONCAT('', c.case_id, '') as case_id, - CONCAT('  ') as link, + CONCAT('  ') as link, CONCAT('  ') as edit 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) diff --git a/admin/extensionstatus.php b/admin/extensionstatus.php index 4c9e32bf..161fc1f9 100644 --- a/admin/extensionstatus.php +++ b/admin/extensionstatus.php @@ -215,7 +215,7 @@ if (isset($_GET['edit']) || isset($_GET['addext'])) - " /> + " />
" . T_("Unassign the operator from this extension to be able to delete it") . ""; diff --git a/admin/questionnairelist.php b/admin/questionnairelist.php index a869ea5d..7b88e8cf 100644 --- a/admin/questionnairelist.php +++ b/admin/questionnairelist.php @@ -566,7 +566,7 @@ else CASE WHEN enabled = 0 THEN CONCAT('  ') ELSE - CONCAT('  ') + CONCAT('  ') END as enabledisable, CONCAT('') as modify, CONCAT('') as inlime, diff --git a/admin/samplelist.php b/admin/samplelist.php index b34152ac..3bd72fa7 100644 --- a/admin/samplelist.php +++ b/admin/samplelist.php @@ -89,13 +89,9 @@ if (isset($_POST['ed'])) unset($_POST['ed']); unset($_POST['sample_import_id']); - -// print_r($_POST). "
"; // if (isset($_POST['del']) && isset($_POST['type']) ) { $a = array(); $b = array(); $cert = array(); $a = $_POST['type']; - - //echo "

type before unset->>"; foreach($_POST['type'] as $key => $val) { echo ' | ', $key,' => ',$val,' | '; }; print "

"; foreach($_POST['del'] as $p) { unset ($_POST['type'][$p]); @@ -110,7 +106,6 @@ if (isset($_POST['ed'])) } /* else { echo "
", T_("You can delete string '$key'. "), "
"; } */ } - //echo "

del ->>"; foreach($_POST['del'] as $key => $val) { echo ' | ', $key,' => ',$val,' | '; }; print "

"; } if (isset($_POST['type'])){ @@ -136,7 +131,7 @@ if (isset($_POST['ed'])) if ($eml < 2) {$ch4 = true;} else { echo "
", T_("Too many e-mail fields. Please check selected types for E-mail."), "
"; } - if ($ch1 && $ch2 && $ch3 && $ch4) */$typecheck = true; //echo $ch1,$ch2,$ch3,$ch4, "typecheck=",$typecheck, "
" ; + if ($ch1 && $ch2 && $ch3 && $ch4) */$typecheck = true; if ($typecheck){ @@ -178,11 +173,10 @@ if (isset($_POST['ed'])) if (isset($_POST['var'])){ foreach($_POST['var'] as $p => $val) - {// echo '| ',$p,' => ',$val,'+ '; - $v = str_replace(" ", "_", $val); - + { + $val = str_replace(array(" ,",", ",","," "," "),"_", $val); $sql = "UPDATE sample_import_var_restrict - SET `var` = '$v' + SET `var` = '$val' WHERE sample_import_id = $sample_import_id AND `var_id` = $p"; $db->Execute($sql); @@ -199,7 +193,7 @@ if (isset($_POST['ed'])) $db->Execute($sql); foreach($_POST['see'] as $p => $val) - {// echo $p,' => ',$val,' + '; + { $sql = "UPDATE sample_import_var_restrict SET `restrict` = 0 WHERE sample_import_id = $sample_import_id @@ -300,7 +294,7 @@ if (isset($_GET['edit']) ) $rd = $db->GetAll($sql); $sql = "SELECT sir.var_id, - CONCAT('') as var, + CONCAT('') as var, CONCAT ('\n"; } @@ -435,6 +436,12 @@ if ($tokenTableExists && $thissurvey['anonymized']=='N' && isset($_POST['attribu $dquery .= ", (SELECT c4.case_id FROM `case` as c4 WHERE c4.token = {$dbprefix}survey_$surveyid.token) as caseid "; + } + if (in_array('outcomeid',$_POST['attribute_select'])) + { + $dquery .= ", (SELECT c5.current_outcome_id + FROM `case` as c5 + WHERE c5.token = {$dbprefix}survey_$surveyid.token) as outcomeid "; } if (in_array('caseoutcome',$_POST['attribute_select'])) { @@ -643,11 +650,16 @@ for ($i=0; $i<$fieldcount; $i++) { if ($type == "csv") {$firstline .= "\"".T_("Case ID")."\"$separator";} else {$firstline .= T_("Case ID")."$separator";} + } + elseif ($fieldinfo == "outcomeid") + { + if ($type == "csv") {$firstline .= "\"".T_("Outcome ID")."\"$separator";} + else {$firstline .= T_("Outcome ID")."$separator";} } elseif ($fieldinfo == "caseoutcome") { if ($type == "csv") {$firstline .= "\"".T_("Case outcome")."\"$separator";} - else {$firstline .= T_("Case outcome")."$separator";} + else {$firstline .= T_("Case outcome")."$separator";} $caseoutcome_key = $i; } elseif ($fieldinfo == "email") { @@ -838,7 +850,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); if (isset($drow['caseoutcome'])) $drow['caseoutcome'] = T_($drow['caseoutcome']); + $drow=array_map('strip_tags_full',$drow); if (isset($drow['caseoutcome']) && !empty($drow['caseoutcome'])) $drow['caseoutcome'] = T_($drow['caseoutcome']); if($convertyto1 == "Y") //Converts "Y" to "1" in export { @@ -921,6 +933,7 @@ elseif ($answers == "long") //chose complete answers while ($drow = $dresult->FetchRow()) { + if (isset($caseoutcome_key) && isset($drow[$caseoutcome_key]) && !empty($drow[$caseoutcome_key])) $drow[$caseoutcome_key] = T_($drow[$caseoutcome_key]); $rowcounter++; if ($type == "pdf") { @@ -942,7 +955,7 @@ elseif ($answers == "long") //chose complete answers $fqid=0; // By default fqid is set to zero $field=$dresult->FetchField($i); $fieldinfo=$field->name; - if ($fieldinfo != "startlanguage" && $fieldinfo != "id" && $fieldinfo != "datestamp" && $fieldinfo != "startdate" && $fieldinfo != "ipaddr" && $fieldinfo != "refurl" && $fieldinfo != "token" && $fieldinfo != "firstname" && $fieldinfo != "lastname" && $fieldinfo != "email" && (substr($fieldinfo,0,10)!="attribute_") && $fieldinfo != "completed" && $fieldinfo != "caseoutcome"&& $fieldinfo != "caseid" && $fieldinfo != "callattempts" && $fieldinfo != "messagesleft"&& $fieldinfo != "casenotes"&& $fieldinfo != "interviewtimec"&& $fieldinfo != "interviewtimel"&& $fieldinfo != "lastnumber"&& $fieldinfo != "operatoru"&& $fieldinfo != "shiftr") + if ($fieldinfo != "startlanguage" && $fieldinfo != "id" && $fieldinfo != "datestamp" && $fieldinfo != "startdate" && $fieldinfo != "ipaddr" && $fieldinfo != "refurl" && $fieldinfo != "token" && $fieldinfo != "firstname" && $fieldinfo != "lastname" && $fieldinfo != "email" && (substr($fieldinfo,0,10)!="attribute_") && $fieldinfo != "completed" && $fieldinfo != "outcomeid" && $fieldinfo != "caseoutcome"&& $fieldinfo != "caseid" && $fieldinfo != "callattempts" && $fieldinfo != "messagesleft"&& $fieldinfo != "casenotes"&& $fieldinfo != "interviewtimec"&& $fieldinfo != "interviewtimel"&& $fieldinfo != "lastnumber"&& $fieldinfo != "operatoru"&& $fieldinfo != "shiftr") { $fielddata=$fieldmap[$fieldinfo]; $fqid=$fielddata['qid']; @@ -966,7 +979,10 @@ elseif ($answers == "long") //chose complete answers case "caseid": $ftitle=T_("Case ID").":"; break; - case "caseoutcome": + case "outcomeid": + $ftitle=T_("Outcome ID").":"; + break; + case "caseoutcome": $ftitle=T_("Case outcome").":"; break; case "callattempts":