diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php index ce10798d..d3e12f15 100755 --- a/Apollo/api/application/models/Calltracking_model.php +++ b/Apollo/api/application/models/Calltracking_model.php @@ -1987,6 +1987,7 @@ public function GetStaffCallDetails($branchID,$myDate,$staff) $this->db->join('T_Login L','L.ID=LT.AssignedTo'); $this->db->join('T_StaffDetails SD','SD.StaffID=L.StaffID'); $this->db->join('T_PickListDetails PLD','PLD.ListCode = LTF.StatusName'); + $this->db->where('LTF.IsActive',1); $this->db->where("date_format(LTF.CreatedOn,'%Y-%m-%d')=",$myDate); $this->db->where('LT.CreatedBranch',$branchID); $this->db->where('LTF.AssignedStaff',$staff); @@ -2017,12 +2018,12 @@ public function GetStaffCallDetails($branchID,$myDate,$staff) public function GetStaffCountDetails($branchID,$myDate) { - $this->db->select('AssignedStaff,Firstname,Lastname,SD.StaffID,count(InteractionId) as count'); $this->db->from('T_Lead_Tracking_Followup LTF'); $this->db->join('T_Login L','L.ID=LTF.AssignedStaff'); $this->db->join('T_StaffDetails SD','SD.StaffID=L.StaffID'); $this->db->join('T_Staff_BranchAccess SBA','SBA.StaffID = SD.StaffID'); + $this->db->where('LTF.IsActive',1); $this->db->where("date_format(LTF.CreatedOn,'%Y-%m-%d')=",$myDate); $this->db->where('SBA.BranchCode',$branchID); $this->db->group_by('AssignedStaff'); diff --git a/Apollo/assets/views/status-update/answer_booklet_status.html b/Apollo/assets/views/status-update/answer_booklet_status.html index 5fbf9415..2d44cad8 100755 --- a/Apollo/assets/views/status-update/answer_booklet_status.html +++ b/Apollo/assets/views/status-update/answer_booklet_status.html @@ -303,7 +303,7 @@