diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php
index 7907a74d..13b997ee 100755
--- a/Apollo/api/application/models/Reports_model.php
+++ b/Apollo/api/application/models/Reports_model.php
@@ -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){
- $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
(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
@@ -179,17 +179,18 @@ from
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
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
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
- group by fid,sid)
- as sfb on sfb.fid=sfs.fid and sfb.sid=sfs.sid
+ group by sid,cid)
+ as sfb on sfb.sid=sms.sid
left join
(select ID,StudentId,FeesID,BillDate from T_Students_Fees_PaidDetails where ID in
(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
(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
@@ -218,12 +219,12 @@ left join
$fromd= date("Y-m-d",strtotime($from));
$tod=date("Y-m-d",strtotime($to));
- $sql.="and STR_TO_DATE(ams.adate,'%d-%m-%Y') >= '".$fromd."'
- and STR_TO_DATE(ams.adate,'%d-%m-%Y') <= '".$tod."'";
+ $sql.="and STR_TO_DATE(sms.adate,'%d-%m-%Y') >= '".$fromd."'
+ and STR_TO_DATE(sms.adate,'%d-%m-%Y') <= '".$tod."'";
}
$sql.=" group by sms.sid,sms.cid,ctype,univID";
-
+ // echo $sql;
$leadDet=$this->db->query($sql);
$cert_statusDetails = $leadDet->result();
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){
- $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
- from
- (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
-FROM T_CertificationStatus c
- left join T_PickListDetails p on p.ListCode=c.ListCode
- left join T_CertificationMaster cm on cm.CertificationID=c.CertificationType
-WHERE c.ID IN (SELECT max(ID) FROM T_CertificationStatus group by StudentID,CourseID,BranchCode,Sem,CertificationType)
- and (p.ListName like 'ISSUED TO STUDENT' or p.ListName like 'RECEIVED')
-group by sid,sem,cid,branch,ctype
+ $sql = "select sms.ID,sms.sid,sms.cid,sms.fid,sms.sem as Sem_year,sms.certname as Certificate_name,sms.ctype,
+sms.issuedate,sms.istatus,
+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
+(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,
+max(if(ListName = 'ISSUED TO STUDENT', CDate,'-')) as issuedate,max(if(ListName = 'ISSUED TO STUDENT', 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
+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 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
- FROM T_ApplicationStatus as app
- left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType
- left join T_PickListDetails p on p.ListCode=app.ListCode
- 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')
- group by sid,cid,lcode,branch,ctype) as sms
-
+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,
+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
+left join
+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
(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
- group by sid,fid,cid,batch)
+ group by sid,cid)
as sfs on sfs.sid=sms.sid and sfs.cid=sms.cid
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
- group by sid,fid,billno)
- as sfp on sfp.sid=sms.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.ccid=sms.cid
-left join
+ group by sid,cid)
+ as sfb on sfb.sid=sms.sid and sfb.fid=sms.fid and (sfb.ftype=sms.cid or sfb.cid=sms.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
left join T_UniversityMaster as u on u.UniversityID=cm.UniversityID
@@ -277,8 +283,10 @@ left join
as cm on cm.cid=sms.cid
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 and scd.cid=sms.cid
- where std.active = 1 and sms.branch = '".$br."'
+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
+
+ where sms.branch = '".$br."'
";
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));
$tod=date("Y-m-d",strtotime($to));
- $sql.="and STR_TO_DATE(sfp.bdate,'%d-%m-%Y') >= '".$fromd."'
- and STR_TO_DATE(sfp.bdate,'%d-%m-%Y') <= '".$tod."'";
+ $sql.="and STR_TO_DATE(sms.mdate,'%d-%m-%Y') >= '".$fromd."'
+ 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);
$mcert_statusDetails = $leadDet->result();
diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js
index 8bd39ea3..3cd797b0 100755
--- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js
+++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js
@@ -299,7 +299,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
//console.log(selectedStudents);return false;
var comments = [];
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)){
diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js
index 788ed1c1..c20f334f 100755
--- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js
+++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js
@@ -297,6 +297,10 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
$scope.trackForm = {
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);
if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date;
@@ -354,7 +358,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
assignedTo: myModel.assignedTo,
status: myModel.status,
referedBy: myModel.referedBy,
- comments:"Call Tracking For Report Application Details ",
+ comments:comments,
enquiryStatus:myModel.enquiryStatus,
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js
index e78ed61c..befbaa56 100755
--- a/Apollo/assets/js/controllers/report_balfeeCtrl.js
+++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js
@@ -349,6 +349,10 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
$scope.trackForm = {
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);
if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date;
@@ -406,7 +410,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
assignedTo: myModel.assignedTo,
status: myModel.status,
referedBy: myModel.referedBy,
- comments:"Call Tracking For Report ExamFees Details ",
+ comments:comments,
enquiryStatus:myModel.enquiryStatus,
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js
index 411b1980..cd859572 100755
--- a/Apollo/assets/js/controllers/report_certificateCtrl.js
+++ b/Apollo/assets/js/controllers/report_certificateCtrl.js
@@ -98,7 +98,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
});
// disable submit
- $scope.$watchCollection('filters.from_date', function (newValue,oldValue) {
+ $scope.$watchCollection('univModel.from_date', function (newValue,oldValue) {
if(newValue==undefined || newValue=='' || newValue==null){
$scope.disableSubmit=true;
}
@@ -110,7 +110,11 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
});
$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);
$scope.cert_data = '';
$scope.message = '';
diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js
index 474f4a24..c0491250 100755
--- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js
+++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js
@@ -294,6 +294,10 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
$scope.trackForm = {
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);
if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date;
diff --git a/Apollo/assets/js/controllers/report_examfeeCtrl.js b/Apollo/assets/js/controllers/report_examfeeCtrl.js
index 53c9dc44..5384fd15 100755
--- a/Apollo/assets/js/controllers/report_examfeeCtrl.js
+++ b/Apollo/assets/js/controllers/report_examfeeCtrl.js
@@ -308,6 +308,10 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
$scope.trackForm = {
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);
if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date;
@@ -365,7 +369,7 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
assignedTo: myModel.assignedTo,
status: myModel.status,
referedBy: myModel.referedBy,
- comments:"Call Tracking For Report Exam Writing Fees Details ",
+ comments:comments,
enquiryStatus:myModel.enquiryStatus,
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
index 67afe2f9..b2d7c8d8 100755
--- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
+++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
@@ -47,6 +47,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
"to_date": "",
};
+
$scope.filters = function () {
var filterlist = {
@@ -99,7 +100,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
});
// disable submit
- $scope.$watchCollection('filters.from_date', function (newValue,oldValue) {
+ $scope.$watchCollection('univModel.from_date', function (newValue,oldValue) {
if(newValue==undefined || newValue=='' || newValue==null){
$scope.disableSubmit=true;
}
@@ -110,8 +111,21 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
});
$scope.onSubmit = function () {
- $scope.filterUniv = angular.fromJson($scope.univModel.university);
- //alert($scope.batch.name);
+ //alert($scope.univModel.from_date);
+ // 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.message = '';
var response_data = {
@@ -161,7 +175,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
$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
diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js
index 0a644f17..d0331da4 100755
--- a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js
+++ b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js
@@ -292,6 +292,10 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
$scope.trackForm = {
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);
if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date;
@@ -349,7 +353,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
assignedTo: myModel.assignedTo,
status: myModel.status,
referedBy: myModel.referedBy,
- comments:"Call Tracking For Report MarkCard Details ",
+ comments:comments,
enquiryStatus:myModel.enquiryStatus,
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js
index 141c7968..b273ed7e 100755
--- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js
+++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js
@@ -295,6 +295,10 @@ $scope.exportExcel= function () {
$scope.trackForm = {
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)){
$scope.nextFollowupDate = myModel.date;
@@ -351,7 +355,7 @@ $scope.exportExcel= function () {
assignedTo: myModel.assignedTo,
status: myModel.status,
referedBy: myModel.referedBy,
- comments:"Call Tracking For Study Material Status Report ",
+ comments:comments,
enquiryStatus:myModel.enquiryStatus,
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
diff --git a/Apollo/assets/views/report_certificate_status.html b/Apollo/assets/views/report_certificate_status.html
index 0d7a8aa7..ec78932d 100755
--- a/Apollo/assets/views/report_certificate_status.html
+++ b/Apollo/assets/views/report_certificate_status.html
@@ -70,7 +70,7 @@ td,th {
-
@@ -83,7 +83,7 @@ td,th {
-
@@ -156,18 +156,18 @@ td,th {