mirror of
https://github.com/ACSPRI/queXS
synced 2024-04-02 12:12:16 +00:00
added 'predefined outcomes' filter
This commit is contained in:
11
call.php
11
call.php
@@ -101,13 +101,16 @@ function display_outcomes($contacted,$ca,$case_id)
|
|||||||
AND call_attempt_id = '$ca'";
|
AND call_attempt_id = '$ca'";
|
||||||
|
|
||||||
$rs = $db->GetAll($sql);
|
$rs = $db->GetAll($sql);
|
||||||
|
|
||||||
|
$outcomes = $db->GetOne("SELECT q.outcomes FROM `questionnaire` as q LEFT JOIN `case` as c ON (c.questionnaire_id =q.questionnaire_id) WHERE c.case_id = $case_id");
|
||||||
|
|
||||||
if (!empty($rs))
|
if (!empty($rs))
|
||||||
{
|
{
|
||||||
//we have an appointment made ... only select appointment ID's
|
//we have an appointment made ... only select appointment ID's
|
||||||
$sql = "SELECT outcome_id,description
|
$sql = "SELECT outcome_id,description
|
||||||
FROM outcome
|
FROM outcome
|
||||||
WHERE outcome_type_id = '5'";
|
WHERE outcome_type_id = '5'
|
||||||
|
AND outcome_id IN ('$outcomes')";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -115,7 +118,8 @@ function display_outcomes($contacted,$ca,$case_id)
|
|||||||
{
|
{
|
||||||
$sql = "SELECT outcome_id,description
|
$sql = "SELECT outcome_id,description
|
||||||
FROM outcome
|
FROM outcome
|
||||||
WHERE outcome_id != 10"; //don't show completed if not
|
WHERE outcome_id != 10
|
||||||
|
AND outcome_id IN ('$outcomes')"; //don't show completed if not
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -124,7 +128,8 @@ function display_outcomes($contacted,$ca,$case_id)
|
|||||||
$sql = "SELECT outcome_id,description
|
$sql = "SELECT outcome_id,description
|
||||||
FROM outcome
|
FROM outcome
|
||||||
WHERE contacted = '$contacted'
|
WHERE contacted = '$contacted'
|
||||||
AND outcome_id != 10"; //don't show completed if not
|
AND outcome_id != 10
|
||||||
|
AND outcome_id IN ('$outcomes')"; //don't show completed if not
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -101,7 +101,9 @@ function display_outcomes($contacted,$ca,$case_id)
|
|||||||
AND call_attempt_id = '$ca'";
|
AND call_attempt_id = '$ca'";
|
||||||
|
|
||||||
$rs = $db->GetAll($sql);
|
$rs = $db->GetAll($sql);
|
||||||
|
|
||||||
|
$outcomes = $db->GetOne("SELECT q.outcomes FROM `questionnaire` as q LEFT JOIN `case` as c ON (c.questionnaire_id =q.questionnaire_id) WHERE c.case_id = $case_id");
|
||||||
|
|
||||||
if (!empty($rs))
|
if (!empty($rs))
|
||||||
{
|
{
|
||||||
//we have an appointment made ... only select appointment ID's
|
//we have an appointment made ... only select appointment ID's
|
||||||
@@ -123,6 +125,7 @@ function display_outcomes($contacted,$ca,$case_id)
|
|||||||
$sql = "SELECT outcome_id,description,contacted
|
$sql = "SELECT outcome_id,description,contacted
|
||||||
FROM outcome
|
FROM outcome
|
||||||
WHERE contacted = '$contacted'
|
WHERE contacted = '$contacted'
|
||||||
|
AND outcome_id IN ('$outcomes')
|
||||||
AND outcome_id NOT IN(5,10,19,21,40,41,42,43,44,45)";
|
AND outcome_id NOT IN(5,10,19,21,40,41,42,43,44,45)";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -133,6 +136,7 @@ function display_outcomes($contacted,$ca,$case_id)
|
|||||||
$sql = "SELECT outcome_id,description,contacted
|
$sql = "SELECT outcome_id,description,contacted
|
||||||
FROM outcome
|
FROM outcome
|
||||||
WHERE contacted = '$contacted'
|
WHERE contacted = '$contacted'
|
||||||
|
AND outcome_id IN ('$outcomes')
|
||||||
AND outcome_id NOT IN(5,10,19,21,40,41,42,43,44,45)";
|
AND outcome_id NOT IN(5,10,19,21,40,41,42,43,44,45)";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user