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:
gandhimathi 2018-09-22 17:22:06 +05:30
commit 48a6651922
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Apollo/api/application/models/Employee_model.php
View File

@ -675,14 +675,14 @@ class Employee_model extends CI_Model
$FinanceModuleAccess = $req['FinanceModuleAccess'];
$sql = "UPDATE ".LOGIN." SET ListCode ='$listCode' WHERE StaffID='$empFor'";
if ($this->db->query($sql) == '1') {
$sql1 = "UPDATE ".STAFF." SET BranchCode='$branchCode', JobResponsibility='$roleResponsibility', FinanceModuleAccess= '$FinanceModuleAccess' WHERE StaffID='$empFor'";
if ($this->db->query($sql1) == '1') {
$result['updateEmpbranchStatus'] = true;
$result['message'] = "Successfully employee branch details Updated";
} else {
$result['updateEmpbranchStatus'] = false;
$result['message'] = "Something Went Wrong.";
}
// $sql1 = "UPDATE ".STAFF." SET BranchCode='$branchCode', JobResponsibility='$roleResponsibility', FinanceModuleAccess= '$FinanceModuleAccess' WHERE StaffID='$empFor'";
// if ($this->db->query($sql1) == '1') {
// $result['updateEmpbranchStatus'] = true;
// $result['message'] = "Successfully employee branch details Updated";
// } else {
// $result['updateEmpbranchStatus'] = false;
// $result['message'] = "Something Went Wrong.";
// }
} else {
$result['updateEmpbranchStatus'] = false;
$result['message'] = "Something Went Wrong.";

2
Apollo/api/application/models/Student_model.php
View File

@ -1024,6 +1024,8 @@ class Student_model extends CI_Model {
$this->db->group_by('t1.StaffID');
$this->db->where('t1.BranchCode', $loginBranchId);
$this->db->where('t1.IsActive','1');
$this->db->where('t2.IsActive','1');
// $this->db->where('t1.ListCode', EMPLOYEE);
$this->db->order_by('t1.CreatedOn', 'DESC');
$empDetails = $this->db->get();