diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php index 9ede1145..d3c312ef 100755 --- a/Apollo/api/application/models/Calltracking_model.php +++ b/Apollo/api/application/models/Calltracking_model.php @@ -1681,8 +1681,9 @@ public function GetStaffCountDetails($branchID,$myDate) $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("date_format(LTF.CreatedOn,'%Y-%m-%d')=",$myDate); - $this->db->where('SD.BranchCode',$branchID); + $this->db->where('SBA.BranchCode',$branchID); $this->db->group_by('AssignedStaff'); $Details = $this->db->get()->result(); diff --git a/Apollo/assets/views/student/studentDetailsModal.html b/Apollo/assets/views/student/studentDetailsModal.html index 67a967fa..b4a28de3 100755 --- a/Apollo/assets/views/student/studentDetailsModal.html +++ b/Apollo/assets/views/student/studentDetailsModal.html @@ -242,59 +242,55 @@ --> -