diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index 9761cad7..7fafcaef 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -344,3 +344,4 @@ $route['getApplicationFormStatusList'] = 'StatusUpdation_Controller/getApplicati // update university enrolment and fees details received $route['receiveEnrolmentFromUniv'] = 'Receive_Enrolment_Fees_Univ_Controller/receiveEnrolmentFromUniv'; +$route['insertFormIdUnivFeeDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/insertFormIdUnivFeeDetails'; 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 a8055856..10a6c03f 100644 --- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php +++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php @@ -65,5 +65,25 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { } + public function insertFormIdUnivFeeDetails_post(){ + $formIdDetails = $this->post('details'); + $localDetails = $this->post('localDetails'); + $updatedDetails = $this->receive_model->formIdFeeDetails($formIdDetails,$localDetails);// Check if the users data store contains users (in case the database result returns NULL) + if ($updatedDetails) + { + $updatedDetails['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($updatedDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + } + else + { + // Set the response and exit + $this->response([ + 'message' => 'Something went wrong.please try again!', + '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/models/Receive_Enrolment_Fees_Univ_model.php b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php index 54a14d62..9eba86fa 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -272,6 +272,60 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { return false; } + public function formIdFeeDetails($formFeeDetails=null,$local=null){ +// print_r($formFeeDetails);exit(); + 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{ + + } + } + + return 'true'; + } + } \ No newline at end of file diff --git a/Apollo/assets/images/logo1.png b/Apollo/assets/images/logo1.png new file mode 100644 index 00000000..95ad2fde Binary files /dev/null and b/Apollo/assets/images/logo1.png differ diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 2ef1749e..0e6c4d1d 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -2324,28 +2324,14 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "$timeout", $scope.printPdf = function (print) { - var innerContents = document.getElementById(print).innerHTML; - - var popupWinindow = window.open('', '_blank', 'width=1200,height=700,scrollbars=no,menubar=no,toolbar=no,location=no,status=no,titlebar=no'); - popupWinindow.document.open(); - popupWinindow.document.write(''); - popupWinindow.document.write(''); - popupWinindow.document.write(innerContents); - popupWinindow.document.write('
'); - popupWinindow.document.write('
'); - popupWinindow.document.write('
'); - popupWinindow.document.write('
'); - popupWinindow.document.write(innerContents); - popupWinindow.document.write(''); - popupWinindow.document.close(); - popupWinindow.focus(); - popupWinindow.print(); - popupWinindow.close(); - - + var printHtml = document.getElementById(print).outerHTML; + //var currentPage = document.body.innerHTML; + var elementPage = '' + printHtml + '

' + printHtml + ''; + document.body.innerHTML = elementPage; + window.print(); + document.body.innerHTML = elementPage; + window.location.reload(); + document.close(); } // $scope.mouseLeave = function(){ diff --git a/Apollo/assets/js/controllers/student_university_fee_compare.js b/Apollo/assets/js/controllers/student_university_fee_compare.js index 9bb5d29c..8f2539d9 100644 --- a/Apollo/assets/js/controllers/student_university_fee_compare.js +++ b/Apollo/assets/js/controllers/student_university_fee_compare.js @@ -189,4 +189,46 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil } // end + + $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.branchListStatus == true) { + swal("", "Updated Successfully", "success"); + } else { + swal("", "Failed", "error"); + } + }); + } + }]); diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 9379fd73..75e3ba8c 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -1182,12 +1182,12 @@ - + diff --git a/Apollo/assets/views/status-update/updateFeesStatus.html b/Apollo/assets/views/status-update/updateFeesStatus.html index 00f9933d..b633f923 100755 --- a/Apollo/assets/views/status-update/updateFeesStatus.html +++ b/Apollo/assets/views/status-update/updateFeesStatus.html @@ -448,32 +448,32 @@ -
+
- - + - -
-
@@ -524,7 +524,7 @@ - + diff --git a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html index f8e43ab8..08e51840 100644 --- a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html +++ b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html @@ -100,6 +100,11 @@ +
+ + + +
+
- APP + APP
+
APP
{{FeesReceiptTitle}} - + + {{FeesReceiptTitle || "APOLLO DISTANCE EDUCATION COLLEGE"}} +
- {{BranchAddr}} + {{BranchAddr}}
For APOLLO DISTANCE EDUCATION COLLEGE
Note: Terms & Conditions will be applicable as per University norms Fees once paid will not be refunded at any reasonsNote: Terms & Conditions will be applicable as per University norms Fees once paid will not be refunded at any reasons