From 1c30e29a34a5e54a231ba709aa5befbb1d698de2 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 6 Sep 2018 09:35:59 +0530 Subject: [PATCH] form id enrolment details changes --- ...Receive_Enrolment_Fees_Univ_Controller.php | 5 +- .../Receive_Enrolment_Fees_Univ_model.php | 188 ++++++++--- .../student_university_fee_compare.js | 243 ++++++-------- .../student/studentUnivFeeCompareDetails.html | 301 +++++++++--------- 4 files changed, 394 insertions(+), 343 deletions(-) diff --git a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php index 7148fd98..2644de03 100644 --- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php +++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php @@ -106,11 +106,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { public function getStudentUnivFeeCompareDetails_post(){ $searchData = $this->post('search'); - - $univID = $searchData['University']; - $sessionID = $searchData['Session']; - $getUnivStudentFeeCompare = $this->receive_model->getStudentUnivFeeCompareDetails($univID,$sessionID);// Check if the users data store contains users (in case the database result returns NULL) + $getUnivStudentFeeCompare = $this->receive_model->getStudentUnivFeeCompareDetails($searchData);// Check if the users data store contains users (in case the database result returns NULL) if ($getUnivStudentFeeCompare) { $getUnivStudentFeeCompare['status'] = REST_Controller::HTTP_OK; diff --git a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php index 8229efef..ab1fee68 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -18,25 +18,26 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { public function getUnivCourseFromFileDetails(){ $selectQuery = "SELECT UniversityCode, UniversityName FROM T_Enrolment_Received_From_University GROUP BY UniversityCode"; $queryDetails = $this->db->query($selectQuery); - if($queryDetails->result()){ foreach ($queryDetails->result() as $formIdDetails){ - $result['univCode'] = $formIdDetails->UniversityCode; - $result['univName'] = $formIdDetails->UniversityName; + $univResult['univCode'] = $formIdDetails->UniversityCode; + $univResult['univName'] = $formIdDetails->UniversityName; $selectCourseQuery = "SELECT CourseCode, CourseName FROM T_Enrolment_Received_From_University WHERE UniversityCode = '$formIdDetails->UniversityCode' GROUP BY CourseCode"; $queryCourseDetails = $this->db->query($selectCourseQuery); - $result['univCourseDetails'] = $queryCourseDetails->result(); + $univResult['univCourseDetails'] = $queryCourseDetails->result(); $selectSessionQuery = "SELECT SessionName FROM T_Enrolment_Received_From_University WHERE UniversityCode = '$formIdDetails->UniversityCode' GROUP BY CourseCode"; $querySessionDetails = $this->db->query($selectSessionQuery); - $result['univSessionDetails'] = $querySessionDetails->result(); + $univResult['univSessionDetails'] = $querySessionDetails->result(); + $merge[]=$univResult; } + $finalArray['status'] = true; $finalArray['message'] = "Success."; - $finalArray['details'] = $result; + $finalArray['details'] = $merge; } else { $finalArray['status'] = false; $finalArray['message'] = "No record found."; @@ -476,7 +477,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $results['stuFeeList_details'] = "details updated successfully."; return $results; } - public function getStudentUnivFeeCompareDetails($univCode=null,$session=null){ + public function getStudentUnivFeeCompareDetails($search=null){ $mergeFormDetails=array(); $this->db->distinct('ENU.FormID'); $this->db->select('ENU.FormID, ENU.FormType, ENU.SemesterYear, ENU.EnrolmentNo,ENU.RollNo, ST.*,UN.UniversityID, UN.UniversityName,CM.CourseID,CM.CourseCode,CM.CourseName'); @@ -485,16 +486,22 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $this->db->join(COURSE.' as CM', 'CM.CourseID = STC.CourseID'); $this->db->join(STUDENTS.' as ST', 'ST.StudentID = STC.StudentID'); $this->db->join(UNIVERSITY.' as UN', 'UN.UniversityID = STC.UniversityID'); - // $this->db->join(FORMFEESRECEIVEDFROMUNIV.' as t2', 't2.FormID = t1.FormID','left'); - //$this->db->where('t1.CourseCode', $courseCode); - $this->db->where('ENU.UniversityCode', $univCode); + if($search['University']!=''){ + $this->db->where('ENU.UniversityCode',$search['University']); + } + if($search['Course']!=''){ + $this->db->where('ENU.CourseName',$search['Course']); + } + if($search['Sem']!=''){ + $this->db->where('ENU.SemesterYear',$search['Sem']); + } $details = $this->db->get(); $detailsList = $details->result(); if($detailsList){ foreach ($detailsList as $fetchStudentRow){ // form id bases get student paid details - $getStudentsetFeesDetails=$this->getStudentsetFeesDetails($fetchStudentRow->StudentID,$fetchStudentRow->CourseID,$fetchStudentRow->SemesterYear,$session); + $getStudentsetFeesDetails=$this->getStudentsetFeesDetails($fetchStudentRow->StudentID,$fetchStudentRow->CourseID,$fetchStudentRow->SemesterYear); if(isset($getStudentsetFeesDetails['status']) AND $getStudentsetFeesDetails['status']==true ){ $formResult['SessionName']=$getStudentsetFeesDetails['SessionName']; $formResult['FormID']=$fetchStudentRow->FormID; @@ -545,7 +552,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { return $resultArr; } /*form id bases get student paid details for getStudentUnivFeeCompareDetails methods*/ - public function getStudentsetFeesDetails($studentID=null,$courseID=null,$sem=null,$session=null){ + public function getStudentsetFeesDetails($studentID=null,$courseID=null,$sem=null){ // create array for find sem value $keyArray = array(0 => 'SEM1', 1 => 'SEM2', 2 => 'SEM3', 3 => 'SEM4',4 => 'SEM5',5 => 'SEM6',6 => 'SEM7',7 => 'SEM8',8 => 'YEAR1',9 => 'YEAR2',10 => 'YEAR3',11 => 'YEAR4',12 => "DMC CHANGE SEM1",13 => "DMC CHANGE SEM2",14 => "DMC CHANGE SEM3",15 => "DMC CHANGE SEM4",16 => "DMC CHANGE SEM5",17 => "DMC CHANGE SEM6",18 => "DMC CHANGE SEM7",19 => "DMC CHANGE SEM8",20 => "DMC CHANGE YEAR1",21 => "DMC CHANGE YEAR2",22 => "DMC CHANGE YEAR3",23 => "DMC CHANGE YEAR4"); $valueArray = array("1","2","3","4","5","6","7","8","1","2","3","4","1","2","3","4","5","6","7","8","1","2","3","4"); @@ -564,7 +571,6 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $this->db->join(SESSIONMASTER . ' as SM' , 'SM.SessionID = SFS.SessionName'); $this->db->where('SFS.FeesType', $fetchRow->ID); $this->db->where('SFS.StudentID', $studentID); - $this->db->where('SFS.SessionName', $session); $feesDetails = $this->db->get()->last_row(); if ($feesDetails) { $feesArray['status'] = true; @@ -587,7 +593,6 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $this->db->join(SESSIONMASTER . ' as SM' , 'SM.SessionID = SFS.SessionName'); $this->db->where('SFS.FeesType',$fetchRow->ID); $this->db->where('SFS.StudentID',$studentID); - $this->db->where('SFS.SessionName', $session); $feesDetails = $this->db->get()->last_row(); if ($feesDetails) { $feesArray['status'] = true; @@ -612,47 +617,132 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { */ public function getUnmatchedFormDetails($reqType){ - // $this->db->select('t1.*'); - // $this->db->from('T_Enrolment_Received_From_University as t1'); - // $this->db->join('T_Student_CourseDetails as t2', 't2.EnrollmentID = t1.EnrolmentNo'); - - if($reqType == 'EnrolmentIDFile'){ - $query = "select * - from T_Enrolment_Received_From_University as t1 - where t1.EnrolmentNo NOT IN (select EnrollmentID from T_Student_CourseDetails)"; - $details = $this->db->query($query); - $detailsList = $details->result(); - if($detailsList){ - $resultArr['unMatchedRecordDetails'] = $detailsList; - $resultArr['unMatchedRecordStatus'] = true; - $resultArr['unMatchedRecordFor'] = 'EnrolmentIDFile'; - $resultArr['message'] = "Successfully data generated"; - } else { + $keyArray = array(0 => 'SEM1', 1 => 'SEM2', 2 => 'SEM3', 3 => 'SEM4',4 => 'SEM5',5 => 'SEM6',6 => 'SEM7',7 => 'SEM8',8 => 'YEAR1',9 => 'YEAR2',10 => 'YEAR3',11 => 'YEAR4',12 => "DMC CHANGE SEM1",13 => "DMC CHANGE SEM2",14 => "DMC CHANGE SEM3",15 => "DMC CHANGE SEM4",16 => "DMC CHANGE SEM5",17 => "DMC CHANGE SEM6",18 => "DMC CHANGE SEM7",19 => "DMC CHANGE SEM8",20 => "DMC CHANGE YEAR1",21 => "DMC CHANGE YEAR2",22 => "DMC CHANGE YEAR3",23 => "DMC CHANGE YEAR4"); + $valueArray = array("1","2","3","4","5","6","7","8","1","2","3","4","1","2","3","4","5","6","7","8","1","2","3","4"); + $this->db->distinct('ENU.FormID'); + $this->db->select('ENU.*'); + $this->db->from(ENROLMENTRECEIVEDFROMUNIV.' as ENU'); + if($reqType['University']!=''){ + $this->db->where('ENU.UniversityCode',$reqType['University']); + } + if($reqType['Course']!=''){ + $this->db->where('ENU.CourseName',$reqType['Course']); + } + if($reqType['Sem']!=''){ + $this->db->where('ENU.SemesterYear',$reqType['Sem']); + } + $details = $this->db->get(); + $resultArr=array(); + $mergeFormDetails=array(); + if($details->result()){ + foreach ($details->result() as $fRow){ + $this->db->distinct('ENU1.FormID'); + $this->db->select('SC.StudentID,SC.CourseID,SC.EnrollmentID,CF.ID,CF.ProgramType,CF.Sem_Year,ENU1.SemesterYear,ENU1.EnrolmentNo'); + $this->db->from(STUDENTCOURSE.' as SC'); + $this->db->join(ENROLMENTRECEIVEDFROMUNIV .' as ENU1', 'ENU1.EnrolmentNo = SC.EnrollmentID'); + $this->db->join(COURSE_FEES .' as CF', 'CF.CourseID = SC.CourseID'); + $this->db->where('ENU1.EnrolmentNo',$fRow->EnrolmentNo); + $this->db->where('ENU1.FormID',$fRow->FormID); + $getEnrolmentMatchDetails=$this->db->get(); + if($getEnrolmentMatchDetails->result()){ + foreach ($getEnrolmentMatchDetails->result() as $sRow){ + $serachKey = array_search(strtoupper($sRow->Sem_Year), $keyArray); + if ($valueArray[$serachKey] == $sRow->SemesterYear) { + $this->db->select('SFS.FeesID'); + $this->db->from(STUDENTS_FEES_STATUS.' as SFS'); + $this->db->join(COURSE_FEES .' as CF', 'SFS.FeesType = CF.ID'); + $this->db->where('SFS.FeesType',$sRow->ID); + $this->db->where('SFS.CourseID',$sRow->CourseID); + $this->db->where('SFS.StudentID',$sRow->StudentID); + $getEnrolmentMatchDetails=$this->db->get(); + if($getEnrolmentMatchDetails->num_rows()==0){ + $formResult['SessionName']=$fRow->SessionName; + $formResult['FormID']=$fRow->FormID; + $formResult['FormType']=$fRow->FormType; + $formResult['SemesterYear']=$fRow->SemesterYear; + $formResult['CentreCode']=$fRow->CentreCode; + $formResult['CentreState']=$fRow->CentreState; + $formResult['EnrolmentNo']=$fRow->EnrolmentNo; + $formResult['EnromentStatus']=true; + $formResult['SemStatus']=false; + $formResult['CourseCode']=$fRow->CourseCode; + $formResult['CourseName']=$fRow->CourseName; + $formResult['RollNo']=$fRow->RollNo; + $formResult['MobileNumber']=$fRow->MobileNumber; + $formResult['StudentName']=$fRow->StudentName; + $formResult['FatherName']=$fRow->FatherName; + $formResult['MotherName']=$fRow->MotherName; + $formResult['EmailID']=$fRow->EmailID; + $formResult['AlternateNumber']=$fRow->AlternateNumber; + $formResult['Gender']=$fRow->Gender; + $formResult['DOB']=$fRow->DOB; + $formResult['PresentAddress']=$fRow->PresentAddress; + $formResult['PermanentAddress']=$fRow->PermanentAddress; + $formResult['AadharNumber']=$fRow->AadharNumber; + $formResult['OtherID']=$fRow->IDProof; + $formResult['UniversityCode']=$fRow->UniversityCode; + $formResult['UniversityName']=$fRow->UniversityName; + $mergeFormDetails[]=$formResult; + } + } + } + + } + else{ + $formResult['SessionName']=$fRow->SessionName; + $formResult['FormID']=$fRow->FormID; + $formResult['FormType']=$fRow->FormType; + $formResult['SemesterYear']=$fRow->SemesterYear; + $formResult['CentreCode']=$fRow->CentreCode; + $formResult['CentreState']=$fRow->CentreState; + $formResult['EnrolmentNo']=$fRow->EnrolmentNo; + $formResult['EnromentStatus']=false; + $formResult['SemStatus']=true; + $formResult['CourseCode']=$fRow->CourseCode; + $formResult['CourseName']=$fRow->CourseName; + $formResult['RollNo']=$fRow->RollNo; + $formResult['MobileNumber']=$fRow->MobileNumber; + $formResult['StudentName']=$fRow->StudentName; + $formResult['FatherName']=$fRow->FatherName; + $formResult['MotherName']=$fRow->MotherName; + $formResult['EmailID']=$fRow->EmailID; + $formResult['AlternateNumber']=$fRow->AlternateNumber; + $formResult['Gender']=$fRow->Gender; + $formResult['DOB']=$fRow->DOB; + $formResult['PresentAddress']=$fRow->PresentAddress; + $formResult['PermanentAddress']=$fRow->PermanentAddress; + $formResult['AadharNumber']=$fRow->AadharNumber; + $formResult['OtherID']=$fRow->IDProof; + $formResult['UniversityCode']=$fRow->UniversityCode; + $formResult['UniversityName']=$fRow->UniversityName; + $mergeFormDetails[]=$formResult; + + } + + } + // echo sizeof($mergeFormDetails);die(); + if(sizeof($mergeFormDetails)>0){ + $resultArr['unMatchedRecordDetails'] = $mergeFormDetails; + $resultArr['unMatchedRecordStatus'] = true; + $resultArr['unMatchedRecordFor'] = 'EnrolmentIDFile'; + $resultArr['message'] = "Successfully data generated"; + } + else{ + $resultArr['unMatchedRecordDetails'] = $mergeFormDetails; + $resultArr['unMatchedRecordStatus'] = false; + $resultArr['unMatchedRecordFor'] = 'EnrolmentIDFile'; + $resultArr['message'] = "Successfully data generated"; + } + + + } + else{ $resultArr['unMatchedRecordDetails'] = []; $resultArr['unMatchedRecordStatus'] = false; $resultArr['unMatchedRecordFor'] = 'EnrolmentIDFile'; - $resultArr['message'] = "No record found"; - } - }else if($reqType == 'FormIDFile'){ - $query = "select * - from T_FormId_FeeDetails_Received_From_University as t1 - where t1.FormID NOT IN (select FormID from T_Enrolment_Received_From_University)"; - $details = $this->db->query($query); - $detailsList = $details->result(); - - if($detailsList){ - $resultArr['unMatchedRecordDetails'] = $detailsList; - $resultArr['unMatchedRecordStatus'] = true; - $resultArr['unMatchedRecordFor'] = 'FormIDFile'; $resultArr['message'] = "Successfully data generated"; - } else { - $resultArr['unMatchedRecordDetails'] = []; - $resultArr['unMatchedRecordStatus'] = false; - $resultArr['unMatchedRecordFor'] = 'FormIDFile'; - $resultArr['message'] = "No record found"; } - } return $resultArr; diff --git a/Apollo/assets/js/controllers/student_university_fee_compare.js b/Apollo/assets/js/controllers/student_university_fee_compare.js index 2ab1c705..dc7a6dd6 100644 --- a/Apollo/assets/js/controllers/student_university_fee_compare.js +++ b/Apollo/assets/js/controllers/student_university_fee_compare.js @@ -20,7 +20,6 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil const LOCALTYPE = logcheck.localType; if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { - console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { console.log("else if"); @@ -45,32 +44,16 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil } } + /* get json sem details for serach + * */ + $scope.semDetails=["1","2","3","4","5","6","7","8"]; - /*$scope.universityData = ''; - $scope.getUniversityList = function () { - var empListreq = { - method: 'POST', - url: apiPoint.url + 'getStudentUniversity/', - headers: { - 'Content-Type': 'application/json' - }, - data: { - data: localDetails - } - }; - $http(empListreq).then(function (response) { - if (response.data.univList) { - $scope.universityData = response.data.university_details; - } else { - } - }); - }*/ // get University List $scope.universitySearchData = ''; $scope.getUniversitySearchList = function () { var empListreq = { method: 'POST', - url: apiPoint.url + 'getUniversitySessionDetails/', + url: apiPoint.url + 'getUnivCourseFromFileDetails/', headers: { 'Content-Type': 'application/json' }, @@ -90,49 +73,50 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil $scope.searchData = { "University": "", - "Session": "", - "Status": "" + "Course": "", + "Sem": "" } $scope.myUnivSearch = ""; $scope.sessionData=""; $scope.getUniveId = function (univ) { - $scope.sessionData=""; if (univ === '') { $scope.myUnivSearch = ""; $scope.searchData.University = ''; - // $scope.searchData.Course = ''; - // $scope.searchData.Batch = ''; - // $scope.courseData = name.Course; - // $scope.batchData = name.Batch; - $scope.searchData.Session = ''; + $scope.searchData.Course = ''; $scope.OpenWindowStatus = false; } else { let name = JSON.parse(univ); - $scope.searchData.University = name.UniversityID; - // $scope.searchData.Course = ''; - // $scope.searchData.Batch = ''; - // $scope.courseData = name.Course; - // $scope.batchData = name.Batch; - $scope.searchData.Session = ''; - $scope.sessionData = name.SessionDetails; + $scope.searchData.University = name.univCode; + $scope.searchData.Course = ''; + $scope.serachCourseData = name.univCourseDetails; $scope.OpenWindowStatus = false; } }; - //For session dropdown - $scope.filterSessionDetails=""; - $scope.$watch('searchData.University', function (newValue,oldValue) { - if(newValue==undefined || newValue==''){ - $scope.filterSessionDetails=""; - } - else{ - if(angular.isString(newValue)){ - $scope.filterSessionDetails=angular.fromJson(newValue); - } + /* mis match serach data*/ + $scope.misMatchsSearchData = { + "University": "", + "Course": "", + "Sem": "" + } + $scope.misMatchCourseData=[]; + $scope.getMisMatchUnivId = function (univ) { + if (univ === '') { + $scope.myUnivSearch = ""; + $scope.misMatchsSearchData.University = ''; + $scope.misMatchsSearchData.Course = ''; + $scope.misMatchCourseData=[]; + + } else { + let uniName = JSON.parse(univ); + $scope.misMatchsSearchData.University = uniName.univCode; + $scope.misMatchsSearchData.Course = ''; + $scope.misMatchCourseData=uniName.univCourseDetails; + } - }); + }; $scope.Searchloader = false; @@ -199,13 +183,10 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil $scope.showFile="0"; $scope.$watchCollection('uploadModel', function (newValue,oldValue) { - if(newValue.university!='' && newValue.university!=null && newValue.uploadFor!='' && newValue.uploadFor=='1'){ + if(newValue.university!='' && newValue.university!=null){ $scope.showFile="1"; } - else if(newValue.university!='' && newValue.university!=null && newValue.uploadFor!='' && newValue.uploadFor=='2'){ - $scope.showFile="2"; - } else{ $scope.showFile="0"; } @@ -233,72 +214,38 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil } $scope.receiveEnrolmentDetails = function (details,uploadForDetails) { - var updateUniversityEnrolment = { - method: 'POST', - url: apiPoint.url + 'receiveEnrolmentFromUniv/', - headers: { - 'Content-Type': 'application/json' - }, - data: { - localDetails: localDetail, - details: details, - universityID: angular.fromJson(uploadForDetails.university).UniversityID, - universityName: angular.fromJson(uploadForDetails.university).UniversityName, + if(details.length==0){ + swal("Warning", "No data found for insert ", "warning"); + } + else{ + var updateUniversityEnrolment = { + method: 'POST', + url: apiPoint.url + 'receiveEnrolmentFromUniv/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + localDetails: localDetail, + details: details, + universityID: angular.fromJson(uploadForDetails.university).UniversityID, + universityName: angular.fromJson(uploadForDetails.university).UniversityName, - } - }; + } + }; + + $http(updateUniversityEnrolment).then(function (response) { + if (response.data.status == true) { + swal("", "Updated Successfully", "success"); + $state.go($state.current, {}, {reload: true}); + } else { + swal("", "Failed", "error"); + } + }); + } - $http(updateUniversityEnrolment).then(function (response) { - if (response.data.status == true) { - swal("", "Updated Successfully", "success"); - $state.go($state.current, {}, {reload: true}); - } else { - swal("", "Failed", "error"); - } - }); } // end - $scope.extractFormIDDetails=""; - $scope.readXlsxFormDetails = function (workbook) { - $scope.extractFormIDDetails=""; - /* DO SOMETHING WITH workbook HERE */ - for (var sheetName in workbook.Sheets) { - var jsonData = XLSX.utils.sheet_to_json(workbook.Sheets[sheetName]); - if(jsonData.length!=0){ - $scope.extractFormIDDetails=jsonData; - } - - } - $scope.error = function (e) { - /* DO SOMETHING WHEN ERROR IS THROWN */ - //console.log(e); - } - - } - - $scope.receiveFormIdFeeDetails = function(details) { - var updateUniversityEnrolment = { - method: 'POST', - url: apiPoint.url + 'insertFormIdUnivFeeDetails/', - headers: { - 'Content-Type': 'application/json' - }, - data: { - localDetails: localDetail, - details: details - } - }; - - $http(updateUniversityEnrolment).then(function (response) { - if (response.data.stuFeeList == true) { - swal("", "Updated Successfully", "success"); - $state.go($state.current, {}, {reload: true}); - } else { - swal("", "Failed", "error"); - } - }); - } $scope.popupLoad = false; $scope.popupLoadData = false; @@ -339,11 +286,10 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil $scope.unMatchedLoadingStatus = false; // Get unmached details - $scope.getUnmatchedRecord = function(ss){ + $scope.getUnmatchedRecord = function(searchDetails){ $scope.unMatchedRecordDetails = ''; $scope.unMatchedNoRecordFound = false; $scope.unMatchedLoadingStatus = true; - var getDetailsFor = ss == 1 ? 'EnrolmentIDFile' : 'FormIDFile'; var getFeeCompareDetailsList = { method: 'POST', url: apiPoint.url + 'getUnmatchedRecordDetails/', @@ -352,7 +298,7 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil }, data: { localDetails: localDetail, - getDetailsFor: getDetailsFor + getDetailsFor: searchDetails } }; $http(getFeeCompareDetailsList).then(function (response) { @@ -394,34 +340,40 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil $scope.checkEnrolmentExistDetails=function (form,entryModel) { $scope.semList=[]; $scope.studentInfo=[]; - var getExistEnrol = { - method: 'POST', - url: apiPoint.url + 'getExistStudentEnrolmentDetails/', - headers: { - 'Content-Type': 'application/json' - }, - data: { - localDetails: localDetail, - enrolmentID: entryModel - } - }; - $http(getExistEnrol).then(function (response) { - if (response.data.status == true) { - if(response.data.semDetails.length==0){ - swal("Warning","Already form enrolment is created for all semester", "warning"); + if(entryModel=='' || entryModel==null || entryModel==undefined){ + swal("Warning","Please enter enrolment id", "error"); + } + else{ + var getExistEnrol = { + method: 'POST', + url: apiPoint.url + 'getExistStudentEnrolmentDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + localDetails: localDetail, + enrolmentID: entryModel } - else{ - $scope.studentInfo=response.data.StudentInfo; - $scope.semList=response.data.semDetails; + }; + $http(getExistEnrol).then(function (response) { + if (response.data.status == true) { + if(response.data.semDetails.length==0){ + swal("Warning","Already form enrolment is created for all semester", "warning"); + } + else{ + $scope.studentInfo=response.data.StudentInfo; + $scope.semList=response.data.semDetails; + } + + } else { + $scope.semList=[]; + $scope.studentInfo=[]; + swal("Failed",response.data.message, "error"); + } + }); + } - } else { - $scope.semList=[]; - $scope.studentInfo=[]; - swal("Failed",response.data.message, "error"); - - } - }); } /* @@ -430,6 +382,8 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil $scope.cancelManualEntry=function (form) { $scope.semList=[]; $scope.enableEnrolment=!$scope.enableEnrolment; + $scope.manualEnModel.sem=""; + $scope.manualEnModel.formID=""; } /* * submit manual entry form details @@ -466,8 +420,8 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil if (response.data.status == true) { $scope.studentInfo=""; $scope.semList=[]; - form.manualFormID.$setPristine(true); - form.manualSem.$setPristine(true); + $scope.manualEnModel.sem=""; + $scope.manualEnModel.formID=""; swal("Success",response.data.message, "success"); } else { swal("Failed",response.data.message, "error"); @@ -476,11 +430,6 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil }); } - - - - - } }]); diff --git a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html index 71cc90fd..be193f9e 100644 --- a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html +++ b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html @@ -2,8 +2,8 @@
-

{{ mainTitle }}

- Student University Fee Compare Details. +

{{ mainTitle }}

+ Student Form ID Enrolment Details.
@@ -82,10 +82,11 @@
- +
+
-
+
@@ -111,12 +112,31 @@ Form id is required
-
-
- - @@ -135,7 +155,7 @@
-
+
@@ -143,28 +163,38 @@ University - - +
- + +
+
+ + + +
- @@ -174,13 +204,14 @@
+
-
-
-

Loading...

-

{{statusMessage}}

-
+
+
+

Loading...

+

{{statusMessage}}

+
@@ -262,30 +293,118 @@ - + + +
+ + + +
+ + +
+ + + +
+
+ + + +
+ +
+ +
+
+
+
Loading...
+
+
+
No Record Found ...
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FormIDEnrolmentNoSemesterYearMobileNumberStudentNameUniversityCodeUniversityNameCourseCodeCourseNameFatherNameMotherNameEmailID
{{p.FormID}}{{p.EnrolmentNo}}{{p.EnrolmentNo}}{{p.SemesterYear}}{{p.SemesterYear}}{{p.MobileNumber}}{{p.StudentName}}{{p.UniversityCode}}{{p.UniversityName}}{{p.CourseCode}}{{p.CourseName}}{{p.FatherName}}{{p.MotherName}}{{p.EmailID}}
+ + +
+ +
+ + +
- - + -
-
- - - -
@@ -294,116 +413,12 @@
-
-
- - - -
-
+
- - -
-
-
- - -
-
-
-
- -
-
-
-
Loading...
-
-
-
No Record Found ...
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
FormIDEnrolmentNoRollNoCentreCodeCentreStateMobileNumberStudentNameFatherNameMotherNameEmailIDUniversityCodeUniversityNameCourseCodeCourseNameSemesterYear
{{p.FormID}}{{p.EnrolmentNo}}{{p.RollNo}}{{p.CentreCode}}{{p.CentreState}}{{p.MobileNumber}}{{p.StudentName}}{{p.FatherName}}{{p.MotherName}}{{p.EmailID}}{{p.UniversityCode}}{{p.UniversityName}}{{p.CourseCode}}{{p.CourseName}}{{p.SemesterYear}}
- - -
-
- - - - - - - - - - - - - - - - - - - - - -
FormIDFormTypeCentreCodeCourseCodeActualCourseFeeCourseFeeAmount
{{p.FormID}}{{p.FormType}}{{p.CentreCode}}{{p.CourseCode}}{{p.ActualCourseFee}}{{p.CourseFee}}{{p.Amount}}
- - -
-
- +