From 061e52cf97848bd7e5aef41ba85541f169d8af69 Mon Sep 17 00:00:00 2001
From: gayathri1990 <maran7mca@gmail.com>
Date: Thu, 11 Oct 2018 14:22:59 +0530
Subject: [PATCH] add tracking deatails in studentview

---
 .../controllers/Student_Controller.php           | 13 +++++++------
 Apollo/api/application/models/Student_model.php  |  4 ++--
 Apollo/assets/js/controllers/studentCtrl.js      | 16 +++++++++-------
 .../views/student/editTrackingDetails.html       |  7 +++----
 .../student/student_details_SuperAdmin.html      |  2 +-
 5 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/Apollo/api/application/controllers/Student_Controller.php b/Apollo/api/application/controllers/Student_Controller.php
index 3ea73fe4..3a94fbc2 100755
--- a/Apollo/api/application/controllers/Student_Controller.php
+++ b/Apollo/api/application/controllers/Student_Controller.php
@@ -123,15 +123,16 @@ class Student_Controller extends REST_Controller {
 	$MobileNumber = $this->post('MobileNumber');
         $trackingDetails = $this->student_model->get_student_tracking_details($MobileNumber); // Check if the employee exist
         if ($trackingDetails) {
-            $trackingDetails['status'] = REST_Controller::HTTP_OK;
-			$trackingDetails['trackingstatus']=true;
-			$trackingDetails['trackingdata']=$trackingDetails;
+          
+			$trackingDetailsData['trackingdata']=$trackingDetails;
+			$trackingDetailsData['status'] = REST_Controller::HTTP_OK;
+			//$trackingDetails['trackingstatus']=true;
             // Set the response and exit
-            $this->response($trackingDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+            $this->response($trackingDetailsData, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
             
         } else {
-            // Set the response and exit
-            $this->response(['message' => 'No users were found', 'status' => REST_Controller::HTTP_NOT_FOUND], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+           
+			
             
         }	
 	}
diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php
index 7a503c7c..2c81a724 100755
--- a/Apollo/api/application/models/Student_model.php
+++ b/Apollo/api/application/models/Student_model.php
@@ -46,8 +46,8 @@ class Student_model extends CI_Model {
         $this->db->join(ACTIVITY.' as AV', 'AV.ActivityID = LT.ActivityStatus');
         $this->db->join(PICK_LIST_DETAILS.' as PLD1', 'PLD1.ListCode = LT.StatusCode');
         $this->db->where('LD.MobileNumber',$MobileNumber);
-	    $trackingDetails=$this->db->get()->first_row();
-	    $result['trackingdetails'] =$trackingDetails;
+	    $trackingDetails=$this->db->get()->result_array();
+	    $result =$trackingDetails;
         return $result;	   
     }
 
diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js
index 0ffd46c2..70ab5ecf 100755
--- a/Apollo/assets/js/controllers/studentCtrl.js
+++ b/Apollo/assets/js/controllers/studentCtrl.js
@@ -1866,7 +1866,7 @@ $scope.allcourselist ='';
         $scope.editId = -1;
 		$scope.editCourseId=-1;
         $scope.trackingEditLoading = true;
-        $scope.courselist = true;
+        $scope.trackingdetails = true;
     }
 
 
@@ -2047,14 +2047,16 @@ $scope.allcourselist ='';
 			
         };
         $http(req).then(function (response) {
-			
-            if (response.data.trackingstatus==true) {
+			console.log(response);
+            if (response.data.status==200) {
                
-                $scope.trackingDetails = response.data.trackingdata;
-				console.log($scope.trackingDetails);
+                $scope.trackingDetails =response.data.trackingdata;
+				 $scope.trackingEditLoading = false;
+				//console.log($scope.trackingDetails);
             } else {
-                $scope.trackingDetails = false;
-                $scope.courseEditLoading='';
+				
+                $scope.trackingdetails = false;
+                $scope.trackingEditLoading='';
             }
         });
     }
diff --git a/Apollo/assets/views/student/editTrackingDetails.html b/Apollo/assets/views/student/editTrackingDetails.html
index c46327bd..4386589c 100644
--- a/Apollo/assets/views/student/editTrackingDetails.html
+++ b/Apollo/assets/views/student/editTrackingDetails.html
@@ -1,12 +1,12 @@
 <div class="row">
     <div class="col-md-12">
         
-        <div ng-if="trackingDetails == false" class="text-center">
+        <div ng-if="trackingdetails == false" class="text-center">
                <h3>No Records Found</h3>
         </div>
         <div class="col-md-12">
 
-            <fieldset >
+            <fieldset ng-if="trackingEditLoading == false && trackingdetails == true" >
                 <legend>
                     Tracking Details
                 </legend>
@@ -62,6 +62,5 @@
                 
             </fieldset>
         </div>
-    </div>
-</div>
+   
 <!--  class="editRowTd" -->
\ No newline at end of file
diff --git a/Apollo/assets/views/student/student_details_SuperAdmin.html b/Apollo/assets/views/student/student_details_SuperAdmin.html
index 6d473a44..9b070e02 100755
--- a/Apollo/assets/views/student/student_details_SuperAdmin.html
+++ b/Apollo/assets/views/student/student_details_SuperAdmin.html
@@ -277,7 +277,7 @@
                                                      <i class="ti-user" tooltip="Personal Details" id="personalDetailButton"  ng-click="setEditId(p.Student_Course_id, p.StudentID);"></i>
                                                 <!--<input type=button class="btn btn-blue btn-xs" id="editCourseRowBtn{{p.StaffID}}" value="Course Details" ng-click="setEditCourseId(p.StudentID);">-->
                                                     <i class="ti-write" tooltip="Course Details"  ng-click="setEditCourseId(p.Student_Course_id, p.StudentID);"></i>
-													 <i class="ti-write" tooltip="Tracking Details"  ng-click="setEditTrackingId(p.Student_Course_id, p.MobileNumber);"></i>
+													 <i class="ti-timer" tooltip="Tracking Details"  ng-click="setEditTrackingId(p.Student_Course_id, p.MobileNumber);"></i>
                                             </td>
                                         </tr>
                                         <tr ng-show="editId === p.Student_Course_id" ng-if="editId === p.Student_Course_id">