diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index 0465bb22..472986f4 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -379,4 +379,6 @@ $route['getUniversityCodeForFormDetailsGet'] = 'Receive_Enrolment_Fees_Univ_Cont $route['getUnmatchedFormIdFeesDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getUnmatchedFormIdFeesDetails'; $route['addToAccountStateList'] = 'Receive_Enrolment_Fees_Univ_Controller/addToAccountStateList'; $route['addUniversityPaymentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addUniversityPaymentDetails'; +$route['updateUniversityPaymentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/updateUniversityPaymentDetails'; + 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 01120c37..d5b7adfc 100644 --- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php +++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php @@ -38,6 +38,7 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { $this->methods['addManualEnrolmentDetails_post']['limit'] = 1000; $this->methods['addUniversityPaymentDetails_post']['limit'] = 1000; + $this->methods['updateUniversityPaymentDetails_post']['limit'] = 1000; // load the model $this->load->model('Receive_Enrolment_Fees_Univ_model', 'receive_model'); @@ -277,7 +278,9 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { // kdk public function getForFormIdDraftDetails_post(){ $reqBranch = $this->post('localDetails'); - $getForFormIdDraftDetails = $this->receive_model->getForFormIdDraftDetails(); // Check if the employee exist + $getDetailsFor = $this->post('getDetailsFor'); + + $getForFormIdDraftDetails = $this->receive_model->getForFormIdDraftDetails($getDetailsFor); // Check if the employee exist if ($getForFormIdDraftDetails) { $getForFormIdDraftDetails['status'] = REST_Controller::HTTP_OK; // Set the response and exit @@ -517,6 +520,42 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { } } + /* + * update university payment details*/ + public function updateUniversityPaymentDetails_post(){ + $now = new DateTime(); + $now->setTimezone(new DateTimezone('Asia/Kolkata')); + $details=$this->post('details'); + $localData=$this->post('localDetails'); + $update['ID']=$details['ID']; + $update['PaymentID']=$details['paymentID']; + $payment['BillNo']=$details['billNo']; + $payment['ReceiptNo']=$details['receiptNo']; + $payment['Amount']=$details['billAmount']; + $payment['ApprovedDate']=$details['date']; + $payment['Remarks']=$details['comments']; + $payment['BranchCode']=$localData['localBranchID']; + $payment['updatedBy']=$localData['localUserID']; + $payment['updatedOn']=$now->format('Y-m-d H:i:s'); + // debit array + $debit['DebitAmount']=$details['billAmount']; + $debit['ApprovedDate']=$details['date']; + $debit['BranchCode']=$localData['localBranchID']; + $debit['updatedBy']=$localData['localUserID']; + $debit['updatedOn']=$now->format('Y-m-d H:i:s'); + $updatePaymentDetails=$this->receive_model->updatePaymentDetails($update,$payment,$debit); + if($updatePaymentDetails['status']==true){ + $this->response($updatePaymentDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + } + else if($updatePaymentDetails['status']==false){ + $this->response($updatePaymentDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + + } + else{ + $this->response(['message' => 'Try again', 'status' => false], 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 e4c23cf8..e16502b3 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -893,8 +893,10 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { // get formid draft mode list details // kdk - public function getForFormIdDraftDetails(){ - $selectQuery = "SELECT * FROM T_FormId_FeeDetails_Received_From_University WHERE DraftStatus = 1"; + public function getForFormIdDraftDetails($getUnivDetails){ + $selectUniv = $getUnivDetails['univCode']; + + $selectQuery = "SELECT * FROM T_FormId_FeeDetails_Received_From_University WHERE UniversityID = '$selectUniv' AND DraftStatus = 1"; $details = $this->db->query($selectQuery); $detailsList = $details->result(); if($detailsList) { @@ -1100,7 +1102,8 @@ $result['updatedraftStatus'] = false; $this->db->select('FUD.*, concat(ST.FirstName," ", ST.Lastname) as app_StudentName, IF(concat(ST.FirstName," " , ST.Lastname) = FUD.Student_Name, "YES", "NO") as StudentNameStatus , ST.Fathername as app_FatherName, IF(ST.Fathername = FUD.Father_Name, "YES", "NO") as FathernameStatus, - CM.CourseCode as app_CourseCode, IF(CM.CourseCode = FUD.CourseCode, "YES", "NO" ) as CourseCodeStatus'); + CM.CourseCode as app_CourseCode, IF(CM.CourseCode = FUD.CourseCode, "YES", "NO" ) as CourseCodeStatus, + IF(ENU.SemesterYear = FUD.Semester, "YES", "NO" ) as SemesterStatus'); $this->db->from('T_FormId_FeeDetails_Received_From_University as FUD'); $this->db->join(ENROLMENTRECEIVEDFROMUNIV.' as ENU', 'FUD.FormID = ENU.FormID' ); $this->db->join(STUDENTCOURSE.' as STC', 'STC.EnrollmentID = ENU.EnrolmentNo'); @@ -1352,7 +1355,7 @@ $result['updatedraftStatus'] = false; * created by kms * */ public function getPaymentVerificationDetails($search){ - $this->db->select('UNCD.ID,UNCD.FormMapID,UNCD.PaymentMapID,UNCD.FormID,UNCD.CreditAmount,UNCD.DebitAmount,UNCD.ApprovedDate,UNCD.UniversityCode,UNCD.UniversityName,UNCD.TypeID,ENU.EnrolmentNo,UNP.BillNo,UNP.PID as PaymentID'); + $this->db->select('UNCD.ID,UNCD.FormMapID,UNCD.PaymentMapID,UNCD.FormID,UNCD.CreditAmount,UNCD.DebitAmount,DATE_FORMAT(UNCD.ApprovedDate, "%d-%m-%Y") as FormatDate,UNCD.ApprovedDate,UNCD.UniversityCode,UNCD.UniversityName,UNCD.TypeID,ENU.EnrolmentNo,UNP.BillNo,UNP.PID as PaymentID,UNP.Amount,UNP.ReceiptNo,UNP.Remarks'); $this->db->from(UNIVERSITYCREDITDEBIY.' as UNCD'); $this->db->join(FORMFEESRECEIVEDFROMUNIV.' as UNFR', 'UNFR.ID = UNCD.FormMapID','left'); $this->db->join(UNIVERSITYPAYMENT.' as UNP', 'UNP.PID = UNCD.PaymentMapID','left'); @@ -1467,4 +1470,77 @@ $result['updatedraftStatus'] = false; return $resultArray; } + /* + * update payment details + * created by kms + * */ + public function updatePaymentDetails($update=null,$payment=null,$debit=null){ + $resultArray=array(); + $this->db->where('UNP.BillNo', $payment['BillNo']); + $this->db->where('UNP.PID != ', $update['PaymentID']); + $this->db->select('UNP.BillNo'); + $this->db->from(UNIVERSITYPAYMENT.' as UNP'); + $billExist = $this->db->get(); + if($billExist->num_rows()<=0){ + if($payment['ReceiptNo']!='' AND $payment['ReceiptNo']!=null){ + $this->db->where('UNP1.ReceiptNo', $payment['ReceiptNo']); + $this->db->where('UNP1.PID != ', $update['PaymentID']); + $this->db->select('UNP1.ReceiptNo'); + $this->db->from(UNIVERSITYPAYMENT.' as UNP1'); + $receiptExist = $this->db->get(); + if($receiptExist->num_rows()<=0){ + $this->db->where('PID', $update['PaymentID']); + $this->db->update(UNIVERSITYPAYMENT, $payment); + if ($this->db->affected_rows() > 0) { + $this->db->where('ID', $update['ID']); + $this->db->update(UNIVERSITYCREDITDEBIY, $debit); + if ($this->db->affected_rows() > 0) { + $resultArray['status']=true; + $resultArray['message']="Payment update successfully"; + } + else{ + $resultArray['status']=false; + $resultArray['message']="Payment update failed.try again"; + } + + } else { + $resultArray['status']=false; + $resultArray['message']="Payment failed.Try again"; + } + } + else{ + $resultArray['status']=false; + $resultArray['message']="Receipt no is already exist.."; + } + } + else{ + $this->db->where('PID', $update['PaymentID']); + $this->db->update(UNIVERSITYPAYMENT, $payment); + if ($this->db->affected_rows() > 0) { + $this->db->where('ID', $update['ID']); + $this->db->update(UNIVERSITYCREDITDEBIY, $debit); + if ($this->db->affected_rows() > 0) { + $resultArray['status']=true; + $resultArray['message']="Payment update successfully"; + } + else{ + $resultArray['status']=false; + $resultArray['message']="Payment update failed.try again"; + } + + + } else { + $resultArray['status']=false; + $resultArray['message']="Payment failed.Try again"; + } + + } + } + else { + $resultArray['status']=false; + $resultArray['message']="Bill no is already exist.."; + } + return $resultArray; + + } } \ No newline at end of file diff --git a/Apollo/assets/js/controllers/entrycorrectionCtrl.js b/Apollo/assets/js/controllers/entrycorrectionCtrl.js index 63cdf1a3..1f08ced5 100644 --- a/Apollo/assets/js/controllers/entrycorrectionCtrl.js +++ b/Apollo/assets/js/controllers/entrycorrectionCtrl.js @@ -146,6 +146,10 @@ $scope.universitySearchData = ''; $scope.OpenWindowStatus = false; $scope.editId = -1; + $scope.courselist =''; + $scope.loadfee=''; + $scope.feecheck=false; + $scope.setEditId = function (P) { //alert(JSON.stringify(P)); @@ -173,11 +177,16 @@ $scope.universitySearchData = ''; $scope.feeInfo=response.data.details; console.log($scope.feeInfo); $scope.editId = P.ID; + $scope.courselist =true; + $scope.feecheck=false; + } else { $scope.feeInfo=""; $scope.loadfee = "No Records Found"; - + $scope.courselist =false; + $scope.feecheck=true; + $scope.editId = P.ID; } }); diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js index 368406f3..9efa8d26 100755 --- a/Apollo/assets/js/controllers/studentCtrl.js +++ b/Apollo/assets/js/controllers/studentCtrl.js @@ -721,12 +721,15 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", $scope.editId = -1; $scope.editCourseId = -1; $scope.setEditId = function (unique_id, id) { + + // alert() $scope.editId = unique_id; $scope.editCourseId = -1; $scope.studentViewPage = -1; } $scope.setEditCourseId = function (unique_id,id) { + $scope.list = false; $scope.getStudentCourseList(id); $scope.currentStudentId = id; @@ -837,6 +840,8 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", // get Student Course List $scope.getStudentCourseList = function (studentId) { + + console.log('in') $scope.courseEditLoading = true; $scope.list = true; $scope.courseEdit = false; @@ -1740,11 +1745,15 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl $scope.editId = -1; $scope.editCourseId = -1; $scope.setEditId = function (uniqe_id ,id) { + + // alert() $scope.editId = uniqe_id; $scope.editCourseId = -1; } $scope.setEditCourseId = function (uniqe_id ,id) { + + //alert('1'); $scope.list = false; $scope.getStudentCourseList(id); $scope.currentStudentId = id; @@ -1752,6 +1761,7 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl $scope.editCourseId = uniqe_id; $scope.editId = -1; $scope.courseEditLoading = true; + $scope.courselist = true; } @@ -1879,6 +1889,9 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl $scope.studentCourseList = response.data.course_details; // $scope.stucour = $scope.studentCourse[0]; } else { + + $scope.courselist = false; + $scope.courseEditLoading=''; } }); } diff --git a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js index 24c39d90..7b561b1e 100644 --- a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js +++ b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js @@ -10,7 +10,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter */ // get local client details - var localDetail = JSON.parse(localStorage.getItem('localObj')); + var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetails = ipCookie('cookiechk'); // load when html page load @@ -129,9 +129,10 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter $scope.Searchloader = false; $scope.studentData = false; - + $scope.formIdListNoRecordFound = false; $scope.onSubmit = function () { $scope.Searchloader = true; + $scope.formIdListNoRecordFound = false; if ($scope.searchData.University !== '' && $scope.searchData.Course !== '') { $scope.Searchloader = true; var empListreq = { @@ -151,27 +152,49 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter $scope.studentData = true; $scope.data = response.data.studentFeeCompareDetails; $scope.studentListLength = $scope.data.length; + $scope.formIdListNoRecordFound = false; // $scope.statusMessage = $scope.data.message; } else { + $scope.formIdListNoRecordFound = true; $scope.Searchloader = false; $scope.studentData = false; - $scope.statusMessage = $scope.data.message; + $scope.statusMessage = response.data.message; } }); } else { } } + //Export excel + var mystyle1 = { + sheetid: 'Student University FormId Fees Details', + headers: true, + caption: { + title:'Student University FormId Fees Details', + width: '300px', + style:'font-size:50px;' + }, + // style:'background:#00FF00', + column: { + style:'font-size:16px' + }, + +}; + + +$scope.exportData = function () { + alasql('SELECT CAST(FormID as NUMBER) as FormID,FormType as FormType,CentreCode as CentreCode,Session as Session,CAST(Year as NUMBER) as Year,Semester as Semester,Student_Name as Student_Name,Father_Name as Father_Name,CourseCode as CourseCode,CAST(ActualCourseFee as NUMBER) as ActualCourseFee,CAST(CourseFee as NUMBER) as CourseFee,CAST(ExamFee as NUMBER) as ExamFee,CAST(EnrollmentFee as NUMBER) as EnrollmentFee,CAST(ProspectusFee as NUMBER) as ProspectusFee,CAST(ReRegFee as NUMBER) as ReRegFee,CAST(CreditTransferFee as NUMBER) as CreditTransferFee,CAST(LateralEntryFee as NUMBER) as LateralEntryFee,CAST(DualSpclFee as NUMBER) as DualSpclFee,CAST(OtherFee as NUMBER) as OtherFee,CAST(NRIFEE as NUMBER) as NRIFEE,CAST(ProvisionalFee as NUMBER) as ProvisionalFee,CAST(MigrationFee as NUMBER) as MigrationFee,CAST(UrgentResultDMCFee as NUMBER) as UrgentResultDMCFee,CAST(AdditionalFee as NUMBER) as AdditionalFee,CAST(Amount as NUMBER) as Amount INTO XLS("FormIdFeesDetails.xls",?) FROM ?',[mystyle1,$scope.data]); +}; + //End of export excel $scope.myObj = { // "color" : "green", "font-size": "inherit" } $scope.myObjErr = { - "text-decoration": "underline", - "text-decoration-color": "red", - "font-size": "inherit" + "color": "red", + "font-size": "inherit", } $scope.editId = -1; @@ -330,10 +353,32 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter } }); } + //Export Excel + var mystyle = { + sheetid: 'Student University FormId Unmatched Records', + headers: true, + caption: { + title:'Student University FormId Unmatched Records', + width: '300px', + style:'font-size:50px;' + }, + // style:'background:#00FF00', + column: { + style:'font-size:16px' + }, + +}; + + +$scope.exportDataTab3 = function () { + alasql('SELECT CAST(FormID as NUMBER) as FormID,FormType as FormType,CentreCode as CentreCode,CourseCode as CourseCode,CAST(ActualCourseFee as NUMBER) as ActualCourseFee,CAST(CourseFee as NUMBER) as CourseFee,CAST(Amount as NUMBER) as Amount INTO XLS("FormIdUnmatchedRecords.xls",?) FROM ?',[mystyle,$scope.unMatchedRecordDetails]); +}; + //End of export excel // get subtab details for the formid fee details get form the university $scope.subTabActive = function (tab) { + $scope.subTabactive = tab; if (tab == 'subTabactive2') { getDraftFormIdDetails(); } @@ -369,6 +414,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter } + $scope.draftListDetails = ''; $scope.draftListDetailsNoRecordFound = false; $scope.draftListDetailsLoading = false; @@ -384,7 +430,8 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter 'Content-Type': 'application/json' }, data: { - localDetails: localDetail + localDetails: localDetail, + getDetailsFor: $scope.formUploadUnivSelectID } }; $http(getFormIdDraftDetailsList).then(function (response) { diff --git a/Apollo/assets/js/controllers/student_university_fee_compare.js b/Apollo/assets/js/controllers/student_university_fee_compare.js index 75647605..a2acd9ad 100644 --- a/Apollo/assets/js/controllers/student_university_fee_compare.js +++ b/Apollo/assets/js/controllers/student_university_fee_compare.js @@ -6,7 +6,7 @@ app.controller('student_university_fee_compareCtrl', ["$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 + * student university fee details compare */ // get local client details @@ -179,7 +179,28 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil } } - + //export excel + var mystyle = { + sheetid: 'Enrolment Details', + headers: true, + caption: { + title:'Student Form Enrolment Details', + width: '300px', + style:'font-size:50px;' + }, + // style:'background:#00FF00', + column: { + style:'font-size:16px' + }, + + }; + + + + $scope.exportData = function () { + alasql('SELECT CAST(FormID as NUMBER) as FormID,EnrolmentNo as EnrolmentNo,FormType as FormType,concat(Firstname,Lastname) as StudentName,Fathername as FatherName,UniversityName as University,CourseName as Course,SemesterYear as SemYear INTO XLS("EnrolmentDetails.xls",?) FROM ?',[mystyle,$scope.data]); + }; + //end of export excel $scope.editId = -1; $scope.setEditId=function(id){ $scope.editId = id; @@ -339,6 +360,28 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil } }); } + //export excel + var mystyle1 = { + sheetid: 'Unmatched Records', + headers: true, + caption: { + title:'Unmatched Records', + width: '300px', + style:'font-size:50px;' + }, + // style:'background:#00FF00', + column: { + style:'font-size:16px' + }, + + }; + + + + $scope.exportDataTab2 = function () { + alasql('SELECT CAST(FormID as NUMBER) as FormID,EnrolmentNo as EnrolmentNo,SemesterYear as SemesterYear,CAST(MobileNumber AS NUMBER) as MobileNumber,StudentName as StudentName,UniversityCode as UniversityCode,UniversityName as UniversityName,CourseCode as CourseCode,CourseName as CourseName,FatherName as FatherName,MotherName as MotherName,EmailID as EmailID INTO XLS("UnmatchedRecords.xls",?) FROM ?',[mystyle1,$scope.unMatchedRecordDetails]); + }; + //End of export excel $scope.manualEnModel={ "enrolmentNo": '', "formID":"", diff --git a/Apollo/assets/js/controllers/univFormPaymentCtrl.js b/Apollo/assets/js/controllers/univFormPaymentCtrl.js index c78855d3..0f3bb313 100644 --- a/Apollo/assets/js/controllers/univFormPaymentCtrl.js +++ b/Apollo/assets/js/controllers/univFormPaymentCtrl.js @@ -176,6 +176,152 @@ app.controller('univFormPaymentCtrl', ["$scope","$rootScope","$filter", "ngTable }; $rootScope.addError=""; }; + /* + * update university payment details + * created by kms + * */ + $rootScope.updatePaymentModel = { + 'ID':"", + 'billNo':"", + 'date':"", + 'billAmount':"", + 'receiptNo':"", + 'comments':"", + 'universityCode':"", + 'universityName':"", + 'paymentID':"" + + }; + $rootScope.viewPayment = function (values) { + var updateDate=new Date(values.ApprovedDate).toDateString(); + $rootScope.updateError=""; + $rootScope.updatePaymentModel = { + 'ID': values.ID, + 'billNo':values.BillNo, + 'date':$filter('date')(new Date(updateDate), 'yyyy-MM-dd'), + 'billAmount':values.DebitAmount, + 'receiptNo':values.ReceiptNo, + 'comments':values.Remarks, + 'universityCode':values.UniversityCode, + 'universityName':values.UniversityName, + 'paymentID':values.PaymentID + }; + $rootScope.updatePaymentModal = $modal.open({ + templateUrl: 'assets/views/student/updateUniversityPaymentModal.html', + // controller: 'univFormPaymentCtrl', + // size: size, + resolve: { + items: function () { + return $rootScope.updatePaymentModel; + } + } + }); + + $rootScope.updatePaymentModal.result.then(function (selectedItem) { + }, function () { + $rootScope.updatePaymentModal.close(); + $rootScope.updatePaymentModel = { + 'ID':"", + 'billNo':"", + 'date':"", + 'billAmount':"", + 'receiptNo':"", + 'comments':"", + 'universityCode':"", + 'universityName':"", + 'paymentID':"" + + }; + }); + + } + + $rootScope.updateError=""; + $rootScope.updateUnivPayment = function (form,updateDetails) { + $rootScope.updateError=""; + var firstError = null; + if (form.$invalid) { + + var field = null, firstError = null; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$name; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[name=' + firstError + ']').focus(); + // swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error"); + } + else{ + var changeDate; + if(angular.isObject(updateDetails.date)){ + var saveDate=new Date(updateDetails.date).toDateString(); + changeDate=$filter('date')(new Date(saveDate), 'yyyy-MM-dd'); + } + else{ + changeDate=updateDetails.date; + + } + $scope.univUpdateData = { + "universityCode":updateDetails.universityCode, + "universityName":updateDetails.universityName, + "billNo":updateDetails.billNo, + "billAmount":updateDetails.billAmount, + "date":changeDate, + "receiptNo":updateDetails.receiptNo, + "comments":updateDetails.comments, + "ID":updateDetails.ID, + "paymentID":updateDetails.paymentID, + } + + var updatePayment = { + method: 'POST', + url: apiPoint.url + 'updateUniversityPaymentDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + localDetails: localDetail, + details: $scope.univUpdateData, + } + }; + $http(updatePayment).then(function (response) { + if (response.data.status==true) { + swal(" ", response.data.message, "success"); + $rootScope.updatePaymentModal.close(); + $rootScope.updatePaymentModel = { + 'ID':"", + 'billNo':"", + 'date':"", + 'billAmount':"", + 'receiptNo':"", + 'comments':"", + 'universityCode':"", + 'universityName':"", + 'paymentID':"" + + }; + $rootScope.getPaymentVerificationDetails($scope.paymentVerficationModel); + + + } else { + $rootScope.updateError=response.data.message; + $timeout(function () { + $rootScope.updateError=""; + }, 4000); + + + } + }); + } + + } + + /* @@ -233,4 +379,24 @@ app.controller('univFormPaymentCtrl', ["$scope","$rootScope","$filter", "ngTable }); }; + /* + * cancel update modal + * */ + $rootScope.cancelUpdatePaymentModal=function () { + $rootScope.updatePaymentModal.close(); + /* $rootScope.updatePaymentModel = { + 'ID':"", + 'billNo':"", + 'date':"", + 'billAmount':"", + 'receiptNo':"", + 'comments':"", + 'universityCode':"", + 'universityName':"", + 'paymentID':"" + + };*/ + $rootScope.updateError=""; + }; + }]); \ No newline at end of file diff --git a/Apollo/assets/views/edit_course.html b/Apollo/assets/views/edit_course.html index 2abf1c2e..c4aff4fd 100644 --- a/Apollo/assets/views/edit_course.html +++ b/Apollo/assets/views/edit_course.html @@ -1,6 +1,8 @@
+ +
@@ -26,7 +28,15 @@ -
+ +
+

No Records Found

+
+
diff --git a/Apollo/assets/views/entry_correction.html b/Apollo/assets/views/entry_correction.html index e399e5ed..5a9fe889 100644 --- a/Apollo/assets/views/entry_correction.html +++ b/Apollo/assets/views/entry_correction.html @@ -167,6 +167,8 @@ + +
diff --git a/Apollo/assets/views/student/UnivFormPaymentDetails.html b/Apollo/assets/views/student/UnivFormPaymentDetails.html index eb2748c9..c35122ea 100644 --- a/Apollo/assets/views/student/UnivFormPaymentDetails.html +++ b/Apollo/assets/views/student/UnivFormPaymentDetails.html @@ -2,6 +2,10 @@ .universityPaid { background: #f4f4f7 !important; } + .spanCursor{ + cursor: pointer; + + }
@@ -65,6 +69,7 @@ Form ID Enrolment No Bill No + Date Payable Paid Balance @@ -75,7 +80,9 @@ {{p.FormID}} {{p.EnrolmentNo}} - {{p.BillNo}} + {{p.BillNo}} + {{p.FormatDate}} + {{p.CreditAmount}} diff --git a/Apollo/assets/views/student/editStudentCourseDetails.html b/Apollo/assets/views/student/editStudentCourseDetails.html index a2746822..7829b4cb 100755 --- a/Apollo/assets/views/student/editStudentCourseDetails.html +++ b/Apollo/assets/views/student/editStudentCourseDetails.html @@ -6,12 +6,15 @@ })
- +

Fetching ...

+
+

No Records Found

+
-
+
Course Details diff --git a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html index c62e4797..3c03b06a 100644 --- a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html +++ b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html @@ -104,7 +104,7 @@
+ +
+ + + +

Loading...

@@ -331,6 +336,9 @@
+ + +
Loading...
@@ -339,6 +347,13 @@
No Record Found ...
+ +
+ + + +
+
diff --git a/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html b/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html index 7072f594..403f1949 100644 --- a/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html +++ b/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html @@ -101,6 +101,14 @@

{{statusMessage}}

+
+
No Record Found ...
+
+
+ + + +
@@ -158,8 +166,8 @@ - - + + - - - @@ -299,7 +307,7 @@
Amount
@@ -181,16 +189,16 @@ {{p.Year}} - {{p.Semester}} +
{{p.Semester}}
- {{p.Student_Name}} + +
{{p.Student_Name}}
 - {{p.Father_Name}} + +
{{p.Father_Name}}
 - {{p.CourseCode}} + +
{{p.CourseCode}}
{{p.ActualCourseFee}} {{p.CourseFee}}
- +
@@ -312,7 +320,7 @@ - @@ -321,7 +329,7 @@
- +
@@ -336,7 +344,7 @@
- +
@@ -417,6 +425,9 @@ Loading...
+
+
No Record Found ...
+
@@ -449,7 +460,7 @@ - +
Amount
@@ -662,7 +673,7 @@
- +
@@ -752,6 +763,11 @@
+
+ + + +
@@ -763,7 +779,7 @@ - + @@ -775,7 +791,7 @@
CourseFee Amount
{{p.FormID}} {{p.FormType}}
- +
diff --git a/Apollo/assets/views/student/updateUniversityPaymentModal.html b/Apollo/assets/views/student/updateUniversityPaymentModal.html new file mode 100644 index 00000000..b857d800 --- /dev/null +++ b/Apollo/assets/views/student/updateUniversityPaymentModal.html @@ -0,0 +1,103 @@ +
+
+ + Payment for : {{updatePaymentModel.universityName}} + +
+
+ + + + Bill no is required +
+
+ + + + Bill amount is required + Enter a valid amount + +
+
+
+ + + Date is required. +
+ +
+
+
+
+ + + +
+
+ + +
+ +
+
+
+
+ {{updateError}} + + + + + +
+
+
+ + +
+ +
\ No newline at end of file