diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index 3c1a8a47..bf5c2175 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -350,6 +350,4 @@ $route['getStudentUnivFeeCompareDetails'] = 'Receive_Enrolment_Fees_Univ_Control $route['formIDFeeCompareDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/formIDFeeCompareDetails'; $route['getUnmatchedRecordDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getUnmatchedRecordDetails'; $route['getUniversitySessionDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getUniversitySessionDetails'; -$route['getExistStudentEnrolmentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getExistStudentEnrolmentDetails'; -$route['addManualEnrolmentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addManualEnrolmentDetails'; - +$route['getUnivCourseFromFileDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getUnivCourseFromFileDetails'; \ No newline at end of file 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 8d669667..7148fd98 100644 --- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php +++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php @@ -257,4 +257,22 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { } + + public function getUnivCourseFromFileDetails_post(){ + // $reqData = $this->post('data'); + // $reqBranch = $this->post('reqBranch'); + $getUnivCourseFromFileDetails = $this->receive_model->getUnivCourseFromFileDetails(); // Check if the employee exist + if ($getUnivCourseFromFileDetails) { + $getUnivCourseFromFileDetails['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($getUnivCourseFromFileDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + + } else { + // Set the response and exit + $this->response(['message' => 'No list were found', 'status' => REST_Controller::HTTP_NOT_FOUND], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code + + } + } + + } \ No newline at end of file diff --git a/Apollo/api/application/controllers/StatusUpdation_Controller.php b/Apollo/api/application/controllers/StatusUpdation_Controller.php index 056244b7..bc18a9f6 100755 --- a/Apollo/api/application/controllers/StatusUpdation_Controller.php +++ b/Apollo/api/application/controllers/StatusUpdation_Controller.php @@ -280,4 +280,5 @@ class StatusUpdation_Controller extends REST_Controller { } + } \ No newline at end of file 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 dd4156a9..7b399aa4 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -15,6 +15,36 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { * created by kms * */ + 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; + + $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(); + + $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(); + + } + $finalArray['status'] = true; + $finalArray['message'] = "Success."; + $finalArray['details'] = $result; + } else { + $finalArray['status'] = false; + $finalArray['message'] = "No record found."; + $finalArray['details'] = []; + } + return $finalArray; + + } @@ -338,116 +368,110 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { public function formIdFeeDetails($formFeeDetails=null,$local=null){ -// print_r($formFeeDetails);exit(); - // $this->db->select('*'); - // $this->db->from('T_Enrolment_Received_From_University'); - // $this->db->where('FormID', $formIdDetails['FormId']); - // $detailsList = $this->db->get(); - // $datassss = $detailsList->result(); - foreach ($formFeeDetails as $formIdDetails){ - - $formIds = $formIdDetails['FormId']; - $formType = $formIdDetails['Form Type'] ? $formIdDetails['Form Type'] : ''; - $CentreCode = $formIdDetails['CentreCode'] ?: ''; - $CourseCode = $formIdDetails['Course_Code'] ?: ''; - $ActualCourseFee = $formIdDetails['Actual_Course_Fee'] ?: ''; - $CourseFee = $formIdDetails['Course_Fee'] ?: ''; - $ExamFee = $formIdDetails['Exam_Fee'] ?: ''; - $EnrollmentFee = $formIdDetails['Enrollment_Fee'] ?: ''; - $ProspectusFee = $formIdDetails['Prospectus_Fee'] ?: ''; - $ReRegFee = $formIdDetails['Re_Reg_Fee'] ?: ''; - $CreditTransferFee = $formIdDetails['Credit_Transfer_Fee'] ?: ''; - $LateralEntryFee = $formIdDetails['Lateral_Entry_Fee'] ?: ''; - $DualSpclFee = $formIdDetails['Dual_Spcl_Fee'] ?: ''; - $OtherFee = $formIdDetails['Other_Fee'] ?: ''; - $NRIFEE = $formIdDetails['NRI_FEE'] ?: ''; - $ProvisionalFee = $formIdDetails['Provisional_Fee'] ?: ''; - $MigrationFee = $formIdDetails['Migration_Fee'] ?: ''; - $UrgentResultDMCFee = $formIdDetails['Urgent_Result_DMC_Fee'] ?: ''; - $AdditionalFee = $formIdDetails['Additional_Fee'] ?: ''; - $Amount = $formIdDetails['Amount'] ?: ''; + $localBranchID = $local['localBranchID']; + $localUserID = $local['localUserID']; + $time = date('Y-m-d H:i:s'); + $CreatedOn = $time; - - $query = "INSERT INTO T_FormId_FeeDetails_Received_From_University - (FormID, FormType, CentreCode, CourseCode, ActualCourseFee, CourseFee, ExamFee, EnrollmentFee, ProspectusFee, ReRegFee, CreditTransferFee, LateralEntryFee, DualSpclFee, OtherFee, NRIFEE, ProvisionalFee, MigrationFee, UrgentResultDMCFee, AdditionalFee, Amount) - VALUES - ( '$formIds', '$formType', '$CentreCode', '$CourseCode', '$ActualCourseFee', '$CourseFee', '$ExamFee', '$EnrollmentFee', '$ProspectusFee', '$ReRegFee', '$CreditTransferFee', '$LateralEntryFee', '$DualSpclFee', '$OtherFee', '$NRIFEE', '$ProvisionalFee', '$MigrationFee', '$UrgentResultDMCFee', '$AdditionalFee', '$Amount' ) - ON DUPLICATE KEY UPDATE - FormType = '$formType', - CentreCode = '$CentreCode', - CourseCode = '$CourseCode', - ActualCourseFee = '$ActualCourseFee', - CourseFee = '$CourseFee', - ExamFee = '$ExamFee', - EnrollmentFee = '$EnrollmentFee', - ProspectusFee = '$ProspectusFee', - ReRegFee = '$ReRegFee', - CreditTransferFee = '$CreditTransferFee', - LateralEntryFee = '$LateralEntryFee', - DualSpclFee = '$DualSpclFee', - OtherFee = '$OtherFee', - NRIFEE = '$NRIFEE', - ProvisionalFee = '$ProvisionalFee', - MigrationFee = '$MigrationFee', - UrgentResultDMCFee = '$UrgentResultDMCFee', - AdditionalFee = '$AdditionalFee', - Amount = '$Amount'"; - $queryDetails = $this->db->query($query); - - - } - -// foreach ($formFeeDetails as $formIdDetails){ -// // echo $formIdDetails['FormId']; -// $this->db->select('*'); -// $this->db->from('T_Enrolment_Received_From_University'); -// $this->db->where('FormID', $formIdDetails['FormId']); -// $detailsList = $this->db->get(); - - -// if($detailsList->result() == 1){ -// // $this->db->select('*'); -// // $this->db->from('T_FormId_FeeDetails_Received_From_University'); -// // $this->db->where('FormID', $formIdDetails['FormId']); -// // $FormIDdetailsList = $this->db->get(); -// // $dbDetailsArr = array(); -// // $dbDetailsArr['FormID'] = $formIdDetails['FormId']; -// // $dbDetailsArr['FormType'] = $formIdDetails['Form Type']; -// // $dbDetailsArr['CentreCode'] = $formIdDetails['CentreCode']; -// // $dbDetailsArr['CourseCode'] = $formIdDetails['Course_Code']; -// // $dbDetailsArr['ActualCourseFee'] = $formIdDetails['Actual_Course_Fee']; -// // $dbDetailsArr['CourseFee'] = $formIdDetails['Course_Fee']; -// // $dbDetailsArr['ExamFee'] = $formIdDetails['Exam_Fee']; -// // $dbDetailsArr['EnrollmentFee'] = $formIdDetails['Enrollment_Fee']; -// // $dbDetailsArr['ProspectusFee'] = $formIdDetails['Prospectus_Fee']; -// // $dbDetailsArr['ReRegFee'] = $formIdDetails['Re_Reg_Fee']; -// // $dbDetailsArr['CreditTransferFee'] = $formIdDetails['Credit_Transfer_Fee']; -// // $dbDetailsArr['LateralEntryFee'] = $formIdDetails['Lateral_Entry_Fee']; -// // $dbDetailsArr['DualSpclFee'] = $formIdDetails['Dual_Spcl_Fee']; -// // $dbDetailsArr['OtherFee'] = $formIdDetails['Other_Fee']; -// // $dbDetailsArr['NRIFEE'] = $formIdDetails['NRI_FEE']; -// // $dbDetailsArr['ProvisionalFee'] = $formIdDetails['Provisional_Fee']; -// // $dbDetailsArr['MigrationFee'] = $formIdDetails['Migration_Fee']; -// // $dbDetailsArr['UrgentResultDMCFee'] = $formIdDetails['Urgent_Result_DMC_Fee']; -// // $dbDetailsArr['AdditionalFee'] = $formIdDetails['Additional_Fee']; -// // $dbDetailsArr['Amount'] = $formIdDetails['Amount']; -// // // $dbDetailsArr['BranchCode'] = $formIdDetails['FormId']; - -// // if($FormIDdetailsList->result()){ -// // $ids = $FormIDdetailsList->result(); -// // $this->db->where('ID', $ids['ID']); -// // $this->db->update('T_FormId_FeeDetails_Received_From_University', $dbDetailsArr); -// // } else { -// // print_r($dbDetailsArr);exit(); -// // $this->db->insert('T_FormId_FeeDetails_Received_From_University', $dbDetailsArr); -// // $this->db->affected_rows(); -// // } - -// } else{ - -// } -// } + foreach ($formFeeDetails as $formIdDetails){ + if(array_key_exists('FormId',$formIdDetails) && $formIdDetails['FormId'] != '' && $formIdDetails['FormId'] != null + && array_key_exists('Form Type',$formIdDetails) && array_key_exists('CentreCode',$formIdDetails) && array_key_exists('Course_Code',$formIdDetails) + && array_key_exists('Actual_Course_Fee',$formIdDetails) && array_key_exists('Course_Fee',$formIdDetails) && array_key_exists('Exam_Fee',$formIdDetails) + && array_key_exists('Enrollment_Fee',$formIdDetails) && array_key_exists('Prospectus_Fee',$formIdDetails) && array_key_exists('Additional_Fee',$formIdDetails) + && array_key_exists('Amount',$formIdDetails) && array_key_exists('Session',$formIdDetails) && array_key_exists('Year',$formIdDetails) + && array_key_exists('Semester',$formIdDetails) && array_key_exists('Student_Name',$formIdDetails) && array_key_exists('Father_Name',$formIdDetails) ){ + + //select query for the check the fields are entered + //echo $formIdDetails['FormId']; echo '===='; + + $formIds = $formIdDetails['FormId']; + $formType = $formIdDetails['Form Type'] ? $formIdDetails['Form Type'] : ''; + $CentreCode = $formIdDetails['CentreCode'] ?: ''; + $Session = $formIdDetails['Session'] ?: ''; + $Year = $formIdDetails['Year'] ?: ''; + $Semester = $formIdDetails['Semester'] ?: ''; + $Student_Name = $formIdDetails['Student_Name'] ?: ''; + $Father_Name = $formIdDetails['Father_Name'] ?: ''; + $CourseCode = $formIdDetails['Course_Code'] ?: ''; + $ActualCourseFee = $formIdDetails['Actual_Course_Fee'] ?: '0'; + $CourseFee = $formIdDetails['Course_Fee'] ?: '0'; + $ExamFee = $formIdDetails['Exam_Fee'] ?: '0'; + $EnrollmentFee = $formIdDetails['Enrollment_Fee'] ?: '0'; + $ProspectusFee = $formIdDetails['Prospectus_Fee'] ?: '0'; + $ReRegFee = $formIdDetails['Re_Reg_Fee'] ?: '0'; + $CreditTransferFee = $formIdDetails['Credit_Transfer_Fee'] ?: '0'; + $LateralEntryFee = $formIdDetails['Lateral_Entry_Fee'] ?: '0'; + $DualSpclFee = $formIdDetails['Dual_Spcl_Fee'] ?: '0'; + $OtherFee = $formIdDetails['Other_Fee'] ?: '0'; + $NRIFEE = $formIdDetails['NRI_FEE'] ?: '0'; + $ProvisionalFee = $formIdDetails['Provisional_Fee'] ?: '0'; + $MigrationFee = $formIdDetails['Migration_Fee'] ?: '0'; + $UrgentResultDMCFee = $formIdDetails['Urgent_Result_DMC_Fee'] ?: '0'; + $AdditionalFee = $formIdDetails['Additional_Fee'] ?: '0'; + $Amount = $formIdDetails['Amount'] ?: '0'; + + $selectQuery = "SELECT * FROM T_FormId_FeeDetails_Received_From_University WHERE + FormID = '$formIds' AND + FormType = '$formType' AND + CentreCode = '$CentreCode' AND + Session = '$Session' AND + Year = '$Year' AND + Semester = '$Semester' AND + Student_Name = '$Student_Name' AND + Father_Name = '$Father_Name' AND + CourseCode = '$CourseCode' AND + ActualCourseFee = '$ActualCourseFee' AND + CourseFee = '$CourseFee' AND + ExamFee = '$ExamFee' AND + EnrollmentFee = '$EnrollmentFee' AND + ProspectusFee = '$ProspectusFee' AND + ReRegFee = '$ReRegFee' AND + CreditTransferFee = '$CreditTransferFee' AND + LateralEntryFee = '$LateralEntryFee' AND + DualSpclFee = '$DualSpclFee' AND + OtherFee = '$OtherFee' AND + NRIFEE = '$NRIFEE' AND + ProvisionalFee = '$ProvisionalFee' AND + MigrationFee = '$MigrationFee' AND + UrgentResultDMCFee = '$UrgentResultDMCFee' AND + AdditionalFee = '$AdditionalFee' AND + Amount = '$Amount'"; + $queryDetails = $this->db->query($selectQuery); + // echo count($queryDetails->result());exit(); + + if(count($queryDetails->result()) == 0){ + $query = "INSERT INTO T_FormId_FeeDetails_Received_From_University + (FormID, FormType, CentreCode,Session,Year,Semester,Student_Name,Father_Name,CourseCode, ActualCourseFee, CourseFee, ExamFee, EnrollmentFee, ProspectusFee, ReRegFee, CreditTransferFee, LateralEntryFee, DualSpclFee, OtherFee, NRIFEE, ProvisionalFee, MigrationFee, UrgentResultDMCFee, AdditionalFee, Amount, CreatedBy, CreatedOn, BranchCode) + VALUES + ( '$formIds', '$formType', '$CentreCode','$Session','$Year','$Semester','$Student_Name','$Father_Name', '$CourseCode', '$ActualCourseFee', '$CourseFee', '$ExamFee', '$EnrollmentFee', '$ProspectusFee', '$ReRegFee', '$CreditTransferFee', '$LateralEntryFee', '$DualSpclFee', '$OtherFee', '$NRIFEE', '$ProvisionalFee', '$MigrationFee', '$UrgentResultDMCFee', '$AdditionalFee', '$Amount', '$localUserID', '$CreatedOn', '$localBranchID' )"; + $queryDetails = $this->db->query($query); + } else { + echo 'else con'; + } + // -- ON DUPLICATE KEY UPDATE + // -- FormType = '$formType', + // -- CentreCode = '$CentreCode', + // -- CourseCode = '$CourseCode', + // -- ActualCourseFee = '$ActualCourseFee', + // -- CourseFee = '$CourseFee', + // -- ExamFee = '$ExamFee', + // -- EnrollmentFee = '$EnrollmentFee', + // -- ProspectusFee = '$ProspectusFee', + // -- ReRegFee = '$ReRegFee', + // -- CreditTransferFee = '$CreditTransferFee', + // -- LateralEntryFee = '$LateralEntryFee', + // -- DualSpclFee = '$DualSpclFee', + // -- OtherFee = '$OtherFee', + // -- NRIFEE = '$NRIFEE', + // -- ProvisionalFee = '$ProvisionalFee', + // -- MigrationFee = '$MigrationFee', + // -- UrgentResultDMCFee = '$UrgentResultDMCFee', + // -- AdditionalFee = '$AdditionalFee', + // -- Amount = '$Amount'"; + } + continue; + } $results['stuFeeList'] = true; $results['stuFeeList_details'] = "details updated successfully."; return $results; diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index 5f17090f..872cea01 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -444,7 +444,8 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se } public function app_pending($bat=null,$br=null,$u=null){ - $sql = "SELECT * FROM (SELECT + $sql = "SELECT + APFS.ID as id, APFS.Registration_Details_ID AS regid, APFS.ListCode as StatusCode, APFS.AppFormDate as StatusUpdationOn, @@ -463,14 +464,18 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se CFD.Sem_Year as Sem_Year, RD.RegistrationType as FormType, STU.StudentID as Student_id -FROM T_ApplicationFormStatus AS APFS LEFT JOIN T_Registration_Details AS RD ON RD.ID = APFS.Registration_Details_ID -LEFT JOIN T_PickListDetails AS PKL ON PKL.ListCode = APFS.ListCode LEFT JOIN T_StudentDetails AS STU ON STU.StudentID = RD.StudentID LEFT JOIN T_CourseMaster AS COUR ON COUR.CourseID = RD.CourseID LEFT JOIN T_Student_CourseDetails AS STU_COUR ON STU_COUR.StudentID = RD.StudentID AND STU_COUR.CourseID = RD.CourseID +FROM T_ApplicationFormStatus AS APFS +LEFT JOIN T_Registration_Details AS RD ON RD.ID = APFS.Registration_Details_ID +LEFT JOIN T_PickListDetails AS PKL ON PKL.ListCode = APFS.ListCode +LEFT JOIN T_StudentDetails AS STU ON STU.StudentID = RD.StudentID +LEFT JOIN T_CourseMaster AS COUR ON COUR.CourseID = RD.CourseID +LEFT JOIN T_Student_CourseDetails AS STU_COUR ON STU_COUR.StudentID = RD.StudentID AND STU_COUR.CourseID = RD.CourseID LEFT JOIN T_Course_Fees_Details AS CFD ON CFD.ID = RD.FeeType LEFT JOIN T_UniversityMaster AS UNIV ON UNIV.UniversityID = COUR.UniversityID LEFT JOIN (SELECT FeesId AS FeeID, min(CreatedOn), BillDate AS BILL FROM T_Students_Fees_PaidDetails GROUP BY FeesId) AS sfpd ON sfpd.FeeID = RD.Student_Fee_Status_Id -where COUR.UniversityID = '$u' and RD.BatchCode = '$bat'and STU_COUR.BranchID = '$br' and STU.IsActive = '1' -ORDER BY StatusUpdationOn DESC) x -GROUP BY x.regid"; +where STU.IsActive = '1' and APFS.ID in (select max(ID) from T_ApplicationFormStatus group by Registration_Details_ID) + + "; // SELECT * FROM (SELECT APFS.Registration_Details_ID AS regid, APFS.ListCode AS StatusCode, APFS.AppFormDate AS StatusUpdationOn, APFS.Comments AS StatusComments, PKL.ListName AS StatusName, concat(STU.Firstname,' ', STU.Lastname) AS StudentName, STU.Fathername AS FatherName, STU.MobileNumber AS Phone_number, COUR.CourseName AS CourseName, UNIV.UniversityName AS UniversityName, sfpd.BILL AS InitialPayDate, RD.Student_Fee_Status_Id AS FeesStatusID, STU_COUR.EnrollmentID AS EnrollmentNumber, CFD.Sem_Year AS Sem_Year, RD.RegistrationType AS FormType, STU.StudentID // FROM T_ApplicationFormStatus AS APFS LEFT JOIN T_Registration_Details AS RD ON RD.ID = APFS.Registration_Details_ID @@ -510,6 +515,20 @@ GROUP BY x.regid"; // LEFT JOIN (Select FeesId as FeeID, min(CreatedOn), BillDate as BILL FROM T_Students_Fees_PaidDetails group by FeesId) as sfpd on sfpd.FeeID = RD.Student_Fee_Status_Id // where COUR.UniversityID = '$u' and RD.BatchCode = '$bat'and STU_COUR.BranchID = '$br' and STU.IsActive = '1' // group by APFS.Registration_Details_ID"; + + if ($bat!= ''){ + + $sql.=" and RD.BatchCode = '".$bat."'"; + + } + if ($u!= ''){ + + $sql.=" and COUR.UniversityID = '".$u."'"; + + } + $sql.=" group by regid,Student_id "; + $sql.=" ORDER BY StatusUpdationOn DESC "; + $leadDet=$this->db->query($sql); $answer = $leadDet->result(); if (count($answer) > 0) { diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index a4b605a6..f543d7f5 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -106,6 +106,7 @@ "STUDENTDETAILS": "Manage", "STUDENTDETAILSADDEDIT": "Manage Details", "STUDENTFEEDETAILCOMPARE": "Student University Fee", + "STUDENTFROMIDFEEDETAILS": "Student FormId Fee Details", "status" : { "MAIN": "Update Status", "STUDYMATERIAL": "Study Material", diff --git a/Apollo/assets/js/config.constant.js b/Apollo/assets/js/config.constant.js index 0239a568..b8c0e32b 100755 --- a/Apollo/assets/js/config.constant.js +++ b/Apollo/assets/js/config.constant.js @@ -238,7 +238,7 @@ app.constant('JS_REQUIRES', { */ 'student_university_fee_compareCtrl':'assets/js/controllers/student_university_fee_compare.js', - + 'studentUnivFormIdFeeDetailsCtrl': 'assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js', }, //*** angularJS Modules diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 9d81c71c..9c4188dd 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -315,6 +315,14 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com ncyBreadcrumb: { label: 'Student University Fee Compare' } + }).state('app.student.studentUnivFormIdFeeDetails', { + url: '/studentUnivFormIdFeeDetails', + templateUrl: "assets/views/student/studentUnivFormIdFeeDetails.html", + resolve: loadSequence('ui.select', 'spin', 'ui.mask', 'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'studentUnivFormIdFeeDetailsCtrl', 'ngTable'), + title: 'Student FormId Fees Details', + ncyBreadcrumb: { + label: 'Student FormId Fees Details' + } }).state('app.student.status', { url: '/status', template: '
STUDENT STATUS UPDATE
', diff --git a/Apollo/assets/js/controllers/report_examfeeCtrl.js b/Apollo/assets/js/controllers/report_examfeeCtrl.js index 59771a17..b7f37006 100755 --- a/Apollo/assets/js/controllers/report_examfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_examfeeCtrl.js @@ -98,22 +98,11 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal", $scope.show = false; $scope.onSubmit = function (form) { - var firstError = null; - if (form.$invalid) { - var field = null, firstError = null; - $scope.show = true; - for (field in form) { - if (field[0] != '$') { - if (firstError === null && !form[field].$valid) { - firstError = form[field].$batch; - } - if (form[field].$pristine) { - form[field].$dirty = true; - } - } - } - angular.element('.ng-invalid[batch=' + firstError + ']').focus(); + if($scope.univModel.university !== null && $scope.univModel.university !== '' ){ + $scope.filterUniv = angular.fromJson($scope.univModel.university); }else { + $scope.filterUniv = ''; + } //alert($scope.batch.name); $scope.examfee_data = ''; $scope.message = ''; @@ -125,7 +114,7 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal", }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.univModel.university.universityID, + university: $scope.filterUniv.universityID, batch: $scope.univModel.batch } @@ -150,7 +139,7 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal", totalf += parseFloat(item.Amount); } return totalf; } - } + } var mystyle = { sheetid: 'EXAM WRITING FEE REPORT', diff --git a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js new file mode 100644 index 00000000..e9f6ee38 --- /dev/null +++ b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js @@ -0,0 +1,374 @@ +'use strict'; +/** + * controllers for ng-table + * Simple table with sorting and filtering on AngularJS + */ + +app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$http", "API_POINTS", "$state", '$rootScope', '$cookies', 'md5', 'ipCookie', '$timeout', '$window', "flowFactory", "$interval", 'SweetAlert', function ($scope, toaster, $filter, ngTableParams, $http, apiPoint, $state, $rootScope, $cookies, md5, ipCookie, $timeout, $window, flowFactory, $interval, SweetAlert) { + /** + * student university fee details compare + */ + + // get local client details + var localDetail = JSON.parse(localStorage.getItem('localObj')); + var localDetails = ipCookie('cookiechk'); + + // load when html page load + $scope.init = function () { + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + 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"); + $state.go('app.dashboard'); + } else { + console.log("else else"); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + if (localDetail != null) { + if (localDetails.localType === 'R004') { + // $scope.getUniversityList(); + $scope.getUniversitySearchList(); + } else { + ipCookie.remove('cookiechk'); + $window.localStorage.clear(); + $state.go('login.signin'); + } + } else { + } + } + + + /*$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/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + data: localDetails + } + }; + $http(empListreq).then(function (response) { + if (response.data.status) { + $scope.universitySearchData = response.data.details; + } else { + $scope.universitySearchData=""; + } + }); + }; + + + $scope.searchData = { + "University": "", + "Session": "", + "Status": "" + } + $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.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.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); + } + } + + }); + + + $scope.Searchloader = false; + $scope.studentData = false; + + $scope.onSubmit = function(){ + $scope.Searchloader = true; + if($scope.searchData.University !== '' && $scope.searchData.Session !==''){ + $scope.Searchloader = true; + var empListreq = { + method: 'POST', + url: apiPoint.url + 'getStudentUnivFeeCompareDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + data: localDetails, + search: $scope.searchData, + } + }; + $http(empListreq).then(function (response) { + if (response.data.formTypeStatus) { + $scope.Searchloader = false; + $scope.studentData = true; + $scope.data = response.data.studentFeeCompareDetails; + $scope.studentListLength = $scope.data.length; + // $scope.statusMessage = $scope.data.message; + } else { + $scope.Searchloader = false; + $scope.studentData = false; + $scope.statusMessage = $scope.data.message; + } + }); + }else { + + } + } + + $scope.editId = -1; + $scope.setEditId=function(id){ + $scope.editId = id; + } + + /*upload model*/ + $scope.uploadModel = { + university: "", + uploadFor: "", + } + /* + * upload options json + * */ + $scope.uploadOptions=[{ + id: 1, + name: 'Received Enrolment From University', + }, + { + id: 2, + name: 'Received Fees From University' + }, + ]; + /* + watch upload model for enable upload options + */ + $scope.showFile="0"; + $scope.$watchCollection('uploadModel', function (newValue,oldValue) { + + if(newValue.university!='' && newValue.university!=null && newValue.uploadFor!='' && newValue.uploadFor=='1'){ + $scope.showFile="1"; + + } + else if(newValue.university!='' && newValue.university!=null && newValue.uploadFor!='' && newValue.uploadFor=='2'){ + $scope.showFile="2"; + } + else{ + $scope.showFile="0"; + } + + }); + + /* update received enrolment from university + * created by kms + * */ + $scope.extractDetails=""; + $scope.readXlsxDetails = function (workbook) { + /* 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.extractDetails=jsonData; + } + + } + $scope.error = function (e) { + /* DO SOMETHING WHEN ERROR IS THROWN */ + //console.log(e); + } + + } + + $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, + + } + }; + + $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) { + console.log(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; + $scope.formPaymentDetails=""; + + // Fee compare details get + + $scope.getFeeCompareDetails = function(formId, enrolmentId){ + $scope.popupLoadData = false; + $scope.formPaymentDetails=""; + $scope.popupLoad = true; + var getFeeCompareDetailsList = { + method: 'POST', + url: apiPoint.url + 'formIDFeeCompareDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + localDetails: localDetail, + formId: formId, + enrolmentId: enrolmentId + } + }; + + $http(getFeeCompareDetailsList).then(function (response) { + if (response.data.status == true) { + $scope.popupLoad = false; + $scope.popupLoadData = true; + $scope.formPaymentDetails=response.data; + + } else { + $scope.popupLoad = false; + $scope.popupLoadData = true; + $scope.formPaymentDetails=response.data; + } + }); + } + + $scope.unMatchedLoadingStatus = false; + // Get unmached details + $scope.getUnmatchedRecord = function(ss){ + $scope.unMatchedRecordDetails = ''; + $scope.unMatchedNoRecordFound = false; + $scope.unMatchedLoadingStatus = true; + var getDetailsFor = ss == 1 ? 'EnrolmentIDFile' : 'FormIDFile'; + var getFeeCompareDetailsList = { + method: 'POST', + url: apiPoint.url + 'getUnmatchedRecordDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + localDetails: localDetail, + getDetailsFor: getDetailsFor + } + }; + $http(getFeeCompareDetailsList).then(function (response) { + if (response.data.unMatchedRecordStatus == true) { + $scope.unMatchedLoadingStatus = false; + $scope.unMatchedNoRecordFound = false; + $scope.unMatchedRecordDetails=response.data.unMatchedRecordDetails; + $scope.unMatchedRecordDetailsType= response.data.unMatchedRecordFor; + } else { + $scope.unMatchedLoadingStatus = false; + $scope.unMatchedNoRecordFound = true; + $scope.unMatchedRecordDetails=response.data.unMatchedRecordDetails; + } + }); + } + +}]); diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 251b04dd..5be3dd7c 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -221,6 +221,11 @@ STUDENT UNIV FEE COMPARE DETAILS +
  • + + STUDENT FORMID FEE DETAILS + +
    • +
    +
    +
    +

    {{ mainTitle }}

    + Student University FormId Fees Details. +
    +
    +
    +
    + + +
    + + + + +
    +
    + +
    + + + + +
    +
    +
    +
    + + + +
    + + +
    + + + +
    + +
    +
    + + + +
    +
    +
    + +
    +
    +
    + +
    +
    +

    Loading...

    +

    {{statusMessage}}

    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    FormID + Form Type + Student Name + Father Name + University + Course + Sem/Year + Enrolment ID + University Paid + Student Paid +
    + {{p.FormID}} + + {{p.FormType}} + + + {{p.Firstname}} {{p.Lastname}} + + + {{p.Fathername}}{{p.UniversityName}}{{p.CourseName}}{{p.SemesterYear}}{{p.EnrolmentNo}}{{p.UniversityPaidAmount}}{{p.StudentPaidAmount}}
    + + + +
    +
    +     + +
    +
    +
    + + +
    +
    + + + + +
    +
    +
    + + + +
    +
    +
    +
    + + + +
    +
    + +
    +
    +     + + +
    +
    +
    + + +
    +
    +
    +
    + +
    +
    +
    +
    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}}
    + + +
    +
    +     + +     +
    +
    +
    + + \ No newline at end of file