From e20ef04a185a0ed6a67f24981f53dc57a963f85d Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Sat, 8 Sep 2018 18:36:25 +0530 Subject: [PATCH 01/12] form id details check update : kdk --- Apollo/api/application/config/routes.php | 3 + ...Receive_Enrolment_Fees_Univ_Controller.php | 59 ++++++- .../Receive_Enrolment_Fees_Univ_model.php | 154 +++++++++++++++++- .../studentUnivFormIdFeeDetailsCtrl.js | 89 ++++++++-- .../student/studentUnivFormIdFeeDetails.html | 134 +++++++++------ Apollo/images/student/Dri_Be563jFw2aQu.jpeg | Bin 0 -> 8618 bytes Apollo/images/student/Dri_hRifsSNIu7HX.jpeg | Bin 0 -> 8618 bytes 7 files changed, 372 insertions(+), 67 deletions(-) create mode 100644 Apollo/images/student/Dri_Be563jFw2aQu.jpeg create mode 100644 Apollo/images/student/Dri_hRifsSNIu7HX.jpeg diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index 44c4e2a1..c2bf3a6c 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -375,3 +375,6 @@ $route['getStudentUnivFormIdFeeDatailsList'] = 'Receive_Enrolment_Fees_Univ_Cont $route['getFormIdDetailsStatusUpdateList'] = 'Receive_Enrolment_Fees_Univ_Controller/getFormIdDetailsStatusUpdateList'; $route['insertStatusUpdateDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/insertStatusUpdateDetails'; $route['paymentVerficationDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/paymentVerficationDetails'; +$route['getUniversityCodeForFormDetailsGet'] = 'Receive_Enrolment_Fees_Univ_Controller/getUniversityCodeForFormDetailsGet'; +$route['getUnmatchedFormIdFeesDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getUnmatchedFormIdFeesDetails'; +$route['addToAccountStateList'] = 'Receive_Enrolment_Fees_Univ_Controller/addToAccountStateList'; 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 637edb56..ba1705fd 100644 --- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php +++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php @@ -85,7 +85,8 @@ 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) + $univDetails = $this->post('univ'); + $updatedDetails = $this->receive_model->formIdFeeDetails($formIdDetails,$localDetails, $univDetails);// Check if the users data store contains users (in case the database result returns NULL) if ($updatedDetails) { $updatedDetails['status'] = REST_Controller::HTTP_OK; @@ -289,7 +290,9 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { public function addForFormIdDraftDetails_post(){ $reqBranch = $this->post('localDetails'); $details = $this->post('details'); - $addForFormIdDraftDetails = $this->receive_model->addForFormIdDraftDetails($details, $reqBranch); // Check if the employee exist + $univDetails = $this->post('univ'); + + $addForFormIdDraftDetails = $this->receive_model->addForFormIdDraftDetails($details, $reqBranch, $univDetails); // Check if the employee exist if ($addForFormIdDraftDetails) { $addForFormIdDraftDetails['status'] = REST_Controller::HTTP_OK; // Set the response and exit @@ -391,5 +394,57 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { } } + public function getUniversityCodeForFormDetailsGet_post(){ + $reqData = $this->post('data'); + $loginUserId = $reqData['localUserID']; + $loginUserBranchId = $reqData['localBranchID']; + $loginUserType = $reqData['localType']; + $getUniversityListDetails = $this->receive_model->get_university_list($loginUserBranchId); // Check if the employee exist + if ($getUniversityListDetails) { + $getUniversityListDetails['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($getUniversityListDetails, 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 + + } + } + + public function getUnmatchedFormIdFeesDetails_post(){ + $localDetails = $this->post('localDetails'); + $getDetailsFor = $this->post('getDetailsFor'); + + $getUnmatchedFormIdFeesDetails = $this->receive_model->getUnmatchedFormIdFeesDetails($localDetails, $getDetailsFor); // Check if the employee exist + if ($getUnmatchedFormIdFeesDetails) { + $getUnmatchedFormIdFeesDetails['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($getUnmatchedFormIdFeesDetails, 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 + + } + } + + public function addToAccountStateList_post(){ + $localDetails = $this->post('localDetails'); + $getDetailsFor = $this->post('details'); + + $addFormIdListToAccountState = $this->receive_model->addFormIdListToAccountState($localDetails, $getDetailsFor); // Check if the employee exist + if ($addFormIdListToAccountState) { + $addFormIdListToAccountState['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($addFormIdListToAccountState, 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/models/Receive_Enrolment_Fees_Univ_model.php b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php index a869d2b7..cf8abb13 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -368,9 +368,10 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { } - public function formIdFeeDetails($formFeeDetails=null,$local=null){ + public function formIdFeeDetails($formFeeDetails=null,$local=null, $univ =null){ $localBranchID = $local['localBranchID']; $localUserID = $local['localUserID']; + $univId = $univ['univCode']; $time = date('Y-m-d H:i:s'); $CreatedOn = $time; @@ -443,9 +444,9 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { 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, DraftStatus, EditStatus) + (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,UniversityID, CreatedBy, CreatedOn, BranchCode, DraftStatus, EditStatus) 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' , 0, 0)"; + ( '$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', '$univId', '$localUserID', '$CreatedOn', '$localBranchID' , 0, 0)"; $queryDetails = $this->db->query($query); } else { echo 'else con'; @@ -905,10 +906,11 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { return $result; } - public function addForFormIdDraftDetails($details, $local){ + public function addForFormIdDraftDetails($details, $local, $univ =null){ $localBranchID = $local['localBranchID']; $localUserID = $local['localUserID']; + $univId = $univ['univCode']; $time = date('Y-m-d H:i:s'); $CreatedOn = $time; @@ -967,9 +969,9 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { 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, DraftStatus, EditStatus) + (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, UniversityID, CreatedBy, CreatedOn, BranchCode, DraftStatus, EditStatus) 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' , 1, 1)"; + ( '$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', '$univId' , '$localUserID', '$CreatedOn', '$localBranchID' , 1, 1)"; $queryDetails = $this->db->query($query); if($queryDetails){ @@ -1153,7 +1155,11 @@ $result['updatedraftStatus'] = false; } public function getFormIdDetailsStatusUpdateList($reqBranchData, $searchDetails){ - $selectQuery = "SELECT * FROM T_FormId_FeeDetails_Received_From_University_StatusUpdate WHERE FormIdDetailsID = '$searchDetails'"; + $selectQuery = "SELECT * , concat(t3.Firstname, '', t3.Lastname) as CreatedByName + FROM T_FormId_FeeDetails_Received_From_University_StatusUpdate as t1 + LEFT JOIN T_Login as t2 ON t1.CreatedBy = t2.ID + LEFT JOIN T_StaffDetails as t3 ON t2.StaffID = t3.StaffID + WHERE FormIdDetailsID = '$searchDetails' ORDER BY t1.CreatedOn DESC "; $details = $this->db->query($selectQuery); $detailsList = $details->result(); if($detailsList) { @@ -1188,4 +1194,138 @@ $result['updatedraftStatus'] = false; return $result; } + // get university list + public function get_university_list($branch) { + $this->db->select('UniversityID, UniversityName'); + $this->db->order_by('CreatedOn', 'DESC'); + $this->db->from(UNIVERSITY); + $this->db->where('IsActive', 1); + $this->db->where('BranchCode', $branch); + $univDetails = $this->db->get(); + $universityDetails = $univDetails->result(); + if (count($universityDetails) > 0) { + $results['univList'] = true; + $results['university_details'] = $universityDetails; + } else { + $results['univList'] = false; + $results['message'] = 'No record found'; + } + return $results; + } + + public function getUnmatchedFormIdFeesDetails($localDetails, $getDetailsFor) { + + $searchUniv = $getDetailsFor['univCode']; + // echo $searchUniv;exit(); + $query = "select * + from T_FormId_FeeDetails_Received_From_University as t1 + where t1.FormID NOT IN (select FormID from T_Enrolment_Received_From_University) + and t1.UniversityID ='$searchUniv'"; + $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; + } + + public function addFormIdListToAccountState($localDetails, $getDetailsFor){ + $localCreatedBy = $localDetails['localUserID']; + $time = date('Y-m-d H:i:s'); + $localCreatedOn = $time; + foreach($getDetailsFor as $row) { + $ids = $row['ID']; + $query = "SELECT t1.ID, t1.FormID, t1.Amount, t2.ApprovedDate , t2.CreatedOn ,t2.UniversityCode, t2.UniversityName + from T_FormId_FeeDetails_Received_From_University as t1 + LEFT JOIN T_Enrolment_Received_From_University as t2 ON t1.FormID = t2.FormID + WHERE t1.ID = '$ids'"; + $details = $this->db->query($query); + $detailsList = $details->result(); + if($detailsList){ + $arr['FormMapID'] = $detailsList[0]->ID; + $arr['FormID'] = $detailsList[0]->FormID; + $arr['CreditAmount'] = $detailsList[0]->Amount; + $ApprovedDate = date('y-m-d',strtotime($detailsList[0]->ApprovedDate)); + $CreatedOn = date('y-m-d',strtotime($detailsList[0]->CreatedOn)); + $arr['ApprovedDate'] = $ApprovedDate ? $ApprovedDate : $CreatedOn; + $arr['TypeID'] = 1; + $arr['TypeName'] = 'Credit'; + $arr['UniversityCode'] = $detailsList[0]->UniversityCode; + $arr['UniversityName'] = $detailsList[0]->UniversityName; + $arr['CreatedOn'] = $localCreatedOn; + $arr['CreatedBy'] = $localCreatedBy; + $this->db->insert('T_University_Credit_Debit', $arr); + if ($this->db->affected_rows() >= 1) { + $updateQuery = 'UPDATE `T_FormId_FeeDetails_Received_From_University` SET `AddToAccountStatus` = 1 WHERE `ID` = '.$ids; + $queryDetails = $this->db->query($updateQuery); + if ($this->db->affected_rows() == '1') { + $result['accountStateMoveStatus'] = true; + $result['accountStateMoveMessagae'] = "Updated Successfully."; + } else { + $result['accountStateMoveStatus'] = false; + $result['accountStateMoveMessagae'] = "Something went wrong."; + } + } else { + $result['accountStateMoveStatus'] = false; + $result['accountStateMoveMessagae'] = "Something went wrong."; + } + } else { + $result['accountStateMoveStatus'] = false; + $result['accountStateMoveMessagae'] = "Something went wrong."; + } + } + return $result; + } + + + // 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 { + // $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; + // } + } \ No newline at end of file diff --git a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js index 7f424922..e908a57a 100644 --- a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js +++ b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js @@ -37,6 +37,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter if (localDetails.localType === 'R004') { // $scope.getUniversityList(); $scope.getUniversitySearchList(); + $scope.getUniveesityListFromApp(); } else { ipCookie.remove('cookiechk'); $window.localStorage.clear(); @@ -47,11 +48,11 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter } - /*$scope.universityData = ''; - $scope.getUniversityList = function () { + $scope.universityData = ''; + $scope.getUniveesityListFromApp = function () { var empListreq = { method: 'POST', - url: apiPoint.url + 'getStudentUniversity/', + url: apiPoint.url + 'getUniversityCodeForFormDetailsGet/', headers: { 'Content-Type': 'application/json' }, @@ -65,7 +66,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter } else { } }); - }*/ + } // get University List $scope.universitySearchData = ''; $scope.getUniversitySearchList = function () { @@ -229,9 +230,12 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter } + $scope.formUploadUnivSelectID = { + 'univCode': '' + }; + $scope.receiveFormIdFeeDetails = function (details) { console.log(details); - var updateUniversityEnrolment = { method: 'POST', url: apiPoint.url + 'insertFormIdUnivFeeDetails/', @@ -240,7 +244,8 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter }, data: { localDetails: localDetail, - details: details + details: details, + univ: $scope.formUploadUnivSelectID } }; @@ -291,22 +296,26 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter }); } + + $scope.formIdMissMatchUnivSelectID = { + 'univCode': '' + }; + $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/', + url: apiPoint.url + 'getUnmatchedFormIdFeesDetails/', headers: { 'Content-Type': 'application/json' }, data: { localDetails: localDetail, - getDetailsFor: getDetailsFor + getDetailsFor: $scope.formIdMissMatchUnivSelectID } }; $http(getFeeCompareDetailsList).then(function (response) { @@ -404,7 +413,8 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter }, data: { localDetails: localDetail, - details : $scope.draftManualEntryDetails + details : $scope.draftManualEntryDetails, + univ: $scope.formUploadUnivSelectID } }; $http(addDraftDetailsList).then(function (response) { @@ -535,11 +545,17 @@ $scope.draftManualEntryDetails = { $scope.statusUpdateEditId = -1; $scope.statusUpdate = function(id){ $scope.statusUpdateEditId = id; + $scope.statusUpdateFormIdDetails = { + "Status": "", + "Comments": "" + } } + $scope.StatusListDetails = ''; $scope.getFormIdDetailsStatusListLoading = false; $scope.getFormIdDetailsStatusList = function(id){ + $scope.getFormIdDetailsStatusListLoading = true; var getFormIdDetailsStatusList = { method: 'POST', @@ -568,6 +584,13 @@ $scope.draftManualEntryDetails = { "Comments": "" } + $scope.resetStatusUpdateForm = function(){ + $scope.statusUpdateFormIdDetails = { + "Status": "", + "Comments": "" + } + } + $scope.addStatusUpdateDetails = function(id, formId){ var addStatusUpdateDetailsStatusList = { method: 'POST', @@ -598,4 +621,50 @@ $scope.draftManualEntryDetails = { }}); } + $scope.addToAccountState = function(id){ + + swal({ + title: "Are you sure?", + text: "You Want to Add this Record to Account State List!", + type: "warning", + showCancelButton: true, + confirmButtonColor: '#DD6B55', + confirmButtonText: 'Yes', + cancelButtonText: "No", + closeOnConfirm: false, + closeOnCancel: false + }, + function(isConfirm){ + if (isConfirm){ + var selectedItems = []; + function getUpdateDetails(id) { + this.ID = id; + } + let itemGetID = new getUpdateDetails(id); + selectedItems.push(itemGetID); + var addToAccountStateList = { + method: 'POST', + url: apiPoint.url + 'addToAccountStateList/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + localDetails: localDetail, + details : selectedItems + } + }; + $http(addToAccountStateList).then(function (response) { + if (response.data.accountStateMoveStatus == true) { + swal("", response.data.accountStateMoveMessagae, "success"); + $scope.onSubmit(); + } else { + swal("", response.data.accountStateMoveMessagae, "warning"); + + }}); + } else { + swal("Cancelled", "Your record not added to list :)", "error"); + } + }); + } + }]); diff --git a/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html b/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html index c9e7d398..109e1810 100644 --- a/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html +++ b/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html @@ -162,7 +162,8 @@ - + + {{p.FormID}} @@ -214,51 +215,81 @@ -
+

Loading...

-
-
+
+
-
-
+
+
+ Add Status + +
+
+ - + -
-
-
+
+ - +
+ +
+
+
+
+ {{addError}} + + + + + +
+
+
+ + +
+ +
\ No newline at end of file From 4980352f1de7c400456955c2abce973d4a5b2594 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 8 Sep 2018 20:14:00 +0530 Subject: [PATCH 07/12] university payment changes --- ...Receive_Enrolment_Fees_Univ_Controller.php | 21 ++++++++++++++ .../Receive_Enrolment_Fees_Univ_model.php | 28 +++++++++++++++++++ 2 files changed, 49 insertions(+) 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 94dc8585..c2cb6cff 100644 --- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php +++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php @@ -446,6 +446,27 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { } } + /* + * get payment verfication details + * created by kms + * */ + public function paymentVerficationDetails_post(){ + $fromDetails['UniversityCode']=$this->post('universityID'); + $fromDetails['UniversityName']=$this->post('universityName'); + $getVerificationDetails=$this->receive_model->getPaymentVerificationDetails($fromDetails); + if($getVerificationDetails['status']==true){ + $this->response($getVerificationDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + + } + else if($getVerificationDetails['status']==false){ + $this->response($getVerificationDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + + } + else{ + $this->response(['details' => 'No list were found', 'status' => false], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code + + } + } /* * add university payment details * created by kms 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 d1bddd1d..7c21481b 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -1327,6 +1327,34 @@ $result['updatedraftStatus'] = false; // } // return $resultArr; // } + /* + * get payment verification details + * 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'); + $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'); + $this->db->join(ENROLMENTRECEIVEDFROMUNIV.' as ENU', 'ENU.FormID = UNFR.FormID','left'); + $this->db->order_by('UNCD.ApprovedDate','DESC'); + $this->db->where('UNCD.UniversityCode',$search['UniversityCode']); + $this->db->order_by('UNCD.UniversityName',$search['UniversityName']); + $details = $this->db->get(); + $resultArray=array(); + if($details->result()){ + $resultArray['status']=true; + $resultArray['details']=$details->result(); + + } + + else{ + $resultArray['status']=false; + $resultArray['details']="No list were found"; + } + return $resultArray; + + } /* * add payment details From e75fd5b9ee0d69c5498ac2fbc0ab1a8f77c0c2c3 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 8 Sep 2018 20:23:38 +0530 Subject: [PATCH 08/12] payment html changes --- .../application/models/Receive_Enrolment_Fees_Univ_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7c21481b..8ebda10d 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -1332,7 +1332,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'); + $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->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'); From 9c495676091cd57b0f97af0c99c9624616b421a6 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 8 Sep 2018 20:23:48 +0530 Subject: [PATCH 09/12] payment html changes --- Apollo/assets/views/student/UnivFormPaymentDetails.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Apollo/assets/views/student/UnivFormPaymentDetails.html b/Apollo/assets/views/student/UnivFormPaymentDetails.html index d6ce30fc..eb2748c9 100644 --- a/Apollo/assets/views/student/UnivFormPaymentDetails.html +++ b/Apollo/assets/views/student/UnivFormPaymentDetails.html @@ -64,6 +64,7 @@ Form ID Enrolment No + Bill No Payable Paid Balance @@ -74,6 +75,7 @@ {{p.FormID}} {{p.EnrolmentNo}} + {{p.BillNo}} {{p.CreditAmount}} From 4aa5332c38119628850b2b9c848a2ed1b93025a1 Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Mon, 10 Sep 2018 10:34:59 +0530 Subject: [PATCH 10/12] university formid details changes : kdk --- ...Receive_Enrolment_Fees_Univ_Controller.php | 19 +- .../Receive_Enrolment_Fees_Univ_model.php | 24 +- .../studentUnivFormIdFeeDetailsCtrl.js | 335 +++++++++--------- .../student/studentUnivFormIdFeeDetails.html | 184 +++++----- 4 files changed, 307 insertions(+), 255 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 c2cb6cff..01120c37 100644 --- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php +++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php @@ -273,6 +273,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { } } + // get formid draft mode list details + // kdk public function getForFormIdDraftDetails_post(){ $reqBranch = $this->post('localDetails'); $getForFormIdDraftDetails = $this->receive_model->getForFormIdDraftDetails(); // Check if the employee exist @@ -288,6 +290,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { } } + // add formid manual details form the university and draftmode + // kdk public function addForFormIdDraftDetails_post(){ $reqBranch = $this->post('localDetails'); $details = $this->post('details'); @@ -306,6 +310,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { } } + // manual formid entry draft details move to the list details + // kdk public function draftMovetoList_post(){ $reqBranch = $this->post('localDetails'); $details = $this->post('details'); @@ -322,6 +328,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { } } + // edit draft mode formid manul entry details + // kdk public function editDraftFormIdFeesDetails_post(){ $reqBranch = $this->post('localDetails'); $details = $this->post('details'); @@ -341,7 +349,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { } } - // get formid fee details list with status + // get formid , fee details form the file upload for the university , course, student + // kdk public function getStudentUnivFormIdFeeDatailsList_post(){ $reqBranchData = $this->post('data'); $searchDetails = $this->post('search'); @@ -359,6 +368,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { } } + // get formid status list for that particular record + // kdk public function getFormIdDetailsStatusUpdateList_post(){ $reqBranchData = $this->post('localDetails'); $statusDetailsId = $this->post('detailsID'); @@ -376,6 +387,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { } } + // add formid list file status list for that record + // kdk public function insertStatusUpdateDetails_post(){ $reqBranchData = $this->post('localDetails'); $statusDetails = $this->post('details'); @@ -413,6 +426,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { } } + // get unmatched records of the formid file details , compare with file 1 + // kdk public function getUnmatchedFormIdFeesDetails_post(){ $localDetails = $this->post('localDetails'); $getDetailsFor = $this->post('getDetailsFor'); @@ -430,6 +445,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { } } + // add fromid university amount details to account state + // kdk public function addToAccountStateList_post(){ $localDetails = $this->post('localDetails'); $getDetailsFor = $this->post('details'); 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 8ebda10d..e4c23cf8 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -367,7 +367,8 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { return $finalArray; } - + // add student formid feedetails from the university by file upload , with check the unique entry + // kdk public function formIdFeeDetails($formFeeDetails=null,$local=null, $univ =null){ $localBranchID = $local['localBranchID']; $localUserID = $local['localUserID']; @@ -890,6 +891,8 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { return $resultArray; } + // get formid draft mode list details + // kdk public function getForFormIdDraftDetails(){ $selectQuery = "SELECT * FROM T_FormId_FeeDetails_Received_From_University WHERE DraftStatus = 1"; $details = $this->db->query($selectQuery); @@ -906,6 +909,8 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { return $result; } + // add formid manual details form the university and draftmode + // kdk public function addForFormIdDraftDetails($details, $local, $univ =null){ $localBranchID = $local['localBranchID']; @@ -988,6 +993,8 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { return $result; } + // manual formid entry draft details move to the list details + // kdk public function draftMovetoList($detail, $local){ // print_r($details);exit(); @@ -1016,6 +1023,8 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { return $result; } + // edit draft mode formid manul entry details + // kdk public function editDraftFormIdFeesDetails($reqBranch, $details, $detailsID){ $ids = $detailsID; $formIds = $details['FormID']; @@ -1085,6 +1094,8 @@ $result['updatedraftStatus'] = false; return $result; } + // get formid , fee details form the file upload for the university , course, student + // kdk public function getStudentUnivFormIdFeeDatailsList($reqBranchData, $searchDetails){ $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 , @@ -1154,6 +1165,8 @@ $result['updatedraftStatus'] = false; } + // get formid status list for that particular record + // kdk public function getFormIdDetailsStatusUpdateList($reqBranchData, $searchDetails){ $selectQuery = "SELECT * , concat(t3.Firstname, '', t3.Lastname) as CreatedByName FROM T_FormId_FeeDetails_Received_From_University_StatusUpdate as t1 @@ -1174,6 +1187,8 @@ $result['updatedraftStatus'] = false; return $result; } + // add formid list file status list for that record + // kdk public function insertStatusUpdateDetails($reqBranchData, $statusDetails, $id, $formId ){ $newLeadDetails['FormIdDetailsID'] = $id; @@ -1194,7 +1209,8 @@ $result['updatedraftStatus'] = false; return $result; } - // get university list + // get university list for search + // kdk public function get_university_list($branch) { $this->db->select('UniversityID, UniversityName'); $this->db->order_by('CreatedOn', 'DESC'); @@ -1213,6 +1229,8 @@ $result['updatedraftStatus'] = false; return $results; } + // get unmatched records of the formid file details , compare with file 1 + // kdk public function getUnmatchedFormIdFeesDetails($localDetails, $getDetailsFor) { $searchUniv = $getDetailsFor['univCode']; @@ -1237,6 +1255,8 @@ $result['updatedraftStatus'] = false; return $resultArr; } + // Add formid , university amount payment details to the account state + // kdk public function addFormIdListToAccountState($localDetails, $getDetailsFor){ $localCreatedBy = $localDetails['localUserID']; $time = date('Y-m-d H:i:s'); diff --git a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js index e908a57a..24c39d90 100644 --- a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js +++ b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js @@ -1,7 +1,6 @@ 'use strict'; /** - * controllers for ng-table - * Simple table with sorting and filtering on AngularJS + * Student University Formid, Fee details compare * kdk */ @@ -89,7 +88,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter }); }; - $scope.semDetails=["1","2","3","4","5","6","7","8"]; + $scope.semDetails = ["1", "2", "3", "4", "5", "6", "7", "8"]; $scope.searchData = { "University": "", @@ -164,15 +163,15 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter } } - $scope.myObj = { + $scope.myObj = { // "color" : "green", - "font-size" : "inherit" + "font-size": "inherit" } - $scope.myObjErr = { + $scope.myObjErr = { "text-decoration": "underline", "text-decoration-color": "red", - "font-size" : "inherit" + "font-size": "inherit" } $scope.editId = -1; @@ -296,7 +295,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter }); } - + $scope.formIdMissMatchUnivSelectID = { 'univCode': '' }; @@ -334,8 +333,8 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter // get subtab details for the formid fee details get form the university - $scope.subTabActive= function(tab){ - if( tab == 'subTabactive2'){ + $scope.subTabActive = function (tab) { + if (tab == 'subTabactive2') { getDraftFormIdDetails(); } } @@ -345,14 +344,14 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter 'FormID': '', 'FormType': 'NEW', 'CentreCode': '', - 'Session':'', - 'Year':'', - 'Semester':'', - 'Student_Name':'', - 'Father_Name':'', - 'CourseCode':'', - 'ActualCourseFee':'0', - 'CourseFee':'0', + 'Session': '', + 'Year': '', + 'Semester': '', + 'Student_Name': '', + 'Father_Name': '', + 'CourseCode': '', + 'ActualCourseFee': '0', + 'CourseFee': '0', 'ExamFee': '0', 'EnrollmentFee': '0', 'ProspectusFee': '0', @@ -361,7 +360,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter 'LateralEntryFee': '0', 'DualSpclFee': '0', 'OtherFee': '0', - 'NRIFEE':'0', + 'NRIFEE': '0', 'ProvisionalFee': '0', 'MigrationFee': '0', 'UrgentResultDMCFee': '0', @@ -369,12 +368,12 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter 'Amount': '0' } - + $scope.draftListDetails = ''; $scope.draftListDetailsNoRecordFound = false; $scope.draftListDetailsLoading = false; // get draft form id details - function getDraftFormIdDetails(){ + function getDraftFormIdDetails() { $scope.draftListDetailsLoading = true; $scope.draftListDetailsNoRecordFound = false; $scope.draftListDetails = ''; @@ -402,8 +401,8 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter // manual entry details add - $scope.addManualData = function() { - alert(JSON.stringify($scope.draftManualEntryDetails)); + $scope.addManualData = function () { + // alert(JSON.stringify($scope.draftManualEntryDetails)); var addDraftDetailsList = { method: 'POST', @@ -413,7 +412,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter }, data: { localDetails: localDetail, - details : $scope.draftManualEntryDetails, + details: $scope.draftManualEntryDetails, univ: $scope.formUploadUnivSelectID } }; @@ -430,93 +429,96 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter }); } - function getEmptycall(){ -$scope.draftManualEntryDetails = { - 'FormID': '', - 'FormType': 'NEW', - 'CentreCode': '', - 'Session':'', - 'Year':'', - 'Semester':'', - 'Student_Name':'', - 'Father_Name':'', - 'CourseCode':'', - 'ActualCourseFee':'0', - 'CourseFee':'0', - 'ExamFee': '0', - 'EnrollmentFee': '0', - 'ProspectusFee': '0', - 'ReRegFee': '0', - 'CreditTransferFee': '0', - 'LateralEntryFee': '0', - 'DualSpclFee': '0', - 'OtherFee': '0', - 'NRIFEE':'0', - 'ProvisionalFee': '0', - 'MigrationFee': '0', - 'UrgentResultDMCFee': '0', - 'AdditionalFee': '0', - 'Amount': '0' + function getEmptycall() { + $scope.draftManualEntryDetails = { + 'FormID': '', + 'FormType': 'NEW', + 'CentreCode': '', + 'Session': '', + 'Year': '', + 'Semester': '', + 'Student_Name': '', + 'Father_Name': '', + 'CourseCode': '', + 'ActualCourseFee': '0', + 'CourseFee': '0', + 'ExamFee': '0', + 'EnrollmentFee': '0', + 'ProspectusFee': '0', + 'ReRegFee': '0', + 'CreditTransferFee': '0', + 'LateralEntryFee': '0', + 'DualSpclFee': '0', + 'OtherFee': '0', + 'NRIFEE': '0', + 'ProvisionalFee': '0', + 'MigrationFee': '0', + 'UrgentResultDMCFee': '0', + 'AdditionalFee': '0', + 'Amount': '0' + } + return 0; } - return 0; -} - $scope.addToList = function(id){ - swal({ - title: "Are you sure?", - text: "You Want to Add this Record to List!", - type: "warning", - showCancelButton: true, - confirmButtonColor: '#DD6B55', - confirmButtonText: 'Yes', - cancelButtonText: "No", - closeOnConfirm: false, - closeOnCancel: false - }, - function(isConfirm){ - if (isConfirm){ - var selectedItems = []; - function getUpdateDetails(id) { - this.ID = id; - this.DraftStatus = 0; - } - let itemGetID = new getUpdateDetails(id); - selectedItems.push(itemGetID); - var draftMoveToList = { - method: 'POST', - url: apiPoint.url + 'draftMovetoList/', - headers: { - 'Content-Type': 'application/json' - }, - data: { - localDetails: localDetail, - details : selectedItems + // add draft details to list + $scope.addToList = function (id) { + swal({ + title: "Are you sure?", + text: "You Want to Add this Record to List!", + type: "warning", + showCancelButton: true, + confirmButtonColor: '#DD6B55', + confirmButtonText: 'Yes', + cancelButtonText: "No", + closeOnConfirm: false, + closeOnCancel: false + }, + function (isConfirm) { + if (isConfirm) { + var selectedItems = []; + function getUpdateDetails(id) { + this.ID = id; + this.DraftStatus = 0; } - }; - $http(draftMoveToList).then(function (response) { - if (response.data.draftStatus == true) { - // alert(); - swal("", response.data.draftDetailsMessagae, "success"); - getDraftFormIdDetails(); - } else { - swal("", response.data.draftDetailsMessagae, "warning"); - - }}); + let itemGetID = new getUpdateDetails(id); + selectedItems.push(itemGetID); + var draftMoveToList = { + method: 'POST', + url: apiPoint.url + 'draftMovetoList/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + localDetails: localDetail, + details: selectedItems + } + }; + $http(draftMoveToList).then(function (response) { + if (response.data.draftStatus == true) { + // alert(); + swal("", response.data.draftDetailsMessagae, "success"); + getDraftFormIdDetails(); + } else { + swal("", response.data.draftDetailsMessagae, "warning"); + + } + }); } else { - swal("Cancelled", "Your record not added to list :)", "error"); + swal("Cancelled", "Your record not added to list :)", "error"); } }); } $scope.editId = -1; $scope.leader = {}; - $scope.editList = function(details, d){ + $scope.editList = function (details, d) { $scope.leader = {}; angular.copy(d, $scope.leader); $scope.editId = details; } - $scope.updateFeeIDDetails = function(id, p){ + // update feeid details in draft mode + $scope.updateFeeIDDetails = function (id, p) { var editDraftMoveToList = { method: 'POST', url: apiPoint.url + 'editDraftFormIdFeesDetails/', @@ -525,7 +527,7 @@ $scope.draftManualEntryDetails = { }, data: { localDetails: localDetail, - details : p, + details: p, detailsID: id } }; @@ -535,27 +537,29 @@ $scope.draftManualEntryDetails = { swal("", response.data.updatedraftDetailsMessagae, "success"); getDraftFormIdDetails(); $scope.editId = -1; - $scope.leader = {}; + $scope.leader = {}; } else { swal("", response.data.updatedraftDetailsMessagae, "warning"); - - }}); + + } + }); } $scope.statusUpdateEditId = -1; - $scope.statusUpdate = function(id){ + $scope.statusUpdate = function (id) { $scope.statusUpdateEditId = id; - $scope.statusUpdateFormIdDetails = { + $scope.statusUpdateFormIdDetails = { "Status": "", "Comments": "" } } - $scope.StatusListDetails = ''; + $scope.StatusListDetails = ''; $scope.getFormIdDetailsStatusListLoading = false; - $scope.getFormIdDetailsStatusList = function(id){ - + // formid records status details + $scope.getFormIdDetailsStatusList = function (id) { + $scope.getFormIdDetailsStatusListLoading = true; var getFormIdDetailsStatusList = { method: 'POST', @@ -565,18 +569,19 @@ $scope.draftManualEntryDetails = { }, data: { localDetails: localDetail, - detailsID : id + detailsID: id } }; $http(getFormIdDetailsStatusList).then(function (response) { if (response.data.formIdstatusListStatus == true) { - $scope.getFormIdDetailsStatusListLoading = false; + $scope.getFormIdDetailsStatusListLoading = false; $scope.StatusListDetails = response.data.formIdstatusListDetails; } else { - $scope.getFormIdDetailsStatusListLoading = false; + $scope.getFormIdDetailsStatusListLoading = false; $scope.StatusListDetails = response.data.formIdstatusListDetails; $scope.StatusListDetailsApiMessage = response.data.formIdstatusListMessagae; - }}); + } + }); } $scope.statusUpdateFormIdDetails = { @@ -584,14 +589,16 @@ $scope.draftManualEntryDetails = { "Comments": "" } - $scope.resetStatusUpdateForm = function(){ - $scope.statusUpdateFormIdDetails = { + $scope.resetStatusUpdateForm = function () { + $scope.statusUpdateFormIdDetails = { "Status": "", "Comments": "" } } - $scope.addStatusUpdateDetails = function(id, formId){ + // add status for the formid record details + // kdk + $scope.addStatusUpdateDetails = function (id, formId) { var addStatusUpdateDetailsStatusList = { method: 'POST', url: apiPoint.url + 'insertStatusUpdateDetails/', @@ -600,69 +607,73 @@ $scope.draftManualEntryDetails = { }, data: { localDetails: localDetail, - details : $scope.statusUpdateFormIdDetails, + details: $scope.statusUpdateFormIdDetails, id: id, - formId : formId + formId: formId } }; $http(addStatusUpdateDetailsStatusList).then(function (response) { if (response.data.insertStatusUpdateDetailsStatus == true) { - $scope.statusUpdateFormIdDetails = { - "Status": "", - "Comments": "" - } - $scope.statusUpdateEditId = -1; - swal("", response.data.insertStatusUpdateDetailsMessagae, "success"); - } else { - swal("", response.data.insertStatusUpdateDetailsMessagae, "success"); + $scope.statusUpdateFormIdDetails = { + "Status": "", + "Comments": "" + } + $scope.statusUpdateEditId = -1; + swal("", response.data.insertStatusUpdateDetailsMessagae, "success"); + } else { + swal("", response.data.insertStatusUpdateDetailsMessagae, "success"); // $scope.getFormIdDetailsStatusListLoading = false; // $scope.StatusListDetails = response.data.formIdstatusListDetails; // $scope.StatusListDetailsApiMessage = response.data.formIdstatusListMessagae; - }}); + } + }); } - $scope.addToAccountState = function(id){ + // add formid list details to account state + // kdk + $scope.addToAccountState = function (id) { - swal({ - title: "Are you sure?", - text: "You Want to Add this Record to Account State List!", - type: "warning", - showCancelButton: true, - confirmButtonColor: '#DD6B55', - confirmButtonText: 'Yes', - cancelButtonText: "No", - closeOnConfirm: false, - closeOnCancel: false - }, - function(isConfirm){ - if (isConfirm){ - var selectedItems = []; - function getUpdateDetails(id) { - this.ID = id; - } - let itemGetID = new getUpdateDetails(id); - selectedItems.push(itemGetID); - var addToAccountStateList = { - method: 'POST', - url: apiPoint.url + 'addToAccountStateList/', - headers: { - 'Content-Type': 'application/json' - }, - data: { - localDetails: localDetail, - details : selectedItems + swal({ + title: "Are you sure?", + text: "You Want to Add this Record to Account State List!", + type: "warning", + showCancelButton: true, + confirmButtonColor: '#DD6B55', + confirmButtonText: 'Yes', + cancelButtonText: "No", + closeOnConfirm: false, + closeOnCancel: false + }, + function (isConfirm) { + if (isConfirm) { + var selectedItems = []; + function getUpdateDetails(id) { + this.ID = id; } - }; - $http(addToAccountStateList).then(function (response) { - if (response.data.accountStateMoveStatus == true) { - swal("", response.data.accountStateMoveMessagae, "success"); - $scope.onSubmit(); - } else { - swal("", response.data.accountStateMoveMessagae, "warning"); - - }}); + let itemGetID = new getUpdateDetails(id); + selectedItems.push(itemGetID); + var addToAccountStateList = { + method: 'POST', + url: apiPoint.url + 'addToAccountStateList/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + localDetails: localDetail, + details: selectedItems + } + }; + $http(addToAccountStateList).then(function (response) { + if (response.data.accountStateMoveStatus == true) { + swal("", response.data.accountStateMoveMessagae, "success"); + $scope.onSubmit(); + } else { + swal("", response.data.accountStateMoveMessagae, "warning"); + + } + }); } else { - swal("Cancelled", "Your record not added to list :)", "error"); + swal("Cancelled", "Your record not added to list :)", "error"); } }); } diff --git a/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html b/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html index b9ff5667..7072f594 100644 --- a/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html +++ b/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html @@ -5,7 +5,7 @@

{{ mainTitle }}

Student University FormId Fees Details.
- +
@@ -105,7 +105,7 @@ - @@ -147,23 +147,23 @@ - - - - - + --> - + + + + + + + + + + + +
Action + Action FormID NRIFEE ProvisionalFee + ProvisionalFee MigrationFee + MigrationFee UrgentResultDMCFee + UrgentResultDMCFee AdditionalFee - Amount + AdditionalFee + Amount
- - + + {{p.FormID}} @@ -184,10 +184,10 @@ {{p.Semester}} - {{p.Student_Name}} + {{p.Student_Name}} - {{p.Father_Name}} + {{p.Father_Name}} {{p.CourseCode}} @@ -213,15 +213,16 @@
- -
-
-
-

Loading...

-
- -
+
+ +
+
+
+

Loading...

+
+
+ +
@@ -253,7 +254,8 @@
-
- - - - - - - - - - - - -
FormIDStatusCommentsUpdated On
{{s.FormID}}{{s.Status}}{{s.Comments}}{{s.CreatedOn}}
+
FormIDStatusCommentsUpdated On
{{s.FormID}}{{s.Status}}{{s.Comments}}{{s.CreatedOn}}
-
-

{{StatusListDetailsApiMessage}}

-
-
-
-
- +
+
+

{{StatusListDetailsApiMessage}}

-
- - +
+
+
+ +
+
+
+ + +
- - +
+
- -
- +
@@ -443,7 +447,7 @@ UrgentResultDMCFee AdditionalFee Amount - + @@ -471,7 +475,7 @@ {{p.DualSpclFee}} {{p.OtherFee}} {{p.NRIFEE}} - {{p.ProvisionalFee}} + {{p.ProvisionalFee}} {{p.MigrationFee}} {{p.UrgentResultDMCFee}} {{p.AdditionalFee}} @@ -485,76 +489,76 @@ - +
- +
- +
- +
-
+
- +
- +
-
- +
+
- +
- +
- +
- +
- +
- +
@@ -562,76 +566,76 @@ - +
- +
- +
- +
- +
- +
- +
- +
- +
-
+
- +
- +
- +
- +
@@ -639,7 +643,7 @@ - +
@@ -662,7 +666,7 @@
- +
- -
@@ -778,8 +782,8 @@ +
- - \ No newline at end of file + \ No newline at end of file From 988991dfea00eb5ab1a57fcb6f7069579c529eac Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 10 Sep 2018 11:43:43 +0530 Subject: [PATCH 11/12] feestatus control_bala --- Apollo/assets/js/controllers/feesStatusCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 5634d7b2..d498a33b 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -1389,7 +1389,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n } else { - startPayableAmt = Math.round(startPayableAmt / 10) * 10; + startPayableAmt = Math.round(startPayableAmt); $scope.updateMoreItems.push({ ID: "", Name: installmentService.installmentWords(i), From a5633be534b700a0f5a9a4a301b3034c15f22fea Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 10 Sep 2018 11:45:28 +0530 Subject: [PATCH 12/12] batch comtroller bala --- Apollo/api/application/controllers/Batch_Controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/api/application/controllers/Batch_Controller.php b/Apollo/api/application/controllers/Batch_Controller.php index 9a77c55b..9124550c 100755 --- a/Apollo/api/application/controllers/Batch_Controller.php +++ b/Apollo/api/application/controllers/Batch_Controller.php @@ -44,7 +44,7 @@ class Batch_Controller extends REST_Controller { $details['IsActive'] = $this->post('status'); $details['BranchCode'] = $this->post('branchCode'); $details['CreatedOn'] = $now->format('Y-m-d H:i:s'); - print_r( $details +'samplearray'); + //print_r( $details +'samplearray'); $batchDetails = $this->batch_model->addBatch($details);// Check if the users data store contains users (in case the database result returns NULL) if ($batchDetails)