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

report changes

Browse Source
This commit is contained in:
gandhimathi 2018-09-27 13:01:38 +05:30
parent 789336251d
commit 392b361839
9 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Apollo/api/application/models/Reports_model.php
View File

@ -269,13 +269,13 @@ left join
ifnull(sms.rcvedate,'-') as rdate,ifnull(sms.rstatus,'-') as rstatus,sms.acmts,ifnull(sms.balance,0) as Balance_fee,std.name as Student_name,std.father as Father_name,std.phone as Phone_number,cm.course as Course_name,cm.uname as University,mdate,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
from
(select c.ID,c.StudentID as sid,sfs.CourseID as cid,sfs.BranchCode as branch,sfs.FeesID as fid,Sem as sem,c.CertificationType as certname,c.CertificationType as ctype,CDate as mdate,balpayable as balance,
max(if(ListName = 'ISSUED TO STUDENT', CDate,'-')) as issuedate,max(if(ListName = 'ISSUED TO STUDENT', ListName,'-')) as istatus,
max(if(ListName = 'ISSUED', CDate,'-')) as issuedate,max(if(ListName = 'ISSUED', ListName,'-')) as istatus,
max(if(ListName = 'RECEIVED', CDate,'-')) as rcvedate,max(if(ListName = 'RECEIVED', ListName,'-')) as rstatus,c.Comments as acmts
from T_CertificationStatus c
left join T_Students_Fees_Status sfs on sfs.FeesType=c.CourseID and sfs.StudentID=c.StudentID
left join T_PickListDetails list on list.ListCode=c.ListCode
left join BalFees bal on bal.student=c.StudentID and bal.course=sfs.CourseID and bal.semyr=c.Sem
where CDate is not null and (list.ListName like 'ISSUED TO STUDENT' or list.ListName like 'RECEIVED%' )
where CDate is not null and (list.ListName like 'ISSUED' 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,ifnull(cm.CertificateName,a.CertificationType) as certname,a.CertificationType as ctype,AppDate as mdate,bal.balpayable as balance,
@ -289,7 +289,7 @@ left join
left join (select student, course, sum(balpayable) balpayable from BalFees group by student, course) bal on bal.student=a.StudentID and bal.course=a.CourseID
where cm.CertificateName not like 'APPLICATION%' and a.ID in (select Max(a.ID) from T_ApplicationStatus a
left join T_CertificationMaster cm on cm.CertificationID=a.CertificationType
group by a.StudentID,a.CourseID,cm.CertificateName) and (list.ListName like 'ISSUED TO STUDENT' or list.ListName like 'RECEIVED%' )
group by a.StudentID,a.CourseID,a.ListCode,cm.CertificateName) and (list.ListName like 'ISSUED TO STUDENT' or list.ListName like 'RECEIVED%' )
group by sid,cid,ctype
union
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,
@ -303,7 +303,7 @@ left join
left join (select student, course, sum(balpayable) balpayable from BalFees group by student, course) bal on bal.student=a.StudentID and bal.course=a.CourseID
where a.CertificationType not like 'CERT%' and a.ID in (select Max(a.ID) from T_ApplicationStatus a
left join T_CertificationMaster cm on cm.CertificationID=a.CertificationType
group by a.StudentID,a.CourseID,cm.CertificateName) and (list.ListName like 'ISSUED TO STUDENT' or list.ListName like 'RECEIVED%' )
group by a.StudentID,a.CourseID,a.ListCode,cm.CertificateName) and (list.ListName like 'ISSUED TO STUDENT' or list.ListName like 'RECEIVED%' )
group by sid,cid,ctype
) as sms
left join
@ -646,16 +646,16 @@ $sql.=" group by Student_id,cid,ctype";
}
public function doc_pending($bat=null,$br=null,$u=null){
$sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sfs.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sfs.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,sms.certname as certname,ifnull(sfp.bdate,'-') as Admission_date,ifnull(sms.follow_date,'-') as fdate,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
$sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sfs.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,sms.certname as certname,ifnull(sfp.bdate,'-') as Admission_date,ifnull(sms.follow_date,'-') as fdate,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
from
(select StudentID as sid,Details as certname,DocumentDate as follow_date,StatusName as status
(select StudentID as sid,CourseID as cid,Details as certname,DocumentDate as follow_date,StatusName as status
from T_Student_DocumentTrack_Details
where StatusName not like 'CLOSED') as sms
where StatusName not like 'CLOSED' and CourseID is not null) as sms
left join
(SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype,BranchCode as branch
FROM T_Students_Fees_Status
group by sid,fid,cid,batch)
as sfs on sfs.sid=sms.sid
as sfs on sfs.sid=sms.sid and sfs.cid = sms.cid
left join
(SELECT ID,StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails
WHERE IsActive = 1 and ID IN (SELECT min(ID) FROM T_Students_Fees_PaidDetails group by StudentID,FeesID)
@ -673,7 +673,7 @@ left join
left join
(SELECT StudentID as sid,MobileNumber as phone,IsActive as active,concat(FirstName,' ',Lastname) as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid
left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid
where std.active = 1 and sfs.branch = '".$br."'
where std.active = 1 and sfs.branch = '".$br."'
";

2
Apollo/assets/js/controllers/report_app_pendingCtrl.js
View File

@ -168,7 +168,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
$scope.exportData = function () {
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,InitialPayDate as InititalPaymentDate,EnrollmentNumber as EnrollmentID,Student_name as StudentName,FatherName as FatherName,Course_name as CourseName,Sem_Year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,StatusName as ApplicationPendingStatus,FormType as FormType,StatusUpdationOn as Date INTO XLS("New_RegFormStatusReport.xls",?) FROM ?',[mystyle,$scope.app_pending_data]);
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,InitialPayDate as InititalPaymentDate,EnrollmentNumber as EnrollmentID,Student_name as StudentName,FatherName as FatherName,Course_name as CourseName,Sem_Year as SemYear,University as University,StatusName as ApplicationPendingStatus,FormType as FormType,StatusUpdationOn as Date INTO XLS("New_RegFormStatusReport.xls",?) FROM ?',[mystyle,$scope.app_pending_data]);
};

4
Apollo/assets/js/controllers/report_balfeeCtrl.js
View File

@ -215,7 +215,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
$scope.exportData = function () {
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,eid as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,University as University,regdate as RegistrationDate,CAST(Total AS NUMBER) as TotalFee,CAST(Paid_fee AS NUMBER) as FeesPaid,CAST(bal AS NUMBER) as Balance,billno1 as BillNO1,CAST(billamt1 AS NUMBER) as BillAmount1,billno2 as BillNO2,CAST(billamt2 AS NUMBER) as BillAmount2, billno3 as BillNO3, CAST(billamt3 AS NUMBER) as BillAmount3, billno4 as BillNO4, CAST(billamt4 AS NUMBER) as BillAmount4, billno5 as BillNO5,CAST(billamt5 AS NUMBER) as BillAmount5,billno6 as BillNO6,CAST(billamt6 AS NUMBER) as BillAmount6,billno7 as BillNo7,CAST(billamt7 AS NUMBER)as BillAmount7,billno8 as BillNO8,CAST(billamt8 AS NUMBER) as BillAmount8,billno9 as BillNO9,CAST(billamt9 AS NUMBER) as BillAmount9,billno10 as BillNO10,CAST(billamt10 AS NUMBER) as BillAmount10 INTO XLS("Balancefee_status.xls",?) FROM ?',[mystyle,$scope.returnResultData]);
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,eid as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,University as University,regdate as InitialPaymentDate,CAST(Total AS NUMBER) as TotalFee,CAST(Paid_fee AS NUMBER) as FeesPaid,CAST(bal AS NUMBER) as Balance,billno1 as BillNO1,CAST(billamt1 AS NUMBER) as BillAmount1,billno2 as BillNO2,CAST(billamt2 AS NUMBER) as BillAmount2, billno3 as BillNO3, CAST(billamt3 AS NUMBER) as BillAmount3, billno4 as BillNO4, CAST(billamt4 AS NUMBER) as BillAmount4, billno5 as BillNO5,CAST(billamt5 AS NUMBER) as BillAmount5,billno6 as BillNO6,CAST(billamt6 AS NUMBER) as BillAmount6,billno7 as BillNo7,CAST(billamt7 AS NUMBER)as BillAmount7,billno8 as BillNO8,CAST(billamt8 AS NUMBER) as BillAmount8,billno9 as BillNO9,CAST(billamt9 AS NUMBER) as BillAmount9,billno10 as BillNO10,CAST(billamt10 AS NUMBER) as BillAmount10 INTO XLS("Balancefee_status.xls",?) FROM ?',[mystyle,$scope.returnResultData]);
};
@ -351,7 +351,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
submit: function (form, myModel,loading,selectedStudents) {
var comments = [];
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
comments [stuid] ="Call Tracking For Report Balance Fee";
comments [stuid] ="Call Tracking For Report Balance Fee - Sem:"+selectedStudents[stuid].Sem_year + " - Balance Fee:" +selectedStudents[stuid].bal;
}
//console.log(selectedStudents);
if(isNaN(myModel.date)){

2
Apollo/assets/js/controllers/report_leadCtrl.js
View File

@ -169,7 +169,7 @@ app.controller('report_leadCtrl', ["$scope", "$filter","$rootScope","$modal", "A
$scope.exportData = function () {
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,date as Date,CAST(tid AS NUMBER) as TrackingID,fup as FollowupDate,name as Name,univ as University,course as Course,prsStatus as PresentStatus,cmnts as Comments,activity as Activity,AssignTo as AssignTo INTO XLS("Lead_Report.xls",?) FROM ?',[mystyle,$scope.lead_data]);
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,date as Date,CAST(tid AS NUMBER) as TrackingID,fup as FollowupDate,name as Name,CAST(mobile as NUMBER) as PhoneNumber,univ as University,course as Course,prsStatus as PresentStatus,cmnts as Comments,activity as Activity,AssignTo as AssignTo INTO XLS("Lead_Report.xls",?) FROM ?',[mystyle,$scope.lead_data]);
};
/*modal controller

4
Apollo/assets/views/report_application_pending.html
View File

@ -105,7 +105,7 @@
<th>Father Name</th>
<th>Course</th>
<th>Sem/Year</th>
<th>Phone No</th>
<!--<th>Phone No</th>-->
<th>University</th>
<th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Application Pending Status</th>
<th>Form Type</th>
@ -125,7 +125,7 @@
<td>{{p.FatherName}}</td>
<td>{{p.Course_name}}</td>
<td>{{p.Sem_Year}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
<!--<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>-->
<td>{{p.University}}</td>
<td>{{p.StatusName}}</td>
<td>{{p.FormType}}</td>

10
Apollo/assets/views/report_balance_fee.html
View File

@ -84,7 +84,7 @@
</div>
<div class="col-md-2">
<span>Balance:Rs.</span><span>{{getbalance()}}</span>
<span>Balance:Rs.</span><span>{{getbalance() || "0"}}</span>
<span>({{getbalance()/gettotal()*100 | number : 2 || "0"}}%)</span>
</div>
<div class="col-md-2">
@ -101,9 +101,7 @@
<thead>
<tr>
<th colspan="7"></th>
<th></th>
<th></th>
<th colspan="9"></th>
<th nowrap style="text-align:center;">Sum of Total Fee</th>
<th nowrap style="text-align:center;">Sum of Fee Paid</th>
<th nowrap style="text-align:center;">Sum of Balance Fee</th>
@ -130,7 +128,7 @@
<th nowrap style="text-align:center;">Course</th>
<th nowrap style="text-align:center;">Sem/Year</th>
<th nowrap style="text-align:center;">University</th>
<th nowrap style="text-align:center;">Reg Date</th>
<th style=" white-space: pre-wrap;text-align:left;width: 100px;text-align:center;">Initial Payment Date</th>
<th nowrap style="text-align:center;">Total Fee</th>
<th nowrap style="text-align:center;">Fees Paid</th>
<th nowrap style="text-align:center;">Balance</th>
@ -163,7 +161,7 @@
</tr>
</thead>
<tbody current-page="currentPage">
<tr dir-paginate="p in returnResultData|filter:search:strict|itemsPerPage:itemsPerPage" ng-if= "p.balance !=0">
<tr dir-paginate="p in returnResultData|filter:search:strict|itemsPerPage:itemsPerPage">
<td><input type="checkbox" ng-checked="myModel.all" id="{{p.Student_id}}" name="{{p.Student_id}}" class="form-control" ng-click="isClick($event);" /></td>
<td nowrap>{{p.SL_NO}}</td>
<td nowrap>{{p.eid}}</td>

2
Apollo/assets/views/report_lead.html
View File

@ -118,6 +118,7 @@ td,th {
<th>Tracking ID</th>
<th>Followup Date</th>
<th>Name</th>
<th>Phone Number</th>
<th>University</th>
<th>Course</th>
<th>Present Status</th>
@ -136,6 +137,7 @@ td,th {
<td>{{p.tid}}</td>
<td>{{p.fup}}</td>
<td>{{p.name}}</td>
<td>{{p.mobile}}</td>
<td>{{p.univ}}</td>
<td>{{p.course}}</td>
<td>{{p.prsStatus}}</td>

2
Apollo/assets/views/status-update/updateFeesStatus.html
View File

@ -521,7 +521,7 @@
<p><strong>Received By:</strong>&nbsp; {{ReceivedBy}}</p>
<p><strong>Date:</strong>&nbsp;<span>{{billDate}}</span> &nbsp; &nbsp; <strong>Place:</strong>&nbsp; {{branchName}}</p>
</td>
<td style="width: 137px; height: 110px;"><strong style="font-size: 12px;">For APOLLO DISTANCE EDUCATION COLLEGE</strong></td>
<td style="width: 137px; height: 110px;"><strong style="font-size: 12px;">Authorized Signatory</strong></td>
</tr>
<tr class="title" style="border:3px solid black;height: 42px;">
<td style="width: 136px; height: 42px; color: black; font-size: 12px;text-align: center;" colspan="4">Note: Terms & Conditions will be applicable as per University norms Fees once paid will not be refunded at any reasons</td>

20
Apollo/assets/views/student/studentDetailsModal.html
View File

@ -239,10 +239,11 @@
<div class="panel-scroll ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
<div ng-if="course.feesDetails==false">
<!-- <center>
<h5 class="text-dark">No Fees Details!</h5>
<h5 class="text-dark">No Fees Details!</h5>
</center>-->
</div>
<table class="table no-margin height-200 ng-scope" ng-if="course.feesDetails!=false" fixed-header>
<!--previous table class ="table no-margin height-200 ng-scope" -->
<table class="table table-striped table-bordered table-hover table-condensed" ng-if="course.feesDetails!=false" fixed-header>
<thead>
<tr>
<th style="text-align:center;">Sem/Year</th>
@ -312,7 +313,8 @@
<h5 class="text-dark">No Document Details!</h5>
</center>-->
</div>
<table class="table height-200 no-margin ng-scope" ng-if="course.applicationDetails!=false" fixed-header>
<!--previous table class ="table no-margin height-200 ng-scope" -->
<table class="table table-striped table-bordered table-hover table-condensed" ng-if="course.applicationDetails!=false" fixed-header>
<thead>
<tr>
<!-- <th>Type</th>-->
@ -370,7 +372,8 @@
<h5 class="text-dark">No Document Details!</h5>
</center>-->
</div>
<table class="table height-200 no-margin ng-scope" ng-if="course.answerbookletDetails!=false" fixed-header>
<!--previous table class ="table no-margin height-200 ng-scope" -->
<table class="table table-striped table-bordered table-hover table-condensed" ng-if="course.answerbookletDetails!=false" fixed-header>
<thead>
<tr>
<!-- <th>Type</th>-->
@ -417,7 +420,8 @@
<h5 class="text-dark">No Document Details!</h5>
</center>-->
</div>
<table class="table height-200 no-margin ng-scope" ng-if="course.certificateDetails!=false" fixed-header>
<!--previous table class ="table no-margin height-200 ng-scope" -->
<table class="table table-striped table-bordered table-hover table-condensed" ng-if="course.certificateDetails!=false" fixed-header>
<thead>
<tr>
<!-- <th>Type</th>-->
@ -467,7 +471,8 @@
<h5 class="text-dark">No Mark Card Details!</h5>
</center>-->
</div>
<table class="table height-200 no-margin ng-scope" ng-if="course.markCardDetails!=false" fixed-header>
<!--previous table class ="table no-margin height-200 ng-scope" -->
<table class="table table-striped table-bordered table-hover table-condensed" ng-if="course.markCardDetails!=false" fixed-header>
<thead>
<tr>
<th>Sem/Year</th>
@ -537,7 +542,8 @@
<h5 class="text-dark">No Study Material Details!</h5>
</center>-->
</div>
<table class="table height-200 no-margin ng-scope" ng-if="course.studyMaterialDetails!=false" fixed-header>
<!--previous table class ="table no-margin height-200 ng-scope" -->
<table class="table table-striped table-bordered table-hover table-condensed" ng-if="course.studyMaterialDetails!=false" fixed-header>
<thead>
<tr>
<th>Sem/Year</th>