SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

User Creation changes

Browse Source
This commit is contained in:
gandhimathi Bharathirajan 2017-05-15 12:32:24 +05:30
parent 98b5faff90
commit 63a5ffd939
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/models/requistion_model.php
View File

@ -400,7 +400,7 @@ class requistion_model extends CI_Model
from T_Requestion_Master mast join T_Employee_Details emp on mast.Requestedby = emp.EmpID
join T_DepartmentDetails Dept on emp.Departmentcode = Dept.HeadDept
join T_Status st on st.StatusCode = mast.Status
where status != ? and emp.Departmentcode = (select HeadDept from T_DepartmentDetails where DEPCode = (select Departmentcode from T_Employee_Details where EmpID=(select EmpID from tbl_users where userId=?)))';
where status not in(?,?,?) and emp.Departmentcode = (select HeadDept from T_DepartmentDetails where DEPCode = (select Departmentcode from T_Employee_Details where EmpID=(select EmpID from tbl_users where userId=?)))';
$subQuery1 = $subQuery;
$query ='';
@ -409,24 +409,24 @@ class requistion_model extends CI_Model
$Where = 'and mast.CreatedDate >= ? and mast.CreatedDate <= ? and Status=?';
$subQuery1 .= $Where;
$query = $this->db->query($subQuery1, array(REQ_DRAFT,$UserID,$FromDate,$ToDate,$Status));
$query = $this->db->query($subQuery1, array(REQ_DRAFT,REQ_DELETED,REQ_REJECTED,$UserID,$FromDate,$ToDate,$Status));
}
else if($FromDate != '' && $ToDate != '' && $Status =='')
{
$Where = 'and mast.CreatedDate >= ? and mast.CreatedDate <= ? ';
$subQuery1 .= $Where;
$query = $this->db->query($subQuery1, array(REQ_DRAFT,$UserID,$FromDate,$ToDate));
$query = $this->db->query($subQuery1, array(REQ_DRAFT,REQ_DELETED,REQ_REJECTED,$UserID,$FromDate,$ToDate));
}
else if($Status != '' && $FromDate == '' && $ToDate == '')
{
$Where = 'and Status = ?';
$subQuery1 .= $Where;
$query = $this->db->query($subQuery1, array(REQ_DRAFT,$UserID,$Status));
$query = $this->db->query($subQuery1, array(REQ_DRAFT,REQ_DELETED,REQ_REJECTED,$UserID,$Status));
}
else
{
$query = $this->db->query($subQuery, array(REQ_DRAFT,$UserID));
$query = $this->db->query($subQuery, array(REQ_DRAFT,REQ_DELETED,REQ_REJECTED,$UserID));
}
// print_r($this->db->last_query());