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

report issues fixes

Browse Source
This commit is contained in:
gandhimathi 2018-08-23 17:02:14 +05:30
parent 7c63172811
commit 9f027f253d
13 changed files with 120 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,7 +168,7 @@ group by sid,sem) as apdate on apdate.sid=sms.sid and apdate.sem=cfd.syear
} }
public function certificate_status($bat=null,$br=null,$u=null,$from=null,$to=null){ public function certificate_status($bat=null,$br=null,$u=null,$from=null,$to=null){
$sql = "select sms.sid,sms.cid,sms.status,sms.adate,sms.acmts,sms.ctype,sms.certname,((sfs.cf + sfs.stf + sfs.others) - sfb.bamount) as balance,sfb.bamount,sfp.BillDate as initialPaid,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(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,cm.uid as univID $sql = "select sms.sid,sms.cid,sms.status,sms.adate,sms.acmts,sms.ctype,sms.certname,((sfs.cf + sfs.stf + sfs.others) - sfb.bamount) as balance,sfs.cf , sfs.stf , sfs.others,sfb.bamount,sfp.BillDate as initialPaid,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(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,cm.uid as univID
from from
(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,CertificateName as certname (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,CertificateName as certname
FROM T_ApplicationStatus as app FROM T_ApplicationStatus as app
@ -179,17 +179,18 @@ from
left join 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 (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
FROM T_Students_Fees_Status FROM T_Students_Fees_Status
group by sid,fid) group by sid,cid)
as sfs on sfs.sid=sms.sid and sfs.cid=sms.cid as sfs on sfs.sid=sms.sid and sfs.cid=sms.cid
left join left join
(SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails (SELECT sfp.StudentID as sid,sfp.FeesId as fid,sfs.CourseID as cid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails sfp
left join T_Students_Fees_Status sfs on sfs.FeesId=sfp.FeesId
where IsActive = 1 where IsActive = 1
group by fid,sid) group by sid,cid)
as sfb on sfb.fid=sfs.fid and sfb.sid=sfs.sid as sfb on sfb.sid=sms.sid
left join left join
(select ID,StudentId,FeesID,BillDate from T_Students_Fees_PaidDetails where ID in (select ID,StudentId,FeesID,BillDate from T_Students_Fees_PaidDetails where ID in
(select min(ID) from T_Students_Fees_PaidDetails group by FeesID) (select min(ID) from T_Students_Fees_PaidDetails group by FeesID)
group by FeesID) as sfp on sfp.FeesID=sfs.fid group by FeesID) as sfp on sfp.FeesID=sfb.fid
left join left join
(SELECT CourseID as cid,cm.UniversityID as cuid,u.UniversityID as uid,CourseName as course, (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 UniversityName as uname,cm.BranchCode as branch FROM T_CourseMaster as cm
@ -218,12 +219,12 @@ left join
$fromd= date("Y-m-d",strtotime($from)); $fromd= date("Y-m-d",strtotime($from));
$tod=date("Y-m-d",strtotime($to)); $tod=date("Y-m-d",strtotime($to));
$sql.="and STR_TO_DATE(ams.adate,'%d-%m-%Y') >= '".$fromd."' $sql.="and STR_TO_DATE(sms.adate,'%d-%m-%Y') >= '".$fromd."'
and STR_TO_DATE(ams.adate,'%d-%m-%Y') <= '".$tod."'"; and STR_TO_DATE(sms.adate,'%d-%m-%Y') <= '".$tod."'";
} }
$sql.=" group by sms.sid,sms.cid,ctype,univID"; $sql.=" group by sms.sid,sms.cid,ctype,univID";
// echo $sql;
$leadDet=$this->db->query($sql); $leadDet=$this->db->query($sql);
$cert_statusDetails = $leadDet->result(); $cert_statusDetails = $leadDet->result();
if (count($cert_statusDetails) > 0) { if (count($cert_statusDetails) > 0) {
@ -239,36 +240,41 @@ left join
} }
public function mark_cert_status($bat=null,$br=null,$u=null,$from=null,$to=null){ public function mark_cert_status($bat=null,$br=null,$u=null,$from=null,$to=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(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.idate,'-') as idate,ifnull(sms.istatus,'-') as istatus,ifnull(sms.rdate,'-') as rdate,ifnull(sms.rstatus,'-') as rstatus,ifnull(sms.acmts,'-') as cmnts,sms.certname as Certificate_name $sql = "select sms.ID,sms.sid,sms.cid,sms.fid,sms.sem as Sem_year,sms.certname as Certificate_name,sms.ctype,
from sms.issuedate,sms.istatus,
(SELECT c.ID as id,StudentID as sid,c.CourseID as cid,c.BranchCode as branch,c.ListCode as lcode,p.ListName as status,c.CertificationType as ctype,c.CDate as adate,c.Comments as acmts,c.CertificationType as certname,if(max(p.ListName)='ISSUED TO STUDENT',p.ListName,'-') as istatus,if(max(p.ListName)='ISSUED TO STUDENT',c.CDate,'-') as idate,if(max(p.ListName)='RECEIVED',p.ListName,'-') as rstatus,if(max(p.ListName)='RECEIVED',c.CDate,'-') as rdate sms.rcvedate,sms.rstatus,sms.acmts,((sfs.cf + sfs.stf + sfs.others) - ifnull(sfb.bamount,0)) as Balance_fee,sfs.cf , sfs.stf , sfs.others,sfb.bamount,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
FROM T_CertificationStatus c from
left join T_PickListDetails p on p.ListCode=c.ListCode (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,
left join T_CertificationMaster cm on cm.CertificationID=c.CertificationType max(if(ListName = 'ISSUED TO STUDENT', CDate,'-')) as issuedate,max(if(ListName = 'ISSUED TO STUDENT', ListName,'-')) as istatus,
WHERE c.ID IN (SELECT max(ID) FROM T_CertificationStatus group by StudentID,CourseID,BranchCode,Sem,CertificationType) max(if(ListName = 'RECEIVED', CDate,'-')) as rcvedate,max(if(ListName = 'RECEIVED', ListName,'-')) as rstatus,c.Comments as acmts
and (p.ListName like 'ISSUED TO STUDENT' or p.ListName like 'RECEIVED') from T_CertificationStatus c
group by sid,sem,cid,branch,ctype 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
where CDate is not null and (list.ListName like 'ISSUED TO STUDENT' or list.ListName like 'RECEIVED%' )
group by sid,cid,sem,ctype
union union
SELECT app.ID as id,app.StudentID as sid,app.CourseID as cid,app.BranchCode as branch,app.ListCode as lcode,p.ListName as status,app.CertificationType as ctype,app.AppDate as adate,app.Comments as acmts,cm.CertificateName as certname,if(max(p.ListName)='ISSUED TO STUDENT',p.ListName,'-') as istatus,if(max(p.ListName)='ISSUED TO STUDENT',app.AppDate,'-') as idate,if(max(p.ListName)='RECEIVED',p.ListName,'-') as rstatus,if(max(p.ListName)='RECEIVED',app.AppDate,'-') as rdate 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,
FROM T_ApplicationStatus as app max(if(ListName = 'ISSUED TO STUDENT', AppDate,'-')) as issuedate,max(if(ListName = 'ISSUED TO STUDENT', ListName,'-')) as istatus,
left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType max(if(ListName = 'RECEIVED', AppDate,'-')) as rcvedate,max(if(ListName = 'RECEIVED', ListName,'-')) as rstatus,a.Comments as acmts
left join T_PickListDetails p on p.ListCode=app.ListCode from T_ApplicationStatus a
where CertificateName not like 'APPLICATION%' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode,CertificationType) and (p.ListName like 'ISSUED TO STUDENT' or p.ListName like 'RECEIVED') left join
group by sid,cid,lcode,branch,ctype) as sms T_Students_Fees_Status sfs on sfs.StudentID=a.StudentID and sfs.CourseID=a.CourseID
left join T_CertificationMaster cm on cm.CertificationID=a.CertificationType
left join T_PickListDetails list on list.ListCode=a.ListCode
where AppDate is not null and a.ID in (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,CertificationType)
group by sid,cid,ctype) as sms
left join 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 (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
FROM T_Students_Fees_Status FROM T_Students_Fees_Status
group by sid,fid,cid,batch) group by sid,cid)
as sfs on sfs.sid=sms.sid and sfs.cid=sms.cid as sfs on sfs.sid=sms.sid and sfs.cid=sms.cid
left join left join
(SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails (SELECT sfp.StudentID as sid,sfp.FeesId as fid,sfs.FeesType as ftype,sfs.CourseID as cid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails sfp
left join T_Students_Fees_Status sfs on sfs.FeesId=sfp.FeesId
where IsActive = 1 where IsActive = 1
group by sid,fid,billno) group by sid,cid)
as sfp on sfp.sid=sms.sid and sfp.fid=sfs.fid as sfb on sfb.sid=sms.sid and sfb.fid=sms.fid and (sfb.ftype=sms.cid or sfb.cid=sms.cid)
left join 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=sms.cid
left join
(SELECT CourseID as cid,cm.UniversityID as cuid,u.UniversityID as uid,CourseName as course, (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 UniversityName as uname,cm.BranchCode as branch FROM T_CourseMaster as cm
left join T_UniversityMaster as u on u.UniversityID=cm.UniversityID left join T_UniversityMaster as u on u.UniversityID=cm.UniversityID
@ -277,8 +283,10 @@ left join
as cm on cm.cid=sms.cid as cm on cm.cid=sms.cid
left join 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 (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 and scd.cid=sms.cid left join
where std.active = 1 and sms.branch = '".$br."' (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=sms.cid
where sms.branch = '".$br."'
"; ";
if ($bat!= ''){ if ($bat!= ''){
@ -295,13 +303,13 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
$fromd= date("Y-m-d",strtotime($from)); $fromd= date("Y-m-d",strtotime($from));
$tod=date("Y-m-d",strtotime($to)); $tod=date("Y-m-d",strtotime($to));
$sql.="and STR_TO_DATE(sfp.bdate,'%d-%m-%Y') >= '".$fromd."' $sql.="and STR_TO_DATE(sms.mdate,'%d-%m-%Y') >= '".$fromd."'
and STR_TO_DATE(sfp.bdate,'%d-%m-%Y') <= '".$tod."'"; and STR_TO_DATE(sms.mdate,'%d-%m-%Y') <= '".$tod."'";
} }
$sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem_year,Certificate_name";
//echo $sql;
$leadDet=$this->db->query($sql); $leadDet=$this->db->query($sql);
$mcert_statusDetails = $leadDet->result(); $mcert_statusDetails = $leadDet->result();

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

@ -299,7 +299,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
//console.log(selectedStudents);return false; //console.log(selectedStudents);return false;
var comments = []; var comments = [];
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){ for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
comments [stuid] ="Call Tracking For Report Answer Booklet Details - BalanceFee:"+selectedStudents[stuid].balance + " - IssuedDate:" +selectedStudents[stuid].issuedate; comments [stuid] ="Call Tracking For Report Answer Booklet Details - BalanceFee:"+selectedStudents[stuid].balance + " - Course:" +selectedStudents[stuid].Course_name;
} }
if(isNaN(myModel.date)){ if(isNaN(myModel.date)){

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

@ -297,6 +297,10 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
$scope.trackForm = { $scope.trackForm = {
submit: function (form, myModel,loading,selectedStudents) { submit: function (form, myModel,loading,selectedStudents) {
var comments = [];
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
comments [stuid] ="Call Tracking For Report Application Details :"+selectedStudents[stuid].Course_name + " - Status:" +selectedStudents[stuid].StatusName;
}
//console.log(selectedStudents); //console.log(selectedStudents);
if(isNaN(myModel.date)){ if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date; $scope.nextFollowupDate = myModel.date;
@ -354,7 +358,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
assignedTo: myModel.assignedTo, assignedTo: myModel.assignedTo,
status: myModel.status, status: myModel.status,
referedBy: myModel.referedBy, referedBy: myModel.referedBy,
comments:"Call Tracking For Report Application Details ", comments:comments,
enquiryStatus:myModel.enquiryStatus, enquiryStatus:myModel.enquiryStatus,
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID, createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,

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

@ -349,6 +349,10 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
$scope.trackForm = { $scope.trackForm = {
submit: function (form, myModel,loading,selectedStudents) { submit: function (form, myModel,loading,selectedStudents) {
var comments = [];
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
comments [stuid] ="Call Tracking For Report Balence Fee:"+selectedStudents[stuid].balance + " - RegistrationDate:" +selectedStudents[stuid].regdate;
}
//console.log(selectedStudents); //console.log(selectedStudents);
if(isNaN(myModel.date)){ if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date; $scope.nextFollowupDate = myModel.date;
@ -406,7 +410,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
assignedTo: myModel.assignedTo, assignedTo: myModel.assignedTo,
status: myModel.status, status: myModel.status,
referedBy: myModel.referedBy, referedBy: myModel.referedBy,
comments:"Call Tracking For Report ExamFees Details ", comments:comments,
enquiryStatus:myModel.enquiryStatus, enquiryStatus:myModel.enquiryStatus,
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID, createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,

8
Apollo/assets/js/controllers/report_certificateCtrl.js
View File

@ -98,7 +98,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
}); });
// disable submit // disable submit
$scope.$watchCollection('filters.from_date', function (newValue,oldValue) { $scope.$watchCollection('univModel.from_date', function (newValue,oldValue) {
if(newValue==undefined || newValue=='' || newValue==null){ if(newValue==undefined || newValue=='' || newValue==null){
$scope.disableSubmit=true; $scope.disableSubmit=true;
} }
@ -110,7 +110,11 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
}); });
$scope.onSubmit = function () { $scope.onSubmit = function () {
$scope.filterUniv = angular.fromJson($scope.univModel.university); if($scope.univModel.university !== null && $scope.univModel.university !== '' ){
$scope.filterUniv = angular.fromJson($scope.univModel.university);
}else {
$scope.filterUniv = '';
}
//alert($scope.batch.name); //alert($scope.batch.name);
$scope.cert_data = ''; $scope.cert_data = '';
$scope.message = ''; $scope.message = '';

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

@ -294,6 +294,10 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
$scope.trackForm = { $scope.trackForm = {
submit: function (form, myModel,loading,selectedStudents) { submit: function (form, myModel,loading,selectedStudents) {
var comments = [];
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
comments [stuid] ="Call Tracking For Report Document Pending:"+selectedStudents[stuid].Course_name + " - Followupdate:" +selectedStudents[stuid].Followupdate;
}
//console.log(selectedStudents); //console.log(selectedStudents);
if(isNaN(myModel.date)){ if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date; $scope.nextFollowupDate = myModel.date;

6
Apollo/assets/js/controllers/report_examfeeCtrl.js
View File

@ -308,6 +308,10 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
$scope.trackForm = { $scope.trackForm = {
submit: function (form, myModel,loading,selectedStudents) { submit: function (form, myModel,loading,selectedStudents) {
var comments = [];
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
comments [stuid] ="Call Tracking For Report Exam Writing Fees Details:"+selectedStudents[stuid].Course_name + " - ExamWritingFee:" +selectedStudents[stuid].ExamWritingFee;
}
//console.log(selectedStudents); //console.log(selectedStudents);
if(isNaN(myModel.date)){ if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date; $scope.nextFollowupDate = myModel.date;
@ -365,7 +369,7 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
assignedTo: myModel.assignedTo, assignedTo: myModel.assignedTo,
status: myModel.status, status: myModel.status,
referedBy: myModel.referedBy, referedBy: myModel.referedBy,
comments:"Call Tracking For Report Exam Writing Fees Details ", comments:comments,
enquiryStatus:myModel.enquiryStatus, enquiryStatus:myModel.enquiryStatus,
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID, createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,

22
Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
View File

@ -48,6 +48,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
}; };
$scope.filters = function () { $scope.filters = function () {
var filterlist = { var filterlist = {
method: 'POST', method: 'POST',
@ -99,7 +100,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
}); });
// disable submit // disable submit
$scope.$watchCollection('filters.from_date', function (newValue,oldValue) { $scope.$watchCollection('univModel.from_date', function (newValue,oldValue) {
if(newValue==undefined || newValue=='' || newValue==null){ if(newValue==undefined || newValue=='' || newValue==null){
$scope.disableSubmit=true; $scope.disableSubmit=true;
} }
@ -110,8 +111,21 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
}); });
$scope.onSubmit = function () { $scope.onSubmit = function () {
$scope.filterUniv = angular.fromJson($scope.univModel.university); //alert($scope.univModel.from_date);
//alert($scope.batch.name); // if(angular.isString($scope.univModel.university) && $scope.univModel.university !== null){
// $scope.filterUniv = angular.fromJson($scope.univModel.university);
// }
// else{
// $scope.filterUniv ='';
// }
//alert($scope.univModel.university);
if($scope.univModel.university !== null && $scope.univModel.university !== '' ){
$scope.filterUniv = angular.fromJson($scope.univModel.university);
}else {
$scope.filterUniv = '';
}
$scope.mark_cert_data = ''; $scope.mark_cert_data = '';
$scope.message = ''; $scope.message = '';
var response_data = { var response_data = {
@ -161,7 +175,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
$scope.exportData = function () { $scope.exportData = function () {
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Document_fee_paid_date as DocumentFeePaidDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,CAST(Balance_fee AS NUMBER) as BalanceFee,Markcard_status as MarkcardStatus,Markcard_date as MarkcardDate,Markcard_comments as MarkcardComments,Certificate_name as CertificateName,Certificate_status as CertificateStatus,Certificate_date as CertificateDate,Certificate_comments as CertificateComments INTO XLS("Markcard/Certificate_status.xls",?) FROM ?',[mystyle,$scope.mark_cert_data]); alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Student_name as StudentName,Father_name as FatherName,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,course_name as CourseName,Sem_year as SemYear,Certificate_name as CertificateName,rstatus as ReceivedStatus,rcvedate as ReceivedDate,istatus as IssuedStatus,issuedate as IssuedDate,acmts as CertificateIssuedComments,CAST(Balance_fee AS NUMBER) as BalanceFee INTO XLS("Markcard/Certificate_status.xls",?) FROM ?',[mystyle,$scope.mark_cert_data]);
}; };
/** /**
* Auto Call Tracking Sriram * Auto Call Tracking Sriram

6
Apollo/assets/js/controllers/report_markcard_statusCtrl.js
View File

@ -292,6 +292,10 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
$scope.trackForm = { $scope.trackForm = {
submit: function (form, myModel,loading,selectedStudents) { submit: function (form, myModel,loading,selectedStudents) {
var comments = [];
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
comments [stuid] ="Call Tracking For Report MarkCard Details:"+selectedStudents[stuid].Balance_Fee + " - ApplicationDate:" +selectedStudents[stuid].appdate;
}
//console.log(selectedStudents); //console.log(selectedStudents);
if(isNaN(myModel.date)){ if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date; $scope.nextFollowupDate = myModel.date;
@ -349,7 +353,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
assignedTo: myModel.assignedTo, assignedTo: myModel.assignedTo,
status: myModel.status, status: myModel.status,
referedBy: myModel.referedBy, referedBy: myModel.referedBy,
comments:"Call Tracking For Report MarkCard Details ", comments:comments,
enquiryStatus:myModel.enquiryStatus, enquiryStatus:myModel.enquiryStatus,
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID, createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,

6
Apollo/assets/js/controllers/report_study_material_statusCtrl.js
View File

@ -295,6 +295,10 @@ $scope.exportExcel= function () {
$scope.trackForm = { $scope.trackForm = {
submit: function (form, myModel,loading,selectedStudents) { submit: function (form, myModel,loading,selectedStudents) {
var comments = [];
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
comments [stuid] ="Call Tracking For Study Material Status Report:"+selectedStudents[stuid].Balance_fee + " - Date:" +selectedStudents[stuid].Date;
}
if(isNaN(myModel.date)){ if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date; $scope.nextFollowupDate = myModel.date;
@ -351,7 +355,7 @@ $scope.exportExcel= function () {
assignedTo: myModel.assignedTo, assignedTo: myModel.assignedTo,
status: myModel.status, status: myModel.status,
referedBy: myModel.referedBy, referedBy: myModel.referedBy,
comments:"Call Tracking For Study Material Status Report ", comments:comments,
enquiryStatus:myModel.enquiryStatus, enquiryStatus:myModel.enquiryStatus,
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID, createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,

12
Apollo/assets/views/report_certificate_status.html
View File

@ -70,7 +70,7 @@ td,th {
<label> <label>
From Date From Date
</label> </label>
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.from_date" <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="univModel.from_date"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions" is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()" placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()"
show-button-bar="true" /> show-button-bar="true" />
@ -83,7 +83,7 @@ td,th {
<label> <label>
To Date To Date
</label> </label>
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.to_date" <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="univModel.to_date"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions" is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()" placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()"
show-button-bar="true" /> show-button-bar="true" />
@ -156,18 +156,18 @@ td,th {
<tr> <tr>
<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><input type="checkbox" ng-checked="myModel.all" id="{{p.Student_id}}" name="{{p.Student_id}}" class="form-control" ng-click="isClick($event);" /></td>
<td>{{p.SL_NO}}</td> <td>{{p.SL_NO}}</td>
<td>{{p.initialPaid}}</td> <td>{{p.initialPaid || "-"}}</td>
<td>{{p.Enrollment_id}}</td> <td>{{p.Enrollment_id || "-"}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td> <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td>
<td>{{p.Father_name}}</td> <td>{{p.Father_name}}</td>
<td>{{p.Course_name}}</td> <td>{{p.Course_name}}</td>
<!-- <td>{{p.Sem_year}}</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.University}}</td>
<td>{{p.balance}}</td> <td style="text-align:right;">{{p.balance || "0"}}</td>
<td>{{p.certname}}</td> <td>{{p.certname}}</td>
<td>{{p.status}}</td> <td>{{p.status}}</td>
<td>{{p.adate}}</td> <td>{{p.adate || "-"}}</td>
</tr> </tr>
</tbody> </tbody>

26
Apollo/assets/views/report_mark_certificate_status.html
View File

@ -70,7 +70,7 @@ td,th {
<label> <label>
From Date From Date
</label> </label>
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.from_date" <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="univModel.from_date"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions" is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()" placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()"
show-button-bar="true" /> show-button-bar="true" />
@ -83,7 +83,7 @@ td,th {
<label> <label>
To Date To Date
</label> </label>
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.to_date" <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="univModel.to_date"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions" is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()" placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()"
show-button-bar="true" /> show-button-bar="true" />
@ -142,17 +142,17 @@ td,th {
<th>SL.No</th> <th>SL.No</th>
<th>Student Name</th> <th>Student Name</th>
<th>Father Name</th> <th>Father Name</th>
<th>Phone No</th>
<th>University</th>
<th>Course</th> <th>Course</th>
<th>Sem/Year</th> <th>Sem/Year</th>
<th>Phone No</th> <th>Certificates Name</th>
<th>University</th>
<th>Balance Fee</th>
<th>Certificates Name</th>
<th>Received Status</th> <th>Received Status</th>
<th>Received Date</th> <th>Received Date</th>
<th>Issued Status</th> <th>Issued Status</th>
<th>Issued Date</th> <th>Issued Date</th>
<th>Certificate Issued Comments</th> <th>Certificate Issued Comments</th>
<th>Balance Fee</th>
</tr> </tr>
</thead> </thead>
@ -162,17 +162,17 @@ td,th {
<td>{{p.SL_NO}}</td> <td>{{p.SL_NO}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td> <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td>
<td>{{p.Father_name}}</td> <td>{{p.Father_name}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
<td>{{p.University}}</td>
<td>{{p.course_name}}</td> <td>{{p.course_name}}</td>
<td>{{p.Sem_year}}</td> <td>{{p.Sem_year}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td> <td>{{p.Certificate_name}}</td>
<td>{{p.University}}</td>
<td style="text-align:right;">{{p.Balance_fee}}</td>
<td>{{p.Certificate_name}}</td>
<td>{{p.rstatus}}</td> <td>{{p.rstatus}}</td>
<td>{{p.rdate}}</td> <td>{{p.rcvedate}}</td>
<td>{{p.istatus}}</td> <td>{{p.istatus}}</td>
<td>{{p.idate}}</td> <td>{{p.issuedate}}</td>
<td>{{p.cmnts}}</td> <td>{{p.acmts}}</td>
<td style="text-align:right;">{{p.Balance_fee}}</td>
</tr> </tr>

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

@ -140,7 +140,7 @@
<td>{{p.staffname}}</td> <td>{{p.staffname}}</td>
<td>{{p.Waiver_bill}}</td> <td>{{p.Waiver_bill}}</td>
<td style="text-align:right;">{{p.Waiver_amount}}</td> <td style="text-align:right;">{{p.Waiver_amount}}</td>
<td>{{p.Referal_bill}}</td> <td style="text-align:center;">{{p.Referal_bill}}</td>
<td style="text-align:right;">{{p.Referal_amount}}</td> <td style="text-align:right;">{{p.Referal_amount}}</td>
<td>{{p.Comments}}</td> <td>{{p.Comments}}</td>