2
0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00

DB syncronization and related files update

This commit is contained in:
Alex
2015-07-16 18:37:42 +03:00
parent 350b27295d
commit 25eb48621d
4 changed files with 581 additions and 845 deletions

View File

@@ -123,7 +123,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 NOT IN(5,10,19,21,40,41,33,34)"; AND outcome_id NOT IN(5,10,19,21,40,41,34,35)";
} }
} }
else else
@@ -133,7 +133,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 NOT IN(5,10,19,21,40,41,33,34)"; AND outcome_id NOT IN(5,10,19,21,40,41,34,35)";
} }
} }
} }

File diff suppressed because it is too large Load Diff

View File

@@ -156,7 +156,7 @@ $sql = "SELECT count(s.sample_id) as count_samples
AND si.enabled = 1 AND si.enabled = 1
AND !(si.call_restrict = 1 AND cr.day_of_week IS NULL) AND !(si.call_restrict = 1 AND cr.day_of_week IS NULL)
AND ou.outcome_type_id IN( SELECT outcome_type_id FROM operator_skill WHERE operator_id = '$operator_id') AND ou.outcome_type_id IN( SELECT outcome_type_id FROM operator_skill WHERE operator_id = '$operator_id')
AND ou.outcome_id NOT IN (10,25,28,33,34,40) "; AND ou.outcome_id NOT IN (10,25,28,34,35,40) ";
$rs = $db->GetRow($sql); $rs = $db->GetRow($sql);

View File

@@ -138,7 +138,7 @@ else
//assigned to operator //assigned to operator
// call restrictions and outside times, operator skill and filter outcomes 10,25,28,33,34,40 // call restrictions and outside times, operator skill and filter outcomes 10,25,28,34,35,40
$sql = "SELECT COUNT( DISTINCT sv.sample_id) as count_samples $sql = "SELECT COUNT( DISTINCT sv.sample_id) as count_samples
FROM `sample` as s FROM `sample` as s
JOIN `sample_var` as sv on( s.sample_id = sv.sample_id ) JOIN `sample_var` as sv on( s.sample_id = sv.sample_id )
@@ -149,7 +149,7 @@ else
AND s.import_id IN ($siid) AND s.import_id IN ($siid)
AND !(si.call_restrict = 1 AND cr.day_of_week IS NULL) AND !(si.call_restrict = 1 AND cr.day_of_week IS NULL)
AND ou.outcome_type_id IN( SELECT outcome_type_id FROM operator_skill WHERE operator_id = '$operator_id') AND ou.outcome_type_id IN( SELECT outcome_type_id FROM operator_skill WHERE operator_id = '$operator_id')
AND ou.outcome_id NOT IN (10,25,28,33,34,40)"; AND ou.outcome_id NOT IN (10,25,28,34,35,40)";
$cases_count = $db->GetRow($sql); $cases_count = $db->GetRow($sql);
if ($cases_count['count_samples'] == 0){ if ($cases_count['count_samples'] == 0){