Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Browse Source
This commit is contained in:
gayathri1990 2018-09-11 15:23:31 +05:30
commit 4c6142e8d6
8 changed files with 125 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php
View File

@ -136,12 +136,12 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
$formData['EnrolmentNo'] = $this->post('enrolmentId');;
$getDetails = $this->receive_model->getFormIDFeeDetails($formData);
if ($getDetails['status']=true)
if ($getDetails['formTypeStatus']=true)
{
// Set the response and exit
$this->response($getDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
}
else if($getDetails['status']=false){
else if($getDetails['formTypeStatus']=false){
$this->response([
'message' => $getDetails['Message'],
], REST_Controller::HTTP_OK); // NOT_FOUND (404) being the HTTP response code
@ -151,7 +151,7 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
// Set the response and exit
$this->response([
'message' => 'Something went wrong.please try again!',
'status' => false
'formTypeStatus' => false
], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
}
}
@ -160,9 +160,13 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
$getDetailsFor = $this->post('getDetailsFor');
$getUnmatchedFormDetails = $this->receive_model->getUnmatchedFormDetails($getDetailsFor);// Check if the users data store contains users (in case the database result returns NULL)
if ($getUnmatchedFormDetails)
if ($getUnmatchedFormDetails['unMatchedRecordStatus'])
{
// Set the response and exit
$this->response($getUnmatchedFormDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
}
else if ($getUnmatchedFormDetails['unMatchedRecordStatus']==false)
{
$getUnmatchedFormDetails['status'] = REST_Controller::HTTP_OK;
// Set the response and exit
$this->response($getUnmatchedFormDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
}
@ -171,7 +175,7 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
// Set the response and exit
$this->response([
'message' => 'Something went wrong.please try again!',
'status' => REST_Controller::HTTP_NOT_FOUND
'formTypeStatus' => false
], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
}
}

6
Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php
View File

@ -549,7 +549,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
} else {
$resultArr['studentFeeCompareDetails'] = [];
$resultArr['formTypeStatus'] = false;
$resultArr['message'] = "No record found";
$resultArr['message'] = "No record found...";
}
return $resultArr;
}
@ -734,7 +734,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
$resultArr['unMatchedRecordDetails'] = $mergeFormDetails;
$resultArr['unMatchedRecordStatus'] = false;
$resultArr['unMatchedRecordFor'] = 'EnrolmentIDFile';
$resultArr['message'] = "Successfully data generated";
$resultArr['message'] = "No record found...";
}
@ -743,7 +743,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
$resultArr['unMatchedRecordDetails'] = [];
$resultArr['unMatchedRecordStatus'] = false;
$resultArr['unMatchedRecordFor'] = 'EnrolmentIDFile';
$resultArr['message'] = "Successfully data generated";
$resultArr['message'] = "No record found...";
}

7
Apollo/assets/i18n/en.json
View File

@ -118,6 +118,13 @@
"APPLICATION": "Application"
}
},
"formupload": {
"MAIN": "UNIVERSITY FORMS",
"ENROLLMENT": "Enrollment",
"STUDENTFEEDETAILCOMPARE": "Form Enrolment",
"STUDENTFROMIDFEEDETAILS": "Form Fees",
"UNIVERSITYFORMPAYMENT": "Payment"
},
"status": {
"MAIN": "STATUS",
"APPLICATION": "Application",

54
Apollo/assets/js/config.router.js
View File

@ -307,30 +307,14 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
ncyBreadcrumb: {
label: 'Manage Details'
}
}).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: 'University Form Enrolment',
})
.state('app.formupload', {
url: '/student',
template: '<div ui-view class="fade-in-up"> <div style="margin: auto; width: 50%;padding: 10px;"> STUDENT DETAILS </div> </div>',
title: 'Student',
ncyBreadcrumb: {
label: 'University Form Enrolment'
label: 'Student'
}
}).state('app.student.studentUnivFormIdFeeDetails', {
url: '/studentUnivFormIdFeeDetails',
templateUrl: "assets/views/student/studentUnivFormIdFeeDetails.html",
resolve: loadSequence('ui.select', 'spin', 'ui.mask', 'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'studentUnivFormIdFeeDetailsCtrl', 'ngTable'),
title: 'Student FormId Fees Details',
ncyBreadcrumb: {
label: 'Student FormId Fees Details'
}
}).state('app.student.universityformpayment', {
url: '/univformpayment',
templateUrl: "assets/views/student/UnivFormPaymentDetails.html",
resolve: loadSequence('ui.select', 'spin', 'ui.mask', 'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'univFormPaymentCtrl', 'ngTable'),
title: 'University Form Payment Details',
ncyBreadcrumb: {
label: 'University Form Payment Details'
}
}).state('app.student.status', {
url: '/status',
template: '<div ui-view class="fade-in-up"> <div style="margin: auto; width: 50%;padding: 10px;"> STUDENT STATUS UPDATE </div> </div>',
@ -816,7 +800,31 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
label: 'Student Merge'
},
});
}).state('app.formupload.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: 'University Form Enrolment',
ncyBreadcrumb: {
label: 'University Form Enrolment'
}
}).state('app.formupload.studentUnivFormIdFeeDetails', {
url: '/studentUnivFormIdFeeDetails',
templateUrl: "assets/views/student/studentUnivFormIdFeeDetails.html",
resolve: loadSequence('ui.select', 'spin', 'ui.mask', 'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'studentUnivFormIdFeeDetailsCtrl', 'ngTable'),
title: 'Student FormId Fees Details',
ncyBreadcrumb: {
label: 'Student FormId Fees Details'
}
}).state('app.formupload.universityformpayment', {
url: '/univformpayment',
templateUrl: "assets/views/student/UnivFormPaymentDetails.html",
resolve: loadSequence('ui.select', 'spin', 'ui.mask', 'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'univFormPaymentCtrl', 'ngTable'),
title: 'University Form Payment Details',
ncyBreadcrumb: {
label: 'University Form Payment Details'
}
});
// $locationProvider.html5Mode(true);

11
Apollo/assets/js/controllers/student_university_fee_compare.js
View File

@ -146,10 +146,10 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
$scope.Searchloader = false;
$scope.studentData = false;
$scope.statusMessage="";
$scope.onSubmit = function(){
$scope.Searchloader = true;
if($scope.searchData.University !== '' && $scope.searchData.Session !==''){
$scope.statusMessage="";
$scope.Searchloader = true;
var empListreq = {
method: 'POST',
@ -168,15 +168,14 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
$scope.studentData = true;
$scope.data = response.data.studentFeeCompareDetails;
$scope.studentListLength = $scope.data.length;
// $scope.statusMessage = $scope.data.message;
$scope.statusMessage="";
} else {
$scope.Searchloader = false;
$scope.studentData = false;
$scope.statusMessage = $scope.data.message;
$scope.statusMessage = response.data.message;
$scope.data="";
}
});
}else {
}
}
//export excel

49
Apollo/assets/views/partials/nav.html
View File

@ -180,7 +180,7 @@
</a>
</li>-->
<li>
<a href="javascript:;">
<a href="javascript:void(0);">
<span translate="sidebar.nav.student.status.MAIN">Status Update</span> <i class="icon-arrow"></i>
</a>
<ul class="sub-menu">
@ -216,23 +216,9 @@
</li>
</ul>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.UnivFormEnroment" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.student.STUDENTFEEDETAILCOMPARE"> University Form Enrolment </span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.studentUnivFormIdFeeDetails" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.student.STUDENTFROMIDFEEDETAILS"> STUDENT FORMID FEE DETAILS </span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.universityformpayment" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.student.UNIVERSITYFORMPAYMENT"> University Form Payment </span>
</a>
</li>
</ul>
</li>
<!--<li ng-class="{'active open':$state.includes('app.call')}">
<a ui-sref="app.call.tracking">
<div class="item-content">
@ -426,6 +412,7 @@
</ul>
</li>
<li ng-class="{'active open':$state.includes('app.reports')}">
<a href="javascript:void(0)">
@ -522,6 +509,36 @@
</ul>
</li>
<li ng-class="{'active open':$state.includes('app.formupload')}">
<a href="javascript:void(0)">
<div class="item-content">
<div class="item-media">
<i class="ti-check"></i>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.formupload.MAIN"> University Form Upload </span><i class="icon-arrow"></i>
</div>
</div>
</a>
<ul class="sub-menu">
<li ui-sref-active="active">
<a ui-sref="app.formupload.UnivFormEnroment" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.formupload.STUDENTFEEDETAILCOMPARE"> Form Enrolment </span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.formupload.studentUnivFormIdFeeDetails" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.formupload.STUDENTFROMIDFEEDETAILS"> Form Fees </span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.formupload.universityformpayment" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.formupload.UNIVERSITYFORMPAYMENT"> Payment </span>
</a>
</li>
</ul>
</li>
<!--<li ng-class="{'active open':$state.includes('app.myprofile')}">
<a ui-sref="app.myprofile" ng-click="checkSuperAdmin()">
<div class="item-content">

4
Apollo/assets/views/student/UnivFormPaymentDetails.html
View File

@ -16,7 +16,7 @@
<span class="mainDescription">Form List. </span>
</div>
<div ncy-breadcrumb></div>
<!--<div ncy-breadcrumb></div>-->
</div>
</section>
<div class="container-fluid container-fullw bg-white" ng-controller="univFormPaymentCtrl" data-ng-init="init()">
@ -67,7 +67,7 @@
<thead>
<tr>
<th> Form ID</th>
<th> Enrolment No</th>
<th> Enrollment ID</th>
<th> Bill No</th>
<th> Date</th>
<th> Payable</th>

70
Apollo/assets/views/student/studentUnivFeeCompareDetails.html
View File

@ -2,8 +2,8 @@
<section id="page-title">
<div class="row">
<div class="col-sm-8">
<h1 class="mainTitle" translate="Enrolment Details">{{ mainTitle }}</h1>
<span class="mainDescription">Student Form Enrolment Details. </span>
<h1 class="mainTitle" translate="Enrollment Details">{{ mainTitle }}</h1>
<span class="mainDescription">Student Form Enrollment Details. </span>
</div>
<!-- <div ncy-breadcrumb></div>-->
</div>
@ -43,7 +43,7 @@
<div class="row" ng-init="init()">
<tabset id="here" class="tabbable">
<tab tabindex="1" active="tabactive1" ng-click="tabActive('tabactive1')" heading="View Enrolment Details" id="viewDetails">
<tab tabindex="1" active="tabactive1" ng-click="tabActive('tabactive1')" heading="Matched Details" id="viewDetails">
<script>
$("#selectBranch").change(function () {
$("#searchIn").focus();
@ -52,7 +52,7 @@
});
</script>
<div class="col-md-12">
<button class="btn btn-sm btn-info" tabindex="2" style="float: right" ng-click="addManualEnrolemntDetails('1')">Add Enrolment Details</button>
<button class="btn btn-sm btn-info" tabindex="2" style="float: right" ng-click="addManualEnrolemntDetails('1')">Add Enrollment Details</button>
</div>
<div class="container" ng-show="enableEnrolment==true">
<form name="manualEnForm" id="manualEnForm" novalidate>
@ -60,7 +60,7 @@
<div class="col-md-12">
<fieldset>
<legend>
Add Enrolment Details
Add Enrollment Details
</legend>
<div class="row">
@ -68,7 +68,7 @@
<div class="col-md-12 form-group"
ng-class="{'has-error':manualEnForm.manualEnrolmentNo.$dirty && manualEnForm.manualEnrolmentNo.$invalid, 'has-success':manualEnForm.manualEnrolmentNo.$valid}">
<label>
Enrolment ID<span class="symbol required"></span>
Enrollment ID<span class="symbol required"></span>
</label>
<input type="text" placeholder="Enter Enrolment No"
@ -76,9 +76,9 @@
ng-model="manualEnModel.enrolmentNo" required />
<span class="error text-small block"
ng-if="manualEnForm.manualEnrolmentNo.$dirty && manualEnForm.manualEnrolmentNo.$invalid"
ng-hide="manualEnForm.manualEnrolmentNo.$error.maxlength || manualEnForm.manualEnrolmentNo.$error.minlength || manualEnForm.manualEnrolmentNo.$error.pattern">Enrolment no is required</span>
ng-hide="manualEnForm.manualEnrolmentNo.$error.maxlength || manualEnForm.manualEnrolmentNo.$error.minlength || manualEnForm.manualEnrolmentNo.$error.pattern">Enrollment no is required</span>
<span class="error text-small block"
ng-if="manualEnForm.manualEnrolmentNo.$error.maxlength || manualEnForm.manualEnrolmentNo.$error.minlength || manualEnForm.manualEnrolmentNo.$error.pattern">Enter a valid enrolment no</span>
ng-if="manualEnForm.manualEnrolmentNo.$error.maxlength || manualEnForm.manualEnrolmentNo.$error.minlength || manualEnForm.manualEnrolmentNo.$error.pattern">Enter a valid enrollment no</span>
</div>
<div class="col-md-6 form-group">
@ -172,7 +172,7 @@
<div class="col-md-3">
<label for="form-field-select-2">
Course
Course <span class="symbol required"></span>
</label>
<select ui-select2 class="form-control" tabindex="10" class="cs-select cs-skin-elastic" name="serachCourse" id="serachCourse" ng-model="searchData.Course">
@ -191,14 +191,10 @@
</div>
<div class="col-md-2" style="padding-top: 2.3%;">
<div class="pull-right">
<button ng-disabled="searchData.University == ''" type="submit" class="btn btn-success btn-o" tabindex="12">
Submit
<div class="col-md-2" style="margin-top: 23px;">
<button ng-disabled="searchData.University == '' || searchData.Course == ''" type="submit" class="btn btn-success" tabindex="12">
Get Record
</button>
</div>
</div>
</div>
@ -207,23 +203,24 @@
<div>
<!--{{data | json}}-->
<div class="row" style="text-align: right;">
<button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
</div>
<div ng-if="Searchloader">
<div align="center" >
<h3 style="color: blue;">Loading...</h3></div>
<h2> {{statusMessage}} </h2>
<div style="color: blue; align: center;" align="center"> Loading...</div>
</div>
<div class="table-responsive" ng-if="studentData">
<div align="center" ng-if="studentData==false">
<div style="color: red; align: center;" align="center"> {{statusMessage}}</div>
</div>
<div class="row" style="text-align: right;">
<button class="btn btn-success btn-o" ng-click="exportData()" ng-if="studentData">Export to Excel</button>
</div>
<div class="table-responsive" ng-if="studentData">
<table class="table table-hover" >
<thead>
<tr>
<th> FormID
</th>
<th> Enrolment No
<th> Enrollment ID
</th>
<th> Form Type
</th>
@ -240,7 +237,7 @@
</tr>
</thead>
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results" pagination-id="matched">
<tr>
<td>
{{p.FormID}}
@ -292,13 +289,13 @@
</tr>-->
</tbody>
</table>
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
<dir-pagination-controls pagination-id="matched" max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls>
</div>
</div>
</tab>
<tab tabindex="13" active="tabactive2" ng-click="tabActive('tabactive2')" heading="Unmatched Records" id="unmatchedRecord">
<tab tabindex="13" active="tabactive2" ng-click="tabActive('tabactive2')" heading="Un-Matched Details" id="unmatchedRecord">
<div class="col-md-3 form-group">
<label for="form-field-select-2">
@ -314,7 +311,8 @@
<div class="col-md-3 form-group">
<label for="form-field-select-2">
Course
Course <span class="symbol required"></span>
</label>
</label>
<select class="form-control" tabindex="15" class="cs-select cs-skin-elastic" name="mismatchCourseSearch" id="mismatchCourseSearch" ng-model="misMatchsSearchData.Course">
<option value="" selected>Select Course</option>
@ -334,7 +332,7 @@
</div>
<div class="col-md-2" style="margin-top: 20px;">
<button class="btn btn-success" ng-disabled="!misMatchUnivSearch" ng-click="getUnmatchedRecord(misMatchsSearchData)">Get Record</button>
<button class="btn btn-success" ng-disabled="!misMatchUnivSearch || misMatchsSearchData.Course=='' " ng-click="getUnmatchedRecord(misMatchsSearchData)">Get Record</button>
</div>
@ -344,11 +342,11 @@
<div style="color: blue; align: center;" align="center"> Loading...</div>
</div>
<div ng-if="unMatchedNoRecordFound">
<div style="color: red; align: center;" align="center"> No Record Found ...</div>
<div style="color: red; align: center;" align="center"> No record found ...</div>
</div>
</div>
<div class="row" style="text-align: right;">
<div class="row" style="text-align: right;" ng-if="!unMatchedNoRecordFound && unMatchedRecordDetails">
<button class="btn btn-success btn-o" ng-click="exportDataTab2()">Export to Excel</button>
@ -359,7 +357,7 @@
<table class="table table-border table-hover" >
<thead>
<th>FormID</th>
<th>EnrolmentNo</th>
<th>Enrollment ID</th>
<th>SemesterYear</th>
<th>MobileNumber</th>
<th>StudentName</th>
@ -377,7 +375,7 @@
</thead>
<tbody dir-paginate="p in unMatchedRecordDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
<tbody dir-paginate="p in unMatchedRecordDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results" pagination-id="unmatched">
<tr>
<td>{{p.FormID}}</td>
<td ng-if="p.EnromentStatus==true">{{p.EnrolmentNo}}</td>
@ -402,7 +400,7 @@
</tr>
</tbody>
</table>
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
<dir-pagination-controls pagination-id="unmatched" max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls>
</div>