enrolment upload model
This commit is contained in:
gandhimathi
parent
990395d7b4
commit
01fbbfbcd6
@ -349,4 +349,7 @@ $route['insertFormIdUnivFeeDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/i
|
||||
$route['getStudentUnivFeeCompareDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getStudentUnivFeeCompareDetails';
|
||||
$route['formIDFeeCompareDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/formIDFeeCompareDetails';
|
||||
$route['getUnmatchedRecordDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getUnmatchedRecordDetails';
|
||||
$route['getUniversitySessionDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getUniversitySessionDetails';
|
||||
$route['getUniversitySessionDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getUniversitySessionDetails';
|
||||
$route['getExistStudentEnrolmentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getExistStudentEnrolmentDetails';
|
||||
$route['addManualEnrolmentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addManualEnrolmentDetails';
|
||||
|
||||
|
||||
@ -34,6 +34,9 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
$this->methods['receiveEnrolmentFromUniv_post']['limit'] = 500; // 500 requests per hour per user/key
|
||||
$this->methods['formIDFeeCompareDetails_post']['limit'] = 500;
|
||||
$this->methods['getUniversitySessionDetails_post']['limit'] = 500;
|
||||
$this->methods['getExistStudentEnrolmentDetails_post']['limit'] = 1000;
|
||||
|
||||
$this->methods['addManualEnrolmentDetails_post']['limit'] = 1000;
|
||||
|
||||
// load the model
|
||||
$this->load->model('Receive_Enrolment_Fees_Univ_model', 'receive_model');
|
||||
@ -193,6 +196,65 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
$this->response(['message' => 'No list were found', 'status' => false], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
/*
|
||||
* get exist enrolment student details
|
||||
* created by kms
|
||||
* */
|
||||
public function getExistStudentEnrolmentDetails_post(){
|
||||
$localData = $this->post('localDetails');
|
||||
$enrolmentID=$this->post('enrolmentID');
|
||||
$getEnrolmentDetails=$this->receive_model->getExistStudentEnrolmentDetails($enrolmentID,$localData);
|
||||
if($getEnrolmentDetails['status']==true){
|
||||
$this->response($getEnrolmentDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
|
||||
|
||||
}
|
||||
else if($getEnrolmentDetails['status']==false){
|
||||
$this->response($getEnrolmentDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
|
||||
|
||||
|
||||
}
|
||||
else{
|
||||
$this->response(['message' => 'No list were found', 'status' => false], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
|
||||
|
||||
}
|
||||
}
|
||||
/*
|
||||
* add manual enrolment details
|
||||
* cretaed by kms
|
||||
* */
|
||||
public function addManualEnrolmentDetails_post(){
|
||||
$now = new DateTime();
|
||||
$now->setTimezone(new DateTimezone('Asia/Kolkata'));
|
||||
$localData = $this->post('localDetails');
|
||||
$studentInfo=$this->post('studentInfo');
|
||||
$semDetails=$this->post('sem');
|
||||
$studentInfo['CreatedOn'] = $now->format('Y-m-d H:i:s');
|
||||
$studentInfo['FormID'] = $this->post('formID');
|
||||
$studentInfo['SemesterYear'] = $semDetails['sem'];
|
||||
$studentInfo['FormType'] = $semDetails['FormType'];
|
||||
$studentInfo['SessionName'] = $semDetails['SessionName'];
|
||||
$studentInfo['EnrolmentNo'] = $this->post('enrolmentID');
|
||||
$studentInfo['CreatedBy'] = $localData['localUserID'];
|
||||
$studentInfo['BranchCode'] = $localData['localBranchID'];
|
||||
$studentInfo['ManualEntry'] = 1;
|
||||
$addEnrolmentDetails=$this->receive_model->addManualEnrolmentDetails($studentInfo);
|
||||
if($addEnrolmentDetails['status']==true){
|
||||
$this->response($addEnrolmentDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
|
||||
|
||||
}
|
||||
else if($addEnrolmentDetails['status']==false){
|
||||
$this->response($addEnrolmentDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
|
||||
|
||||
|
||||
}
|
||||
else{
|
||||
$this->response(['message' => 'No list were found', 'status' => false], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -15,7 +15,7 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
|
||||
|
||||
// load when html page load
|
||||
$scope.init = function () {
|
||||
|
||||
|
||||
var logcheck = JSON.parse(localStorage.getItem('localObj'));
|
||||
|
||||
const LOCALTYPE = logcheck.localType;
|
||||
@ -134,7 +134,7 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
||||
$scope.Searchloader = false;
|
||||
$scope.studentData = false;
|
||||
|
||||
@ -278,8 +278,6 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
|
||||
}
|
||||
|
||||
$scope.receiveFormIdFeeDetails = function(details) {
|
||||
console.log(details);
|
||||
|
||||
var updateUniversityEnrolment = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'insertFormIdUnivFeeDetails/',
|
||||
@ -369,6 +367,120 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
|
||||
$scope.unMatchedRecordDetails=response.data.unMatchedRecordDetails;
|
||||
}
|
||||
});
|
||||
}
|
||||
$scope.manualEnModel={
|
||||
"enrolmentNo": '',
|
||||
"formID":"",
|
||||
"sem":'',
|
||||
};
|
||||
/*
|
||||
* add manual enrolment details
|
||||
* */
|
||||
$scope.enableEnrolment=false;
|
||||
$scope.addManualEnrolemntDetails=function (values) {
|
||||
if(values=='1'){
|
||||
$scope.enableEnrolment=!$scope.enableEnrolment;
|
||||
}
|
||||
else{
|
||||
$scope.enableEnrolment=!$scope.enableEnrolment;
|
||||
}
|
||||
|
||||
}
|
||||
/*
|
||||
* check enrolment exist or not in student details
|
||||
* */
|
||||
$scope.semList=[];
|
||||
$scope.studentInfo=[];
|
||||
$scope.checkEnrolmentExistDetails=function (form,entryModel) {
|
||||
$scope.semList=[];
|
||||
$scope.studentInfo=[];
|
||||
var getExistEnrol = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'getExistStudentEnrolmentDetails/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
localDetails: localDetail,
|
||||
enrolmentID: entryModel
|
||||
}
|
||||
};
|
||||
$http(getExistEnrol).then(function (response) {
|
||||
if (response.data.status == true) {
|
||||
if(response.data.semDetails.length==0){
|
||||
swal("Warning","Already form enrolment is created for all semester", "warning");
|
||||
}
|
||||
else{
|
||||
$scope.studentInfo=response.data.StudentInfo;
|
||||
$scope.semList=response.data.semDetails;
|
||||
}
|
||||
|
||||
} else {
|
||||
$scope.semList=[];
|
||||
$scope.studentInfo=[];
|
||||
swal("Failed",response.data.message, "error");
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
/*
|
||||
* cancel manual entry for enrolment details
|
||||
* */
|
||||
$scope.cancelManualEntry=function (form) {
|
||||
$scope.semList=[];
|
||||
$scope.enableEnrolment=!$scope.enableEnrolment;
|
||||
}
|
||||
/*
|
||||
* submit manual entry form details
|
||||
* */
|
||||
$scope.manualEnrolmentSubmit = function (form) {
|
||||
if($scope.manualEnModel.enrolmentNo=='' || $scope.manualEnModel.enrolmentNo==null || $scope.manualEnModel.enrolmentNo==undefined){
|
||||
swal("Wraning","Please enter enrolment id", "warning");
|
||||
|
||||
}
|
||||
else if($scope.manualEnModel.sem=='' || $scope.manualEnModel.sem==null){
|
||||
swal("Wraning","Please select sem", "warning");
|
||||
|
||||
}
|
||||
else if($scope.manualEnModel.formID=='' || $scope.manualEnModel.formID==null){
|
||||
swal("Wraning","Please enter form id", "warning");
|
||||
|
||||
}
|
||||
else{
|
||||
var addEntry = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'addManualEnrolmentDetails/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
localDetails: localDetail,
|
||||
enrolmentID: $scope.manualEnModel.enrolmentNo,
|
||||
formID: $scope.manualEnModel.formID,
|
||||
sem: $scope.manualEnModel.sem,
|
||||
studentInfo:$scope.studentInfo
|
||||
}
|
||||
};
|
||||
$http(addEntry).then(function (response) {
|
||||
if (response.data.status == true) {
|
||||
$scope.studentInfo="";
|
||||
$scope.semList=[];
|
||||
form.manualFormID.$setPristine(true);
|
||||
form.manualSem.$setPristine(true);
|
||||
swal("Success",response.data.message, "success");
|
||||
} else {
|
||||
swal("Failed",response.data.message, "error");
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
}]);
|
||||
|
||||
@ -184,4 +184,21 @@ app.service('dateListDescService', function() {
|
||||
});
|
||||
return listDetails;
|
||||
}
|
||||
});
|
||||
app.directive('numberOnly', function () {
|
||||
return {
|
||||
require: 'ngModel',
|
||||
restrict: 'A',
|
||||
link: function (scope, element, attrs, ctrl) {
|
||||
ctrl.$parsers.push(function (input) {
|
||||
if (input == undefined) return ''
|
||||
var inputNumber = input.toString().replace(/[^0-9]/g, '');
|
||||
if (inputNumber != input) {
|
||||
ctrl.$setViewValue(inputNumber);
|
||||
ctrl.$render();
|
||||
}
|
||||
return inputNumber;
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
||||
@ -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 Details" id="viewDetails">
|
||||
<tab tabindex="1" active="tabactive1" ng-click="tabActive('tabactive1')" heading="View Enrolment Details" id="viewDetails">
|
||||
<script>
|
||||
$("#selectBranch").change(function () {
|
||||
$("#searchIn").focus();
|
||||
@ -51,6 +51,89 @@
|
||||
$("#searchIn").focus();
|
||||
});
|
||||
</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>
|
||||
</div>
|
||||
<div class="container" ng-show="enableEnrolment==true">
|
||||
<form name="manualEnForm" id="manualEnForm" novalidate>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<fieldset>
|
||||
<legend>
|
||||
Add Enrolment Details
|
||||
</legend>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
<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>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Enrolment No"
|
||||
autofocus tabindex="3" class="form-control" name="manualEnrolmentNo" id="manualEnrolmentNo" ng-minlength="6" ng-maxlength="18"
|
||||
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>
|
||||
<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>
|
||||
|
||||
</div>
|
||||
<div class="col-md-6 form-group">
|
||||
<button class="btn btn-sm btn-info" tabindex="4" style="float: left" ng-click="checkEnrolmentExistDetails(Form,manualEnModel.enrolmentNo);">Search</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-8" ng-if="semList.length!=0">
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':manualEnForm.manualSem.$dirty && manualEnForm.manualSem.$invalid, 'has-success':manualEnForm.manualSem.$valid}">
|
||||
<label>
|
||||
Sem <span class="symbol required"></span>
|
||||
</label>
|
||||
<select class="form-control" name="manualSem" tabindex="5" id="manualSem"
|
||||
ng-model="manualEnModel.sem"
|
||||
ng-options="semD.sem for semD in semList"
|
||||
required>
|
||||
<option value=""> Select sem</option>
|
||||
</select>
|
||||
<span class="error text-small block"
|
||||
ng-if="manualEnForm.manualSem.$dirty && manualEnForm.manualSem.$invalid">Sem is required</span>
|
||||
</div>
|
||||
|
||||
<div class="col-md-8 form-group" ng-class="{'has-error':manualEnForm.manualFormID.$dirty && manualEnForm.manualFormID.$invalid, 'has-success':manualEnForm.manualFormID.$valid}">
|
||||
<label> Form ID <span class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<input type="text" tabindex="6" placeholder="Enter Form ID"
|
||||
class="form-control" name="manualFormID"
|
||||
ng-model="manualEnModel.formID" required number-only/>
|
||||
<span class="error text-small block"
|
||||
ng-if="manualEnForm.manualFormID.$dirty && manualEnForm.manualFormID.$invalid">Form id is required</span>
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="pull-right">
|
||||
<button tabindex="14" type="button" ng-click="manualEnrolmentSubmit(manualEnForm)" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in">
|
||||
Save
|
||||
</button>
|
||||
<button type="button" class="btn btn-warning btn-wide" tabindex="15"
|
||||
ng-click="cancelManualEntry(manualEnForm)">
|
||||
Cancel
|
||||
</button>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="container-fluid container-fullw">
|
||||
<form name="Form" id="form" novalidate ng-submit="onSubmit()" method="post">
|
||||
@ -104,6 +187,8 @@
|
||||
<tr>
|
||||
<th> FormID
|
||||
</th>
|
||||
<th> Enrolment No
|
||||
</th>
|
||||
<th> Form Type
|
||||
</th>
|
||||
<th> Student Name
|
||||
@ -116,12 +201,7 @@
|
||||
</th>
|
||||
<th> Sem/Year
|
||||
</th>
|
||||
<th> Enrolment ID
|
||||
</th>
|
||||
<th> University Paid
|
||||
</th>
|
||||
<th> Student Paid
|
||||
</th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
|
||||
@ -129,6 +209,7 @@
|
||||
<td>
|
||||
{{p.FormID}}
|
||||
</td>
|
||||
<td>{{p.EnrolmentNo}}</td>
|
||||
<td>
|
||||
{{p.FormType}}
|
||||
</td>
|
||||
@ -142,9 +223,7 @@
|
||||
<td>{{p.UniversityName}}</td>
|
||||
<td>{{p.CourseName}}</td>
|
||||
<td>{{p.SemesterYear}}</td>
|
||||
<td>{{p.EnrolmentNo}}</td>
|
||||
<td>{{p.UniversityPaidAmount}}</td>
|
||||
<td>{{p.StudentPaidAmount}}</td>
|
||||
|
||||
<!-- <td>
|
||||
<i class="ti-write" tooltip="View Fee Details" id="personalDetailButton" ng-click="setEditId(p.FormID);getFeeCompareDetails(p.FormID, p.EnrolmentNo)"></i>
|
||||
</td>-->
|
||||
|
||||
Loading…
Reference in New Issue
Block a user