From 17e654509c71572e266ac1f7ab0020154fae1821 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 6 Sep 2018 12:53:08 +0530 Subject: [PATCH 1/6] common files changes university enrolment details --- .../models/Receive_Enrolment_Fees_Univ_model.php | 1 + Apollo/assets/js/config.constant.js | 3 +++ Apollo/assets/js/controllers/univFormPaymentCtrl.js | 0 .../assets/views/student/UnivFormPaymentDetails.html | 10 ++++++++++ 4 files changed, 14 insertions(+) create mode 100644 Apollo/assets/js/controllers/univFormPaymentCtrl.js create mode 100644 Apollo/assets/views/student/UnivFormPaymentDetails.html 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 e1cb468c..827920e5 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -755,6 +755,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $this->db->select('UniversityID,UniversityName'); $this->db->order_by('UniversityID','DESC'); $this->db->where('IsActive','1'); + $this->db->group_by('UniversityName'); // $this->db->where('BranchCode',$branchID); $universityDetails = $this->db->get(UNIVERSITY); $universityResult=array(); diff --git a/Apollo/assets/js/config.constant.js b/Apollo/assets/js/config.constant.js index 82beca4b..15774703 100755 --- a/Apollo/assets/js/config.constant.js +++ b/Apollo/assets/js/config.constant.js @@ -243,6 +243,9 @@ app.constant('JS_REQUIRES', { 'student_university_fee_compareCtrl':'assets/js/controllers/student_university_fee_compare.js', 'studentUnivFormIdFeeDetailsCtrl': 'assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js', + // university form payment details + 'univFormPaymentCtrl': 'assets/js/controllers/univFormPaymentCtrl.js', + }, //*** angularJS Modules diff --git a/Apollo/assets/js/controllers/univFormPaymentCtrl.js b/Apollo/assets/js/controllers/univFormPaymentCtrl.js new file mode 100644 index 00000000..e69de29b diff --git a/Apollo/assets/views/student/UnivFormPaymentDetails.html b/Apollo/assets/views/student/UnivFormPaymentDetails.html new file mode 100644 index 00000000..566549bd --- /dev/null +++ b/Apollo/assets/views/student/UnivFormPaymentDetails.html @@ -0,0 +1,10 @@ + + + + + Title + + + + + \ No newline at end of file From a65458bc771be7afa02d079dac999cc16f57dbe3 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 6 Sep 2018 16:52:19 +0530 Subject: [PATCH 2/6] data correction screen for student merge --- Apollo/api/application/config/routes.php | 3 + .../controllers/DataCorrection_Controller.php | 29 ++- .../application/models/Data_correction.php | 30 ++- Apollo/assets/i18n/en.json | 3 +- Apollo/assets/js/config.constant.js | 5 +- Apollo/assets/js/config.router.js | 9 + .../assets/js/controllers/studentMergeCtrl.js | 225 ++++++++++++++++++ Apollo/assets/views/MergeStudentModal.html | 45 ++++ Apollo/assets/views/StudentMerge.html | 109 +++++++++ Apollo/assets/views/partials/nav.html | 5 + 10 files changed, 456 insertions(+), 7 deletions(-) create mode 100644 Apollo/assets/js/controllers/studentMergeCtrl.js create mode 100644 Apollo/assets/views/MergeStudentModal.html create mode 100644 Apollo/assets/views/StudentMerge.html diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index ce09afb1..c9edcbd4 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -348,6 +348,9 @@ $route['report_examfee'] = 'Report/examfee'; $route['report_balfee'] = 'Report/balfee'; $route['report_lead'] = 'Report/lead'; $route['insertUniversityfile'] = 'UniversityFile_Controller/insertUniversityfile'; +//Data correction +$route['Stud_Merge'] = 'DataCorrection_Controller/StudMerge'; +$route['get_Mob'] = 'DataCorrection_Controller/getMob'; //Application Form Details $route['getApplicationFromDetails'] = 'StatusUpdation_Controller/getApplicationFromDetails'; diff --git a/Apollo/api/application/controllers/DataCorrection_Controller.php b/Apollo/api/application/controllers/DataCorrection_Controller.php index 70660b6f..0bfe5b5e 100644 --- a/Apollo/api/application/controllers/DataCorrection_Controller.php +++ b/Apollo/api/application/controllers/DataCorrection_Controller.php @@ -35,9 +35,32 @@ class DataCorrection_Controller extends REST_Controller { public function StudMerge_post() { - $toDelete = $this->post('toDelete'); - $toMerge = $this->post('toMerge'); - $getStatus = $this->Data_correction->Student_Merge($toDelete,$toMerge); + $name = $this->post('name'); + $getStatus = $this->Data_Correction->Student_Merge($name); + //print_r($getStatus); + if ($getStatus) + { + $getStatus['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($getStatus, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + } + else + { + // Set the response and exit + $this->response([ + 'message' => 'No records found!', + 'status' => REST_Controller::HTTP_NOT_FOUND + ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code + } + + + } + + public function getMob_post() + { + $deleteNo = $this->post('deleteNo'); + $mergeNo = $this->post('mergeNo'); + $getStatus = $this->Data_Correction->getMobile($deleteNo,$mergeNo); //print_r($getStatus); if ($getStatus) { diff --git a/Apollo/api/application/models/Data_correction.php b/Apollo/api/application/models/Data_correction.php index f84ea742..4f912ab3 100644 --- a/Apollo/api/application/models/Data_correction.php +++ b/Apollo/api/application/models/Data_correction.php @@ -7,9 +7,15 @@ defined('BASEPATH') OR exit('No direct script access allowed'); class Data_Correction extends CI_Model { - Public function Student_Merge($toDelete=null,$toMerge=null) + Public function Student_Merge($name=null) { - $sql = ""; + $sql = "select scd.StudentID as Student_id,scd.CourseID as cid,Firstname as Student_name,std.MobileNumber as Phone_number,CourseName as Course_name,UniversityName as University +from T_Student_CourseDetails as scd +left join T_StudentDetails as std on std.StudentID = scd.StudentID and std.IsActive = 1 +left join T_CourseMaster AS cm ON cm.CourseID = scd.CourseID +left join T_UniversityMaster as univ on univ.UniversityID = scd.UniversityID +where Firstname like '".$name."' +group by Student_id,cid"; $b=$this->db->query($sql); $batch = $b->result(); if (count($batch) > 0) { @@ -21,6 +27,26 @@ class Data_Correction extends CI_Model } return $results; } + + Public function getMobile($deleteNo=null,$mergeNo=null) + { + $sql = "call SP_MERGE_STUDENT_DATA('".$deleteNo."','".$mergeNo."',@countRow); + "; + $a=$this->db->query($sql); + $sqlOut = " select @countRow as counts;"; + $b=$this->db->query($sqlOut); + $batch = $b->result(); + //echo $batch[0]->counts; + if ($batch[0]->counts > 0) { + $results['MergeStatus'] = true; + $results['after_Merge'] = $batch; + $results['message'] = 'Student details successfully merged'; + } else { + $results['MergeStatus'] = false; + $results['message'] = 'Can not Merge'; + } + return $results; + } diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index 85282b7d..1d1a7aab 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -157,7 +157,8 @@ }, "entry": { "MAIN": "My Details", - "coursecorrection": "Course Details" + "coursecorrection": "Course Details", + "stud_merge": "Student Merge" }, "announcement": { "MAIN": "ANNOUNCEMENT", diff --git a/Apollo/assets/js/config.constant.js b/Apollo/assets/js/config.constant.js index 15774703..ee716a2d 100755 --- a/Apollo/assets/js/config.constant.js +++ b/Apollo/assets/js/config.constant.js @@ -236,7 +236,10 @@ app.constant('JS_REQUIRES', { 'report_examfeeCtrl':'assets/js/controllers/report_examfeeCtrl.js', 'report_balfeeCtrl':'assets/js/controllers/report_balfeeCtrl.js', 'report_leadCtrl':'assets/js/controllers/report_leadCtrl.js', - + + //Data Correction + 'studentMergeCtrl':'assets/js/controllers/studentMergeCtrl.js', + /** * univesity sutdent fee compare details */ diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 5e5edef4..c878eaf4 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -807,6 +807,15 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com label: 'coursecorrection' }, + }).state('app.entry.stud_merge', { + url: '/studentMergeCtrl', + templateUrl: "assets/views/StudentMerge.html", + resolve: loadSequence('studentMergeCtrl','ngTable', 'ladda', 'angular-ladda'), + title: 'Student Merge', + ncyBreadcrumb: { + label: 'Student Merge' + }, + }); // $locationProvider.html5Mode(true); diff --git a/Apollo/assets/js/controllers/studentMergeCtrl.js b/Apollo/assets/js/controllers/studentMergeCtrl.js new file mode 100644 index 00000000..5467a6e0 --- /dev/null +++ b/Apollo/assets/js/controllers/studentMergeCtrl.js @@ -0,0 +1,225 @@ +'use strict'; +/*** controller***/ +app.controller('studentMergeCtrl', ["$scope", "$filter","$rootScope", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', '$window',"dateListDescService","$modal", + function ($scope, $filter,$rootScope, apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window, dateListDescService,$modal,$log) { + + $scope.name = { + "studentName": "", + + }; + + $scope.onSubmit = function (form) { + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + $scope.show = true; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$studentName; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[batch=' + firstError + ']').focus(); + }else { + //alert($scope.batch.name); + $scope.stud_merge = ''; + $scope.message = ''; + console.log($scope.stud_merge); + var response_data = { + method: 'POST', + url: apiPoint.url + 'Stud_Merge/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + name: $scope.name.studentName + + } + + }; + + $http(response_data).then(function (response) { + if (response.data.MergeStatus == true) { + $scope.stud_merge = response.data.Stud_Merge; + } else { + $scope.message = response.data.message; + } + + }); + + } + } + + + //merge student + $scope.selectedStudentsID = []; + $scope.number1 = ''; + $scope.number2 = ''; + $scope.getMobile = ''; + $scope.toDelete = ''; + $scope.toMerge = ''; + // $rootScope.num1 = ''; + // $rootScope.num2 = ''; + $scope.isCheckAll = function(e){ + var val = (e.target.checked ? true : false); + if(val) + { + // $scope.disable = false; + var len = $scope.Stud_Merge.length; + var i = 0; + for(i=0;i +
+
+ +
+
+ + Select Mobile number to merge + + + +
+ + +   {{num1}} to merge with {{num2}} + +
+
+ +   {{num2}} to merge with {{num1}} +
+ + + + +
+
+ + + +
+
+
+
+
+
+ \ No newline at end of file diff --git a/Apollo/assets/views/StudentMerge.html b/Apollo/assets/views/StudentMerge.html new file mode 100644 index 00000000..4dc3ea98 --- /dev/null +++ b/Apollo/assets/views/StudentMerge.html @@ -0,0 +1,109 @@ +
+
+
+

Student Merge

+
+ +
+
+ + + + +
+
+
+
+
+
+ +
+ +
+ + + +
+ + +
+
+ + + +
+
+
+
+
+
+ +
+ +
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Student NameMobile NumberCourse NameUniversityAction
{{p.Student_name}}{{p.Phone_number}}{{p.Course_name}}{{p.University}}
+

{{message}}

+ +
+ + + +
+
\ No newline at end of file diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index a05d13dc..95d799f6 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -555,6 +555,11 @@ COURSECORRECTION +
  • + + Student Merge + +
    • From 0ea6c34e7ddb4d6b98b26a2a1481c02450b57330 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 6 Sep 2018 11:31:52 +0000 Subject: [PATCH 3/6] DataCorrection_Controller.php edited online with Bitbucket --- .../api/application/controllers/DataCorrection_Controller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Apollo/api/application/controllers/DataCorrection_Controller.php b/Apollo/api/application/controllers/DataCorrection_Controller.php index 0bfe5b5e..e596b8f2 100644 --- a/Apollo/api/application/controllers/DataCorrection_Controller.php +++ b/Apollo/api/application/controllers/DataCorrection_Controller.php @@ -36,7 +36,7 @@ class DataCorrection_Controller extends REST_Controller { public function StudMerge_post() { $name = $this->post('name'); - $getStatus = $this->Data_Correction->Student_Merge($name); + $getStatus = $this->Data_correction->Student_Merge($name); //print_r($getStatus); if ($getStatus) { @@ -60,7 +60,7 @@ class DataCorrection_Controller extends REST_Controller { { $deleteNo = $this->post('deleteNo'); $mergeNo = $this->post('mergeNo'); - $getStatus = $this->Data_Correction->getMobile($deleteNo,$mergeNo); + $getStatus = $this->Data_correction->getMobile($deleteNo,$mergeNo); //print_r($getStatus); if ($getStatus) { From b715749d8178a62fb73ffe1c4c8d4214ff1026ce Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Thu, 6 Sep 2018 17:49:48 +0530 Subject: [PATCH 4/6] formid details, fees details update record : kdk --- Apollo/api/application/config/routes.php | 3 +- ...Receive_Enrolment_Fees_Univ_Controller.php | 19 ++ .../Receive_Enrolment_Fees_Univ_model.php | 99 ++++++++-- .../studentUnivFormIdFeeDetailsCtrl.js | 48 ++++- Apollo/assets/views/partials/nav.html | 4 +- .../student/studentUnivFormIdFeeDetails.html | 187 +++++++++++++++++- 6 files changed, 328 insertions(+), 32 deletions(-) diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index ce09afb1..d00e7b67 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -366,4 +366,5 @@ $route['getExistStudentEnrolmentDetails'] = 'Receive_Enrolment_Fees_Univ_Control $route['addManualEnrolmentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addManualEnrolmentDetails'; $route['getForFormIdDraftDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getForFormIdDraftDetails'; $route['addForFormIdDraftDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addForFormIdDraftDetails'; -$route['draftMovetoList'] = 'Receive_Enrolment_Fees_Univ_Controller/draftMovetoList'; \ No newline at end of file +$route['draftMovetoList'] = 'Receive_Enrolment_Fees_Univ_Controller/draftMovetoList'; +$route['editDraftFormIdFeesDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/editDraftFormIdFeesDetails'; \ No newline at end of file diff --git a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php index 1c22c772..1b50ad60 100644 --- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php +++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php @@ -321,5 +321,24 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { } } + public function editDraftFormIdFeesDetails_post(){ + $reqBranch = $this->post('localDetails'); + $details = $this->post('details'); + $detailsID = $this->post('detailsID'); + + $details = $this->post('details'); + $editDraftFormIdFeesDetails = $this->receive_model->editDraftFormIdFeesDetails($reqBranch, $details, $detailsID); // Check if the employee exist + if ($editDraftFormIdFeesDetails) { + $editDraftFormIdFeesDetails['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($editDraftFormIdFeesDetails, 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 9d7fea9a..09189869 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -442,9 +442,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) + (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) 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)"; + ( '$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)"; $queryDetails = $this->db->query($query); } else { echo 'else con'; @@ -876,9 +876,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) + (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) 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)"; + ( '$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)"; $queryDetails = $this->db->query($query); if($queryDetails){ @@ -899,11 +899,9 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { // print_r($details);exit(); foreach($detail as $row) { - // echo $row['ID'];exit(); - $data[] = array( - 'ID' => $row['ID'], - 'FormType'=> 'Hello' - ); + $ids = $row['ID']; + $updateQuery = 'UPDATE `T_FormId_FeeDetails_Received_From_University` SET `DraftStatus` = 0 WHERE `ID` = '.$ids; + $queryDetails = $this->db->query($updateQuery); } // $data = array( @@ -917,16 +915,81 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { // ) // ); // print_r($data);exit(); - $this->db->update_batch('T_FormId_FeeDetails_Received_From_University', $data, 'ID'); + // $this->db->update('T_FormId_FeeDetails_Received_From_University', $data, 'ID'); - $detailsList = $details->result(); - if($detailsList){ - $result['draftStatus'] = true; - $result['draftDetailsMessagae'] = "Updated Successfully."; - } else { - $result['draftStatus'] = false; - $result['draftDetailsMessagae'] = "Something went wrong."; - } + // $detailsList = $details->result(); + $result['draftStatus'] = true; + $result['draftDetailsMessagae'] = "Updated Successfully."; + return $result; + } + + public function editDraftFormIdFeesDetails($reqBranch, $details, $detailsID){ + $ids = $detailsID; + $formIds = $details['FormID']; + $formType = $details['FormType']; + $CentreCode = $details['CentreCode']; + $Session = $details['Session']; + $Year = $details['Year']; + $Semester = $details['Semester']; + $Student_Name = $details['Student_Name']; + $Father_Name = $details['Father_Name']; + $CourseCode = $details['CourseCode']; + $ActualCourseFee = $details['ActualCourseFee']; + $CourseFee = $details['CourseFee']; + $ExamFee = $details['ExamFee']; + $EnrollmentFee = $details['EnrollmentFee']; + $ProspectusFee = $details['ProspectusFee']; + $ReRegFee = $details['ReRegFee']; + $CreditTransferFee = $details['CreditTransferFee']; + $LateralEntryFee = $details['LateralEntryFee']; + $DualSpclFee = $details['DualSpclFee']; + $OtherFee = $details['OtherFee']; + $NRIFEE = $details['NRIFEE']; + $ProvisionalFee = $details['ProvisionalFee']; + $MigrationFee = $details['MigrationFee']; + $UrgentResultDMCFee = $details['UrgentResultDMCFee']; + $AdditionalFee = $details['AdditionalFee']; + $Amount = $details['Amount']; + + $data = array( + 'FormID' => $formIds , + 'FormType' => $formType , + 'CentreCode'=> $CentreCode, + 'Session' =>$Session, + 'Year' =>$Year, + 'Semester' =>$Semester, + 'Student_Name' =>$Student_Name , + 'Father_Name' =>$Father_Name, + 'CourseCode' =>$CourseCode, + 'ActualCourseFee' =>$ActualCourseFee, + 'CourseFee' =>$CourseFee, + 'ExamFee' =>$ExamFee, + 'EnrollmentFee' =>$EnrollmentFee, + 'ProspectusFee' =>$ProspectusFee, + 'ReRegFee'=>$ReRegFee, + 'CreditTransferFee' =>$CreditTransferFee, + 'LateralEntryFee' =>$LateralEntryFee, + 'DualSpclFee' =>$DualSpclFee, + 'OtherFee' =>$OtherFee, + 'NRIFEE' =>$NRIFEE , + 'ProvisionalFee' =>$ProvisionalFee, + 'MigrationFee' =>$MigrationFee, + 'UrgentResultDMCFee' =>$UrgentResultDMCFee, + 'AdditionalFee' =>$AdditionalFee, + 'Amount' => $Amount + ); + + $this->db->where('ID', $detailsID); + $this->db->update('T_FormId_FeeDetails_Received_From_University', $data); + // echo $this->db->affected_rows();exit(); + if($this->db->affected_rows() > 0){ +$result['updatedraftStatus'] = true; + $result['updatedraftDetailsMessagae'] = "Updated Successfully."; + }else{ +$result['updatedraftStatus'] = false; + $result['updatedraftDetailsMessagae'] = "Something went wrong."; + } + return $result; } } \ No newline at end of file diff --git a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js index dd1faef7..6bfdd424 100644 --- a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js +++ b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js @@ -482,19 +482,51 @@ $scope.draftManualEntryDetails = { }; $http(draftMoveToList).then(function (response) { if (response.data.draftStatus == true) { - // swal("", response.data.draftDetailsMessagae, "success"); - // getDraftFormIdDetails(); - // getEmptycall(); + // alert(); + swal("", response.data.draftDetailsMessagae, "success"); + getDraftFormIdDetails(); } else { - // swal("", response.data.draftDetailsMessagae, "warning"); - // getDraftFormIdDetails(); - // getEmptycall(); - } - }); + swal("", response.data.draftDetailsMessagae, "warning"); + + }}); } else { swal("Cancelled", "Your record not added to list :)", "error"); } }); } + $scope.editId = -1; + $scope.leader = {}; + $scope.editList = function(details, d){ + $scope.leader = {}; + angular.copy(d, $scope.leader); + $scope.editId = details; + } + + $scope.updateFeeIDDetails = function(id, p){ + var editDraftMoveToList = { + method: 'POST', + url: apiPoint.url + 'editDraftFormIdFeesDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + localDetails: localDetail, + details : p, + detailsID: id + } + }; + $http(editDraftMoveToList).then(function (response) { + if (response.data.updatedraftStatus == true) { + // alert(); + swal("", response.data.updatedraftDetailsMessagae, "success"); + getDraftFormIdDetails(); + $scope.editId = -1; + $scope.leader = {}; + } else { + swal("", response.data.updatedraftDetailsMessagae, "warning"); + + }}); + } + }]); diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 24e120eb..c5988d12 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -221,11 +221,11 @@ STUDENT UNIV FEE COMPARE DETAILS - +