From 7bb136febab6315485bafb817dbe2121c83ee158 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 5 Sep 2018 14:33:57 +0530 Subject: [PATCH 1/7] data correction --- Apollo/api/application/models/Data_correction.php | 3 ++- Apollo/assets/views/edit_course.html | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Apollo/api/application/models/Data_correction.php b/Apollo/api/application/models/Data_correction.php index e4cab2e2..f84ea742 100644 --- a/Apollo/api/application/models/Data_correction.php +++ b/Apollo/api/application/models/Data_correction.php @@ -26,7 +26,7 @@ class Data_Correction extends CI_Model Public function GetAllCourseDetails($search) { - $this->db->select('sd.MobileNumber,sd.Firstname,sd.Lastname,CourseName,UniversityName,scd.CourseID,scd.ID,sd.StudentID,scd.IsActive as IsActive,scd.DeactiveComments as Reason,scd.UniversityID,sfs.FeesID'); + $this->db->select('sd.MobileNumber,sd.Firstname,sd.Lastname,CourseName,UniversityName,scd.CourseID,scd.ID,sd.StudentID,scd.IsActive as IsActive,scd.DeactiveComments as Reason,scd.UniversityID,sfs.FeesID,scd.Deactive'); $this->db->from('T_StudentDetails sd'); $this->db->join('T_Student_CourseDetails scd','scd.StudentID = sd.StudentID'); $this->db->join('T_CourseMaster cm','cm.CourseID = scd.CourseID'); @@ -110,6 +110,7 @@ class Data_Correction extends CI_Model $coursearr['IsActive'] = $search['IsActive']; $coursearr['DeactiveComments'] =$search['Reason']; + $coursearr['Deactive'] = '0'; $this->db->where('StudentID', $search['studentId']); $this->db->where('UniversityID', $search['University']); $this->db->where('CourseID', $search['courseId']); diff --git a/Apollo/assets/views/edit_course.html b/Apollo/assets/views/edit_course.html index e165dcf6..2abf1c2e 100644 --- a/Apollo/assets/views/edit_course.html +++ b/Apollo/assets/views/edit_course.html @@ -27,6 +27,7 @@
+
@@ -64,7 +65,7 @@ -
+
From bae8d8a311e9c5691b87d42d94479368a43b4806 Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Thu, 6 Sep 2018 09:15:48 +0530 Subject: [PATCH 2/7] form upload details changes : kdk --- Apollo/api/application/config/routes.php | 3 + ...Receive_Enrolment_Fees_Univ_Controller.php | 47 +++++ .../Receive_Enrolment_Fees_Univ_model.php | 135 +++++++++++- .../studentUnivFormIdFeeDetailsCtrl.js | 192 +++++++++++++++--- .../student/studentUnivFormIdFeeDetails.html | 148 ++++++++++++++ 5 files changed, 496 insertions(+), 29 deletions(-) diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index ae79d2f2..ce31d44a 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -353,3 +353,6 @@ $route['getUniversitySessionDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/ $route['getUnivCourseFromFileDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getUnivCourseFromFileDetails'; $route['getExistStudentEnrolmentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getExistStudentEnrolmentDetails'; $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 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 7148fd98..1c22c772 100644 --- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php +++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php @@ -274,5 +274,52 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { } } + public function getForFormIdDraftDetails_post(){ + $reqBranch = $this->post('localDetails'); + $getForFormIdDraftDetails = $this->receive_model->getForFormIdDraftDetails(); // Check if the employee exist + if ($getForFormIdDraftDetails) { + $getForFormIdDraftDetails['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($getForFormIdDraftDetails, 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 addForFormIdDraftDetails_post(){ + $reqBranch = $this->post('localDetails'); + $details = $this->post('details'); + $addForFormIdDraftDetails = $this->receive_model->addForFormIdDraftDetails($details, $reqBranch); // Check if the employee exist + if ($addForFormIdDraftDetails) { + $addForFormIdDraftDetails['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($addForFormIdDraftDetails, 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 draftMovetoList_post(){ + $reqBranch = $this->post('localDetails'); + $details = $this->post('details'); + $draftMovetoList = $this->receive_model->draftMovetoList($details, $reqBranch); // Check if the employee exist + if ($draftMovetoList) { + $draftMovetoList['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($draftMovetoList, 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 7b399aa4..0fb4d807 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) + (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) 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' )"; + ( '$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)"; $queryDetails = $this->db->query($query); } else { echo 'else con'; @@ -697,4 +697,135 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { return $universityResult; } + public function getForFormIdDraftDetails(){ + $selectQuery = "SELECT * FROM T_FormId_FeeDetails_Received_From_University WHERE DraftStatus = 1"; + $details = $this->db->query($selectQuery); + $detailsList = $details->result(); + if($detailsList) { + $result['draftStatus'] = true; + $result['draftDetails'] = $detailsList; + $result['draftDetailsMessagae'] = "details generate successfully."; + } else { + $result['draftStatus'] = false; + $result['draftDetails'] = ''; + $result['draftDetailsMessagae'] = "No Record Found."; + } + return $result; + } + + public function addForFormIdDraftDetails($details, $local){ + + $localBranchID = $local['localBranchID']; + $localUserID = $local['localUserID']; + $time = date('Y-m-d H:i:s'); + $CreatedOn = $time; + + $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']; + $selectQuery = "SELECT * FROM T_FormId_FeeDetails_Received_From_University WHERE + FormID = '$formIds' AND + FormType = '$formType' AND + CentreCode = '$CentreCode' AND + Session = '$Session' AND + Year = '$Year' AND + Semester = '$Semester' AND + Student_Name = '$Student_Name' AND + Father_Name = '$Father_Name' AND + CourseCode = '$CourseCode' AND + ActualCourseFee = '$ActualCourseFee' AND + CourseFee = '$CourseFee' AND + ExamFee = '$ExamFee' AND + EnrollmentFee = '$EnrollmentFee' AND + ProspectusFee = '$ProspectusFee' AND + ReRegFee = '$ReRegFee' AND + CreditTransferFee = '$CreditTransferFee' AND + LateralEntryFee = '$LateralEntryFee' AND + DualSpclFee = '$DualSpclFee' AND + OtherFee = '$OtherFee' AND + NRIFEE = '$NRIFEE' AND + ProvisionalFee = '$ProvisionalFee' AND + MigrationFee = '$MigrationFee' AND + UrgentResultDMCFee = '$UrgentResultDMCFee' AND + AdditionalFee = '$AdditionalFee' AND + Amount = '$Amount'"; + $queryDetails = $this->db->query($selectQuery); + + 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) + 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)"; + $queryDetails = $this->db->query($query); + + if($queryDetails){ + $result['draftStatus'] = true; + $result['draftDetailsMessagae'] = "Updated Successfully."; + }else{ + $result['draftStatus'] = false; + $result['draftDetailsMessagae'] = "Something went wrong."; + } + } else { + $result['draftStatus'] = false; + $result['draftDetailsMessagae'] = "This record already exist."; + } + return $result; + } + + public function draftMovetoList($detail, $local){ + // print_r($details);exit(); + + foreach($detail as $row) { + // echo $row['ID'];exit(); + $data[] = array( + 'ID' => $row['ID'], + 'FormType'=> 'Hello' + ); + } + + // $data = array( + // array( + // 'ID' => 1, + // 'FormType' => 'Hello' + // ), + // array( + // 'ID' => 2, + // 'FormType' => 'World' + // ) + // ); + // print_r($data);exit(); + $this->db->update_batch('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."; + } + } + } \ No newline at end of file diff --git a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js index 7ec75d6d..dd1faef7 100644 --- a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js +++ b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js @@ -327,36 +327,174 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter getDraftFormIdDetails(); } } + + + $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' + } + + $scope.draftListDetails = ''; + $scope.draftListDetailsNoRecordFound = false; + $scope.draftListDetailsLoading = false; // get draft form id details function getDraftFormIdDetails(){ - // $scope.unMatchedRecordDetails = ''; - // $scope.unMatchedNoRecordFound = false; - // $scope.unMatchedLoadingStatus = true; - // var getDetailsFor = ss == 1 ? 'EnrolmentIDFile' : 'FormIDFile'; - // var getFeeCompareDetailsList = { - // method: 'POST', - // url: apiPoint.url + 'getUnmatchedRecordDetails/', - // headers: { - // 'Content-Type': 'application/json' - // }, - // data: { - // localDetails: localDetail, - // getDetailsFor: getDetailsFor - // } - // }; - // $http(getFeeCompareDetailsList).then(function (response) { - // if (response.data.unMatchedRecordStatus == true) { - // $scope.unMatchedLoadingStatus = false; - // $scope.unMatchedNoRecordFound = false; - // $scope.unMatchedRecordDetails = response.data.unMatchedRecordDetails; - // $scope.unMatchedRecordDetailsType = response.data.unMatchedRecordFor; - // } else { - // $scope.unMatchedLoadingStatus = false; - // $scope.unMatchedNoRecordFound = true; - // $scope.unMatchedRecordDetails = response.data.unMatchedRecordDetails; - // } - // }); + $scope.draftListDetailsLoading = true; + $scope.draftListDetailsNoRecordFound = false; + $scope.draftListDetails = ''; + var getFormIdDraftDetailsList = { + method: 'POST', + url: apiPoint.url + 'getForFormIdDraftDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + localDetails: localDetail + } + }; + $http(getFormIdDraftDetailsList).then(function (response) { + if (response.data.draftStatus == true) { + $scope.draftListDetailsLoading = false; + $scope.draftListDetails = response.data.draftDetails; + $scope.draftListDetailsNoRecordFound = false; + } else { + $scope.draftListDetailsLoading = false; + $scope.draftListDetailsNoRecordFound = true; + } + }); + } + + // manual entry details add + + $scope.addManualData = function() { + alert(JSON.stringify($scope.draftManualEntryDetails)); + + var addDraftDetailsList = { + method: 'POST', + url: apiPoint.url + 'addForFormIdDraftDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + localDetails: localDetail, + details : $scope.draftManualEntryDetails + } + }; + $http(addDraftDetailsList).then(function (response) { + if (response.data.draftStatus == true) { + swal("", response.data.draftDetailsMessagae, "success"); + getDraftFormIdDetails(); + getEmptycall(); + } else { + swal("", response.data.draftDetailsMessagae, "warning"); + getDraftFormIdDetails(); + getEmptycall(); + } + }); + } + + 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; +} + + $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 + } + }; + $http(draftMoveToList).then(function (response) { + if (response.data.draftStatus == true) { + // swal("", response.data.draftDetailsMessagae, "success"); + // getDraftFormIdDetails(); + // getEmptycall(); + } else { + // swal("", response.data.draftDetailsMessagae, "warning"); + // getDraftFormIdDetails(); + // getEmptycall(); + } + }); + } 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 962b0e68..ac5daec2 100644 --- a/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html +++ b/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html @@ -202,6 +202,154 @@
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FormIDFormTypeCentreCodeSessionYearSemesterStudent_NameFather_NameCourseCodeActualCourseFeeCourseFeeExamFeeEnrollmentFeeProspectusFeeReRegFeeCreditTransferFeeLateralEntryFeeDualSpclFeeOtherFeeNRIFEEProvisionalFeeMigrationFeeUrgentResultDMCFeeAdditionalFeeAmount
+ + +
+
+ +
+
+
+ Loading... +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FormIDFormTypeCentreCodeSessionYearSemesterStudent NameFather NameCourseCodeActualCourseFeeCourseFeeExamFeeEnrollmentFeeProspectusFeeReRegFeeCreditTransferFeeLateralEntryFeeDualSpclFeeOtherFeeNRIFEEProvisionalFeeMigrationFeeUrgentResultDMCFeeAdditionalFeeAmountAction
{{p.FormID}}{{p.FormType}}{{p.CentreCode}}{{p.Session}}{{p.Year}}{{p.Semester}}{{p.Student_Name}}{{p.Father_Name}}{{p.CourseCode}}{{p.ActualCourseFee}}{{p.CourseFee}}{{p.ExamFee}}{{p.EnrollmentFee}}{{p.ProspectusFee}}{{p.ReRegFee}}{{p.CreditTransferFee}}{{p.LateralEntryFee}}{{p.DualSpclFee}}{{p.OtherFee}}{{p.NRIFEE}}{{p.ProvisionalFee}}{{p.MigrationFee}}{{p.UrgentResultDMCFee}}{{p.AdditionalFee}}{{p.Amount}} + +
+ + +
+
+ -
-
-

Loading...

-

{{statusMessage}}

-
+
+
+

Loading...

+

{{statusMessage}}

+
@@ -262,30 +293,118 @@ - + + +
+ + + +
+ + +
+ + + +
+
+ + + +
+ +
+ +
+
+
+
Loading...
+
+
+
No Record Found ...
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FormIDEnrolmentNoSemesterYearMobileNumberStudentNameUniversityCodeUniversityNameCourseCodeCourseNameFatherNameMotherNameEmailID
{{p.FormID}}{{p.EnrolmentNo}}{{p.EnrolmentNo}}{{p.SemesterYear}}{{p.SemesterYear}}{{p.MobileNumber}}{{p.StudentName}}{{p.UniversityCode}}{{p.UniversityName}}{{p.CourseCode}}{{p.CourseName}}{{p.FatherName}}{{p.MotherName}}{{p.EmailID}}
+ + +
+ + + + +
- - + -
-
- - - -
@@ -294,116 +413,12 @@
-
-
- - - -
-
+
- - -
-
-
- - -
-
-
-
- -
-
-
-
Loading...
-
-
-
No Record Found ...
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
FormIDEnrolmentNoRollNoCentreCodeCentreStateMobileNumberStudentNameFatherNameMotherNameEmailIDUniversityCodeUniversityNameCourseCodeCourseNameSemesterYear
{{p.FormID}}{{p.EnrolmentNo}}{{p.RollNo}}{{p.CentreCode}}{{p.CentreState}}{{p.MobileNumber}}{{p.StudentName}}{{p.FatherName}}{{p.MotherName}}{{p.EmailID}}{{p.UniversityCode}}{{p.UniversityName}}{{p.CourseCode}}{{p.CourseName}}{{p.SemesterYear}}
- - -
-
- - - - - - - - - - - - - - - - - - - - - -
FormIDFormTypeCentreCodeCourseCodeActualCourseFeeCourseFeeAmount
{{p.FormID}}{{p.FormType}}{{p.CentreCode}}{{p.CourseCode}}{{p.ActualCourseFee}}{{p.CourseFee}}{{p.Amount}}
- - -
-
- + From fe7b851e91da3bed73a57f86dbff889f26b7dd6c Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 6 Sep 2018 09:47:34 +0530 Subject: [PATCH 5/7] common files changes university enrolment details --- Apollo/assets/views/student/studentUnivFeeCompareDetails.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html index be193f9e..5e836c2d 100644 --- a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html +++ b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html @@ -3,7 +3,7 @@

{{ mainTitle }}

- Student Form ID Enrolment Details. + Student Form Enrolment Details.
From dcc4ed7ee6687ac394496bdb10065d5436f11a09 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 6 Sep 2018 09:48:00 +0530 Subject: [PATCH 6/7] common files changes university enrolment details --- Apollo/assets/i18n/en.json | 2 +- Apollo/assets/js/config.router.js | 8 ++++---- Apollo/assets/views/partials/nav.html | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index 18ddf828..5d2ab428 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -106,7 +106,7 @@ "ENROLLMENT": "Enrollment", "STUDENTDETAILS": "Manage", "STUDENTDETAILSADDEDIT": "Manage Details", - "STUDENTFEEDETAILCOMPARE": "Student University Fee", + "STUDENTFEEDETAILCOMPARE": "University Form Enrolment", "STUDENTFROMIDFEEDETAILS": "Student FormId Fee Details", "status" : { "MAIN": "Update Status", diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 76cbf9e4..fd27f560 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -307,13 +307,13 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com ncyBreadcrumb: { label: 'Manage Details' } - }).state('app.student.studentUnivFeeCompareDetails', { - url: '/studentUnivFeeCompare', + }).state('app.student.UnivFormEnroment', { + url: '/UnivFormEnrolment', templateUrl: "assets/views/student/studentUnivFeeCompareDetails.html", resolve: loadSequence('ui.select', 'spin', 'ui.mask', 'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'student_university_fee_compareCtrl', 'ngTable'), - title: 'Student University Fee Compare', + title: 'University Form Enrolment', ncyBreadcrumb: { - label: 'Student University Fee Compare' + label: 'University Form Enrolment' } }).state('app.student.studentUnivFormIdFeeDetails', { url: '/studentUnivFormIdFeeDetails', diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 24e120eb..0eb85f73 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -217,8 +217,8 @@
  • - - STUDENT UNIV FEE COMPARE DETAILS + + University Form Enrolment