-GetRow($sql);
-
- if (!empty($rs))
- {
- $contact_phone_id = $rs['contact_phone_id'];
-
- if (!isset($rs['respondent_id']))
- {
- $sql = "SELECT respondent_id
- FROM respondent
- WHERE case_id = $case_id";
-
- $respondent_id = $db->GetOne($sql);
- }
- else
- {
- $respondent_id = $rs['respondent_id'];
- }
- $call_id = get_call($operator_id,$respondent_id,$contact_phone_id,true);
- }
-}
+
-if (!is_respondent_selection($operator_id))
- $data = get_limesurvey_url($operator_id);
-else
- $data = get_respondentselection_url($operator_id,true,true); //use second interface
+
+ if (!$call_id)
+ {
+ if ($appointment)
+ {
+ //create a call on the appointment number
+ $sql = "SELECT cp.*, a.respondent_id
+ FROM contact_phone as cp, appointment as a
+ WHERE cp.case_id = '$case_id'
+ AND a.appointment_id = '$appointment'
+ AND a.contact_phone_id = cp.contact_phone_id";
+ }
+ else
+ {
+ //create a call on the first available number by priority
+ $sql = "SELECT c. *
+ FROM contact_phone AS c
+ LEFT JOIN (
+ SELECT contact_phone.contact_phone_id
+ FROM contact_phone
+ LEFT JOIN `call` ON ( call.contact_phone_id = contact_phone.contact_phone_id )
+ LEFT JOIN outcome ON ( call.outcome_id = outcome.outcome_id )
+ WHERE contact_phone.case_id = '$case_id'
+ AND outcome.tryagain =0
+ ) AS l ON l.contact_phone_id = c.contact_phone_id
+ LEFT JOIN
+ (
+ SELECT contact_phone_id
+ FROM `call`
+ WHERE call_attempt_id = '$ca'
+ AND outcome_id NOT IN (15,18)
+ ) as ca on ca.contact_phone_id = c.contact_phone_id
+ WHERE c.case_id = '$case_id'
+ AND l.contact_phone_id IS NULL
+ AND ca.contact_phone_id IS NULL
+ order by c.priority ASC";
+
+
+ }
+ $rs = $db->GetRow($sql);
+
+ if (!empty($rs))
+ {
+ $contact_phone_id = $rs['contact_phone_id'];
+
+ if (!isset($rs['respondent_id']))
+ {
+ $sql = "SELECT respondent_id
+ FROM respondent
+ WHERE case_id = $case_id";
+
+ $respondent_id = $db->GetOne($sql);
+ }
+ else
+ {
+ $respondent_id = $rs['respondent_id'];
+ }
+ $call_id = get_call($operator_id,$respondent_id,$contact_phone_id,true);
+ }
+ }
+
+ if (!is_respondent_selection($operator_id))
+ $data = get_limesurvey_url($operator_id);
+ else
+ $data = get_respondentselection_url($operator_id,true,true); //use second interface
+
+ xhtml_object($data,"main-content", "embeddedobject content");
+
+ ?>
+
+
+
"; exit();}
$db->CompleteTrans();
diff --git a/js/headerexpand_interface2.js b/js/headerexpand_interface2.js
index f911ab92..5954e1f8 100644
--- a/js/headerexpand_interface2.js
+++ b/js/headerexpand_interface2.js
@@ -1,20 +1,17 @@
function headerexpand()
{
- $(".header").css("height","38%");
- $(".content").css("height","60%");
- $(".content").css("top","40%");
+ $(".headerexpand").css("top","35%");
+ $(".content").css("height","63%");
+ $(".content").css("top","37%");
$(".box:not(.important)").css("display","");
-// $(".item_2_half_height").removeClass("item_2_half_height").addClass("item_2_full_height");
- $(".item_3_half_height").removeClass("item_3_half_height").addClass("item_3_full_height");
+
}
function headercontract()
{
- $(".header").css("height","13%");
- $(".content").css("height","85%");
- $(".content").css("top","15%");
+ $(".headerexpand").css("top","18%");
+ $(".content").css("height","80%");
+ $(".content").css("top","20%");
$(".box:not(.important)").css("display","none");
-// $(".item_2_full_height").removeClass("item_2_full_height").addClass("item_2_half_height");
- $(".item_3_full_height").removeClass("item_3_full_height").addClass("item_3_half_height");
-
+
}
diff --git a/js/headerexpandmanual_interface2.js b/js/headerexpandmanual_interface2.js
index 05efaa9a..77b2df40 100644
--- a/js/headerexpandmanual_interface2.js
+++ b/js/headerexpandmanual_interface2.js
@@ -6,20 +6,20 @@ $(document).ready(function(){
function headerforcecontract()
{
- $("#headerexpandimage").attr('src',"./images/arrow-down-2.jpg");
+ $("#headerexpandimage").attr('class',"fa fa-lg fa-fw fa-toggle-down ");
headercontract();
}
function headertogglemanual()
{
- if ($("#headerexpandimage").attr('src') == './images/arrow-up-2.jpg')
+ if ($("#headerexpandimage").attr('class') == 'fa fa-lg fa-fw fa-toggle-up')
{
- $("#headerexpandimage").attr('src',"./images/arrow-down-2.jpg");
+ $("#headerexpandimage").attr('class',"fa fa-lg fa-fw fa-toggle-down");
headercontract();
}
else
{
- $("#headerexpandimage").attr('src',"./images/arrow-up-2.jpg");
+ $("#headerexpandimage").attr('class',"fa fa-lg fa-fw fa-toggle-up");
headerexpand();
}
diff --git a/status_interface2.php b/status_interface2.php
index c5ba8858..78c675ed 100644
--- a/status_interface2.php
+++ b/status_interface2.php
@@ -215,18 +215,20 @@ if ($ca)
//Display all available numbers for this case as a list of radio buttons
//By default, the selected radio button should have a "call" started for it
//When then next one clicked, it should bring up call screen if no outcome otherwise start new call
- print "
" . T_("No more numbers to call") . "
";
diff --git a/waitnextcase_interface2.php b/waitnextcase_interface2.php
index 9e97c434..cffd1f25 100644
--- a/waitnextcase_interface2.php
+++ b/waitnextcase_interface2.php
@@ -46,7 +46,7 @@ include ("auth-interviewer.php");
*/
include_once("functions/functions.xhtml.php");
-xhtml_head(T_("Standby"),false,array("include/bootstrap/css/bootstrap.min.css","css/index_interface2.css"), array(), false, 300);
+xhtml_head(T_("Standby"),false,array("include/bootstrap/css/bootstrap.min.css","include/bootstrap/css/bootstrap-theme.min.css","include/font-awesome/css/font-awesome.css","css/index_interface2.css"), array(), false, 300);
if (isset($_GET['auto']))
{
@@ -91,7 +91,7 @@ if (empty($rs))
else
{
- print "
'/>
- 
-
- 
-