trackingdetails added in student view
This commit is contained in:
parent
d09be16129
commit
0fdc3d06d7
@ -125,6 +125,7 @@ $route['getStudentList'] = 'Student_Controller/getStudentList';
|
|||||||
$route['updateStudentExistDetail'] = 'Student_Controller/updateStudentExistDetail';
|
$route['updateStudentExistDetail'] = 'Student_Controller/updateStudentExistDetail';
|
||||||
$route['chkUpdateStuExistDetail'] = 'Student_Controller/chkUpdateStuExistDetail';
|
$route['chkUpdateStuExistDetail'] = 'Student_Controller/chkUpdateStuExistDetail';
|
||||||
$route['getStudentCourseList'] = 'Student_Controller/getStudentCourseList';
|
$route['getStudentCourseList'] = 'Student_Controller/getStudentCourseList';
|
||||||
|
$route['getStudentTrackingDetails']= 'Student_Controller/getStudentTrackingDetails';
|
||||||
$route['getStudentCourseDetails'] = 'Student_Controller/getStudentCourseDetails';
|
$route['getStudentCourseDetails'] = 'Student_Controller/getStudentCourseDetails';
|
||||||
$route['updateStudentCourseDetail'] = 'Student_Controller/updateStudentCourseDetail';
|
$route['updateStudentCourseDetail'] = 'Student_Controller/updateStudentCourseDetail';
|
||||||
$route['insertStudentCourse'] = 'Student_Controller/insertStudentCourse';
|
$route['insertStudentCourse'] = 'Student_Controller/insertStudentCourse';
|
||||||
|
|||||||
@ -118,7 +118,23 @@ class Student_Controller extends REST_Controller {
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
public function getStudentTrackingDetails_post()
|
||||||
|
{
|
||||||
|
$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;
|
||||||
|
// Set the response and exit
|
||||||
|
$this->response($trackingDetails, 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
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
public function getStudentCourseDetails_post() {
|
public function getStudentCourseDetails_post() {
|
||||||
$studentCourseID = $this->post('studentcourseId');
|
$studentCourseID = $this->post('studentcourseId');
|
||||||
$studentCourse = $this->student_model->get_student_course($studentCourseID); // Check if the employee exist
|
$studentCourse = $this->student_model->get_student_course($studentCourseID); // Check if the employee exist
|
||||||
|
|||||||
@ -35,6 +35,21 @@ class Student_model extends CI_Model {
|
|||||||
$result['branch_active_status'] = $statusDetails->IsActive;
|
$result['branch_active_status'] = $statusDetails->IsActive;
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
public function get_student_tracking_details($MobileNumber)
|
||||||
|
{
|
||||||
|
$this->db->select('LTF.FollowupOn,LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,LTF.FollowupComments');
|
||||||
|
$this->db->from(LEAD_TRACKING_FOLLOWUP.' as LTF');
|
||||||
|
$this->db->join(LEAD_TRACKING.' as LT','LT.TrackingID=LTF.TrackingID');
|
||||||
|
$this->db->join(LEAD_DETAILS.' as LD', 'LT.LeadID = LD.LeadID');
|
||||||
|
$this->db->join(LOGIN.' as LO', 'LO.ID = LT.AssignedTo');
|
||||||
|
$this->db->join(STAFF.' as ST', 'ST.StaffID = LO.StaffID');
|
||||||
|
$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;
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
// get student list based on login user
|
// get student list based on login user
|
||||||
public function get_student_list($loginUserId, $loginUserBranchId, $loginUserType, $getSearchData,$batchcode) {
|
public function get_student_list($loginUserId, $loginUserBranchId, $loginUserType, $getSearchData,$batchcode) {
|
||||||
|
|||||||
@ -1833,11 +1833,13 @@ $scope.allcourselist ='';
|
|||||||
|
|
||||||
$scope.editId = -1;
|
$scope.editId = -1;
|
||||||
$scope.editCourseId = -1;
|
$scope.editCourseId = -1;
|
||||||
|
$scope.editTrackingId=-1;
|
||||||
$scope.setEditId = function (uniqe_id ,id) {
|
$scope.setEditId = function (uniqe_id ,id) {
|
||||||
|
|
||||||
// alert()
|
// alert()
|
||||||
$scope.editId = uniqe_id;
|
$scope.editId = uniqe_id;
|
||||||
$scope.editCourseId = -1;
|
$scope.editCourseId = -1;
|
||||||
|
$scope.editTrackingId=-1;
|
||||||
}
|
}
|
||||||
|
|
||||||
$scope.setEditCourseId = function (uniqe_id ,id) {
|
$scope.setEditCourseId = function (uniqe_id ,id) {
|
||||||
@ -1849,18 +1851,33 @@ $scope.allcourselist ='';
|
|||||||
// $scope.getStudentCourseDetails(id);
|
// $scope.getStudentCourseDetails(id);
|
||||||
$scope.editCourseId = uniqe_id;
|
$scope.editCourseId = uniqe_id;
|
||||||
$scope.editId = -1;
|
$scope.editId = -1;
|
||||||
|
$scope.editTrackingId=-1;
|
||||||
$scope.courseEditLoading = true;
|
$scope.courseEditLoading = true;
|
||||||
$scope.courselist = true;
|
$scope.courselist = true;
|
||||||
}
|
}
|
||||||
|
$scope.setEditTrackingId = function (uniqe_id ,MobileNumber) {
|
||||||
|
|
||||||
|
//alert('1');
|
||||||
|
$scope.list = false;
|
||||||
|
$scope.getStudentTrackingDetails(MobileNumber);
|
||||||
|
$scope.currentStudentId = MobileNumber;
|
||||||
|
// $scope.getStudentCourseDetails(id);
|
||||||
|
$scope.editTrackingId = uniqe_id;
|
||||||
|
$scope.editId = -1;
|
||||||
|
$scope.editCourseId=-1;
|
||||||
|
$scope.trackingEditLoading = true;
|
||||||
|
$scope.courselist = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
$scope.cancel = function () {
|
$scope.cancel = function () {
|
||||||
$scope.getStudentList();
|
$scope.getStudentList();
|
||||||
$scope.editId = -1;
|
$scope.editId = -1;
|
||||||
$scope.editCourseId = -1;
|
$scope.editCourseId = -1;
|
||||||
|
$scope.editTrackingId=-1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$scope.cancelCourseDetails = function () {
|
$scope.cancelCourseDetails = function () {
|
||||||
$scope.getStudentCourseList($scope.currentStudentId);
|
$scope.getStudentCourseList($scope.currentStudentId);
|
||||||
// $scope.editId = -1;
|
// $scope.editId = -1;
|
||||||
@ -2010,6 +2027,37 @@ $scope.allcourselist ='';
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
$scope.getStudentTrackingDetails = function (MobileNumber)
|
||||||
|
{
|
||||||
|
|
||||||
|
$scope.trackingEditLoading = true;
|
||||||
|
$scope.list = true;
|
||||||
|
$scope.courseEdit = false;
|
||||||
|
$scope.courseAdd = false;
|
||||||
|
var req = {
|
||||||
|
method: 'POST',
|
||||||
|
url: apiPoint.url + 'getStudentTrackingDetails/',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
},
|
||||||
|
data: {
|
||||||
|
MobileNumber: MobileNumber,
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
};
|
||||||
|
$http(req).then(function (response) {
|
||||||
|
|
||||||
|
if (response.data.trackingstatus==true) {
|
||||||
|
|
||||||
|
$scope.trackingDetails = response.data.trackingdata;
|
||||||
|
console.log($scope.trackingDetails);
|
||||||
|
} else {
|
||||||
|
$scope.trackingDetails = false;
|
||||||
|
$scope.courseEditLoading='';
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
$scope.stuCourseEditDetailsObj = {};
|
$scope.stuCourseEditDetailsObj = {};
|
||||||
|
|||||||
67
Apollo/assets/views/student/editTrackingDetails.html
Normal file
67
Apollo/assets/views/student/editTrackingDetails.html
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
<div class="row">
|
||||||
|
<div class="col-md-12">
|
||||||
|
|
||||||
|
<div ng-if="trackingDetails == false" class="text-center">
|
||||||
|
<h3>No Records Found</h3>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-12">
|
||||||
|
|
||||||
|
<fieldset >
|
||||||
|
<legend>
|
||||||
|
Tracking Details
|
||||||
|
</legend>
|
||||||
|
<!--list of course details : start-->
|
||||||
|
<div>
|
||||||
|
<table class="table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th> ID </th>
|
||||||
|
<th>Followup</th>
|
||||||
|
<th> Name </th>
|
||||||
|
<th>Mobile </th>
|
||||||
|
<th>University</th>
|
||||||
|
<th>Course</th>
|
||||||
|
<th>Activity </th>
|
||||||
|
<th>Assigned </th>
|
||||||
|
<th>Comments</th>
|
||||||
|
<th>Status</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody >
|
||||||
|
<tr ng-repeat="s in trackingDetails">
|
||||||
|
<td>{{s.TrackingID}}
|
||||||
|
<td>{{s.FollowupOn}}</td>
|
||||||
|
<td>{{s.LeadName}}</td>
|
||||||
|
<td>{{s.MobileNumber}}</td>
|
||||||
|
<td>{{s.University}}</td>
|
||||||
|
<td>{{s.Course}}</td>
|
||||||
|
<td>{{s.ActivityName}}</td>
|
||||||
|
<td>{{s.Firstname}}</td>
|
||||||
|
<td>{{s.FollowupComments}}</td>
|
||||||
|
<td>{{s.statusListName}}</td>
|
||||||
|
|
||||||
|
|
||||||
|
<!--ng-hide="s.Fee_paid_exist == 1 && localUserType == 'R002'"-->
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-12">
|
||||||
|
<div class="pull-right">
|
||||||
|
<!-- <button type="reset" id="addCourseBtn" class="btn btn-into btn-wide" tabindex="100" ng-click="addStudentCourse()"> -->
|
||||||
|
<!-- Add Course -->
|
||||||
|
<!-- </button> -->
|
||||||
|
<button type="reset" class="btn btn-warning btn-wide" tabindex="101" ng-click="cancel()">
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
</fieldset>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- class="editRowTd" -->
|
||||||
@ -271,12 +271,13 @@
|
|||||||
<td><span ng-if="p.IsActive == true" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">ACTIVE</span>
|
<td><span ng-if="p.IsActive == true" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">ACTIVE</span>
|
||||||
<span tooltip="{{p.DeactiveComments}}" ng-if="p.IsActive == false" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">DEACTIVE</span></td>
|
<span tooltip="{{p.DeactiveComments}}" ng-if="p.IsActive == false" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">DEACTIVE</span></td>
|
||||||
<td><div id="containersPara">{{p.Comments}}</div></td>
|
<td><div id="containersPara">{{p.Comments}}</div></td>
|
||||||
<td style="text-align: center;">
|
<td style="padding-left: 2px;">
|
||||||
<!--<input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.StudentID}}" value="Personal Details"
|
<!--<input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.StudentID}}" value="Personal Details"
|
||||||
ng-click="setEditId(p.StudentID);">-->
|
ng-click="setEditId(p.StudentID);">-->
|
||||||
<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>
|
||||||
</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">
|
||||||
@ -284,6 +285,9 @@
|
|||||||
</tr>
|
</tr>
|
||||||
<tr ng-show="editCourseId === p.Student_Course_id" ng-if="editCourseId === p.Student_Course_id">
|
<tr ng-show="editCourseId === p.Student_Course_id" ng-if="editCourseId === p.Student_Course_id">
|
||||||
<td colspan="8" ng-include src="'assets/views/student/editStudentCourseDetails.html'"></td>
|
<td colspan="8" ng-include src="'assets/views/student/editStudentCourseDetails.html'"></td>
|
||||||
|
</tr>
|
||||||
|
<tr ng-show="editTrackingId === p.Student_Course_id" ng-if="editTrackingId === p.Student_Course_id">
|
||||||
|
<td colspan="8" ng-include src="'assets/views/student/editTrackingDetails.html'"></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user