diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index 959961a5..4e39b8b1 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -16,17 +16,19 @@ class Fees_status_model extends CI_Model * */ public function getStudentList($search=null) { - if($search['MobileNumber']!='' OR $search['Firstname']!='' OR $search['UniversityID']!='' OR $search['CourseID']!=''){ - $this->db->select('ST.StudentID,ST.MobileNumber,ST.Firstname,ST.Lastname,ST.Fathername,ST.EmailID,STC.ID,US.UniversityID,US.UniversityName,CU.CourseID,CU.CourseName,ST.PermanentAddress,if(STC.EnrollmentID = "","",STC.EnrollmentID) as EnrollmentID,US.ProfilePicPath,US.MobileNumber as UnivMobileNumber,US.Address,US.EmailID,ST.MotherName,CU.Specilization1 as Specilization'); + + if($search['MobileNumber']!='' OR $search['Firstname']!='' OR $search['UniversityID']!='' OR $search['CourseID']!='' OR $search['BatchCode']!=''){ + $this->db->select('ST.StudentID,ST.MobileNumber,ST.Firstname,ST.Lastname,ST.Fathername,ST.EmailID,STC.ID,US.UniversityID,US.UniversityName,CU.CourseID,CU.CourseName,ST.PermanentAddress,if(STC.EnrollmentID = "","",STC.EnrollmentID) as EnrollmentID,US.ProfilePicPath,US.MobileNumber as UnivMobileNumber,US.Address,US.EmailID,ST.MotherName,CU.Specilization1 as Specilization,BA.BatchCode,BA.BatchName'); $this->db->from(STUDENTS.' as ST'); $this->db->join(STUDENTCOURSE.' as STC', 'STC.StudentID = ST.StudentID'); $this->db->join(COURSE.' as CU', 'CU.CourseID = STC.CourseID'); // $this->db->join(SESSIONMASTER.' as SM', 'SM.SessionID = STC.SessionID'); $this->db->join(UNIVERSITY.' as US', 'US.UniversityID = CU.UniversityID'); + $this->db->join(BATCH.' as BA', 'BA.UniversityID = US.UniversityID'); $this->db->where('ST.IsActive','1'); $this->db->where('STC.IsActive','1'); if($search['requestedBranch']!='All'){ - $this->db->where('STC.BranchID',$search['requestedBranch']); + $this->db->where('STC.BranchID',$search['requestedBranch']); $this->db->where('US.BranchCode',$search['requestedBranch']); $this->db->where('CU.BranchCode',$search['requestedBranch']); } @@ -43,6 +45,9 @@ class Fees_status_model extends CI_Model if($search['CourseID']!=''){ $this->db->where('STC.CourseID',$search['CourseID']); } + if($search['BatchCode']!=''){ + $this->db->where('BA.BatchCode',$search['BatchCode']); + } /* if($search['MobileNumber']!='' AND $search['Firstname']==''){ $this->db->where('ST.MobileNumber',$search['MobileNumber']); } @@ -734,7 +739,7 @@ class Fees_status_model extends CI_Model * */ public function getUniversityDetails($requestedBy=null,$requestedBranch=null) { - $this->db->select('UniversityID,UniversityName'); + $this ->db->select('UniversityID,UniversityName'); $this->db->where('IsActive','1'); $this->db->where('BranchCode',$requestedBranch); $this->db->order_by('CreatedOn','DESC'); @@ -749,6 +754,7 @@ class Fees_status_model extends CI_Model $university_array['universityID'] = $row->UniversityID; $university_array['universityName'] = $row->UniversityName; $university_array['courseDetails']= $this->getCourseDetails($row->UniversityID,$requestedBranch); + $university_array['batchDetails']= $this->getBatch($row->UniversityID,$requestedBranch); $result_array[]=$university_array; } $result_university['univerSityDetails']= $result_array; @@ -759,6 +765,7 @@ class Fees_status_model extends CI_Model $result_university['universityID'] = ""; $result_university['universityName'] = ""; $result_university['courseDetails']= ""; + $result_university['batchDetails']=""; } @@ -2373,4 +2380,15 @@ $REGID=''; } } + public function getBatch($universityID=null,$br=null) + { + $this->db->select('BatchCode,BatchName,str_to_date(BatchDate, "%d-%m-%Y") BatchDate'); + $this->db->where('UniversityID',$universityID); + //$this->db->where('IsActive','1'); + $this->db->where('BranchCode',$br); + $this->db->order_by('BatchDate','DESC'); + $batchDetails = $this->db->get(BATCH); + return $batchDetails->result(); + } + } \ No newline at end of file diff --git a/Apollo/assets/js/api/application/controllers/Fees_Status_Controller.php b/Apollo/assets/js/api/application/controllers/Fees_Status_Controller.php index 6afbc0a6..58688ad8 100644 --- a/Apollo/assets/js/api/application/controllers/Fees_Status_Controller.php +++ b/Apollo/assets/js/api/application/controllers/Fees_Status_Controller.php @@ -55,6 +55,7 @@ class Fees_Status_Controller extends REST_Controller { * */ public function getStudentList_post() { + echo "i am here";die(); $search['requestedBy'] = $this->post('requestedtBy'); $search['Firstname'] = $this->post('studentName'); $search['MobileNumber'] = $this->post('mobileNumber'); @@ -62,6 +63,7 @@ class Fees_Status_Controller extends REST_Controller { $search['CourseID'] = $this->post('course'); $search['requestedDept'] = $this->post('requestedDept'); $search['requestedBranch'] = $this->post('branchId'); + $search['BatchCode'] = $this->post('batch'); $getStudentDetails = $this->Fees_model->getStudentList($search); if ($getStudentDetails) { diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index daf21951..df6c4df3 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -8,6 +8,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n "studentName": "", "mobileNumber": "", "universityName":"", + "batch":"", "courseName":"" }; // bill date restrict @@ -197,6 +198,7 @@ console.log($scope.paymentOptions); mobileNumber: myModel.mobileNumber, university: $scope.univId, course:myModel.courseName, + batch:myModel.batch, requestedtBy: JSON.parse(sessionStorage.getItem('localObj')).localUserID, branchId: JSON.parse(sessionStorage.getItem('localObj')).localBranchID, requestedDept: JSON.parse(sessionStorage.getItem('localObj')).localType, diff --git a/Apollo/assets/views/status-update/answer_booklet_status.html b/Apollo/assets/views/status-update/answer_booklet_status.html index 2ee0ea6f..9dfb6d03 100755 --- a/Apollo/assets/views/status-update/answer_booklet_status.html +++ b/Apollo/assets/views/status-update/answer_booklet_status.html @@ -135,8 +135,8 @@ First Name - Last Name - + Father Name + Mobile @@ -160,7 +160,7 @@ {{p.Firstname}} - {{p.Lastname}} + {{p.Fathername}} {{p.MobileNumber}} {{p.EmailID}} {{p.CourseName}} ({{p.CourseCode}}) diff --git a/Apollo/assets/views/status-update/application_status.html b/Apollo/assets/views/status-update/application_status.html index fca1319b..e66fff6f 100644 --- a/Apollo/assets/views/status-update/application_status.html +++ b/Apollo/assets/views/status-update/application_status.html @@ -135,8 +135,8 @@ First Name - Last Name - + Father Name + MobileNumber @@ -160,7 +160,7 @@ {{p.Firstname}} - {{p.Lastname}} + {{p.Fathername}} {{p.MobileNumber}} {{p.EmailID}} {{p.CourseName}}({{p.CourseCode}}) diff --git a/Apollo/assets/views/status-update/certificate_status.html b/Apollo/assets/views/status-update/certificate_status.html index 43eb3958..6331366f 100644 --- a/Apollo/assets/views/status-update/certificate_status.html +++ b/Apollo/assets/views/status-update/certificate_status.html @@ -135,8 +135,8 @@ First Name - Last Name - + Father Name + MobileNumber @@ -160,7 +160,7 @@ {{p.Firstname}} - {{p.Lastname}} + {{p.Fathername}} {{p.MobileNumber}} {{p.EmailID}} {{p.CourseName}}({{p.CourseCode}}) diff --git a/Apollo/assets/views/status-update/fees_status.html b/Apollo/assets/views/status-update/fees_status.html index dae84496..cfbede76 100755 --- a/Apollo/assets/views/status-update/fees_status.html +++ b/Apollo/assets/views/status-update/fees_status.html @@ -39,7 +39,33 @@
Search
-
+
+ + + +
+
+ + +
+
+ + + +
+
+
+
@@ -51,7 +77,7 @@
-
+
@@ -59,25 +85,7 @@ Invalid student name
-
- - - -
-
- - - -
+
diff --git a/Apollo/assets/views/status-update/markcard_status.html b/Apollo/assets/views/status-update/markcard_status.html index 1f78401d..94100614 100644 --- a/Apollo/assets/views/status-update/markcard_status.html +++ b/Apollo/assets/views/status-update/markcard_status.html @@ -132,8 +132,8 @@ First Name - Last Name - + Father Name + MobileNumber @@ -157,7 +157,7 @@ {{p.Firstname}} - {{p.Lastname}} + {{p.Fathername}} {{p.MobileNumber}} {{p.EmailID}} {{p.CourseName}}({{p.CourseCode}})