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

trackingdetails in studentview

Browse Source
This commit is contained in:
gayathri1990 2018-10-11 18:34:16 +05:30
parent f3460b667f
commit 252244d582
5 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,8 +120,11 @@ class Student_Controller extends REST_Controller {
} }
public function getStudentTrackingDetails_post() public function getStudentTrackingDetails_post()
{ {
$universityid=$this->post('universityid');
$courseid=$this->post('courseid');
$MobileNumber = $this->post('MobileNumber'); $MobileNumber = $this->post('MobileNumber');
$trackingDetails = $this->student_model->get_student_tracking_details($MobileNumber); // Check if the employee exist $loginBranch=$this->post('loginBranch');
$trackingDetails = $this->student_model->get_student_tracking_details($universityid,$courseid,$MobileNumber,$loginBranch); // Check if the employee exist
if ($trackingDetails) { if ($trackingDetails) {
$trackingDetailsData['trackingdata']=$trackingDetails; $trackingDetailsData['trackingdata']=$trackingDetails;

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

@ -35,9 +35,9 @@ 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) public function get_student_tracking_details($universityid,$courseid,$MobileNumber,$loginBranch)
{ {
$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->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->from(LEAD_TRACKING_FOLLOWUP.' as LTF');
$this->db->join(LEAD_TRACKING.' as LT','LT.TrackingID=LTF.TrackingID'); $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(LEAD_DETAILS.' as LD', 'LT.LeadID = LD.LeadID');
@ -45,7 +45,14 @@ class Student_model extends CI_Model {
$this->db->join(STAFF.' as ST', 'ST.StaffID = LO.StaffID'); $this->db->join(STAFF.' as ST', 'ST.StaffID = LO.StaffID');
$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->join(UNIVERSITY.' as UM','UM.UniversityName=LT.University');
$this->db->join(COURSE.' as CM','CM.CourseName=LT.Course');
$this->db->where('LD.MobileNumber',$MobileNumber); $this->db->where('LD.MobileNumber',$MobileNumber);
$this->db->where('PLD1.BranchCode',$loginBranch);
$this->db->where('UM.UniversityID',$universityid);
$this->db->where('CM.CourseID',$courseid);
//$this->db->group by('LD.LeadID');
$this->db->group_by('LD.LeadID');
$trackingDetails=$this->db->get()->result_array(); $trackingDetails=$this->db->get()->result_array();
$result =$trackingDetails; $result =$trackingDetails;
return $result; return $result;
@ -57,7 +64,7 @@ class Student_model extends CI_Model {
// list for super admin based on branch // list for super admin based on branch
if ($getSearchData["University"] === '' && $getSearchData["Course"] === '' && $getSearchData["Status"] === '') { if ($getSearchData["University"] === '' && $getSearchData["Course"] === '' && $getSearchData["Status"] === '') {
$this->db->select('S.*, SC.id as Student_Course_id , U.UniversityName, C.CourseName,C.CourseCode,C.CourseID'); $this->db->select('S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID');
$this->db->from('' . STUDENTCOURSE . ' as SC'); $this->db->from('' . STUDENTCOURSE . ' as SC');
$this->db->join('' . STUDENTS . ' as S', 'S.StudentID = SC.StudentID', 'LEFT'); $this->db->join('' . STUDENTS . ' as S', 'S.StudentID = SC.StudentID', 'LEFT');
$this->db->join('' . UNIVERSITY . ' as U', 'SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode', 'LEFT'); $this->db->join('' . UNIVERSITY . ' as U', 'SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode', 'LEFT');
@ -82,7 +89,7 @@ class Student_model extends CI_Model {
$StuStatus = $getSearchData['Status']; $StuStatus = $getSearchData['Status'];
if ($StuStatus == '') { if ($StuStatus == '') {
if ($University != '' && $Course == '' && $batchcode=='') { if ($University != '' && $Course == '' && $batchcode=='') {
$subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, C.CourseName,C.CourseCode,C.CourseID $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID
FROM " . STUDENTCOURSE . " as SC FROM " . STUDENTCOURSE . " as SC
LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@ -98,7 +105,7 @@ class Student_model extends CI_Model {
ORDER BY S.CreatedOn"; ORDER BY S.CreatedOn";
// GROUP BY SC.StudentID // GROUP BY SC.StudentID
} else if ($University != '' && $Course != '' && $batchcode=='') { } else if ($University != '' && $Course != '' && $batchcode=='') {
$subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, C.CourseCode,C.CourseName,C.CourseID $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseCode,C.CourseName,C.CourseID
FROM " . STUDENTCOURSE . " as SC FROM " . STUDENTCOURSE . " as SC
LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@ -122,7 +129,7 @@ class Student_model extends CI_Model {
else if($University !='' && $Course == '' && $batchcode!='') else if($University !='' && $Course == '' && $batchcode!='')
{ {
$subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, C.CourseCode,C.CourseName,C.CourseID $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, U.UniversityID,C.CourseCode,C.CourseName,C.CourseID
FROM " . STUDENTCOURSE . " as SC FROM " . STUDENTCOURSE . " as SC
LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@ -144,7 +151,7 @@ class Student_model extends CI_Model {
else if($University !=''&&$Course != '' && $batchcode !='') else if($University !=''&&$Course != '' && $batchcode !='')
{ {
$subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode, C.CourseName,C.CourseID $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode, U.UniversityID,C.CourseName,C.CourseID
FROM " . STUDENTCOURSE . " as SC FROM " . STUDENTCOURSE . " as SC
LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@ -170,7 +177,7 @@ class Student_model extends CI_Model {
else else
{ {
if ($University != '' && $Course == '' && $batchcode=='' ) { if ($University != '' && $Course == '' && $batchcode=='' ) {
$subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode, C.CourseName,C.CourseID $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode,U.UniversityID, C.CourseName,C.CourseID
FROM " . STUDENTCOURSE . " as SC LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID FROM " . STUDENTCOURSE . " as SC LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID LEFT JOIN " . COURSE . " as C ON LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID LEFT JOIN " . COURSE . " as C ON
SC.CourseID = C.CourseID SC.CourseID = C.CourseID
@ -185,7 +192,7 @@ class Student_model extends CI_Model {
group by Student_Course_id,StudentID group by Student_Course_id,StudentID
ORDER BY S.CreatedOn"; ORDER BY S.CreatedOn";
} else if ($University != '' && $Course != '' && $batchcode=='') { } else if ($University != '' && $Course != '' && $batchcode=='') {
$subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, C.CourseCode,C.CourseName,C.CourseID $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, C.CourseCode,C.CourseName,C.CourseID,U.UniversityID
FROM " . STUDENTCOURSE . " as SC FROM " . STUDENTCOURSE . " as SC
LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@ -205,7 +212,7 @@ class Student_model extends CI_Model {
if ($University != '' && $Course == ''&& $batchcode=='' ) { if ($University != '' && $Course == ''&& $batchcode=='' ) {
$subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, C.CourseCode,C.CourseName,C.CourseID $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseCode,C.CourseName,C.CourseID
FROM " . STUDENTCOURSE . " as SC LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID FROM " . STUDENTCOURSE . " as SC LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID LEFT JOIN " . COURSE . " as C ON LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID LEFT JOIN " . COURSE . " as C ON
SC.CourseID = C.CourseID SC.CourseID = C.CourseID
@ -221,7 +228,7 @@ class Student_model extends CI_Model {
group by Student_Course_id,StudentID group by Student_Course_id,StudentID
ORDER BY S.CreatedOn"; ORDER BY S.CreatedOn";
} else if ($University != '' && $Course != '' && $batchcode=='') { } else if ($University != '' && $Course != '' && $batchcode=='') {
$subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, C.CourseCode,C.CourseName,C.CourseID $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseCode,C.CourseName,C.CourseID
FROM " . STUDENTCOURSE . " as SC FROM " . STUDENTCOURSE . " as SC
LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@ -242,7 +249,7 @@ class Student_model extends CI_Model {
else if($University != '' && $Course == '' && $batchcode !='' ) else if($University != '' && $Course == '' && $batchcode !='' )
{ {
$subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, C.CourseCode,C.CourseName,C.CourseID $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, U.UniversityID,C.CourseCode,C.CourseName,C.CourseID
FROM " . STUDENTCOURSE . " as SC LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID FROM " . STUDENTCOURSE . " as SC LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID LEFT JOIN " . COURSE . " as C ON LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID LEFT JOIN " . COURSE . " as C ON
SC.CourseID = C.CourseID SC.CourseID = C.CourseID
@ -269,7 +276,7 @@ class Student_model extends CI_Model {
{ {
$subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode, C.CourseName,C.CourseID $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode, U.UniversityID,C.CourseName,C.CourseID
FROM " . STUDENTCOURSE . " as SC FROM " . STUDENTCOURSE . " as SC
LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@ -296,7 +303,7 @@ class Student_model extends CI_Model {
else{ else{
$subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode, C.CourseName,C.CourseID $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode, C.CourseName,C.CourseID,U.UniversityID
FROM " . STUDENTCOURSE . " as SC FROM " . STUDENTCOURSE . " as SC
LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@ -334,7 +341,7 @@ class Student_model extends CI_Model {
} else if ($loginUserType == ADMIN) { } else if ($loginUserType == ADMIN) {
// list for admin // list for admin
if ($getSearchData["University"] === '' && $getSearchData["Course"] === '' && $getSearchData["Status"] === '') { if ($getSearchData["University"] === '' && $getSearchData["Course"] === '' && $getSearchData["Status"] === '') {
$this->db->select('S.*, SC.id as Student_Course_id , U.UniversityName, C.CourseCode,C.CourseName,C.CourseID'); $this->db->select('S.*, SC.id as Student_Course_id , U.UniversityName, U.UniversityID, C.CourseCode,C.CourseName,C.CourseID');
$this->db->from('' . STUDENTCOURSE . ' as SC'); $this->db->from('' . STUDENTCOURSE . ' as SC');
$this->db->join('' . STUDENTS . ' as S', 'S.StudentID = SC.StudentID', 'LEFT'); $this->db->join('' . STUDENTS . ' as S', 'S.StudentID = SC.StudentID', 'LEFT');
$this->db->join('' . UNIVERSITY . ' as U', 'SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode', 'LEFT'); $this->db->join('' . UNIVERSITY . ' as U', 'SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode', 'LEFT');

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

@ -1855,11 +1855,11 @@ $scope.allcourselist ='';
$scope.courseEditLoading = true; $scope.courseEditLoading = true;
$scope.courselist = true; $scope.courselist = true;
} }
$scope.setEditTrackingId = function (uniqe_id ,MobileNumber) { $scope.setEditTrackingId = function (uniqe_id,courseid,universityid,MobileNumber) {
//alert('1');
$scope.list = false; $scope.list = false;
$scope.getStudentTrackingDetails(MobileNumber); $scope.getStudentTrackingDetails(courseid,universityid,MobileNumber);
$scope.currentStudentId = MobileNumber; $scope.currentStudentId = MobileNumber;
// $scope.getStudentCourseDetails(id); // $scope.getStudentCourseDetails(id);
$scope.editTrackingId = uniqe_id; $scope.editTrackingId = uniqe_id;
@ -1867,6 +1867,7 @@ $scope.allcourselist ='';
$scope.editCourseId=-1; $scope.editCourseId=-1;
$scope.trackingEditLoading = true; $scope.trackingEditLoading = true;
$scope.trackingdetails = true; $scope.trackingdetails = true;
} }
@ -2027,7 +2028,7 @@ $scope.allcourselist ='';
} }
}); });
} }
$scope.getStudentTrackingDetails = function (MobileNumber) $scope.getStudentTrackingDetails = function (courseid,universityid,MobileNumber)
{ {
$scope.trackingEditLoading = true; $scope.trackingEditLoading = true;
@ -2042,7 +2043,9 @@ $scope.allcourselist ='';
}, },
data: { data: {
MobileNumber: MobileNumber, MobileNumber: MobileNumber,
courseid:courseid,
universityid:universityid,
loginBranch: localDetails.localBranchID,
} }
}; };
@ -2052,6 +2055,7 @@ $scope.allcourselist ='';
$scope.trackingDetails =response.data.trackingdata; $scope.trackingDetails =response.data.trackingdata;
$scope.trackingEditLoading = false; $scope.trackingEditLoading = false;
// $scope.
//console.log($scope.trackingDetails); //console.log($scope.trackingDetails);
} else { } else {

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

@ -1,6 +1,9 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div ng-if="trackingEditLoading == true" class="text-center">
<!-- <img src="assets/images/ajax_loader_blue.gif" style="width: 5%; height: 30%"> -->
<h3>Fetching ...</h3>
</div>
<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>

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-timer" 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.CourseID,p.UniversityID, 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">