From 1eb11b0186bab4c211044d3b4c169bb70eb16da6 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Wed, 24 Oct 2018 14:48:54 +0530
Subject: [PATCH 1/3] Dashboard changes

---
 Apollo/assets/js/controllers/dashboardCtrl.js | 10 +++-------
 Apollo/assets/views/dashboard_tile3.html      |  5 +++--
 2 files changed, 6 insertions(+), 9 deletions(-)

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 @@
 											</center>
 										</div>
 										<!-- <div id="dxPivotGrid" dx-pivot-grid="adBatchgrid" ng-if="adb==false"></div> -->
-										<div id="dxPivotGrid" dx-pivot-grid="adBatchgrid" ng-if="adb==false && fbselect==false"></div>
+										<div class="table-responsive">
+										<div dx-pivot-grid="adBatchgrid" ng-if="adb==false && fbselect==false"></div>
 										<div  dx-pivot-grid="adBatchgrid1" ng-if="fbselect==true"></div>
-										
+									    </div>
 										
 									</div>
 									

From 920107c107b32b7dead6612a3f961f31c78ef632 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Wed, 24 Oct 2018 14:57:52 +0530
Subject: [PATCH 2/3] calltaracking_model changes

---
 Apollo/api/application/models/Calltracking_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)
             {

From 2a2f06fa9f7e595edd1c3a2e40ff5581355c1588 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Wed, 24 Oct 2018 17:07:58 +0530
Subject: [PATCH 3/3] batch isactive remove view batch

---
 Apollo/api/application/models/StatusUpdation_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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();