From 336691571b7da65c56e78fc9306079971b66b79f Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 17 Aug 2018 17:54:45 +0530 Subject: [PATCH 1/4] dashboard changes --- Apollo/assets/views/dashboard.html | 107 ++++++++++++++--------------- 1 file changed, 51 insertions(+), 56 deletions(-) diff --git a/Apollo/assets/views/dashboard.html b/Apollo/assets/views/dashboard.html index 9ee52f8b..f34898a6 100755 --- a/Apollo/assets/views/dashboard.html +++ b/Apollo/assets/views/dashboard.html @@ -15,8 +15,44 @@
+ +
+
+
+
+

University Registration

+ +
+
+
+
+
No university details!
+
+
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+
+
+
+ +
-
+
@@ -41,13 +77,13 @@ Name Mobile Activity - Status + Status - + - + {{today.TrackingID}} {{today.LeadName}} {{today.MobileNumber}} @@ -88,13 +124,13 @@ Mobile Activity Followup - Status + Status - + - + {{lead.TrackingID}} {{lead.LeadName}} {{lead.MobileNumber}} @@ -135,13 +171,13 @@ Mobile Activity Followup - Status + Status - + - + {{pending.TrackingID}} {{pending.LeadName}} {{pending.MobileNumber}} @@ -158,51 +194,9 @@
-
- - -
+
+ +
-->
From 5e6b6ed9db498bc2d76d090691f17d5741cceb51 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 17 Aug 2018 17:55:08 +0530 Subject: [PATCH 2/4] dashboard changes --- Apollo/assets/js/controllers/dashboardCtrl.js | 39 ++++++++++++++++--- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/Apollo/assets/js/controllers/dashboardCtrl.js b/Apollo/assets/js/controllers/dashboardCtrl.js index b424092e..d27167a3 100755 --- a/Apollo/assets/js/controllers/dashboardCtrl.js +++ b/Apollo/assets/js/controllers/dashboardCtrl.js @@ -10,7 +10,7 @@ app.controller('dashboardCtrl', ["$scope","$rootScope", "toaster", "$filter", "n * this method called from view ng-init directive * created by kms * */ - + $scope.getLoginType=JSON.parse(localStorage.getItem('localObj')).localType; $scope.initCallTracking = function () { $rootScope.pendingFolloupDetails = []; var getCallTrack = { @@ -184,10 +184,11 @@ app.controller('OnotherCtrl', ["$scope", "toaster", "$filter", "$http", "API_POI var localDetails = ipCookie('cookiechk'); $scope.init = function () { - $scope.this_Student = 0; - $scope.this_Staff = 0; - $scope.this_TotalUser = 0; - $scope.getTotalUsers(); + // $scope.this_Student = 0; + // $scope.this_Staff = 0; + // $scope.this_TotalUser = 0; + // $scope.getTotalUsers(); + $scope.getUniversityRegisteredDetails(); } @@ -284,6 +285,34 @@ app.controller('OnotherCtrl', ["$scope", "toaster", "$filter", "$http", "API_POI legendTemplate: '
    <% for (var i=0; i
  • <%if(segments[i].label){%><%=segments[i].label%><%}%>
    • <%}%>
' }; + /* + * get university based student registration details + * created by kms + * */ + $scope.getUniversityRegisteredDetails = function () { + $scope.registerdStudentDetails=""; + $scope.notEmptyRegistration=true; + var req = { + method: 'POST', + url: apiPoint.url + 'getUniversityRegisteredStudent/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + data: localDetails + } + }; + $http(req).then(function (response) { + if (response.data) { + $scope.notEmptyRegistration=response.data.resultStatus; + $scope.registerdStudentDetails=response.data.details; + + } else { + $scope.registerdStudentDetails=""; + $scope.notEmptyRegistration=false; + } + }); + }; }]); app.filter('unique', function() { From 1aa7d58683fb68da83b8671080bd252ffcb40b89 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 17 Aug 2018 17:55:25 +0530 Subject: [PATCH 3/4] dash board changes --- Apollo/api/application/controllers/Dashboard_Controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/api/application/controllers/Dashboard_Controller.php b/Apollo/api/application/controllers/Dashboard_Controller.php index 4b957cec..d19b0293 100755 --- a/Apollo/api/application/controllers/Dashboard_Controller.php +++ b/Apollo/api/application/controllers/Dashboard_Controller.php @@ -93,7 +93,7 @@ class Dashboard_Controller extends REST_Controller { * get university based student registration details for dash board * created by kms * */ - public function getUniversityRegisteredStudent(){ + public function getUniversityRegisteredStudent_post(){ $data = $this->post('data'); $getRegisteredDetails = $this->dashboard_model->get_univ_registered_student($data); if ($getRegisteredDetails) { From 5f81769c1eecdf6627ced6a373e1ffd609af63ed Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 17 Aug 2018 17:55:44 +0530 Subject: [PATCH 4/4] dashboard changes --- .../application/models/Dashboard_model.php | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/Apollo/api/application/models/Dashboard_model.php b/Apollo/api/application/models/Dashboard_model.php index 55fc64dd..bd127be4 100755 --- a/Apollo/api/application/models/Dashboard_model.php +++ b/Apollo/api/application/models/Dashboard_model.php @@ -74,7 +74,37 @@ class Dashboard_model extends CI_Model * created by kms * */ public function get_univ_registered_student($details){ - + $this->db->distinct(); + $this->db->select('UniversityID,UniversityName'); + $this->db->from(UNIVERSITY); + $this->db->order_by('ID','DESC'); + $this->db->where('BranchCode',$details['localBranchID']); + $getUnivDetails = $this->db->get(); + if($getUnivDetails->result()){ + $resultDetails['resultStatus']=true; + foreach ($getUnivDetails->result() as $rows){ + $fetchDetails['UniversityID']=$rows->UniversityID; + $fetchDetails['UniversityName']=$rows->UniversityName; + $this->db->select('StudentID'); + $this->db->from(STUDENTCOURSE); + $this->db->where('BranchID',$details['localBranchID']); + $this->db->where('UniversityID',$rows->UniversityID); + $getRegisterDetails = $this->db->get(); + if($getRegisterDetails->num_rows()>0){ + $fetchDetails['StudentCounts']=$getRegisterDetails->num_rows(); + } + else{ + $fetchDetails['StudentCounts']=0; + } + $getArray[]=$fetchDetails; + } + $resultDetails['details']=$getArray; + } + else{ + $resultDetails['resultStatus']=false; + $resultDetails['Message']="No records found!"; + } + return $resultDetails; }