From 5c3bc40f69da1e8b12943b3ce883d35064fd44c0 Mon Sep 17 00:00:00 2001
From: Alex <ddrmoscow@gmail.com>
Date: Wed, 9 Sep 2015 11:58:43 +0300
Subject: [PATCH] added 'predefined outcomes' filter

---
 call.php            | 11 ++++++++---
 call_interface2.php |  6 +++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/call.php b/call.php
index 3ff2b79f..d1a6c8dc 100644
--- a/call.php
+++ b/call.php
@@ -101,13 +101,16 @@ function display_outcomes($contacted,$ca,$case_id)
 			AND call_attempt_id = '$ca'";
 	
 		$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))
 		{
 			//we have an appointment made ... only select appointment ID's
 			$sql = "SELECT outcome_id,description
 				FROM outcome
-				WHERE outcome_type_id = '5'";		
+				WHERE outcome_type_id = '5'
+				AND outcome_id IN ('$outcomes')";		
 		}
 		else
 		{
@@ -115,7 +118,8 @@ function display_outcomes($contacted,$ca,$case_id)
 			{
 				$sql = "SELECT outcome_id,description
 					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
 			{
@@ -124,7 +128,8 @@ function display_outcomes($contacted,$ca,$case_id)
 				$sql = "SELECT outcome_id,description
 					FROM outcome
 					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
 			}
 
 		}
diff --git a/call_interface2.php b/call_interface2.php
index ae5b3247..4ddf19a4 100644
--- a/call_interface2.php
+++ b/call_interface2.php
@@ -101,7 +101,9 @@ function display_outcomes($contacted,$ca,$case_id)
 			AND call_attempt_id = '$ca'";
 	
 		$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))
 		{
 			//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
 					FROM outcome
 					WHERE contacted = '$contacted'
+					AND outcome_id IN ('$outcomes')
 					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
 					FROM outcome
 					WHERE contacted = '$contacted'
+					AND outcome_id IN ('$outcomes')
 					AND outcome_id NOT IN(5,10,19,21,40,41,42,43,44,45)";
 			}
 		}