From c552cea5978a9e99b8fcea992cebe313b67474d1 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 28 Aug 2018 16:29:18 +0530 Subject: [PATCH 1/3] print option in bill details screen fixed --- Apollo/assets/images/logo1.png | Bin 0 -> 4107 bytes .../assets/js/controllers/feesStatusCtrl.js | 30 +++++------------- .../views/status-update/updateFeesStatus.html | 20 ++++++------ 3 files changed, 18 insertions(+), 32 deletions(-) create mode 100644 Apollo/assets/images/logo1.png diff --git a/Apollo/assets/images/logo1.png b/Apollo/assets/images/logo1.png new file mode 100644 index 0000000000000000000000000000000000000000..95ad2fde6d58918f7a7083b5943e5411f75f4b19 GIT binary patch literal 4107 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 JPDHLkV1mOl2l)U1 literal 0 HcmV?d00001 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/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 @@ - + From 55975c4d7b14b38611da63475da37f5605d373dc Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Tue, 28 Aug 2018 16:38:47 +0530 Subject: [PATCH 2/3] add recieve formid file details : kdk --- Apollo/api/application/config/routes.php | 1 + ...Receive_Enrolment_Fees_Univ_Controller.php | 20 +++++++ .../Receive_Enrolment_Fees_Univ_model.php | 54 +++++++++++++++++++ .../student_university_fee_compare.js | 42 +++++++++++++++ .../student/studentUnivFeeCompareDetails.html | 5 ++ 5 files changed, 122 insertions(+) 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 8d9c2cbe..37ad06f0 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -54,6 +54,60 @@ die(); 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/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/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 @@ +
+ + + +
From bd0009a260605efabdfe55d268141845a0081477 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 28 Aug 2018 17:15:36 +0530 Subject: [PATCH 3/3] data correction visibility --- Apollo/assets/views/partials/nav.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 @@ - +
+
- 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