diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php index eff367ef..f94ce9e0 100755 --- a/Apollo/api/application/models/Calltracking_model.php +++ b/Apollo/api/application/models/Calltracking_model.php @@ -793,7 +793,7 @@ class Calltracking_model extends CI_Model { if($leadDet){ $result_array = array(); $result_array['followupStatus']=true; - $result=''; + $result=[]; $activityID=''; foreach ($leadDet->result() as $row) { diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index ce6ae1c8..39187bd0 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -603,7 +603,7 @@ $upperresult=strtoupper($getlastansbookstatus); $this->db->select('t3.BatchName, t3.BatchCode,t3.BatchDate'); $this->db->from('' . BATCH . ' as t3'); $this->db->where('t3.UniversityID', $clip->UniversityID); - $this->db->where('t3.IsActive', 1); + // $this->db->where('t3.IsActive', 1); $this->db->where('t3.BranchCode', $branch); $batDetails = $this->db->get(); $batchDetails = $batDetails->result(); diff --git a/Apollo/assets/js/controllers/dashboardCtrl.js b/Apollo/assets/js/controllers/dashboardCtrl.js index d226e593..d8e8e479 100755 --- a/Apollo/assets/js/controllers/dashboardCtrl.js +++ b/Apollo/assets/js/controllers/dashboardCtrl.js @@ -897,8 +897,6 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", " allowSortingBySummary: true, allowSorting: true, allowFiltering: true, - allowExpandAll: true, - wordWrapEnabled: true, height: 440, showBorders: true, fieldChooser: { @@ -920,8 +918,6 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", " }, { caption: "staff", dataField: "Staff", - dataType: "string", - width: 200, area: "column" }, { caption: "TotalNoOfAdmissions", @@ -1041,15 +1037,15 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", " }, { caption: "staff", dataField: "Staff", - dataType: "string", - width: 200, + // dataType: "string", + // width: 200, area: "column" }, { caption: "TotalNoOfAdmissions", dataField: "TotalNoOfAdmissions", dataType: "number", summaryType: "sum", - width: 100, + // width: 100, area: "data" }], store: $scope.adBatchfilter diff --git a/Apollo/assets/views/dashboard_tile3.html b/Apollo/assets/views/dashboard_tile3.html index a31e06b4..38d46980 100644 --- a/Apollo/assets/views/dashboard_tile3.html +++ b/Apollo/assets/views/dashboard_tile3.html @@ -136,9 +136,10 @@ -
+
+
- +