diff --git a/Apollo/api/application/config/database.php b/Apollo/api/application/config/database.php index b4747cfb..43aad5e9 100755 --- a/Apollo/api/application/config/database.php +++ b/Apollo/api/application/config/database.php @@ -76,17 +76,17 @@ $query_builder = TRUE; $db['default'] = array( 'dsn' => '', 'hostname' => 'apollodec.com', - 'username' => 'apollod4_SIT', - 'password' => 'apollosit1234', - 'database' => 'apollod4_ApolloDECNEWSIT', + // 'username' => 'apollod4_SIT', + // 'password' => 'apollosit1234', + // 'database' => 'apollod4_ApolloDECNEWSIT', // 'username' => 'apollod4_DEV', // 'password' => 'apollo1234', // 'database' => 'apollod4_ApolloDECDev', - // 'username' => 'apollod4_PROD', - // 'password' => 'approd!2017', - // 'database' => 'apollod4_ApolloDECNEWPROD', + 'username' => 'apollod4_PROD', + 'password' => 'approd!2017', + 'database' => 'apollod4_ApolloDECNEWPROD', 'dbdriver' => 'mysqli', 'dbprefix' => '', 'pconnect' => FALSE, diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index 3f5152b7..d614bfda 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -125,6 +125,7 @@ where BranchCode = '".$br."' and BatchName = '".$batch."'"; public function markcard($bat=null,$br=null,$u=null){ $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(sfs.rollno,'-') as Roll_NO,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(sms.cdate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(sfp.bdate,'-') as Initial_paid_date,bal.balpayable as Balance_Fee,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,ifnull(appdate,'-') as appdate,ifnull(ansdate,'-') as ansdate + ,scd.coursestatus as Course_Status,ifnull(andate.courierdetails,'-') as Courier_Details from (SELECT c.ID,StudentID as sid,c.CourseID as cid,c.BranchCode as branch,c.ListCode as lcode,p.ListName,c.CertificationType as ctype,c.CDate as cdate,c.Sem as sem FROM T_CertificationStatus c left join T_PickListDetails p on p.ListCode=c.ListCode @@ -151,9 +152,9 @@ order by CourseID) as cm on cm.cid=cfd.ccid left join (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,concat(FirstName,' ',Lastname) 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 StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch,ifnull(Status,'-') as coursestatus FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.coursestatus not in ('Cancelled','Discontinued','Refund_issued') left join (select ID,StudentID as sid,Sem, -if(ListName = 'SENT TO UNIVERSITY', AnsDate,'-') as ansdate +if(ListName = 'SENT TO UNIVERSITY', AnsDate,'-') as ansdate,CourierDetails as courierdetails from T_AnswerBookletStatus abs left join T_PickListDetails list on list.ListCode=abs.ListCode where AnsDate is not null and ID in (select max(ID) from T_AnswerBookletStatus where AnsDate is not null group by StudentID,Sem) @@ -237,7 +238,7 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se // (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,concat(FirstName,' ',Lastname) 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 - $sql ="SELECT sms.sid AS Student_id,sms.cid,ifnull(sms.status,'-') AS STATUS,ifnull(DATE_FORMAT(sms.adate, '%d-%m-%Y'),'-') AS adate,ifnull(sms.acmts,'-') AS acmts,ifnull(sms.ctype,'-') AS ctype,ifnull(sms.certname,'-') AS certname,ifnull(balance,'-') AS balance,ifnull(sfb.bdate,'-') 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(DATE_FORMAT(sms.adate, '%d-%m-%Y'),'-') AS adate,ifnull(sms.acmts,'-') AS acmts,ifnull(sms.ctype,'-') AS ctype,ifnull(sms.certname,'-') AS certname,ifnull(balance,'-') AS balance,ifnull(sfb.bdate,'-') 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,sfs.batch as Batch,scd.coursestatus as Course_Status,ifnull(andate.courierdetails,'-') as Courier_Details FROM ( SELECT app.ID,app.StudentID AS sid,app.CourseID AS cid,app.BranchCode AS branch,app.ListCode AS lcode,p.ListName AS STATUS,STR_TO_DATE(AppDate, '%d-%m-%Y' @@ -270,7 +271,14 @@ LEFT JOIN LEFT JOIN (SELECT StudentID AS sid,MobileNumber AS phone,IsActive AS active,concat(FirstName,' ',Lastname) 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 + (SELECT StudentID AS sid,UniversityID AS uid,CourseID AS cid,EnrollmentID AS eid,BranchID AS branch,ifnull(Status,'-') as coursestatus + FROM T_Student_CourseDetails) AS scd ON scd.sid=sms.sid AND scd.cid=sms.cid And scd.coursestatus not in ('Cancelled','Discontinued','Refund_issued') +left join (select StudentID as sid,CourierDetails as courierdetails + from T_AnswerBookletStatus abs + left join T_PickListDetails list on list.ListCode=abs.ListCode + where AnsDate is not null and ID in ( select max(ID) from T_AnswerBookletStatus where AnsDate is not null group by StudentID,Sem) + group by sid,Sem) as andate on andate.sid=sms.sid + where sms.branch = '".$br."'"; @@ -303,7 +311,7 @@ LEFT JOIN $sql.=" ORDER BY sfb.bdate ASC"; //echo $sql; - // print_r($sql); + // print_r($sql);die(); $leadDet=$this->db->query($sql); $cert_statusDetails = $leadDet->result(); diff --git a/Apollo/assets/views/report_certificate_status.html b/Apollo/assets/views/report_certificate_status.html index b3d2833d..de710d8a 100755 --- a/Apollo/assets/views/report_certificate_status.html +++ b/Apollo/assets/views/report_certificate_status.html @@ -22,6 +22,7 @@ td,th { th { cursor: pointer; } */ + .word-break{ word-wrap: break-word; }