diff --git a/admin/assignsample.php b/admin/assignsample.php
index ecd30a00..7781d54b 100644
--- a/admin/assignsample.php
+++ b/admin/assignsample.php
@@ -140,7 +140,7 @@ if (isset($_GET['questionnaire_id']) && isset($_GET['sample']) && isset($_GET['
$db->Execute($sql);
- //generate one case for each sample record and set outcome to 41 (where an email address provided)
+ //generate one case for each sample record and set outcome to goutcome
$sql = "SELECT s.sample_id, sv.val as email
FROM sample as s
LEFT JOIN (sample_var as sv, sample_import_var_restrict as sivr) ON (sv.sample_id = s.sample_id and sv.var_id = sivr.var_id and sivr.type = 8)
@@ -153,6 +153,7 @@ if (isset($_GET['questionnaire_id']) && isset($_GET['sample']) && isset($_GET['
$onlyvalidemail = true;
}
+ $goutcome = bigintval($_GET['goutcome']);
$count = 0;
foreach($rs as $r)
@@ -161,7 +162,7 @@ if (isset($_GET['questionnaire_id']) && isset($_GET['sample']) && isset($_GET['
set_time_limit(30);
//only if a valid email
if (!$onlyvalidemail || validate_email($r['email'])) {
- $case_id = add_case($r['sample_id'],$questionnaire_id,"NULL",$testing,41, true);
+ $case_id = add_case($r['sample_id'],$questionnaire_id,"NULL",$testing,$goutcome, true);
if ($case_id === false) {
$error .= "
Failed to add case for record #$count";
} else {
@@ -178,13 +179,13 @@ if (isset($_GET['questionnaire_id']) && isset($_GET['sample']) && isset($_GET['
}
$sql = "INSERT INTO call_attempt (case_id,operator_id,respondent_id,start,end)
- VALUES ($case_id, 1, $resp_id, NOW(), NOW())";
+ VALUES ($case_id, 1, $resp_id, CONVERT_TZ(NOW(),'System','UTC'), CONVERT_TZ(NOW(),'System','UTC'))";
$db->Execute($sql);
$call_attempt_id = $db->Insert_ID();
$sql = "INSERT INTO `call` (operator_id,respondent_id,case_id,contact_phone_id,call_attempt_id,start,end,outcome_id,state)
- VALUES (1,$resp_id,$case_id,0,$call_attempt_id,NOW(),NOW(),41,5)";
+ VALUES (1,$resp_id,$case_id,0,$call_attempt_id,CONVERT_TZ(NOW(),'System','UTC'),CONVERT_TZ(NOW(),'System','UTC'),$goutcome,5)";
$db->Execute($sql);
$call_id = $db->Insert_ID();
@@ -426,7 +427,13 @@ if ($questionnaire_id != false)
$qs = $db->GetAll($sql);
if (!empty($qs))
- {
+ {
+ $sql = "SELECT outcome_id,description
+ FROM outcome
+ WHERE 1";
+
+ $ou = $db->GetAll($sql);
+
print "