Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-12-31 11:07:25 +05:30
commit dbd004d957
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Apollo/api/application/config/database.php
View File

@ -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',

4
Apollo/api/application/models/Reports_model.php
View File

@ -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();