unmatched details captured : kdk
This commit is contained in:
dineshkumarkannan
parent
6a1ed4aa3a
commit
2bf600b995
@ -348,3 +348,4 @@ $route['receiveEnrolmentFromUniv'] = 'Receive_Enrolment_Fees_Univ_Controller/rec
|
|||||||
$route['insertFormIdUnivFeeDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/insertFormIdUnivFeeDetails';
|
$route['insertFormIdUnivFeeDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/insertFormIdUnivFeeDetails';
|
||||||
$route['getStudentUnivFeeCompareDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getStudentUnivFeeCompareDetails';
|
$route['getStudentUnivFeeCompareDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getStudentUnivFeeCompareDetails';
|
||||||
$route['formIDFeeCompareDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/formIDFeeCompareDetails';
|
$route['formIDFeeCompareDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/formIDFeeCompareDetails';
|
||||||
|
$route['getUnmatchedRecordDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getUnmatchedRecordDetails';
|
||||||
@ -127,7 +127,7 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
|||||||
* created by kms
|
* created by kms
|
||||||
* */
|
* */
|
||||||
public function formIDFeeCompareDetails_post(){
|
public function formIDFeeCompareDetails_post(){
|
||||||
$formData['FormID'] = $this->post('formId');;
|
$formData['FormID'] = $this->post('formId');
|
||||||
$formData['EnrolmentNo'] = $this->post('enrolmentId');;
|
$formData['EnrolmentNo'] = $this->post('enrolmentId');;
|
||||||
|
|
||||||
$getDetails = $this->receive_model->getFormIDFeeDetails($formData);
|
$getDetails = $this->receive_model->getFormIDFeeDetails($formData);
|
||||||
@ -151,4 +151,24 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getUnmatchedRecordDetails_post(){
|
||||||
|
|
||||||
|
$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)
|
||||||
|
{
|
||||||
|
$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
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Set the response and exit
|
||||||
|
$this->response([
|
||||||
|
'message' => 'Something went wrong.please try again!',
|
||||||
|
'status' => REST_Controller::HTTP_NOT_FOUND
|
||||||
|
], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -538,4 +538,55 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
|
|||||||
}
|
}
|
||||||
return $feesArray;
|
return $feesArray;
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* Unmached file details
|
||||||
|
*/
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -286,6 +286,9 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
|
|||||||
$scope.popupLoad = false;
|
$scope.popupLoad = false;
|
||||||
$scope.popupLoadData = false;
|
$scope.popupLoadData = false;
|
||||||
$scope.formPaymentDetails="";
|
$scope.formPaymentDetails="";
|
||||||
|
|
||||||
|
// Fee compare details get
|
||||||
|
|
||||||
$scope.getFeeCompareDetails = function(formId, enrolmentId){
|
$scope.getFeeCompareDetails = function(formId, enrolmentId){
|
||||||
$scope.popupLoadData = false;
|
$scope.popupLoadData = false;
|
||||||
$scope.formPaymentDetails="";
|
$scope.formPaymentDetails="";
|
||||||
@ -317,4 +320,36 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$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/',
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
}]);
|
}]);
|
||||||
|
|||||||
@ -223,6 +223,106 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</tab>
|
</tab>
|
||||||
|
<tab tabindex="3" active="tabactive3" ng-click="tabActive('tabactive3')" heading="Unmatched Records" id="unmatchedRecord">
|
||||||
|
|
||||||
|
<div class="container">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-4 form-group">
|
||||||
|
<label>
|
||||||
|
Upload For <span class="symbol required"></span>
|
||||||
|
</label>
|
||||||
|
<select class="form-control" name="uploadFor" tabindex="2" id="uploadFor"
|
||||||
|
ng-model="getUnmatchedDetailsFor"
|
||||||
|
ng-options="upload.id as upload.name for upload in uploadOptions"
|
||||||
|
required>
|
||||||
|
<option value=""> Select</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="container">
|
||||||
|
<button class="btn btn-success" ng-click="getUnmatchedRecord(getUnmatchedDetailsFor)">Get Record</button>
|
||||||
|
</div>
|
||||||
|
<div class="container">
|
||||||
|
<div ng-if="unMatchedLoadingStatus">
|
||||||
|
<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>
|
||||||
|
</div>
|
||||||
|
<div class="container table-responsive" ng-if="!unMatchedNoRecordFound && unMatchedRecordDetails">
|
||||||
|
<div ng-if="unMatchedRecordDetailsType == 'EnrolmentIDFile'">
|
||||||
|
<table class="table table-border table-hover" >
|
||||||
|
<thead>
|
||||||
|
<th>FormID</th>
|
||||||
|
<th>EnrolmentNo</th>
|
||||||
|
<th>RollNo</th>
|
||||||
|
<th>CentreCode</th>
|
||||||
|
<th>CentreState</th>
|
||||||
|
<th>MobileNumber</th>
|
||||||
|
<th>StudentName</th>
|
||||||
|
<th>FatherName</th>
|
||||||
|
<th>MotherName</th>
|
||||||
|
<th>EmailID</th>
|
||||||
|
<th>UniversityCode</th>
|
||||||
|
<th>UniversityName</th>
|
||||||
|
<th>CourseCode</th>
|
||||||
|
<th>CourseName</th>
|
||||||
|
<th>SemesterYear</th>
|
||||||
|
</thead>
|
||||||
|
<tbody dir-paginate="p in unMatchedRecordDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
|
||||||
|
<tr>
|
||||||
|
<td>{{p.FormID}}</td>
|
||||||
|
<td>{{p.EnrolmentNo}}</td>
|
||||||
|
<td>{{p.RollNo}}</td>
|
||||||
|
<td>{{p.CentreCode}}</td>
|
||||||
|
<td>{{p.CentreState}}</td>
|
||||||
|
<td>{{p.MobileNumber}}</td>
|
||||||
|
<td>{{p.StudentName}}</td>
|
||||||
|
<td>{{p.FatherName}}</td>
|
||||||
|
<td>{{p.MotherName}}</td>
|
||||||
|
<td>{{p.EmailID}}</td>
|
||||||
|
<td>{{p.UniversityCode}}</td>
|
||||||
|
<td>{{p.UniversityName}}</td>
|
||||||
|
<td>{{p.CourseCode}}</td>
|
||||||
|
<td>{{p.CourseName}}</td>
|
||||||
|
<td>{{p.SemesterYear}}</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
|
||||||
|
</dir-pagination-controls>
|
||||||
|
</div>
|
||||||
|
<div ng-if="unMatchedRecordDetailsType == 'FormIDFile'">
|
||||||
|
<table class="table table-border table-hover" >
|
||||||
|
<thead>
|
||||||
|
<th>FormID</th>
|
||||||
|
<th>FormType</th>
|
||||||
|
<th>CentreCode</th>
|
||||||
|
<th>CourseCode</th>
|
||||||
|
<th>ActualCourseFee</th>
|
||||||
|
<th>CourseFee</th>
|
||||||
|
<th>Amount</th>
|
||||||
|
</thead>
|
||||||
|
<tbody dir-paginate="p in unMatchedRecordDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
|
||||||
|
<tr>
|
||||||
|
<td>{{p.FormID}}</td>
|
||||||
|
<td>{{p.FormType}}</td>
|
||||||
|
<td>{{p.CentreCode}}</td>
|
||||||
|
<td>{{p.CourseCode}}</td>
|
||||||
|
<td>{{p.ActualCourseFee}}</td>
|
||||||
|
<td>{{p.CourseFee}}</td>
|
||||||
|
<td>{{p.Amount}}</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
|
||||||
|
</dir-pagination-controls>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</tab>
|
||||||
|
|
||||||
</tabset>
|
</tabset>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user