Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add tracking deatails in studentview

Browse Source
This commit is contained in:
gayathri1990 2018-10-11 14:22:59 +05:30
parent cce4618ad3
commit 061e52cf97
5 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Apollo/api/application/controllers/Student_Controller.php
View File

@ -123,15 +123,16 @@ class Student_Controller extends REST_Controller {
$MobileNumber = $this->post('MobileNumber'); $MobileNumber = $this->post('MobileNumber');
$trackingDetails = $this->student_model->get_student_tracking_details($MobileNumber); // Check if the employee exist $trackingDetails = $this->student_model->get_student_tracking_details($MobileNumber); // Check if the employee exist
if ($trackingDetails) { if ($trackingDetails) {
$trackingDetails['status'] = REST_Controller::HTTP_OK;
$trackingDetails['trackingstatus']=true; $trackingDetailsData['trackingdata']=$trackingDetails;
$trackingDetails['trackingdata']=$trackingDetails; $trackingDetailsData['status'] = REST_Controller::HTTP_OK;
//$trackingDetails['trackingstatus']=true;
// Set the response and exit // 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 { } 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
} }
} }

4
Apollo/api/application/models/Student_model.php
View File

@ -46,8 +46,8 @@ class Student_model extends CI_Model {
$this->db->join(ACTIVITY.' as AV', 'AV.ActivityID = LT.ActivityStatus'); $this->db->join(ACTIVITY.' as AV', 'AV.ActivityID = LT.ActivityStatus');
$this->db->join(PICK_LIST_DETAILS.' as PLD1', 'PLD1.ListCode = LT.StatusCode'); $this->db->join(PICK_LIST_DETAILS.' as PLD1', 'PLD1.ListCode = LT.StatusCode');
$this->db->where('LD.MobileNumber',$MobileNumber); $this->db->where('LD.MobileNumber',$MobileNumber);
$trackingDetails=$this->db->get()->first_row(); $trackingDetails=$this->db->get()->result_array();
$result['trackingdetails'] =$trackingDetails; $result =$trackingDetails;
return $result; return $result;
} }

16
Apollo/assets/js/controllers/studentCtrl.js
View File

@ -1866,7 +1866,7 @@ $scope.allcourselist ='';
$scope.editId = -1; $scope.editId = -1;
$scope.editCourseId=-1; $scope.editCourseId=-1;
$scope.trackingEditLoading = true; $scope.trackingEditLoading = true;
$scope.courselist = true; $scope.trackingdetails = true;
} }
@ -2047,14 +2047,16 @@ $scope.allcourselist ='';
}; };
$http(req).then(function (response) { $http(req).then(function (response) {
console.log(response);
if (response.data.trackingstatus==true) { if (response.data.status==200) {
$scope.trackingDetails = response.data.trackingdata; $scope.trackingDetails =response.data.trackingdata;
console.log($scope.trackingDetails); $scope.trackingEditLoading = false;
//console.log($scope.trackingDetails);
} else { } else {
$scope.trackingDetails = false;
$scope.courseEditLoading=''; $scope.trackingdetails = false;
$scope.trackingEditLoading='';
} }
}); });
} }

7
Apollo/assets/views/student/editTrackingDetails.html
View File

@ -1,12 +1,12 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <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> <h3>No Records Found</h3>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<fieldset > <fieldset ng-if="trackingEditLoading == false && trackingdetails == true" >
<legend> <legend>
Tracking Details Tracking Details
</legend> </legend>
@ -62,6 +62,5 @@
</fieldset> </fieldset>
</div> </div>
</div>
</div>
<!-- class="editRowTd" --> <!-- class="editRowTd" -->

2
Apollo/assets/views/student/student_details_SuperAdmin.html
View File

@ -277,7 +277,7 @@
<i class="ti-user" tooltip="Personal Details" id="personalDetailButton" ng-click="setEditId(p.Student_Course_id, p.StudentID);"></i> <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);">--> <!--<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="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> </td>
</tr> </tr>
<tr ng-show="editId === p.Student_Course_id" ng-if="editId === p.Student_Course_id"> <tr ng-show="editId === p.Student_Course_id" ng-if="editId === p.Student_Course_id">