diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php
index 900277e4..5f17090f 100755
--- a/Apollo/api/application/models/Reports_model.php
+++ b/Apollo/api/application/models/Reports_model.php
@@ -251,9 +251,9 @@ left join
}
public function mark_cert_status($bat=null,$br=null,$u=null,$from=null,$to=null){
- $sql = "select sms.ID,sms.sid,sms.cid,sms.fid,sms.sem as Sem_year,sms.certname as Certificate_name,sms.ctype,
+ $sql = "select sms.ID,sms.sid,sms.cid,sms.fid,sms.sem as Sem_year,ifnull(sms.certname,'-') as Certificate_name,sms.ctype,
sms.issuedate,sms.istatus,
-ifnull(sms.rcvedate,'-') as rdate,sms.rstatus,sms.acmts,sms.balance 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
+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,
diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js
index ff9aaa60..5634d7b2 100755
--- a/Apollo/assets/js/controllers/feesStatusCtrl.js
+++ b/Apollo/assets/js/controllers/feesStatusCtrl.js
@@ -2319,7 +2319,8 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "$timeout",
$scope.receiptNo=pdfValue.ReceiptNo;
$scope.cur_url = window.location.hostname + window.location.pathname;
-
+ console.log($scope.cur_url);
+ console.log($scope.BranchLogo);
}
//testing for print
@@ -2329,10 +2330,10 @@ 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 = '' + printHtml + '
' + printHtml + '';
+ var elementPage = '' + printHtml + '
' + printHtml + '';
+ popupWinindow.document.body.innerHTML = elementPage;
popupWinindow.document.body.innerHTML = elementPage;
popupWinindow.print();
- popupWinindow.document.body.innerHTML = elementPage;
//window.location.reload();
popupWinindow.document.close();
}
diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js
index cd859572..6e7a1047 100755
--- a/Apollo/assets/js/controllers/report_certificateCtrl.js
+++ b/Apollo/assets/js/controllers/report_certificateCtrl.js
@@ -300,7 +300,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
//console.log(selectedStudents);
var comments = [];
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
- comments [stuid] ="Call Tracking For Report Certificate Status - DocumentName:"+selectedStudents[stuid].Certificate_name + " - Status:" +selectedStudents[stuid].Certificate_status + " - Date:" +selectedStudents[stuid].Certificate_date;
+ comments [stuid] ="Call Tracking For Report Certificate Status - DocumentName:"+selectedStudents[stuid].certname + " - Status:" +selectedStudents[stuid].status + " - Date:" +selectedStudents[stuid].adate;
}
if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date;
diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
index aa27b2c7..6c2e48d7 100755
--- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
+++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
@@ -175,7 +175,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
$scope.exportData = function () {
- 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]);
+ 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,rdate 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
@@ -310,7 +310,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
//console.log(selectedStudents);
var comments = [];
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
- comments [stuid] ="Call Tracking For Report Certificate Status - SemYear:"+selectedStudents[stuid].Sem_year + " - Balance:" +selectedStudents[stuid].Balance_fee + " - CertificateName:" +selectedStudents[stuid].Certificate_name + " - ReceivedStatus:" +selectedStudents[stuid].rstatus + " - ReceivedDate:" +selectedStudents[stuid].rdate;
+ comments [stuid] ="Call Tracking For Report Markcard/Certificate Status - SemYear:"+selectedStudents[stuid].Sem_year + " - Balance:" +selectedStudents[stuid].Balance_fee + " - CertificateName:" +selectedStudents[stuid].Certificate_name + " - ReceivedStatus:" +selectedStudents[stuid].rstatus + " - ReceivedDate:" +selectedStudents[stuid].rdate;
}
if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date;
diff --git a/Apollo/assets/views/status-update/updateFeesStatus.html b/Apollo/assets/views/status-update/updateFeesStatus.html
index 63184d54..fd21243b 100755
--- a/Apollo/assets/views/status-update/updateFeesStatus.html
+++ b/Apollo/assets/views/status-update/updateFeesStatus.html
@@ -455,14 +455,14 @@
- ![APP]()
+ ![APP]()
|
- ![APP]()
+ ![APP]()
|