From 134ba09fa30926d9634f7afcd9b7a5e610cfb49e Mon Sep 17 00:00:00 2001 From: sriramv Date: Sat, 29 Dec 2018 18:54:13 +0530 Subject: [PATCH] 1574 stud pend doc --- Apollo/api/application/config/database.php | 12 ++++++------ Apollo/api/application/models/Reports_model.php | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Apollo/api/application/config/database.php b/Apollo/api/application/config/database.php index e0d83a26..50f2b8a8 100755 --- a/Apollo/api/application/config/database.php +++ b/Apollo/api/application/config/database.php @@ -76,13 +76,13 @@ $query_builder = TRUE; $db['default'] = array( 'dsn' => '', 'hostname' => 'apollodec.com', - 'username' => 'apollod4_DEV', - 'password' => 'apollo1234', - 'database' => 'apollod4_ApolloDECDev', + 'username' => 'apollod4_DEV', + 'password' => 'apollo1234', + 'database' => 'apollod4_ApolloDECDev', - // 'username' => 'apollod4_SIT', - // 'password' => 'apollosit1234', - // 'database' => 'apollod4_ApolloDECNEWSIT', + // 'username' => 'apollod4_SIT', + // 'password' => 'apollosit1234', + // 'database' => 'apollod4_ApolloDECNEWSIT', // 'username' => 'apollod4_PROD', // 'password' => 'approd!2017', diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index 84ea15d8..40553480 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -729,7 +729,7 @@ $sql.=" group by Student_id,cid,ctype"; //if ($u!= '' and $bat = '') else{ - $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(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,sms.certname as certname,'-' as Admission_date,ifnull(sms.follow_date,'-') as fdate,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber + $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(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,sms.certname as certname,ifnull(sfp.bdate,'-') as Admission_date,ifnull(sms.follow_date,'-') as fdate,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber from (select StudentID as sid,CourseID as cid,Details as certname,DocumentDate as follow_date,StatusName as status from T_Student_DocumentTrack_Details @@ -762,7 +762,7 @@ $sql.=" group by Student_id,cid,ctype"; } - + $leadDet=$this->db->query($sql); $answer = $leadDet->result();