Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Browse Source
This commit is contained in:
resicovenba 2018-01-25 10:54:34 +05:30
commit 7533024b06
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Apollo/api/application/models/Calltracking_model.php
View File

@ -329,8 +329,9 @@ class Calltracking_model extends CI_Model {
if ($search['requestedDept'] == EMPLOYEE){ if ($search['requestedDept'] == EMPLOYEE){
$this->db->where('LT.AssignedTo', $search['requestedBy']); $this->db->where('LT.AssignedTo', $search['requestedBy']);
$this->db->where('LT.CreatedBranch', $search['CreatedBranch']);
} }
if($search['searchDate']!='' OR $search['searchDate']!=null){ if($search['searchDate']!='' OR $search['searchDate']!=null){
/* if(sizeof($search['searchDate']) == '1'){ /* if(sizeof($search['searchDate']) == '1'){
$this->db->where('LTF.FollowupOn <= ', $search['searchDate'][0]); $this->db->where('LTF.FollowupOn <= ', $search['searchDate'][0]);
@ -420,6 +421,7 @@ class Calltracking_model extends CI_Model {
if ($search['requestedDept'] == EMPLOYEE){ if ($search['requestedDept'] == EMPLOYEE){
$this->db->where('LT.AssignedTo', $search['requestedBy']); $this->db->where('LT.AssignedTo', $search['requestedBy']);
$this->db->where('LT.CreatedBranch', $search['CreatedBranch']);
} }
if(($search['searchDate']!='' OR $search['searchDate']!=null) AND sizeof($search['searchDate']) == '1'){ if(($search['searchDate']!='' OR $search['searchDate']!=null) AND sizeof($search['searchDate']) == '1'){
@ -570,6 +572,7 @@ class Calltracking_model extends CI_Model {
if ($trackingID['requestedDept'] == EMPLOYEE){ if ($trackingID['requestedDept'] == EMPLOYEE){
$this->db->where('LT.AssignedTo', $trackingID['UpdatedBy']); $this->db->where('LT.AssignedTo', $trackingID['UpdatedBy']);
$this->db->where('LT.CreatedBranch', $trackingID['CreatedBranch']);
} }
@ -646,6 +649,8 @@ class Calltracking_model extends CI_Model {
if ($reqDept == EMPLOYEE){ if ($reqDept == EMPLOYEE){
$this->db->where('LT.AssignedTo', $updatedBy); $this->db->where('LT.AssignedTo', $updatedBy);
$this->db->where('LT.CreatedBranch', $branchId);
} }
@ -727,6 +732,7 @@ class Calltracking_model extends CI_Model {
if ($search['requestedDept'] == EMPLOYEE){ if ($search['requestedDept'] == EMPLOYEE){
$this->db->where('LT.AssignedTo', $search['requestedBy']); $this->db->where('LT.AssignedTo', $search['requestedBy']);
$this->db->where('LT.CreatedBranch', $search['BranchID']);
} }
$this->db->where('LTF.FollowupOn',$todayDate); $this->db->where('LTF.FollowupOn',$todayDate);
@ -778,6 +784,7 @@ class Calltracking_model extends CI_Model {
if ($search['requestedDept'] == EMPLOYEE){ if ($search['requestedDept'] == EMPLOYEE){
$this->db->where('LT.AssignedTo', $search['requestedBy']); $this->db->where('LT.AssignedTo', $search['requestedBy']);
$this->db->where('LT.CreatedBranch', $search['BranchID']);
} }
$this->db->like('LD.CreatedOn', $todayDate, 'after'); $this->db->like('LD.CreatedOn', $todayDate, 'after');
@ -830,6 +837,7 @@ class Calltracking_model extends CI_Model {
if ($search['requestedDept'] == EMPLOYEE){ if ($search['requestedDept'] == EMPLOYEE){
$this->db->where('LT.AssignedTo', $search['requestedBy']); $this->db->where('LT.AssignedTo', $search['requestedBy']);
$this->db->where('LT.CreatedBranch', $search['BranchID']);
} }
$trackDetails=$this->db->get(); $trackDetails=$this->db->get();