report issues fixed
This commit is contained in:
gandhimathi
parent
b78f96a700
commit
5be0fea000
@ -360,7 +360,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
|
||||
}
|
||||
public function answer_booklet($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(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(sms.adate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,listdate.issuedate as issuedate,listdate.rcvedate as rcvedate,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as balance
|
||||
$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(sms.branch,'-') as Branch_code,ifnull(sms.adate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,listdate.issuedate as issuedate,listdate.rcvedate as rcvedate,ifnull(((sfs.cf + sfs.stf + sfs.others)-(sfp.bamount)),0) as balance
|
||||
|
||||
from
|
||||
(SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,AnsDate as
|
||||
@ -379,7 +379,7 @@ left join
|
||||
group by sid,fid,billno)
|
||||
as sfp on sfp.sid=sfs.sid and sfp.fid=sfs.fid
|
||||
left join
|
||||
(SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd on cfd.cid=sms.cid
|
||||
(SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd on cfd.ccid=sfs.cid and cfd.cid=sfs.ftype
|
||||
left join
|
||||
(SELECT ListCode as lcode,ListName as status FROM T_PickListDetails)
|
||||
as list on list.lcode=sms.lcode
|
||||
@ -394,13 +394,13 @@ left join
|
||||
(SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName 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
|
||||
left join
|
||||
(select ID,StudentID as sid,
|
||||
(select ID,StudentID as sid,Sem as sem,
|
||||
max(if(ListName = 'ISSUED TO STUDENT', AnsDate,'-')) as issuedate,
|
||||
max(if(ListName = 'RECEIVED FROM STUDENT', AnsDate,'-')) as rcvedate
|
||||
from T_AnswerBookletStatus abs
|
||||
left join T_PickListDetails list on list.ListCode=abs.ListCode where AnsDate is not null
|
||||
group by sid
|
||||
) as listdate on listdate.sid=sms.sid
|
||||
group by sid,Sem
|
||||
) as listdate on listdate.sid=sms.sid and listdate.sem=sms.sem
|
||||
where std.active = 1 and sms.branch = '".$br."'
|
||||
";
|
||||
|
||||
@ -414,7 +414,7 @@ group by sid
|
||||
$sql.=" and cm.uid = '".$u."'";
|
||||
|
||||
}
|
||||
$sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem,Sem_year";
|
||||
$sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem";
|
||||
|
||||
|
||||
|
||||
@ -537,7 +537,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
|
||||
$sql.=" and cm.uid = '".$u."'";
|
||||
|
||||
}
|
||||
$sql.="group by Student_id,Course_id,Batch_code,Branch_code";
|
||||
$sql.="group by Student_id,Course_id,Batch_code,Branch_code,certname";
|
||||
|
||||
|
||||
|
||||
@ -563,16 +563,15 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
|
||||
IF(ModeOfPayment = 'WAIVER', sum(BillAmount), 0) AS waiver,
|
||||
IF(ModeOfPayment = 'REFERRAL', BillNO,'-') AS referal_bill,
|
||||
IF(ModeOfPayment = 'REFERRAL', sum(BillAmount), 0) AS referal FROM T_Students_Fees_PaidDetails
|
||||
where IsActive = 1
|
||||
group by waiver_bill,referal_bill) as sms
|
||||
where IsActive = 1 and ModeOfPayment = 'WAIVER' or ModeOfPayment = 'REFERRAL'
|
||||
group by fid,waiver_bill,referal_bill) as sms
|
||||
left join
|
||||
(SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype FROM T_Students_Fees_Status
|
||||
group by sid,cid,batch) as sfs on sfs.sid=sms.sid and sfs.fid=sms.fid
|
||||
group by sid,cid,fid,batch) as sfs on sfs.sid=sms.sid and sfs.fid=sms.fid
|
||||
left join
|
||||
(SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd on cfd.ccid=sfs.cid and cfd.cid=sfs.ftype
|
||||
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 and scd.cid=sfs.cid
|
||||
|
||||
left join
|
||||
(SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd on cfd.ccid=scd.cid and cfd.cid=sfs.ftype
|
||||
(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=sfs.sid and scd.cid=sfs.cid
|
||||
left join
|
||||
(SELECT CourseID as cid,cm.UniversityID as cuid,u.UniversityID as uid,CourseName as course,
|
||||
UniversityName as uname,cm.BranchCode as branch FROM T_CourseMaster as cm
|
||||
@ -671,7 +670,7 @@ left join
|
||||
}
|
||||
public function balfee($bat=null,$br=null,$u=null){
|
||||
|
||||
$sql = "SELECT ifnull(sfp.StudentID,'-') as Student_id,ifnull(scd.eid,'-') as eid,ifnull(std.name,'-') as Student_name,date_format(std.regdate,'%d-%m-%Y') as regdate,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sfs.batch,'-') as Batch_code,ifnull(sfs.cid,'-') as Course_id,ifnull(cm.course,'-') as Course_name,ifnull(u.uname,'-') as University,ifnull(sfs.branch,'-') as Branch_code,ifnull(cfd.syear,'-') as Sem_year,ifnull((sfs.cf + sfs.stf + sfs.others),0) as Total,ifnull((sfb.bamount),0) as Paid_fee,ifnull(((sfs.cf + sfs.stf + sfs.others) - (sfb.bamount)),0) as balance,
|
||||
$sql = "SELECT ifnull(sfp.StudentID,'-') as Student_id,scd.EnrollmentID as eid,sfs.CourseID as cid,std.MobileNumber as Phone_number,FirstName as Student_name,Fathername as Father_name,PermanentAddress as address,AlternateNumber,date_format(std.CreatedOn,'%d-%m-%Y') as regdate,cm.CourseName as Course_name,u.UniversityName as University,sfp.FeesID as fid,(CourseFees + STFOrWR + Others) as Total,ifnull((sfp.BillAmount),0) as Paid_fee,((CourseFees + STFOrWR + Others) - sfp.BillAmount) as balance,cfd.Sem_Year as Sem_year,std.PermanentAddress as address,std.AlternateNumber as AlternateNumber,
|
||||
ifnull(MAX(CASE WHEN Installment = 1 THEN sfp.BillNO END),'-') as billno1,
|
||||
ifnull(MAX(CASE WHEN Installment = 1 THEN sfp.BillAmount END),0) as billamt1,
|
||||
ifnull(MAX(CASE WHEN Installment = 2 THEN sfp.BillNO END),'-') as billno2,
|
||||
@ -691,45 +690,30 @@ left join
|
||||
ifnull(MAX(CASE WHEN Installment = 9 THEN sfp.BillNO END),'-') as billno9,
|
||||
ifnull(MAX(CASE WHEN Installment = 9 THEN sfp.BillAmount END),0) as billamt9,
|
||||
ifnull(MAX(CASE WHEN Installment = 10 THEN sfp.BillNO END),'-') as billno10,
|
||||
ifnull(MAX(CASE WHEN Installment = 10 THEN sfp.BillAmount END),0) as billamt10,
|
||||
ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
|
||||
FROM T_Students_Fees_PaidDetails as sfp
|
||||
left join (SELECT FeesID as fid,BatchCode as batch,BranchCode as branch,StudentID as sid,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others,Comments as cmts FROM T_Students_Fees_Status
|
||||
group by fid,sid,batch,branch) as sfs on sfs.fid=sfp.FeesID and sfs.sid=sfp.StudentID
|
||||
left join
|
||||
(SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd
|
||||
on cfd.ccid=sfs.cid
|
||||
left join
|
||||
(SELECT CourseID as cid,UniversityID as uid,CourseName as course FROM T_CourseMaster) as cm
|
||||
on cm.cid=sfs.cid
|
||||
left join
|
||||
(SELECT UniversityID as uid,UniversityName as uname FROM T_UniversityMaster) as u
|
||||
on u.uid=cm.uid
|
||||
left join
|
||||
(SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father,IsActive as active,PermanentAddress as address,AlternateNumber,CreatedOn as regdate FROM T_StudentDetails where IsActive = 1) as std on std.sid=sfp.StudentID
|
||||
left join
|
||||
(SELECT BatchCode as bcode,BatchName as batchname FROM T_BatchMaster) as b on b.bcode=sfs.batch
|
||||
left join
|
||||
(SELECT BranchCode as brcode,BranchName as bname FROM T_BranchMaster) as br on br.brcode=sfp.UpdatedBy
|
||||
left join
|
||||
(SELECT StudentID as sid,FeesID as fid,BillNo as billno,sum(BillAmount) as bamount FROM T_Students_Fees_PaidDetails where IsActive = 1
|
||||
group by sid,fid) as sfb on sfb.sid=sfp.StudentID and sfb.fid=sfp.FeesID
|
||||
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=sfs.sid
|
||||
where sfp.IsActive = 1 and br.brcode = '".$br."'
|
||||
ifnull(MAX(CASE WHEN Installment = 10 THEN sfp.BillAmount END),0) as billamt10
|
||||
|
||||
FROM T_Students_Fees_PaidDetails as sfp
|
||||
left join T_Students_Fees_Status sfs on sfs.FeesID=sfp.FeesID
|
||||
left join T_Course_Fees_Details cfd on cfd.ID=sfs.FeesType
|
||||
left join T_CourseMaster cm on cm.CourseID=sfs.CourseID
|
||||
left join T_UniversityMaster u on u.UniversityID=cm.UniversityID
|
||||
left join T_StudentDetails std on std.StudentID=sfp.StudentID and std.IsActive = 1
|
||||
left join T_Student_CourseDetails scd on scd.StudentID=sfs.StudentID and scd.CourseID=sfs.CourseID
|
||||
where sfp.IsActive = 1 and sfp.UpdatedBy = '".$br."'
|
||||
|
||||
";
|
||||
|
||||
if ($bat!= ''){
|
||||
|
||||
$sql.=" and sfs.batch = '".$bat."'";
|
||||
$sql.=" and sfs.BatchCode = '".$bat."'";
|
||||
|
||||
}
|
||||
if ($u!= ''){
|
||||
|
||||
$sql.=" and u.uid = '".$u."'";
|
||||
$sql.=" and u.UniversityID = '".$u."'";
|
||||
|
||||
}
|
||||
$sql.=" group by Student_id,Batch_code,Course_id,Branch_code";
|
||||
$sql.=" group by Student_id,fid";
|
||||
|
||||
|
||||
|
||||
@ -860,7 +844,7 @@ from T_Lead_Tracking_Followup as ltf
|
||||
}
|
||||
|
||||
|
||||
public function GetNewRegList($det)
|
||||
public function GetNewRegList($det)
|
||||
{
|
||||
|
||||
$fdate=$det['from'];
|
||||
|
||||
@ -92,7 +92,9 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
|
||||
}
|
||||
// response data
|
||||
$scope.show = false;
|
||||
$scope.returnResultData = [];
|
||||
$scope.onSubmit = function (form) {
|
||||
$scope.returnResultData.length=0;
|
||||
var firstError = null;
|
||||
if (form.$invalid) {
|
||||
var field = null, firstError = null;
|
||||
@ -133,9 +135,10 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
|
||||
for(var i=0;i<$scope.balfee_data.length;i++)
|
||||
if($scope.balfee_data[i].balance !=0){
|
||||
$scope.balfee_data[i].SL_NO = j+1;
|
||||
$scope.returnResultData.push($scope.balfee_data[i]);
|
||||
j++;
|
||||
}
|
||||
|
||||
|
||||
} else {
|
||||
$scope.message = response.data.message;
|
||||
}
|
||||
@ -143,30 +146,38 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
|
||||
});
|
||||
|
||||
$scope.gettotal = function(){
|
||||
var length = $scope.returnResultData.length;
|
||||
var totalfee = 0;
|
||||
for(var i = 0; i < $scope.balfee_data.length; i++){
|
||||
var item = $scope.balfee_data[i];
|
||||
for(var i = 0; i < length; i++){
|
||||
var item = $scope.returnResultData[i];
|
||||
totalfee += parseFloat(item.Total);
|
||||
}
|
||||
|
||||
return totalfee; }
|
||||
|
||||
|
||||
$scope.getpaid = function(){
|
||||
var totalpaid = 0;
|
||||
for(var i = 0; i < $scope.balfee_data.length; i++){
|
||||
var item = $scope.balfee_data[i];
|
||||
for(var i = 0; i < $scope.returnResultData.length; i++){
|
||||
var item = $scope.returnResultData[i];
|
||||
totalpaid += parseFloat(item.Paid_fee);
|
||||
}
|
||||
|
||||
return totalpaid; }
|
||||
|
||||
$scope.getbalance = function(){
|
||||
var totalbalance=0;
|
||||
for(var i = 0; i < $scope.balfee_data.length; i++){
|
||||
var item = $scope.balfee_data[i];
|
||||
for(var i = 0; i < $scope.returnResultData.length; i++){
|
||||
var item = $scope.returnResultData[i];
|
||||
totalbalance += parseFloat(item.balance);
|
||||
|
||||
}
|
||||
|
||||
return totalbalance; }
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -133,10 +133,10 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
|
||||
}
|
||||
}
|
||||
var mystyle = {
|
||||
sheetid: 'DOCUMENT PENDING STUDENT LIST REPORT',
|
||||
sheetid: 'STUDENT DOCUMENTS PENDING REPORT',
|
||||
headers: true,
|
||||
caption: {
|
||||
title:'DOCUMENT PENDING STUDENT LIST REPORT',
|
||||
title:'STUDENT DOCUMENTS PENDING REPORT',
|
||||
width: '300px',
|
||||
style:'font-size:50px;'
|
||||
},
|
||||
|
||||
@ -480,7 +480,7 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor
|
||||
assignedTo: myModel.assignedTo,
|
||||
status: myModel.status,
|
||||
referedBy: myModel.referedBy,
|
||||
comments:"Call Tracking For Report MarkCard Details ",
|
||||
comments:"Call Tracking For Study Material Status Report ",
|
||||
|
||||
enquiryStatus:myModel.enquiryStatus,
|
||||
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
|
||||
|
||||
@ -35,8 +35,9 @@
|
||||
University
|
||||
</label>
|
||||
|
||||
<select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
|
||||
<select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
|
||||
<option value="" selected>Select University</option>
|
||||
<option ng-repeat="details in university" value="{{details.universityID}}">{{details.universityName}}</option>
|
||||
</select>
|
||||
<span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
|
||||
</div>
|
||||
@ -45,8 +46,9 @@
|
||||
Batch
|
||||
</label>
|
||||
|
||||
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
|
||||
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
|
||||
<option value="" selected>Select Batch</option>
|
||||
<option ng-repeat="batch in univModel.university.batchDetails" value="{{batch.BatchCode}}">{{batch.BatchName}}</option>
|
||||
</select>
|
||||
<span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
|
||||
</div>
|
||||
@ -71,10 +73,10 @@
|
||||
<input class="form-control" type="text" ng-model="search" id="searchIn" autofocus tabindex="2" placeholder="Search" />
|
||||
</div>
|
||||
<div class="col-md-2">
|
||||
<span>Total Fee:Rs.</span><span>{{gettotal()}}</span>
|
||||
<span>Total Fee:Rs.</span><span>{{gettotal() || "0"}}</span>
|
||||
</div>
|
||||
<div class="col-md-2">
|
||||
<span>Paid:Rs.</span><span>{{getpaid()}}</span>
|
||||
<span>Paid:Rs.</span><span>{{getpaid() || "0"}}</span>
|
||||
</div>
|
||||
|
||||
<div class="col-md-2">
|
||||
|
||||
@ -104,7 +104,7 @@
|
||||
<tr>
|
||||
<td>{{p.SL_NO}}</td>
|
||||
<td>{{p.Expense_name}}</td>
|
||||
<td style ="text-align:center;">{{p.Amount}}</td>
|
||||
<td style ="text-align:right;">{{p.Amount}}</td>
|
||||
|
||||
</tr>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user