diff --git a/admin/assignsample.php b/admin/assignsample.php index bdb6b2e0..70fe30ce 100644 --- a/admin/assignsample.php +++ b/admin/assignsample.php @@ -143,7 +143,7 @@ if (isset($_GET['questionnaire_id']) && isset($_GET['sample']) && isset($_GET[' $lime_sid = $db->GetOne("SELECT lime_sid FROM questionnaire WHERE questionnaire_id = '$questionnaire_id'"); $testing = $db->GetOne("SELECT testing FROM questionnaire WHERE questionnaire_id = '$questionnaire_id'"); - //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) @@ -156,6 +156,7 @@ if (isset($_GET['questionnaire_id']) && isset($_GET['sample']) && isset($_GET[' $onlyvalidemail = true; } + $goutcome = bigintval($_GET['goutcome']); foreach($rs as $r) { @@ -163,7 +164,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, $addsample); + $case_id = add_case($r['sample_id'],$questionnaire_id,"NULL",$testing,$goutcome, $addsample); if ($case_id === false) { $error .= "Could not add case - please ensure there enough additional attributes available in your Limesurvey participant table"; $error .= "
Failed to add case for record #$count"; @@ -181,13 +182,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(); @@ -515,6 +516,12 @@ if ($questionnaire_id != false) print "
" . T_("Unable to access token/participants table in Limesurvey. Please confirm that this survey has a participant table created.") . "
"; } else { + $sql = "SELECT outcome_id,description + FROM outcome + WHERE 1"; + $ou = $db->GetAll($sql); + + ?>
@@ -541,14 +548,23 @@ if ($questionnaire_id != false)
" data-off="" data-width="85"/>



- +
" data-off="" data-width="85"/>
*

-