Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec
This commit is contained in:
gandhimathi
commit
a50bc68d65
@ -347,4 +347,5 @@ $route['getApplicationFormStatusList'] = 'StatusUpdation_Controller/getApplicati
|
||||
$route['receiveEnrolmentFromUniv'] = 'Receive_Enrolment_Fees_Univ_Controller/receiveEnrolmentFromUniv';
|
||||
$route['insertFormIdUnivFeeDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/insertFormIdUnivFeeDetails';
|
||||
$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
|
||||
* */
|
||||
public function formIDFeeCompareDetails_post(){
|
||||
$formData['FormID'] = $this->post('formId');;
|
||||
$formData['FormID'] = $this->post('formId');
|
||||
$formData['EnrolmentNo'] = $this->post('enrolmentId');;
|
||||
|
||||
$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
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -664,4 +664,55 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
||||
}
|
||||
@ -178,6 +178,13 @@ from
|
||||
left join T_PickListDetails p on p.ListCode = app.ListCode
|
||||
left join BalFees bal on bal.student=app.StudentID and bal.course=app.CourseID
|
||||
where CertificateName not like 'APPLICATION%' and app.ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,ListCode,BranchCode,CertificationType)
|
||||
group by app.ID
|
||||
union
|
||||
SELECT app.ID,app.StudentID as sid,app.CourseID as cid,app.BranchCode as branch,app.ListCode as lcode,p.ListName as status,AppDate as adate,app.Comments as acmts,CertificationType as ctype,app.CertificationType as certname,sum(bal.balpayable) as balance
|
||||
FROM T_ApplicationStatus as app
|
||||
left join T_PickListDetails p on p.ListCode = app.ListCode
|
||||
left join BalFees bal on bal.student=app.StudentID and bal.course=app.CourseID
|
||||
where app.CertificationType not like 'CERT%' and app.ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,ListCode,BranchCode,CertificationType)
|
||||
group by app.ID) as sms
|
||||
left join
|
||||
(SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others
|
||||
@ -258,7 +265,7 @@ left join BalFees bal on bal.student=c.StudentID and bal.course=sfs.CourseID and
|
||||
where CDate is not null and (list.ListName like 'ISSUED TO STUDENT' or list.ListName like 'RECEIVED%' )
|
||||
group by sid,cid,sem,ctype
|
||||
union
|
||||
select a.ID,a.StudentID as sid,a.CourseID as cid,sfs.BranchCode as branch,sfs.FeesID as fid,'-' as sem,cm.CertificateName as certname,a.CertificationType as ctype,AppDate as mdate,bal.balpayable as balance,
|
||||
select a.ID,a.StudentID as sid,a.CourseID as cid,sfs.BranchCode as branch,sfs.FeesID as fid,'-' as sem,ifnull(cm.CertificateName,a.CertificationType) as certname,a.CertificationType as ctype,AppDate as mdate,bal.balpayable as balance,
|
||||
max(if(ListName = 'ISSUED TO STUDENT', AppDate,'-')) as issuedate,max(if(ListName = 'ISSUED TO STUDENT', ListName,'-')) as istatus,
|
||||
max(if(ListName = 'RECEIVED', AppDate,'-')) as rcvedate,max(if(ListName = 'RECEIVED', ListName,'-')) as rstatus,a.Comments as acmts
|
||||
from T_ApplicationStatus a
|
||||
|
||||
@ -2298,6 +2298,7 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "$timeout",
|
||||
$scope.BranchLogo = "";
|
||||
$scope.FeesReceiptTitle = "";
|
||||
$scope.myPdfView = '';
|
||||
$scope.cur_url = '';
|
||||
$scope.ShowHide = function (pdfValue,print) {
|
||||
$timeout(()=> {
|
||||
//alert(this.print);
|
||||
@ -2316,6 +2317,7 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "$timeout",
|
||||
$scope.BranchLogo = pdfValue.LogoPath;
|
||||
$scope.FeesReceiptTitle = pdfValue.FeesReceiptTitle;
|
||||
$scope.receiptNo=pdfValue.ReceiptNo;
|
||||
$scope.cur_url = window.location.hostname + window.location.pathname;
|
||||
|
||||
|
||||
|
||||
@ -2326,12 +2328,13 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "$timeout",
|
||||
|
||||
var printHtml = document.getElementById(print).outerHTML;
|
||||
//var currentPage = document.body.innerHTML;
|
||||
var popupWinindow = window.open('', '_blank', 'width=1200,height=700,scrollbars=no,menubar=no,toolbar=no,location=no,status=no,titlebar=no');
|
||||
var elementPage = '<html><head><style type="text/css" media="print">@media print {#Header, #Footer { display:none !important; }}</style></head><body>' + printHtml + '<br><br>' + printHtml + '</body>';
|
||||
document.body.innerHTML = elementPage;
|
||||
window.print();
|
||||
document.body.innerHTML = elementPage;
|
||||
window.location.reload();
|
||||
document.close();
|
||||
popupWinindow.document.body.innerHTML = elementPage;
|
||||
popupWinindow.print();
|
||||
popupWinindow.document.body.innerHTML = elementPage;
|
||||
//window.location.reload();
|
||||
popupWinindow.document.close();
|
||||
}
|
||||
|
||||
// $scope.mouseLeave = function(){
|
||||
|
||||
@ -286,6 +286,9 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
|
||||
$scope.popupLoad = false;
|
||||
$scope.popupLoadData = false;
|
||||
$scope.formPaymentDetails="";
|
||||
|
||||
// Fee compare details get
|
||||
|
||||
$scope.getFeeCompareDetails = function(formId, enrolmentId){
|
||||
$scope.popupLoadData = false;
|
||||
$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;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}]);
|
||||
|
||||
@ -455,14 +455,14 @@
|
||||
<tr class="title-row" style="height: 15px;">
|
||||
<td class="title-branch" ng-if="BranchLogo=='' || BranchLogo==null" style="width: 136px; height: 82px; color: white; font-size: 22px; text-align: center;" rowspan="3">
|
||||
<div class="user-image">
|
||||
<img class="pull-center" ng-src="assets/images/logo1.png" alt="APP">
|
||||
<img class="pull-center" ng-src="http://{{cur_url}}assets/images/logo1.png" alt="APP">
|
||||
<!-- <img ng-src="{{userInfo.avatar}}" alt="" ng-if="!obj.flow.files.length && !noImage">
|
||||
<img flow-img="obj.flow.files[0]" ng-if="obj.flow.files.length">-->
|
||||
</div>
|
||||
</td>
|
||||
<td class="title-branch" ng-if="BranchLogo!='' && BranchLogo!=null" style="width: 136px; height: 82px; color: white; font-size: 22px; text-align: center;" rowspan="3">
|
||||
<div class="user-image">
|
||||
<img class="pull-center" ng-src="images/{{BranchLogo}}" alt="APP">
|
||||
<img class="pull-center" ng-src="http://{{cur_url}}images/{{BranchLogo}}" alt="APP">
|
||||
<!-- <img ng-src="{{userInfo.avatar}}" alt="" ng-if="!obj.flow.files.length && !noImage">
|
||||
<img flow-img="obj.flow.files[0]" ng-if="obj.flow.files.length">-->
|
||||
</div>
|
||||
|
||||
@ -223,6 +223,106 @@
|
||||
</div>
|
||||
</div>
|
||||
</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>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user