diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php
index 0dba6d07..af86c430 100755
--- a/Apollo/api/application/models/Reports_model.php
+++ b/Apollo/api/application/models/Reports_model.php
@@ -170,7 +170,7 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
}
public function certificate_status($bat=null,$br=null,$u=null,$from=null,$to=null){
- $sql = "select sms.sid as Student_id,sms.cid,ifnull(sms.status,'-') as status,ifnull(sms.adate,'-') as adate,ifnull(sms.acmts,'-') as acmts,sms.ctype,sms.certname,ifnull(balance,'-') as balance,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,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
+ $sql = "select sms.sid as Student_id,sms.cid,ifnull(sms.status,'-') as status,ifnull(sms.adate,'-') as adate,ifnull(sms.acmts,'-') as acmts,ifnull(sms.ctype,'-') as ctype,ifnull(sms.certname,'-') as certname,ifnull(balance,'-') as balance,ifnull(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,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
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,sum(bal.balpayable) as balance
FROM T_ApplicationStatus as app
@@ -258,7 +258,7 @@ 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,ifnull(sms.certname,'-') as Certificate_name,sms.ctype,
-sms.issuedate,sms.istatus,
+ifnull(sms.issuedate,'') as issuedate,sms.istatus,
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,
@@ -462,10 +462,10 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
$sql = "SELECT
APFS.ID as id,
- APFS.Registration_Details_ID AS regid,
+ ifnull(APFS.Registration_Details_ID,'-') AS regid,
APFS.ListCode as StatusCode,
ifnull(APFS.AppFormDate,'-') as StatusUpdationOn,
- APFS.Comments as StatusComments,
+ ifnull(APFS.Comments,'-') as StatusComments,
PKL.ListName as StatusName,
concat(STU.Firstname,' ', STU.Lastname) as Student_name,
STU.Fathername as FatherName,
@@ -474,9 +474,9 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
STU.PresentAddress as address,
COUR.CourseName as Course_name,
UNIV.UniversityName as University,
- sfpd.BILL as InitialPayDate,
+ ifnull(sfpd.BILL,'-') as InitialPayDate,
RD.Student_Fee_Status_Id as FeesStatusID,
- STU_COUR.EnrollmentID as EnrollmentNumber,
+ ifnull(STU_COUR.EnrollmentID,'-') as EnrollmentNumber,
CFD.Sem_Year as Sem_Year,
RD.RegistrationType as FormType,
STU.StudentID as Student_id
@@ -574,7 +574,7 @@ STU.Fathername as FatherName,
STU.MobileNumber as Phone_number,
STU.AlternateNumber as AlternateNumber,
STU.PermanentAddress as address,
-STU_COUR.EnrollmentID as eid,
+ifnull(STU_COUR.EnrollmentID,'-') as eid,
COUR.CourseName as Course_name,
UNIV.UniversityName as University
from T_ApplicationStatus a
@@ -942,7 +942,7 @@ from T_Lead_Tracking_Followup as ltf
$this->db->where('UniversityID',$universityID);
$this->db->where('IsActive','1');
$this->db->where('BranchCode',$br);
- $this->db->order_by('BatchCode','ASC');
+ $this->db->order_by('BatchCode','DESC');
$batchDetails = $this->db->get(BATCH);
return $batchDetails->result();
}
diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
index aec73775..91d71af5 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,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]);
+ alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Student_name as StudentName,Father_name as FatherName,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
diff --git a/Apollo/assets/views/report_answer_booklets.html b/Apollo/assets/views/report_answer_booklets.html
index da410c0f..dc8127d7 100755
--- a/Apollo/assets/views/report_answer_booklets.html
+++ b/Apollo/assets/views/report_answer_booklets.html
@@ -88,8 +88,8 @@ td,th {
-