employee enrollment changes , and employee role mapping changes: kdk
This commit is contained in:
dineshkumarkannan
parent
231254f752
commit
4426a796c5
@ -80,7 +80,7 @@ $route['updateEmpBranchDetail'] = 'Employee_Controller/updateEmpBranchDetail';
|
||||
$route['updateEmpImgExistDetail'] = 'Employee_Controller/updateEmployeeImage';
|
||||
$route['insertEmployeeImage'] = 'Employee_Controller/addEmployeeImage';
|
||||
$route['employeeGetProf'] = 'Employee_Controller/employeeGetProf';
|
||||
|
||||
$route['addEmpBranchDetail'] = 'Employee_Controller/addEmpBranchDetail';
|
||||
// call tracking
|
||||
$route['getTrackingLeadDetails'] = 'Call_Tracking_Controller/getTrackingLeadDetails';
|
||||
$route['addLeadTrackingDetails'] = 'Call_Tracking_Controller/addLeadTrackingDetails';
|
||||
|
||||
@ -437,19 +437,53 @@ class Employee_Controller extends REST_Controller {
|
||||
}
|
||||
}
|
||||
|
||||
public function addEmpBranchDetail_post() {
|
||||
$req['StaffID'] = $this->post('empFor');
|
||||
$req['BranchCode'] = $this->post('updateBranch');
|
||||
$req['ListCode'] = $this->post('updateRole');
|
||||
$req['JobResponsibility'] = $this->post('JobResponsibility');
|
||||
|
||||
$req['FinanceModuleAccess'] = $this->post('FinanceModuleAccess') == 1 ? '1' : '0';
|
||||
$req['CreatedBy'] = $this->post('updateBy');
|
||||
$date = date('Y-m-d H:i:s');
|
||||
$req['IsActive'] = '1';
|
||||
$req['UpdatedOn'] = $date;
|
||||
|
||||
$addEmpBranch = $this->employee_model->add_employee_branch( $req );// Check if the employee exist
|
||||
if ($addEmpBranch)
|
||||
{
|
||||
$addEmpBranch['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
$this->response($addEmpBranch, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
|
||||
}
|
||||
else
|
||||
{
|
||||
// Set the response and exit
|
||||
$this->response([
|
||||
'message' => 'No users were found',
|
||||
'status' => REST_Controller::HTTP_NOT_FOUND
|
||||
], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
|
||||
}
|
||||
}
|
||||
|
||||
// update employee branch
|
||||
public function updateEmpBranchDetail_post() {
|
||||
// exit();
|
||||
$empFor = $this->post('empFor');
|
||||
$reqBanch['BranchCode'] = $this->post('updateBranch');
|
||||
$req['StaffID'] = $this->post('empFor');
|
||||
$req['BranchCode'] = $this->post('updateBranch');
|
||||
$req['ListCode'] = $this->post('updateRole');
|
||||
$reqJOBRES['JobResponsibility'] = $this->post('JobResponsibility');
|
||||
$FinanceModuleAccess = $this->post('FinanceModuleAccess') == 1 ? 1 : 0;
|
||||
$req['JobResponsibility'] = $this->post('JobResponsibility');
|
||||
$req['HomeBranch'] = $this->post('HomeBranch');
|
||||
|
||||
$req['FinanceModuleAccess'] = $this->post('FinanceModuleAccess') == 1 ? '1' : '0';
|
||||
// echo $req['FinanceModuleAccess'];exit();
|
||||
$req['UpdatedBy'] = $this->post('updateBy');
|
||||
$date = date('Y-m-d H:i:s');
|
||||
$req['UpdatedOn'] = $date;
|
||||
|
||||
$updateFor = $this->post('ID');
|
||||
|
||||
$updateBranch = $this->employee_model->upate_employee_branch( $empFor, $reqBanch, $req, $req['UpdatedBy'], $req['UpdatedOn'], $reqJOBRES, $FinanceModuleAccess);// Check if the employee exist
|
||||
$updateBranch = $this->employee_model->upate_employee_branch( $updateFor, $req );// Check if the employee exist
|
||||
if ($updateBranch)
|
||||
{
|
||||
$updateBranch['status'] = REST_Controller::HTTP_OK;
|
||||
|
||||
@ -61,7 +61,7 @@ class Employee_model extends CI_Model
|
||||
} else {
|
||||
// get branch details for admin & staff
|
||||
$result['details'] = $responseDetails;
|
||||
$this->db->select('t3.BranchCode, t3.BranchName');
|
||||
$this->db->select('t3.BranchCode, t3.BranchName, ');
|
||||
$this->db->from('' . STAFF_BRANCH . ' as t2');
|
||||
$this->db->where('t2.StaffID', $EmpId);
|
||||
$this->db->where('t2.IsActive', 1);
|
||||
@ -123,11 +123,13 @@ class Employee_model extends CI_Model
|
||||
} else {
|
||||
// get branch details for admin & staff
|
||||
$result['details'] = $responseDetails;
|
||||
$this->db->select('t3.BranchCode, t3.BranchName');
|
||||
$this->db->select('t3.BranchCode, t3.BranchName, t2.ListCode , t4.ListName, t2.FinanceModuleAccess');
|
||||
$this->db->from('' . STAFF_BRANCH . ' as t2');
|
||||
$this->db->where('t2.StaffID', $EmpId);
|
||||
$this->db->where('t2.IsActive', 1);
|
||||
$this->db->order_by('t2.CreatedOn', 'ACS');
|
||||
$this->db->join('' . BRANCH . ' as t3', 't2.BranchCode = t3.BranchCode', 'LEFT');
|
||||
$this->db->join('' . PICK_LIST_DETAILS . ' as t4', 't4.ListCode = t2.ListCode', 'LEFT');
|
||||
// $this->db->where('t3.IsActive', 1);STAFF_BRANCH
|
||||
// $this->db->join('T_StaffDetails as t2', 't1.StaffID = t2.StaffID', 'LEFT');
|
||||
$branchDetails = $this->db->get();
|
||||
@ -183,12 +185,17 @@ class Employee_model extends CI_Model
|
||||
}
|
||||
} else {
|
||||
$staffId = $this->selfGetEmpId($loginUserId);
|
||||
$this->db->select('*');
|
||||
$this->db->order_by('CreatedOn', 'DESC');
|
||||
$this->db->from(STAFF);
|
||||
// not for SuperAdmin and Student Role code
|
||||
$this->db->where_not_in('StaffID', $staffId);
|
||||
$this->db->where('BranchCode', $loginUserBranchId);
|
||||
$this->db->select('t2.*');
|
||||
$this->db->from('' . STAFF_BRANCH . ' as t1');
|
||||
|
||||
$this->db->join('' . STAFF . ' as t2', 't2.StaffID = t1.StaffID', 'LEFT');
|
||||
|
||||
// not for SuperAdmin and Student Role code
|
||||
$this->db->where_not_in('t1.StaffID', $staffId);
|
||||
$this->db->group_by('t1.StaffID');
|
||||
$this->db->where('t1.BranchCode', $loginUserBranchId);
|
||||
$this->db->where('t1.ListCode', EMPLOYEE);
|
||||
$this->db->order_by('t1.CreatedOn', 'DESC');
|
||||
$empDetails = $this->db->get();
|
||||
$checkArr = $empDetails->result();
|
||||
if (count($checkArr) > 0) {
|
||||
@ -204,13 +211,17 @@ class Employee_model extends CI_Model
|
||||
} else if ($loginUserType == ADMIN) {
|
||||
// list for admin
|
||||
$staffId = $this->selfGetEmpId($loginUserId);
|
||||
$this->db->select('*');
|
||||
$this->db->from(STAFF);
|
||||
$this->db->order_by('CreatedOn', 'DESC');
|
||||
$this->db->select('t2.*');
|
||||
$this->db->from('' . STAFF_BRANCH . ' as t1');
|
||||
|
||||
$this->db->join('' . STAFF . ' as t2', 't2.StaffID = t1.StaffID', 'LEFT');
|
||||
|
||||
// not for SuperAdmin and Student Role code
|
||||
$this->db->where_not_in('StaffID', $staffId);
|
||||
$this->db->where('BranchCode', $loginUserBranchId);
|
||||
$this->db->where('ListCode', EMPLOYEE);
|
||||
$this->db->where_not_in('t1.StaffID', $staffId);
|
||||
$this->db->group_by('t1.StaffID');
|
||||
$this->db->where('t1.BranchCode', $loginUserBranchId);
|
||||
$this->db->where('t1.ListCode', EMPLOYEE);
|
||||
$this->db->order_by('t1.CreatedOn', 'DESC');
|
||||
$empDetails = $this->db->get();
|
||||
$checkArr = $empDetails->result();
|
||||
if (count($checkArr) > 0) {
|
||||
@ -344,11 +355,16 @@ class Employee_model extends CI_Model
|
||||
$branchArr['BranchCode'] = $empArr['BranchCode'];
|
||||
$branchArr['IsActive'] = $empArr['IsActive'];
|
||||
$branchArr['CreatedBy'] = $createdBy;
|
||||
$branchArr['ListCode'] = $empArr['ListCode'];
|
||||
$branchArr['JobResponsibility'] = $empArr['JobResponsibility'];
|
||||
$branchArr['FinanceModuleAccess'] = $empArr['FinanceModuleAccess'];
|
||||
$branchArr['HomeBranch'] = 1;
|
||||
$this->db->insert(STAFF_BRANCH, $branchArr);
|
||||
if ($this->db->affected_rows() == '1') {
|
||||
$loginArr['StaffID'] = $empArr['StaffID'];
|
||||
$loginArr['ListCode'] = $empArr['ListCode'];
|
||||
$loginArr['MobileNumber'] = $empArr['MobileNumber'];
|
||||
// $loginArr['MobileNumber'] = $empArr['MobileNumber'];
|
||||
$loginArr['MobileNumber'] = $empArr['StaffID'];
|
||||
$loginArr['EmailId'] = $empArr['EmailID'];
|
||||
$loginArr['IsActive'] = $empArr['IsActive'];
|
||||
$loginArr['CreatedBy'] = $createdBy;
|
||||
@ -380,11 +396,16 @@ class Employee_model extends CI_Model
|
||||
$branchArr['BranchCode'] = $empArr['BranchCode'];
|
||||
$branchArr['IsActive'] = $empArr['IsActive'];
|
||||
$branchArr['CreatedBy'] = $createdBy;
|
||||
$branchArr['ListCode'] = $empArr['ListCode'];
|
||||
$branchArr['JobResponsibility'] = $empArr['JobResponsibility'];
|
||||
$branchArr['FinanceModuleAccess'] = $empArr['FinanceModuleAccess'];
|
||||
$branchArr['HomeBranch'] = 1;
|
||||
$this->db->insert(STAFF_BRANCH, $branchArr);
|
||||
if ($this->db->affected_rows() == '1') {
|
||||
$loginArr['StaffID'] = $empArr['StaffID'];
|
||||
$loginArr['ListCode'] = $empArr['ListCode'];
|
||||
$loginArr['MobileNumber'] = $empArr['MobileNumber'];
|
||||
// $loginArr['MobileNumber'] = $empArr['MobileNumber'];
|
||||
$loginArr['MobileNumber'] = $empArr['StaffID'];
|
||||
$loginArr['EmailId'] = $empArr['EmailID'];
|
||||
$loginArr['IsActive'] = $empArr['IsActive'];
|
||||
$loginArr['CreatedBy'] = $createdBy;
|
||||
@ -454,17 +475,17 @@ class Employee_model extends CI_Model
|
||||
public function update_employee($empArr, $updateFor, $imageName, $imageSource, $imageSize)
|
||||
{
|
||||
if( $imageSource == '') { // update Employee without image
|
||||
$this->db->select('*');
|
||||
$this->db->from(STAFF);
|
||||
$this->db->where('MobileNumber', $empArr['MobileNumber']);
|
||||
$this->db->where_not_in('StaffID', $updateFor);
|
||||
if ($this->db->get()->first_row()) {
|
||||
$result['updateEmpStatus'] = false;
|
||||
$result['message'] = "This Mobile Number Already Exist";
|
||||
}else {
|
||||
// $this->db->select('*');
|
||||
// $this->db->from(STAFF);
|
||||
// $this->db->where('MobileNumber', $empArr['MobileNumber']);
|
||||
// $this->db->where_not_in('StaffID', $updateFor);
|
||||
// if ($this->db->get()->first_row()) {
|
||||
// $result['updateEmpStatus'] = false;
|
||||
// $result['message'] = "This Mobile Number Already Exist";
|
||||
// }else {
|
||||
$this->db->select('*');
|
||||
$this->db->from(LOGIN);
|
||||
$this->db->where('MobileNumber', $empArr['MobileNumber']);
|
||||
$this->db->where('MobileNumber', $updateFor);
|
||||
$this->db->where_not_in('StaffID', $updateFor);
|
||||
if($this->db->get()->first_row()) {
|
||||
$result['updateEmpStatus'] = false;
|
||||
@ -478,7 +499,7 @@ class Employee_model extends CI_Model
|
||||
$active = $empArr['IsActive'];
|
||||
$updatedBy = $empArr['UpdatedBy'];
|
||||
$updatedOn = $empArr['UpdatedOn'];
|
||||
$sql = "UPDATE ".LOGIN." SET MobileNumber='$mobile', EmailId='$email', IsActive='$active', UpdatedBy='$updatedBy', UpdatedOn='$updatedOn' WHERE StaffID='$updateFor'";
|
||||
$sql = "UPDATE ".LOGIN." SET EmailId='$email', IsActive='$active', UpdatedBy='$updatedBy', UpdatedOn='$updatedOn' WHERE StaffID='$updateFor'";
|
||||
if($this->db->query($sql) == '1'){
|
||||
$result['updateEmpStatus'] = true;
|
||||
$result['message'] = "Successfully employee details Updated";
|
||||
@ -490,23 +511,19 @@ class Employee_model extends CI_Model
|
||||
$result['updateEmpStatus'] = false;
|
||||
$result['message'] = "Something went wrong.please try again";
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
// }
|
||||
}
|
||||
else { // update employee with image
|
||||
|
||||
|
||||
|
||||
} else { // update employee with image
|
||||
|
||||
$this->db->select('*');
|
||||
$this->db->from(STAFF);
|
||||
$this->db->where('MobileNumber', $empArr['MobileNumber']);
|
||||
$this->db->where_not_in('StaffID', $updateFor);
|
||||
if ($this->db->get()->first_row()) {
|
||||
$result['updateEmpStatus'] = false;
|
||||
$result['message'] = "This Mobile Number Already Exist";
|
||||
}else {
|
||||
// $this->db->select('*');
|
||||
// $this->db->from(STAFF);
|
||||
// $this->db->where('MobileNumber', $empArr['MobileNumber']);
|
||||
// $this->db->where_not_in('StaffID', $updateFor);
|
||||
// if ($this->db->get()->first_row()) {
|
||||
// $result['updateEmpStatus'] = false;
|
||||
// $result['message'] = "This Mobile Number Already Exist";
|
||||
// }else {
|
||||
$this->db->select('*');
|
||||
$this->db->from(LOGIN);
|
||||
$this->db->where('MobileNumber', $empArr['MobileNumber']);
|
||||
@ -537,7 +554,7 @@ class Employee_model extends CI_Model
|
||||
$active = $empArr['IsActive'];
|
||||
$updatedBy = $empArr['UpdatedBy'];
|
||||
$updatedOn = $empArr['UpdatedOn'];
|
||||
$sql = "UPDATE ".LOGIN." SET MobileNumber='$mobile', EmailId='$email', IsActive='$active', UpdatedBy='$updatedBy', UpdatedOn='$updatedOn' WHERE StaffID='$updateFor'";
|
||||
$sql = "UPDATE ".LOGIN." SET EmailId='$email', IsActive='$active', UpdatedBy='$updatedBy', UpdatedOn='$updatedOn' WHERE StaffID='$updateFor'";
|
||||
if($this->db->query($sql) == '1'){
|
||||
$result['updateEmpStatus'] = true;
|
||||
$result['message'] = "Successfully employee details Updated";
|
||||
@ -550,7 +567,7 @@ class Employee_model extends CI_Model
|
||||
$result['message'] = "Something went wrong.please try again";
|
||||
}
|
||||
}
|
||||
}
|
||||
// }
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
@ -558,33 +575,33 @@ class Employee_model extends CI_Model
|
||||
// get employee branch details
|
||||
public function get_employee_branch($staffId)
|
||||
{
|
||||
$this->db->select('t3.ListCode, t3.ListName, t4.JobResponsibility, t4.FinanceModuleAccess');
|
||||
$this->db->from('' . PICK_LIST_DETAILS . ' as t3');
|
||||
$this->db->join('' . STAFF . ' as t4', 't4.ListCode = t3.ListCode', 'LEFT');
|
||||
$this->db->where('t4.StaffID', $staffId);
|
||||
$roleDetails = $this->db->get();
|
||||
$checkArr = $roleDetails->result();
|
||||
if (count($checkArr) > 0) {
|
||||
$this->db->select('t1.BranchCode, t1.BranchName');
|
||||
$this->db->from('' . BRANCH . ' as t1');
|
||||
$this->db->join('' . STAFF_BRANCH . ' as t2', 't2.BranchCode = t1.BranchCode', 'LEFT');
|
||||
$this->db->where('t2.StaffID', $staffId);
|
||||
$this->db->where('t2.IsActive', 1);
|
||||
// $this->db->select('t3.ListCode, t3.ListName, t4.JobResponsibility, t4.FinanceModuleAccess');
|
||||
// $this->db->from('' . PICK_LIST_DETAILS . ' as t3');
|
||||
// $this->db->join('' . STAFF . ' as t4', 't4.ListCode = t3.ListCode', 'LEFT');
|
||||
// $this->db->where('t4.StaffID', $staffId);
|
||||
// $roleDetails = $this->db->get();
|
||||
// $checkArr = $roleDetails->result();
|
||||
// if (count($checkArr) > 0) {
|
||||
$this->db->select('t1.*, t2.BranchName, t3.ListName');
|
||||
$this->db->from('' . STAFF_BRANCH . ' as t1');
|
||||
$this->db->join('' . BRANCH . ' as t2', 't2.BranchCode = t1.BranchCode', 'LEFT');
|
||||
$this->db->join('' . PICK_LIST_DETAILS . ' as t3', 't3.ListCode = t1.ListCode', 'LEFT');
|
||||
$this->db->where('t1.StaffID', $staffId);
|
||||
// $this->db->where('t2.IsActive', 1);
|
||||
// $this->db->where('t1.IsActive', 1);
|
||||
$branchDetails = $this->db->get();
|
||||
$branchArr = $branchDetails->result();
|
||||
if( count($branchArr) > 0 ) {
|
||||
$result['empBranchDetails'] = true;
|
||||
$result['role_details'] = $roleDetails->result();
|
||||
$result['branch_details'] = $branchDetails->result();
|
||||
$result['branch_details'] = $branchArr;
|
||||
} else {
|
||||
$result['empBranchDetails'] = true;
|
||||
$result['role_details'] = $roleDetails->result();
|
||||
$result['branch_details'] = $branchDetails->result();
|
||||
$result['empBranchDetails'] = false;
|
||||
$result['message'] = "No Employee Branch Details";
|
||||
}
|
||||
} else {
|
||||
$result['empBranchDetails'] = false;
|
||||
}
|
||||
// } else {
|
||||
// $result['empBranchDetails'] = false;
|
||||
// }
|
||||
// print_r($result);exit();
|
||||
return $result;
|
||||
}
|
||||
|
||||
@ -596,98 +613,178 @@ class Employee_model extends CI_Model
|
||||
return $roleDetails->BranchCode;
|
||||
}
|
||||
|
||||
// update employee branch details
|
||||
public function upate_employee_branch($empFor, $reqBanch, $req, $createby, $createon, $reqJOBRES, $FinanceModuleAccess)
|
||||
{
|
||||
// print_r( count($reqBanch['BranchCode']));exit();
|
||||
if( count($reqBanch['BranchCode']) > 1) {
|
||||
$this->db->where('StaffID', $empFor);
|
||||
$this->db->update(STAFF, $req);
|
||||
// update role to staff table
|
||||
if ($this->db->affected_rows() == '1') {
|
||||
$this->db->where('StaffID', $empFor);
|
||||
$this->db->update(LOGIN, $req);
|
||||
// echo $this->db->affected_rows();exit();
|
||||
// update role to login table
|
||||
if ($this->db->affected_rows() == '1') {
|
||||
// $branchCode = $this->get_branch_code($reqBanch['BranchCode'][0]);
|
||||
$branchCode = $reqBanch['BranchCode'][0];
|
||||
$roleResponsibility = $reqJOBRES['JobResponsibility'];
|
||||
$sql = "UPDATE ".STAFF." SET BranchCode='$branchCode', JobResponsibility='$roleResponsibility', FinanceModuleAccess=$FinanceModuleAccess WHERE StaffID='$empFor'";
|
||||
// update branch to staff table
|
||||
if ($this->db->query($sql) == '1') {
|
||||
$this->db->where('StaffID', $empFor);
|
||||
$this->db->delete(STAFF_BRANCH);
|
||||
foreach($reqBanch['BranchCode'] as $something) {
|
||||
// $branchCode = $this->get_branch_code($something);
|
||||
$branchCode = $something;
|
||||
$sql1 = "INSERT INTO ".STAFF_BRANCH." (StaffID, BranchCode, IsActive, CreatedBy, CreatedOn, UpdatedBy, UpdatedOn)
|
||||
VALUES ('$empFor', '$branchCode', '1','$createby', '$createon', '$createby', '$createon')";
|
||||
// update branch to staff_branch table
|
||||
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.please try again";
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$result['updateEmpbranchStatus'] = false;
|
||||
$result['message'] = "Something went wrong.please try again";
|
||||
}
|
||||
} else {
|
||||
$result['updateEmpbranchStatus'] = false;
|
||||
$result['message'] = "Something went wrong.please try again";
|
||||
}
|
||||
} else {
|
||||
$result['updateEmpbranchStatus'] = false;
|
||||
$result['message'] = "Something went wrong.please try again";
|
||||
}
|
||||
return $result;
|
||||
|
||||
public function add_employee_branch($req) {
|
||||
$staffID = $req['StaffID'];
|
||||
$BranchCode = $req['BranchCode'];
|
||||
$this->db->select('*');
|
||||
$this->db->from(STAFF_BRANCH);
|
||||
$this->db->where('StaffID', $staffID);
|
||||
$this->db->where('BranchCode', $BranchCode);
|
||||
$roleDetails = $this->db->get()->first_row();
|
||||
if(count($roleDetails) > 0) {
|
||||
$result['addEmpbranchStatus'] = false;
|
||||
$result['message'] = "Already Employee Exist for this Branch.";
|
||||
} else {
|
||||
$this->db->where('StaffID', $empFor);
|
||||
$this->db->update(STAFF, $req);
|
||||
// update role to staff table
|
||||
if ($this->db->affected_rows() == '1') {
|
||||
$this->db->where('StaffID', $empFor);
|
||||
$this->db->update(LOGIN, $req);
|
||||
// echo $this->db->affected_rows();exit();
|
||||
// update role to login table
|
||||
$req['HomeBranch'] = 0;
|
||||
$this->db->insert(STAFF_BRANCH, $req);
|
||||
if ($this->db->affected_rows() == '1') {
|
||||
// $branchCode = $this->get_branch_code($reqBanch['BranchCode'][0]);
|
||||
$branchCode = $reqBanch['BranchCode'][0];
|
||||
$roleResponsibility = $reqJOBRES['JobResponsibility'];
|
||||
$sql = "UPDATE ".STAFF." SET BranchCode='$branchCode', JobResponsibility='$roleResponsibility', FinanceModuleAccess=$FinanceModuleAccess WHERE StaffID='$empFor'";
|
||||
// update branch to staff table
|
||||
if ($this->db->query($sql) == '1') {
|
||||
$this->db->where('StaffID', $empFor);
|
||||
$this->db->delete(STAFF_BRANCH);
|
||||
$sql1 = "INSERT INTO ".STAFF_BRANCH." (StaffID, BranchCode, IsActive, CreatedBy, CreatedOn)
|
||||
VALUES ('$empFor', '$branchCode', '1','$createby', '$createon')";
|
||||
// update branch to staff_branch table
|
||||
if ($this->db->query($sql1) == '1') {
|
||||
$result['updateEmpbranchStatus'] = true;
|
||||
$result['message'] = "Successfully employee branch details Updated";
|
||||
$result['addEmpbranchStatus'] = true;
|
||||
$result['message'] = "Successfully employee branch details Added";
|
||||
|
||||
} else {
|
||||
$result['addEmpbranchStatus'] = false;
|
||||
$result['message'] = "Something went wrong.";
|
||||
}
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
|
||||
|
||||
// update employee branch details
|
||||
public function upate_employee_branch($updateFor, $req)
|
||||
{
|
||||
// print_r($req);
|
||||
// echo $updateFor;exit();
|
||||
$staffID = $req['StaffID'];
|
||||
$BranchCode = $req['BranchCode'];
|
||||
$this->db->select('*');
|
||||
$this->db->from(STAFF_BRANCH);
|
||||
$this->db->where('ID', $updateFor);
|
||||
$this->db->where_not_in('BranchCode', $BranchCode);
|
||||
$roleDetails = $this->db->get()->first_row();
|
||||
// print_r($roleDetails);exit();
|
||||
if(count($roleDetails) > 0) {
|
||||
$result['updateEmpbranchStatus'] = false;
|
||||
$result['message'] = "Already Employee Exist for this Branch.";
|
||||
} else {
|
||||
if($req['HomeBranch'] == 1) {
|
||||
$this->db->where('ID', $updateFor);
|
||||
$this->db->update( STAFF_BRANCH , $req);
|
||||
if ($this->db->affected_rows() == '1') {
|
||||
$listCode = $req['ListCode'];
|
||||
$empFor = $req['StaffID'];
|
||||
$branchCode = $req['BranchCode'];
|
||||
$roleResponsibility = $req['JobResponsibility'];
|
||||
$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.";
|
||||
}
|
||||
} else {
|
||||
$result['updateEmpbranchStatus'] = false;
|
||||
$result['message'] = "Something went wrong.please try again";
|
||||
$result['message'] = "Something Went Wrong.";
|
||||
}
|
||||
} else {
|
||||
$result['updateEmpbranchStatus'] = false;
|
||||
$result['message'] = "Something went wrong.please try again";
|
||||
$result['message'] = "Something Went Wrong.";
|
||||
}
|
||||
} else {
|
||||
$result['updateEmpbranchStatus'] = false;
|
||||
$result['message'] = "Something went wrong.please try again";
|
||||
$this->db->where('ID', $updateFor);
|
||||
$this->db->update( STAFF_BRANCH , $req);
|
||||
if ($this->db->affected_rows() == '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.please try again";
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
// $this->db->where('StaffID', $empFor);
|
||||
// $this->db->update($req['StaffID'] , $req);
|
||||
// // update role to staff table
|
||||
// if ($this->db->affected_rows() == '1') {
|
||||
// $this->db->where('StaffID', $empFor);
|
||||
// $this->db->update(LOGIN, $req);
|
||||
// // echo $this->db->affected_rows();exit();
|
||||
// // update role to login table
|
||||
// if ($this->db->affected_rows() == '1') {
|
||||
// // $branchCode = $this->get_branch_code($reqBanch['BranchCode'][0]);
|
||||
// $branchCode = $reqBanch['BranchCode'][0];
|
||||
// $roleResponsibility = $reqJOBRES['JobResponsibility'];
|
||||
// $sql = "UPDATE ".STAFF." SET BranchCode='$branchCode', JobResponsibility='$roleResponsibility', FinanceModuleAccess=$FinanceModuleAccess WHERE StaffID='$empFor'";
|
||||
// // update branch to staff table
|
||||
// if ($this->db->query($sql) == '1') {
|
||||
// $this->db->where('StaffID', $empFor);
|
||||
// $this->db->delete(STAFF_BRANCH);
|
||||
// foreach($reqBanch['BranchCode'] as $something) {
|
||||
// // $branchCode = $this->get_branch_code($something);
|
||||
// $branchCode = $something;
|
||||
// $sql1 = "INSERT INTO ".STAFF_BRANCH." (StaffID, BranchCode, IsActive, CreatedBy, CreatedOn, UpdatedBy, UpdatedOn)
|
||||
// VALUES ('$empFor', '$branchCode', '1','$createby', '$createon', '$createby', '$createon')";
|
||||
// // update branch to staff_branch table
|
||||
// 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.please try again";
|
||||
// }
|
||||
// }
|
||||
// } else {
|
||||
// $result['updateEmpbranchStatus'] = false;
|
||||
// $result['message'] = "Something went wrong.please try again";
|
||||
// }
|
||||
// } else {
|
||||
// $result['updateEmpbranchStatus'] = false;
|
||||
// $result['message'] = "Something went wrong.please try again";
|
||||
// }
|
||||
// } else {
|
||||
// $result['updateEmpbranchStatus'] = false;
|
||||
// $result['message'] = "Something went wrong.please try again";
|
||||
// }
|
||||
// return $result;
|
||||
|
||||
// } else {
|
||||
// $this->db->where('StaffID', $empFor);
|
||||
// $this->db->update(STAFF, $req);
|
||||
// // update role to staff table
|
||||
// if ($this->db->affected_rows() == '1') {
|
||||
// $this->db->where('StaffID', $empFor);
|
||||
// $this->db->update(LOGIN, $req);
|
||||
// // echo $this->db->affected_rows();exit();
|
||||
// // update role to login table
|
||||
// if ($this->db->affected_rows() == '1') {
|
||||
// // $branchCode = $this->get_branch_code($reqBanch['BranchCode'][0]);
|
||||
// $branchCode = $reqBanch['BranchCode'][0];
|
||||
// $roleResponsibility = $reqJOBRES['JobResponsibility'];
|
||||
// $sql = "UPDATE ".STAFF." SET BranchCode='$branchCode', JobResponsibility='$roleResponsibility', FinanceModuleAccess=$FinanceModuleAccess WHERE StaffID='$empFor'";
|
||||
// // update branch to staff table
|
||||
// if ($this->db->query($sql) == '1') {
|
||||
// $this->db->where('StaffID', $empFor);
|
||||
// $this->db->delete(STAFF_BRANCH);
|
||||
// $sql1 = "INSERT INTO ".STAFF_BRANCH." (StaffID, BranchCode, IsActive, CreatedBy, CreatedOn)
|
||||
// VALUES ('$empFor', '$branchCode', '1','$createby', '$createon')";
|
||||
// // update branch to staff_branch table
|
||||
// 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.please try again";
|
||||
// }
|
||||
// } else {
|
||||
// $result['updateEmpbranchStatus'] = false;
|
||||
// $result['message'] = "Something went wrong.please try again";
|
||||
// }
|
||||
// } else {
|
||||
// $result['updateEmpbranchStatus'] = false;
|
||||
// $result['message'] = "Something went wrong.please try again";
|
||||
// }
|
||||
// } else {
|
||||
// $result['updateEmpbranchStatus'] = false;
|
||||
// $result['message'] = "Something went wrong.please try again";
|
||||
// }
|
||||
// return $result;
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -29,6 +29,7 @@ class Login_model extends CI_Model
|
||||
$this->db->where('t1.IsActive', 1);
|
||||
//$this->db->where('t2.IsActive', 1);
|
||||
$loginDetails = $this->db->get(LOGIN)->first_row();
|
||||
// print_r($loginDetails);exit();
|
||||
if ($loginDetails) {
|
||||
if ($mobile == $loginDetails->MobileNumber) {
|
||||
|
||||
|
||||
@ -68,6 +68,8 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$
|
||||
$scope.init = function () {
|
||||
if (localDetail != null) {
|
||||
$scope.currentDate = new Date();
|
||||
$scope.localUserListCode = localDetail.localType;
|
||||
|
||||
// $scope.currentPage = 1;
|
||||
$scope.getEmployeeList();
|
||||
$scope.getRoleList();
|
||||
@ -173,8 +175,21 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$
|
||||
$scope.empBranchDetails = '';
|
||||
$scope.empRoleDetail = '';
|
||||
|
||||
$scope.branchListView = false;
|
||||
$scope.empEditBranchView = false;
|
||||
$scope.empAddNewBranchView = false;
|
||||
|
||||
$scope.getEmpBranchDetails = function (id) {
|
||||
// alert(id);
|
||||
$scope.empEditBranchDetails = {
|
||||
'ID': '',
|
||||
'StaffID': '',
|
||||
'ListCode': '',
|
||||
'BranchCode': '',
|
||||
'JobResponsibility': '',
|
||||
'IsActive': ''
|
||||
}
|
||||
|
||||
var req = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'getEmpBranchDetails/',
|
||||
@ -189,24 +204,226 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$
|
||||
if (response.data.empBranchDetails) {
|
||||
// $scope.editBranchId = id;
|
||||
$scope.branchEditLoading = false;
|
||||
$scope.branchListView = true;
|
||||
$scope.empEditBranchView = false;
|
||||
$scope.empAddNewBranchView = false;
|
||||
$scope.empBranchs = response.data.branch_details;
|
||||
$scope.branchArr = [];
|
||||
$scope.BranchName = '';
|
||||
angular.forEach($scope.empBranchs, function (item, index) {
|
||||
// alert(item.BranchName);
|
||||
$scope.BranchName = item.BranchName + '-' + item.BranchCode;
|
||||
$scope.branchArr.push($scope.BranchName);
|
||||
});
|
||||
$scope.empBranchDetails = {
|
||||
arr: $scope.branchArr,
|
||||
}
|
||||
response.data.role_details[0].FinanceModuleAccess = response.data.role_details[0].FinanceModuleAccess == 1 ? true : false;
|
||||
$scope.empRoleDetail = response.data.role_details[0];
|
||||
// $scope.branchArr = [];
|
||||
// $scope.BranchName = '';
|
||||
// angular.forEach($scope.empBranchs, function (item, index) {
|
||||
// // alert(item.BranchName);
|
||||
// $scope.BranchName = item.BranchName + '-' + item.BranchCode;
|
||||
// $scope.branchArr.push($scope.BranchName);
|
||||
// });
|
||||
// $scope.empBranchDetails = {
|
||||
// arr: $scope.branchArr,
|
||||
// }
|
||||
// response.data.role_details[0].FinanceModuleAccess = response.data.role_details[0].FinanceModuleAccess == 1 ? true : false;
|
||||
// $scope.empRoleDetail = response.data.role_details[0];
|
||||
} else {
|
||||
$scope.NoBranchDetailsFound = response.data.message ;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
$scope.empEditBranchDetails = {
|
||||
'ID': '',
|
||||
'StaffID': '',
|
||||
'ListCode': '',
|
||||
'BranchCode': '',
|
||||
'JobResponsibility': '',
|
||||
'IsActive': '',
|
||||
'FinanceModuleAccess': '',
|
||||
'HomeBranch': ''
|
||||
}
|
||||
|
||||
$scope.getEmpEditBranchDetails = function(p) {
|
||||
$scope.branchListView = false;
|
||||
$scope.empEditBranchView = true;
|
||||
$scope.empAddNewBranchView = false;
|
||||
|
||||
$scope.empEditBranchDetails.ID = p.ID;
|
||||
$scope.empEditBranchDetails.StaffID = p.StaffID;
|
||||
$scope.empEditBranchDetails.ListCode = p.ListCode;
|
||||
$scope.empEditBranchDetails.BranchCode = p.BranchCode;
|
||||
$scope.empEditBranchDetails.JobResponsibility = p.JobResponsibility;
|
||||
$scope.empEditBranchDetails.FinanceModuleAccess = p.FinanceModuleAccess == 1 ? true : false;
|
||||
$scope.empEditBranchDetails.HomeBranch = p.HomeBranch;
|
||||
}
|
||||
|
||||
$scope.getEmpEditBranchDetailsCancel = function() {
|
||||
$scope.branchListView = true;
|
||||
$scope.empEditBranchView = false;
|
||||
$scope.empAddNewBranchView = false;
|
||||
|
||||
$scope.empEditBranchDetails = {
|
||||
'ID': '',
|
||||
'StaffID': '',
|
||||
'ListCode': '',
|
||||
'BranchCode': '',
|
||||
'JobResponsibility': '',
|
||||
'IsActive': '',
|
||||
'FinanceModuleAccess': '',
|
||||
'HomeBranch': ''
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$scope.updateEmpBranchDetails = function (form) {
|
||||
|
||||
if (form.$invalid) {
|
||||
var field = null, firstError = null;
|
||||
for (field in form) {
|
||||
if (field[0] != '$') {
|
||||
if (firstError === null && !form[field].$valid) {
|
||||
firstError = form[field].$name;
|
||||
}
|
||||
if (form[field].$pristine) {
|
||||
form[field].$dirty = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
angular.element('.ng-invalid[name=' + firstError + ']').focus();
|
||||
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
|
||||
} else {
|
||||
|
||||
// angular.forEach(empBranchs.arr, function (item) {
|
||||
// var newString = item.split("-").pop();
|
||||
// $scope.arr1.push(newString);
|
||||
// });
|
||||
// alert(JSON.stringify($scope.arr1));
|
||||
$scope.sendBranchData = {
|
||||
'ID': $scope.empEditBranchDetails.ID,
|
||||
'empFor': $scope.empEditBranchDetails.StaffID ,
|
||||
'updateRole': $scope.empEditBranchDetails.ListCode,
|
||||
'JobResponsibility': $scope.empEditBranchDetails.JobResponsibility,
|
||||
'updateBranch': $scope.empEditBranchDetails.BranchCode,
|
||||
'updateBy': localDetails.localUserID,
|
||||
'FinanceModuleAccess': $scope.empEditBranchDetails.FinanceModuleAccess == true ? 1 : 0,
|
||||
'HomeBranch': $scope.empEditBranchDetails.HomeBranch
|
||||
}
|
||||
// p.IsActive = p.IsActive === true ? 1 : 0;
|
||||
var req = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'updateEmpBranchDetail/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: $scope.sendBranchData
|
||||
};
|
||||
$http(req).then(function (response) {
|
||||
if (response.data.updateEmpbranchStatus == true) {
|
||||
swal("", "Updated Successfully.", "success");
|
||||
$scope.getEmployeeList();
|
||||
$scope.getEmpBranchDetails($scope.empEditBranchDetails.StaffID);
|
||||
$scope.branchListView = true;
|
||||
$scope.empEditBranchView = false;
|
||||
$scope.empAddNewBranchView = false;
|
||||
$scope.empEditBranchDetails = {
|
||||
'ID': '',
|
||||
'StaffID': '',
|
||||
'ListCode': '',
|
||||
'BranchCode': '',
|
||||
'JobResponsibility': '',
|
||||
'IsActive': '',
|
||||
'FinanceModuleAccess': '',
|
||||
'HomeBranch': ''
|
||||
};
|
||||
} else {
|
||||
// $scope.ldloading1[loading.replace('-', '_')] = false;
|
||||
swal("", response.data.message, "error");
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
$scope.addNewBranch = function () {
|
||||
$scope.branchListView = false;
|
||||
$scope.empEditBranchView = false;
|
||||
$scope.empAddNewBranchView = true;
|
||||
}
|
||||
|
||||
$scope.addNewBranchcancel = function() {
|
||||
$scope.branchListView = true;
|
||||
$scope.empEditBranchView = false;
|
||||
$scope.empAddNewBranchView = false;
|
||||
$scope.empAddBranchDetails = {
|
||||
'StaffID': '',
|
||||
'ListCode': '',
|
||||
'BranchCode': '',
|
||||
'JobResponsibility': '',
|
||||
'IsActive': '',
|
||||
'FinanceModuleAccess': ''
|
||||
}
|
||||
}
|
||||
|
||||
$scope.empAddBranchDetails = {
|
||||
'StaffID': '',
|
||||
'ListCode': '',
|
||||
'BranchCode': '',
|
||||
'JobResponsibility': '',
|
||||
'IsActive': '',
|
||||
'FinanceModuleAccess': ''
|
||||
}
|
||||
|
||||
$scope.addEmpBranchDetails = function(emp, form) {
|
||||
if (form.$invalid) {
|
||||
var field = null, firstError = null;
|
||||
for (field in form) {
|
||||
if (field[0] != '$') {
|
||||
if (firstError === null && !form[field].$valid) {
|
||||
firstError = form[field].$name;
|
||||
}
|
||||
if (form[field].$pristine) {
|
||||
form[field].$dirty = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
angular.element('.ng-invalid[name=' + firstError + ']').focus();
|
||||
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
|
||||
} else {
|
||||
|
||||
$scope.addEmpNewBranch = {
|
||||
'empFor': emp,
|
||||
'updateRole': $scope.empAddBranchDetails.ListCode,
|
||||
'JobResponsibility': $scope.empAddBranchDetails.JobResponsibility,
|
||||
'updateBranch': $scope.empAddBranchDetails.BranchCode,
|
||||
'updateBy': localDetails.localUserID,
|
||||
'FinanceModuleAccess': $scope.empAddBranchDetails.FinanceModuleAccess == true ? 1 : 0,
|
||||
}
|
||||
|
||||
var req = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'addEmpBranchDetail/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: $scope.addEmpNewBranch
|
||||
};
|
||||
$http(req).then(function (response) {
|
||||
if (response.data.addEmpbranchStatus == true) {
|
||||
swal("", "Added Successfully.", "success");
|
||||
$scope.getEmployeeList();
|
||||
$scope.getEmpBranchDetails(emp);
|
||||
$scope.branchListView = true;
|
||||
$scope.empEditBranchView = false;
|
||||
$scope.empAddNewBranchView = false;
|
||||
$scope.empAddBranchDetails = {
|
||||
'empFor': emp,
|
||||
'updateRole': $scope.empAddBranchDetails.ListCode,
|
||||
'JobResponsibility': $scope.empAddBranchDetails.JobResponsibility,
|
||||
'updateBranch': $scope.empAddBranchDetails.BranchCode,
|
||||
'updateBy': localDetails.localUserID,
|
||||
'FinanceModuleAccess': $scope.empAddBranchDetails.FinanceModuleAccess
|
||||
}
|
||||
} else {
|
||||
// $scope.ldloading1[loading.replace('-', '_')] = false;
|
||||
swal("", response.data.message, "error");
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
$scope.getRoleList = function () {
|
||||
var req = {
|
||||
method: 'POST',
|
||||
@ -243,13 +460,14 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$
|
||||
|
||||
if (response.data.MeasterBranchDetailStatus == true) {
|
||||
$scope.branchDetails = response.data.branch_details;
|
||||
$scope.branchDetailsName = [];
|
||||
$scope.BranchName = '';
|
||||
angular.forEach($scope.branchDetails, function (item, index) {
|
||||
// alert(item.BranchName);
|
||||
$scope.BranchName = item.BranchName + '-' + item.BranchCode;
|
||||
$scope.branchDetailsName.push($scope.BranchName);
|
||||
});
|
||||
// alert(JSON.stringify($scope.branchDetails));
|
||||
// $scope.branchDetailsName = [];
|
||||
// $scope.BranchName = '';
|
||||
// angular.forEach($scope.branchDetails, function (item, index) {
|
||||
// // alert(item.BranchName);
|
||||
// $scope.BranchName = item.BranchName + '-' + item.BranchCode;
|
||||
// $scope.branchDetailsName.push($scope.BranchName);
|
||||
// });
|
||||
} else {
|
||||
}
|
||||
|
||||
@ -603,69 +821,6 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$
|
||||
}
|
||||
}
|
||||
|
||||
$scope.updateEmpBranchDetails = function (form, empRole, empBranchs, p) {
|
||||
// alert(empBranchs.arr.length);
|
||||
// alert(JSON.stringify(empRole));
|
||||
if (empBranchs.arr.length >= 1) {
|
||||
var firstError = null;
|
||||
if (form.$invalid) {
|
||||
var field = null, firstError = null;
|
||||
for (field in form) {
|
||||
if (field[0] != '$') {
|
||||
if (firstError === null && !form[field].$valid) {
|
||||
firstError = form[field].$name;
|
||||
}
|
||||
if (form[field].$pristine) {
|
||||
form[field].$dirty = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
angular.element('.ng-invalid[name=' + firstError + ']').focus();
|
||||
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
|
||||
} else {
|
||||
// alert(JSON.stringify(p));
|
||||
// alert(JSON.stringify(empRole));
|
||||
|
||||
$scope.arr1 = [];
|
||||
|
||||
angular.forEach(empBranchs.arr, function (item) {
|
||||
var newString = item.split("-").pop();
|
||||
$scope.arr1.push(newString);
|
||||
});
|
||||
// alert(JSON.stringify($scope.arr1));
|
||||
$scope.sendBranchData = {
|
||||
'empFor': p.StaffID,
|
||||
'updateRole': empRole.ListCode,
|
||||
'JobResponsibility': empRole.JobResponsibility,
|
||||
'updateBranch': $scope.arr1,
|
||||
'updateBy': localDetails.localUserID,
|
||||
'FinanceModuleAccess': empRole.FinanceModuleAccess
|
||||
}
|
||||
// p.IsActive = p.IsActive === true ? 1 : 0;
|
||||
var req = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'updateEmpBranchDetail/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: $scope.sendBranchData
|
||||
};
|
||||
$http(req).then(function (response) {
|
||||
if (response.data.updateEmpbranchStatus = true) {
|
||||
swal("", "Updated Successfully.", "success");
|
||||
$scope.getEmployeeList();
|
||||
$scope.editBranchId = -1;
|
||||
} else {
|
||||
// $scope.ldloading1[loading.replace('-', '_')] = false;
|
||||
swal("", response.data.message, "error");
|
||||
}
|
||||
});
|
||||
}
|
||||
} else {
|
||||
swal("Warning!", "should select atleast branch!!", "warning");
|
||||
}
|
||||
}
|
||||
|
||||
}]);
|
||||
|
||||
// file upload directive
|
||||
|
||||
@ -188,10 +188,14 @@ app.controller('topnavCtrl', ["$scope", "$http", "API_POINTS", "$localStorage",
|
||||
};
|
||||
|
||||
|
||||
$scope.upDateLocalBran = function (Id) {
|
||||
$scope.upDateLocalBran = function (Id, listCode, financeAccess) {
|
||||
|
||||
localDetail.localBranchID = Id;
|
||||
localDetails.localBranchID = Id;
|
||||
localDetail.localType = listCode;
|
||||
localDetails.localType = listCode;
|
||||
localDetail.is_DayBookApproval_Access = financeAccess;
|
||||
localDetails.is_DayBookApproval_Access = financeAccess;
|
||||
ipCookie('cookiechk', localDetails, { expires: 21 });
|
||||
localStorage.setItem('localObj', JSON.stringify(localDetail));
|
||||
$window.location.reload();
|
||||
|
||||
@ -1,410 +1,208 @@
|
||||
<form name="Form" id="form" novalidate>
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div ng-if="branchEditLoading == true" class="text-center">
|
||||
<h3>Fetching ...</h3>
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div ng-if="branchEditLoading == true" class="text-center">
|
||||
<!--<img src="assets/images/ajax_loader_blue.gif" style="width: 5%; height: 30%">-->
|
||||
<h3>Fetching ...</h3>
|
||||
</div>
|
||||
<!--<fieldset>
|
||||
<fieldset ng-if="branchEditLoading == false">
|
||||
<legend>
|
||||
Update Employee Details
|
||||
</legend>-->
|
||||
|
||||
<!--<div class="row">
|
||||
|
||||
|
||||
<div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':Form.branchcode.$dirty && Form.branchcode.$invalid, 'has-success':Form.branchcode.$valid}">
|
||||
<label>
|
||||
Branch Code <span class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Branch Code"
|
||||
tabindex="5" class="form-control" name="branchcode"
|
||||
ng-model="p.BranchCode" ng-pattern="/^[a-zA-Z0-9.\s]*$/" readonly required/>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.branchcode.$dirty && Form.branchcode.$error.required">Branch Code required</span>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.branchcode.$dirty && Form.branchcode.$error.pattern">Invalid Branch Code </span>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':Form.branchname.$dirty && Form.branchname.$invalid, 'has-success':Form.branchname.$valid}">
|
||||
<label>
|
||||
Branch Name <span class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Branch Name"
|
||||
tabindex="5" class="form-control" name="branchname"
|
||||
ng-model="p.BranchName" ng-pattern="/^[a-zA-Z0-9.\s]*$/" required/>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.branchname.$dirty && Form.branchname.$error.required">Branch Name required</span>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.branchname.$dirty && Form.branchname.$error.pattern">Invalid Branch Name </span>
|
||||
|
||||
</div>
|
||||
|
||||
<div class=" col-md-4 form-group"
|
||||
ng-class="{'has-error':Form.Email.$dirty && Form.Email.$invalid, 'has-success':Form.Email.$valid}">
|
||||
<label>
|
||||
Email ID <span class="symbol required"></span>
|
||||
</label>
|
||||
<input type="email" tabindex="27"
|
||||
placeholder="Enter Email ID"
|
||||
class="form-control"
|
||||
name="Email"
|
||||
ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i"
|
||||
ng-model="p.EmailID" required>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.Email.$dirty && Form.primaryEmail.$invalid"
|
||||
ng-hide="Form.Email.$error.email">Email is required.</span>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.Email.$error.email">Please, enter a valid email address.</span>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
<div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
Mobile Number <span
|
||||
class="symbol required"></span>
|
||||
</label>
|
||||
<input type="text" name="primaryPhone" tabindex="29"
|
||||
placeholder="Enter Mobile Number"
|
||||
class="form-control"
|
||||
ng-model="p.MobileNumber"
|
||||
ng-minlength="10" ng-maxlength="12"
|
||||
ng-pattern="/^[0-9]*$/" required>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.primaryPhone.$dirty && Form.primaryPhone.$invalid"
|
||||
ng-hide="Form.primaryPhone.$error.maxlength || Form.primaryPhone.$error.minlength || Form.primaryPhone.$error.pattern">Primary phone is required.</span>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.primaryPhone.$error.maxlength || Form.primaryPhone.$error.minlength || Form.primaryPhone.$error.pattern">Enter a Valid Phone Number</span>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':Form.secondaryPhone.$dirty && Form.secondaryPhone.$invalid, 'has-success':Form.secondaryPhone.$valid}">
|
||||
<label class="control-label">
|
||||
Alternate Mobile Number
|
||||
</label>
|
||||
<input type="text" name="secondaryPhone" tabindex="30"
|
||||
placeholder="Enter Alternate Mobile Number"
|
||||
class="form-control"
|
||||
ng-model="p.AlternateNumber"
|
||||
ng-minlength="10" ng-maxlength="12"
|
||||
ng-pattern="/^[0-9]*$/"/>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.secondaryPhone.$error.maxlength || Form.secondaryPhone.$error.minlength || Form.secondaryPhone.$error.pattern">Enter a Valid Phone Number</span>
|
||||
</div>
|
||||
<div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':Form.Landline.$dirty && Form.Landline.$invalid, 'has-success':Form.Landline.$valid}">
|
||||
<label class="control-label">
|
||||
Landline Number
|
||||
</label>
|
||||
<input type="text" name="Landline" tabindex="30"
|
||||
placeholder="Enter Landline Number"
|
||||
class="form-control"
|
||||
ng-model="p.LandlineNumber"
|
||||
ng-minlength="11" ng-maxlength="13"
|
||||
ng-pattern="/^[0-9-]*$/"/>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.Landline.$error.maxlength || Form.Landline.$error.minlength || Form.Landline.$error.pattern">Enter a Valid Number</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
<div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':Form.address.$dirty && Form.address.$invalid, 'has-success':Form.address.$valid}">
|
||||
<label>
|
||||
Address<span class="symbol required"></span>
|
||||
</label>
|
||||
<textarea placeholder="Enter Address" tabindex="31"
|
||||
class="form-control textdsc" name="address"
|
||||
ng-model="p.Address" required></textarea>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.address.$dirty && Form.address.$invalid">Address is required</span>
|
||||
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<label>
|
||||
Active/De-Active
|
||||
</label>
|
||||
<div ng-if="p.IsActive==true">
|
||||
|
||||
<switch ng-model="p.IsActive" ng-init="p.IsActive = true" class="green"></switch>
|
||||
|
||||
</div>
|
||||
<div ng-if="p.IsActive==false">
|
||||
<switch ng-model="p.IsActive" ng-init="p.IsActive = false" class="green"></switch>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
-->
|
||||
<div class="col-md-12">
|
||||
<!--<fieldset>
|
||||
<legend>
|
||||
Personal Details
|
||||
</legend>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.employeeId.$dirty && Form.employeeId.$invalid, 'has-success':Form.employeeId.$valid}">
|
||||
<label>
|
||||
Employee ID <span class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Employee Id" tabindex="5" class="form-control" name="employeeId" ng-model="p.StaffID"
|
||||
ng-pattern="/^[a-zA-Z0-9.\s]*$/" ng-blur='checkEmpIdExist()' readonly required/>
|
||||
<span class="error text-small block" ng-if="Form.employeeId.$dirty && Form.employeeId.$error.required">Employee Id required</span>
|
||||
<span class="error text-small block" ng-if="Form.employeeId.$dirty && Form.employeeId.$error.pattern">Invalid Employee Id </span>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.firstname.$dirty && Form.firstname.$invalid, 'has-success':Form.firstname.$valid}">
|
||||
<label>
|
||||
First Name <span class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter First Name" tabindex="5" class="form-control" name="firstname" ng-model="p.Firstname"
|
||||
ng-pattern="/^[a-zA-Z0-9.\s]*$/" required/>
|
||||
<span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.required">First Name required</span>
|
||||
<span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.pattern">Invalid First Name </span>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.lastname.$dirty && Form.lastname.$invalid, 'has-success':Form.lastname.$valid}">
|
||||
<label>
|
||||
Last Name <span class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Last Name" tabindex="5" class="form-control" name="lastname" ng-model="p.Lastname"
|
||||
ng-pattern="/^[a-zA-Z0-9.\s]*$/" required/>
|
||||
<span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.required">Last Name required</span>
|
||||
<span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.pattern">Invalid Last Name </span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.fathername.$dirty && Form.fathername.$invalid}">
|
||||
<label>
|
||||
Father Name
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Father Name" tabindex="5" class="form-control" name="fathername" ng-model="p.Fathername"
|
||||
ng-pattern="/^[a-zA-Z.\s]*$/" />
|
||||
<span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.pattern">Invalid Father Name </span>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.mothername.$dirty && Form.mothername.$invalid}">
|
||||
<label>
|
||||
Mother Name
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Mother Name" tabindex="5" class="form-control" name="mothername" ng-model="p.MotherName"
|
||||
ng-pattern="/^[a-zA-Z0-9.\s]*$/" />
|
||||
<span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.pattern">Invalid Last Name </span>
|
||||
</div>
|
||||
<div class=" col-md-4 form-group" ng-class="{'has-error':Form.emailId.$dirty && Form.emailId.$invalid, 'has-success':Form.emailId.$valid}">
|
||||
<label>
|
||||
Email ID <span class="symbol required"></span>
|
||||
</label>
|
||||
<input type="email" tabindex="27" placeholder="Enter Email ID" class="form-control" name="emailId" ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i"
|
||||
ng-model="p.EmailID" ng-blur='updateCheckEmailExist(p)' required>
|
||||
<span class="error text-small block" ng-if="Form.emailId.$dirty && Form.primaryEmail.$invalid" ng-hide="Form.emailId.$error.email">Email is required.</span>
|
||||
<span class="error text-small block" ng-if="Form.emailId.$error.email">Please, enter a valid email address.</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
Mobile Number <span
|
||||
class="symbol required"></span>
|
||||
</label>
|
||||
<input type="text" name="primaryPhone" tabindex="29" placeholder="Enter Mobile Number" class="form-control" ng-model="p.MobileNumber"
|
||||
ng-minlength="10" ng-maxlength="12" ng-pattern="/^[0-9]*$/" ng-blur='updateCheckMobileExist(p)' required/>
|
||||
<span class="error text-small block" ng-if="Form.primaryPhone.$dirty && Form.primaryPhone.$invalid" ng-hide="Form.primaryPhone.$error.maxlength || Form.primaryPhone.$error.minlength || Form.primaryPhone.$error.pattern">Mobile Number is required.</span>
|
||||
<span class="error text-small block" ng-if="Form.primaryPhone.$error.maxlength || Form.primaryPhone.$error.minlength || Form.primaryPhone.$error.pattern">Enter a Valid Phone Number</span>
|
||||
</div>
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.secondaryPhone.$dirty && Form.secondaryPhone.$invalid}">
|
||||
<label class="control-label">
|
||||
Alternate Mobile Number
|
||||
</label>
|
||||
<input type="text" name="secondaryPhone" tabindex="30" placeholder="Enter Alternate Mobile Number" class="form-control" ng-model="p.AlternateNumber"
|
||||
ng-minlength="10" ng-maxlength="12" ng-pattern="/^[0-9]*$/" />
|
||||
<span class="error text-small block" ng-if="Form.secondaryPhone.$error.maxlength || Form.secondaryPhone.$error.minlength || Form.secondaryPhone.$error.pattern">Enter a Valid Phone Number</span>
|
||||
</div>
|
||||
|
||||
<div data-ng-controller="DatepickerDemoCtrl">
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.dateofbirth.$dirty && Form.dateofbirth.$invalid, 'has-success':Form.dateofbirth.$valid}">
|
||||
|
||||
|
||||
<label>
|
||||
Date Of Birth <span
|
||||
class="symbol required"></span>
|
||||
</label>
|
||||
<input type="text" tabindex="6" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="p.DOB"
|
||||
is-open="startOpen" ng-init="startOpen = false" name="dateofbirth" datepicker-options="dateOptions"
|
||||
placeholder="Select Date of Birth" close-text="Close" required="required"
|
||||
ng-change="getMaxEndDate(myModel.startDate)" />
|
||||
|
||||
|
||||
<span class="error text-small block" ng-if="Form.dateofbirth.$dirty && Form.dateofbirth.$invalid" ng-hide="Form.dateofbirth.$error.maxlength">Date of Birth is required.</span>
|
||||
<span class="error text-small block" ng-if="Form.dateofbirth.$error.maxlength">Enter a Valid Date of Birth</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.gender.$invalid , 'has-success':Form.gender.$valid}">
|
||||
<label class="block">
|
||||
Gender
|
||||
</label>
|
||||
<div class="clip-radio radio-primary">
|
||||
<input type="radio" id="female" name="gender" value="female" ng-model="p.Gender" required>
|
||||
<label for="female">
|
||||
Female
|
||||
</label>
|
||||
<input type="radio" id="male" name="gender" value="male" ng-model="p.Gender" required>
|
||||
<label for="male">
|
||||
Male
|
||||
</label>
|
||||
<span class="error text-small block" ng-if="Form.gender.$dirty && Form.gender.$invalid">Gender is required.</span>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.qualificaion.$dirty && Form.qualificaion.$invalid}">
|
||||
<label>
|
||||
Qualification
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Qualification" tabindex="5" class="form-control" name="qualificaion" ng-model="p.Qualification"
|
||||
ng-pattern="/^[a-zA-Z.\s]*$/" />
|
||||
<span class="error text-small block" ng-if="Form.qualificaion.$dirty && Form.qualificaion.$error.pattern">Enter a Valid Qualification</span>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.aadharNumber.$dirty && Form.aadharNumber.$invalid, 'has-success':Form.aadharNumber.$valid}">
|
||||
<label>
|
||||
Aadhar Number <span class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<input type="text" name="aadharNumber" tabindex="29" placeholder="0000-0000-0000" ui-mask="9999-9999-9999" class="form-control"
|
||||
ng-model="p.AadharNumber" ng-minlength="10" ng-maxlength="15" ng-pattern="/^[0-9]*$/"
|
||||
required>
|
||||
<span class="error text-small block" ng-if="Form.aadharNumber.$dirty && Form.aadharNumber.$invalid" ng-hide="Form.aadharNumber.$error.maxlength || Form.aadharNumber.$error.minlength || Form.aadharNumber.$error.pattern">Aadhar Number is required.</span>
|
||||
<span class="error text-small block" ng-if="Form.aadharNumber.$error.maxlength || Form.aadharNumber.$error.minlength || Form.aadharNumber.$error.pattern">Enter a Valid Aadhar Number</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.address1.$dirty && Form.address1.$invalid}">
|
||||
<label>
|
||||
Permenent Address
|
||||
</label>
|
||||
<textarea placeholder="Enter Permenent Address" tabindex="31" class="form-control textdsc" name="address1" ng-model="p.PermanentAddress"></textarea>
|
||||
<span class="error text-small block" ng-if="Form.address1.$dirty && Form.address1.$invalid">Permenent Address is required</span>
|
||||
</div>
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.address2.$dirty && Form.address2.$invalid}">
|
||||
<label>
|
||||
Current Address
|
||||
</label>
|
||||
<textarea placeholder="Enter Current Address" tabindex="31" class="form-control textdsc" name="address2" ng-model="p.PresentAddress"></textarea>
|
||||
<span class="error text-small block" ng-if="Form.address2.$dirty && Form.address2.$invalid">Current Address is required</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
<label>
|
||||
Active/De-Active
|
||||
</label>
|
||||
|
||||
<div ng-switch="p.IsActive">
|
||||
<div ng-switch-when="true">
|
||||
<switch ng-model="p.IsActive" ng-init="p.IsActive = true" class="green"></switch>
|
||||
</div>
|
||||
<div ng-switch-when="false">
|
||||
<switch ng-model="p.IsActive" ng-init="p.IsActive = false" class="green"></switch>
|
||||
</div>
|
||||
<div ng-switch-default>
|
||||
<switch ng-model="p.IsActive" ng-init="p.IsActive = true" class="green"></switch>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="pull-right">
|
||||
<button type="button" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateEmpDetails(Form, p)">
|
||||
Save
|
||||
Branch Details
|
||||
</legend>
|
||||
<div ng-if="branchListView == true">
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Branch
|
||||
</th>
|
||||
<th>Role
|
||||
</th>
|
||||
<th>JobResponsibility
|
||||
</th>
|
||||
<th>FinanceModule Access
|
||||
</th>
|
||||
<th>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody ng-repeat="s in empBranchs">
|
||||
<tr>
|
||||
<td>{{s.BranchName}}</td>
|
||||
<td>{{s.ListName}}</td>
|
||||
<td>{{s.JobResponsibility}}</td>
|
||||
<td><span ng-if="s.FinanceModuleAccess == 1">Active</span>
|
||||
<span ng-if="s.FinanceModuleAccess == 0">In-Active</span></td>
|
||||
<td ng-click="getEmpEditBranchDetails(s)" ng-hide = "localUserListCode == 'R003' && s.ListCode == 'R003'" >
|
||||
<i class="fa fa-edit" ></i>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="pull-right">
|
||||
<button type="reset" id="addCourseBtn" class="btn btn-into btn-wide" tabindex="100" ng-click="addNewBranch()">
|
||||
Add Branch
|
||||
</button>
|
||||
<button type="reset" class="btn btn-warning btn-wide" tabindex="9" ng-click="cancel()">
|
||||
<button type="reset" class="btn btn-warning btn-wide" tabindex="101" ng-click="cancel()">
|
||||
Cancel
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>-->
|
||||
<fieldset ng-if="branchEditLoading == false">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div ng-if="empEditBranchView == true">
|
||||
<form name="Form" id="form" novalidate>
|
||||
<div class="row">
|
||||
<div>
|
||||
<div class=" col-md-4 form-group" ng-class="{'has-error':Form.branch.$dirty && Form.branch.$invalid, 'has-success':Form.branch.$valid}">
|
||||
<label>
|
||||
Select Branch
|
||||
</label>
|
||||
<select class="form-control" name="branch" ng-model="empEditBranchDetails.BranchCode" required>
|
||||
|
||||
<option value="" disabled selected>Select Branch</option>
|
||||
<option ng-repeat="itemsbranch in branchDetails" value="{{itemsbranch.BranchCode}}" ng-selected="empEditBranchDetails.BranchCode == itemsbranch.BranchCode">{{itemsbranch.BranchName}}</option>
|
||||
</select>
|
||||
<span class="error text-small block" ng-if="Form.branch.$dirty && Form.branch.$error.required">Role is required</span>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.role.$dirty && Form.role.$invalid, 'has-success':Form.role.$valid}">
|
||||
<label>
|
||||
Role <span class="symbol required"></span>
|
||||
</label>
|
||||
<select class="form-control" name="role" ng-model="empEditBranchDetails.ListCode" required>
|
||||
|
||||
<option value="" disabled selected>Select Role</option>
|
||||
<option ng-repeat="itemsrole in roleDetails" value="{{itemsrole.ListCode}}" ng-selected="empEditBranchDetails.ListCode == itemsrole.ListCode">{{itemsrole.ListName}}</option>
|
||||
</select>
|
||||
<span class="error text-small block" ng-if="Form.role.$dirty && Form.role.$error.required">Role is required</span>
|
||||
</div>
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.jobResponsibility.$dirty && Form.jobResponsibility.$invalid}">
|
||||
<label>
|
||||
Job Responsibility
|
||||
</label>
|
||||
<textarea maxlength="1000" placeholder="Enter Job Responsibility" tabindex="20" class="form-control textdsc" name="jobResponsibility"
|
||||
ng-model="empEditBranchDetails.JobResponsibility"></textarea>
|
||||
<span class="error text-small block" ng-if="Form.jobResponsibility.$dirty && Form.jobResponsibility.$invalid">JOB Responsibility is required</span>
|
||||
<span class="text-small block">Job Responsibility Should be Less than 1000 Characters.</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.financeModuleAccess.$dirty && Form.financeModuleAccess.$invalid, 'has-success':Form.financeModuleAccess.$valid && empRoleDetail.FinanceModuleAccess == true}">
|
||||
<label>
|
||||
Expenses Access <span ng-if="empRoleDetail.FinanceModuleAccess" class="symbol"></span>
|
||||
</label>
|
||||
<div class="checkbox clip-check check-primary">
|
||||
<input type="checkbox" id="checkbox6" name="financeModuleAccess" ng-model="empEditBranchDetails.FinanceModuleAccess">
|
||||
<label for="checkbox6">
|
||||
Expenses Approval Access
|
||||
</label>
|
||||
</div>
|
||||
<span ng-if="myModel.finaceModuleAccess" class="success text-small block"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="pull-right">
|
||||
<button type="button" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateEmpBranchDetails(Form)">
|
||||
Update
|
||||
</button>
|
||||
<button type="reset" class="btn btn-warning btn-wide" tabindex="9" ng-click="getEmpEditBranchDetailsCancel()">
|
||||
Cancel
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div ng-if="empAddNewBranchView == true">
|
||||
<form name="Form" id="form" novalidate>
|
||||
<div class="row">
|
||||
<div>
|
||||
<div class=" col-md-4 form-group" ng-class="{'has-error':Form.branch.$dirty && Form.branch.$invalid, 'has-success':Form.branch.$valid}">
|
||||
<label>
|
||||
Select Branch
|
||||
</label>
|
||||
<select class="form-control" name="branch" ng-model="empAddBranchDetails.BranchCode" required>
|
||||
|
||||
<option value="" disabled selected>Select Branch</option>
|
||||
<option ng-repeat="itemsbranch in branchDetails" value="{{itemsbranch.BranchCode}}">{{itemsbranch.BranchName}}</option>
|
||||
</select>
|
||||
<span class="error text-small block" ng-if="Form.branch.$dirty && Form.branch.$error.required">Role is required</span>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.role.$dirty && Form.role.$invalid, 'has-success':Form.role.$valid}">
|
||||
<label>
|
||||
Role <span class="symbol required"></span>
|
||||
</label>
|
||||
<select class="form-control" name="role" ng-model="empAddBranchDetails.ListCode" required>
|
||||
|
||||
<option value="" disabled selected>Select Role</option>
|
||||
<option ng-repeat="itemsrole in roleDetails" value="{{itemsrole.ListCode}}">{{itemsrole.ListName}}</option>
|
||||
</select>
|
||||
<span class="error text-small block" ng-if="Form.role.$dirty && Form.role.$error.required">Role is required</span>
|
||||
</div>
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.jobResponsibility.$dirty && Form.jobResponsibility.$invalid}">
|
||||
<label>
|
||||
Job Responsibility
|
||||
</label>
|
||||
<textarea maxlength="1000" placeholder="Enter Job Responsibility" tabindex="20" class="form-control textdsc" name="jobResponsibility"
|
||||
ng-model="empAddBranchDetails.JobResponsibility"></textarea>
|
||||
<span class="error text-small block" ng-if="Form.jobResponsibility.$dirty && Form.jobResponsibility.$invalid">JOB Responsibility is required</span>
|
||||
<span class="text-small block">Job Responsibility Should be Less than 1000 Characters.</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.financeModuleAccess.$dirty && Form.financeModuleAccess.$invalid, 'has-success':Form.financeModuleAccess.$valid && empRoleDetail.FinanceModuleAccess == true}">
|
||||
<label>
|
||||
Expenses Access <span ng-if="empRoleDetail.FinanceModuleAccess" class="symbol"></span>
|
||||
</label>
|
||||
<div class="checkbox clip-check check-primary">
|
||||
<input type="checkbox" id="checkbox6" name="financeModuleAccess" ng-model="empAddBranchDetails.FinanceModuleAccess">
|
||||
<label for="checkbox6">
|
||||
Expenses Approval Access
|
||||
</label>
|
||||
</div>
|
||||
<span ng-if="myModel.finaceModuleAccess" class="success text-small block"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="pull-right">
|
||||
<button type="button" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="addEmpBranchDetails(p.StaffID, Form)">
|
||||
Add
|
||||
</button>
|
||||
<button type="reset" class="btn btn-warning btn-wide" tabindex="9" ng-click="addNewBranchcancel()">
|
||||
Cancel
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</fieldset>
|
||||
<!--<fieldset ng-if="branchEditLoading == false">
|
||||
<legend>
|
||||
Branch Details
|
||||
</legend>
|
||||
<div class="row">
|
||||
<!--<div class="col-md-4 form-group" ng-class="{'has-error':Form.homeBranch.$dirty && Form.homeBranch.$invalid, 'has-success':Form.homeBranch.$valid}">
|
||||
<label for="form-field-select-2">
|
||||
Home Branch <span class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<select class="form-control" class="cs-select cs-skin-elastic" name="homeBranch" ng-model="empBranchDetails.BranchCode" required>
|
||||
<option value="" disabled selected>Select Home Branch</option>
|
||||
<option ng-repeat="item in branchDetails" value="{{item.BranchCode}}" ng-selected="empBranchDetails.BranchCode == item.BranchCode">{{item.BranchName}}</option>
|
||||
</select>
|
||||
<span class="error text-small block" ng-if="Form.homeBranch.$dirty && Form.homeBranch.$error.required">Home Branch is Required</span>
|
||||
</div>-->
|
||||
<!--check obj-->
|
||||
<!--<div>
|
||||
<div class=" col-md-4 form-group">
|
||||
<label>
|
||||
Select Branch
|
||||
<div>{{ branchDetails | json}}</div>
|
||||
<div>{{ empBranchsObj | json}}</div>
|
||||
</label>
|
||||
<ui-select multiple ng-model="empBranchsObj.arr" theme="bootstrap" ng-disabled="disabled" close-on-select="false">
|
||||
<ui-select-match placeholder="Select Branch">
|
||||
{{$item.BranchName}}
|
||||
</ui-select-match>
|
||||
<ui-select-choices repeat="name in branchDetailsNameObj.arr | filter:$select.search">
|
||||
|
||||
{{name.BranchName}}
|
||||
</ui-select-choices>
|
||||
</ui-select>
|
||||
</div>
|
||||
</div>-->
|
||||
<!--check obj-->
|
||||
<div>
|
||||
<div class=" col-md-4 form-group">
|
||||
<label>
|
||||
<label>
|
||||
Select Branch
|
||||
<!--<div>{{ branchDetailsName | json}}</div>
|
||||
<div>{{ empBranchDetails | json}}</div>-->
|
||||
</label>
|
||||
<ui-select multiple ng-model="empBranchDetails.arr" theme="bootstrap" ng-disabled="disabled" close-on-select="false">
|
||||
<ui-select-match placeholder="Select Branch">
|
||||
{{$item}}
|
||||
</ui-select-match>
|
||||
<ui-select-choices repeat="name in branchDetailsName | filter:$select.search">
|
||||
{{name}}
|
||||
</ui-select-choices>
|
||||
</ui-select>
|
||||
<ui-select multiple ng-model="empBranchDetails.arr" theme="bootstrap" ng-disabled="disabled" close-on-select="false">
|
||||
<ui-select-match placeholder="Select Branch">
|
||||
{{$item}}
|
||||
</ui-select-match>
|
||||
<ui-select-choices repeat="name in branchDetailsName | filter:$select.search">
|
||||
{{name}}
|
||||
</ui-select-choices>
|
||||
</ui-select>
|
||||
</div>
|
||||
</div>
|
||||
<!--{{ empRoleDetail | json }}-->
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.role.$dirty && Form.role.$invalid, 'has-success':Form.role.$valid}">
|
||||
<label>
|
||||
Role <span class="symbol required"></span>
|
||||
@ -416,53 +214,30 @@
|
||||
</select>
|
||||
<span class="error text-small block" ng-if="Form.role.$dirty && Form.role.$error.required">Role is required</span>
|
||||
</div>
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.jobResponsibility.$dirty && Form.jobResponsibility.$invalid}">
|
||||
<label>
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.jobResponsibility.$dirty && Form.jobResponsibility.$invalid}">
|
||||
<label>
|
||||
Job Responsibility
|
||||
</label>
|
||||
<textarea maxlength="1000" placeholder="Enter Job Responsibility" tabindex="20" class="form-control textdsc" name="jobResponsibility" ng-model="empRoleDetail.JobResponsibility"></textarea>
|
||||
<span class="error text-small block" ng-if="Form.jobResponsibility.$dirty && Form.jobResponsibility.$invalid">JOB Responsibility is required</span>
|
||||
<span class="text-small block">Job Responsibility Should be Less than 1000 Characters.</span>
|
||||
</div>
|
||||
<textarea maxlength="1000" placeholder="Enter Job Responsibility" tabindex="20" class="form-control textdsc" name="jobResponsibility"
|
||||
ng-model="empRoleDetail.JobResponsibility"></textarea>
|
||||
<span class="error text-small block" ng-if="Form.jobResponsibility.$dirty && Form.jobResponsibility.$invalid">JOB Responsibility is required</span>
|
||||
<span class="text-small block">Job Responsibility Should be Less than 1000 Characters.</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.financeModuleAccess.$dirty && Form.financeModuleAccess.$invalid, 'has-success':Form.financeModuleAccess.$valid && empRoleDetail.FinanceModuleAccess == true}">
|
||||
<label>
|
||||
<label>
|
||||
Expenses Access <span ng-if="empRoleDetail.FinanceModuleAccess" class="symbol"></span>
|
||||
</label>
|
||||
<div class="checkbox clip-check check-primary">
|
||||
<input type="checkbox" id="checkbox6" name="financeModuleAccess" ng-model="empRoleDetail.FinanceModuleAccess">
|
||||
<label for="checkbox6">
|
||||
<div class="checkbox clip-check check-primary">
|
||||
<input type="checkbox" id="checkbox6" name="financeModuleAccess" ng-model="empRoleDetail.FinanceModuleAccess">
|
||||
<label for="checkbox6">
|
||||
Expenses Approval Access
|
||||
</label>
|
||||
</div>
|
||||
<span ng-if="myModel.finaceModuleAccess" class="success text-small block"></span>
|
||||
<!--<div class="checkbox clip-check check-primary checkbox-inline">
|
||||
<input type="checkbox" id="checkbox16" name="financeModuleAccess" ng-model="myModel.finaceModuleAccess">
|
||||
</div>
|
||||
<spann ng-if="myModel.finaceModuleAccess" class="text-small block">Job Responsibility Should be Less than 1000 Characters.</span>-->
|
||||
</div>
|
||||
</div>
|
||||
<!--<div class="row">
|
||||
<div class="col-md-4">
|
||||
<label>
|
||||
Active/De-Active
|
||||
</label>
|
||||
|
||||
<div ng-switch="p.IsActive">
|
||||
<div ng-switch-when="true">
|
||||
<switch ng-model="p.IsActive" ng-init="p.IsActive = true" class="green"></switch>
|
||||
</div>
|
||||
<div ng-switch-when="false">
|
||||
<switch ng-model="p.IsActive" ng-init="p.IsActive = false" class="green"></switch>
|
||||
</div>
|
||||
<div ng-switch-default>
|
||||
<switch ng-model="p.IsActive" ng-init="p.IsActive = true" class="green"></switch>
|
||||
</div>
|
||||
</div>
|
||||
<span ng-if="myModel.finaceModuleAccess" class="success text-small block"></span>
|
||||
</div>
|
||||
</div>-->
|
||||
<!--<pre>{{ empRoleDetail }}</pre>-->
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="pull-right">
|
||||
@ -475,12 +250,8 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
</div>
|
||||
</fieldset>-->
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
<!-- class="editRowTd" -->
|
||||
</div>
|
||||
</div>
|
||||
@ -236,7 +236,7 @@
|
||||
class="symbol required"></span>
|
||||
</label>
|
||||
<input type="text" name="primaryPhone" tabindex="7" placeholder="Enter Mobile Number" class="form-control" ng-model="myModelEdit.MobileNumber"
|
||||
ng-minlength="10" ng-maxlength="12" ng-pattern="/^[0-9]*$/" ng-blur='updateCheckMobileExist(myModelEdit)'
|
||||
ng-minlength="10" ng-maxlength="12" ng-pattern="/^[0-9]*$/"
|
||||
required/>
|
||||
<span class="error text-small block" ng-if="Form.primaryPhone.$dirty && Form.primaryPhone.$invalid" ng-hide="Form.primaryPhone.$error.maxlength || Form.primaryPhone.$error.minlength || Form.primaryPhone.$error.pattern">Mobile Number is required.</span>
|
||||
<span class="error text-small block" ng-if="Form.primaryPhone.$error.maxlength || Form.primaryPhone.$error.minlength || Form.primaryPhone.$error.pattern">Enter a Valid Phone Number</span>
|
||||
|
||||
@ -172,9 +172,10 @@
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Employee Id" tabindex="1" class="form-control" name="employeeId" ng-model="myModel.employeeId"
|
||||
ng-pattern="/^[a-zA-Z0-9.\s]*$/" ng-blur='checkEmpIdExist()' required/>
|
||||
ng-minlength="4" ng-maxlength="12" ng-pattern="/^[a-zA-Z0-9.\s]*$/" ng-blur='checkEmpIdExist()' required/>
|
||||
<!--<span class="warning text-small block">Employee ID length Should be (4-12)</span>-->
|
||||
<span class="error text-small block" ng-if="Form.employeeId.$dirty && Form.employeeId.$error.required">Employee Id is required</span>
|
||||
<span class="error text-small block" ng-if="Form.employeeId.$dirty && Form.employeeId.$error.pattern">Invalid Employee Id </span>
|
||||
<span class="error text-small block" ng-if="Form.employeeId.$error.maxlength || Form.employeeId.$error.minlength">Employee ID length Should be (4-12) </span>
|
||||
</div>
|
||||
|
||||
|
||||
@ -261,7 +262,7 @@
|
||||
class="symbol required"></span>
|
||||
</label>
|
||||
<input type="text" name="primaryPhone" tabindex="7" placeholder="Enter Mobile Number" class="form-control" ng-model="myModel.primaryPhone"
|
||||
ng-minlength="10" ng-maxlength="12" ng-pattern="/^[0-9]*$/" ng-blur='checkMobileExist()'
|
||||
ng-minlength="10" ng-maxlength="12" ng-pattern="/^[0-9]*$/"
|
||||
required/>
|
||||
<span class="error text-small block" ng-if="Form.primaryPhone.$dirty && Form.primaryPhone.$invalid" ng-hide="Form.primaryPhone.$error.maxlength || Form.primaryPhone.$error.minlength || Form.primaryPhone.$error.pattern">Mobile Number is required.</span>
|
||||
<span class="error text-small block" ng-if="Form.primaryPhone.$error.maxlength || Form.primaryPhone.$error.minlength || Form.primaryPhone.$error.pattern">Enter a Valid Phone Number</span>
|
||||
|
||||
@ -28,12 +28,12 @@
|
||||
|
||||
<div class="form-group" ng-class="{'has-error':Form.mobilenumber.$dirty && Form.mobilenumber.$invalid, 'has-success':Form.mobilenumber.$valid}">
|
||||
<span class="input-icon">
|
||||
<input type="text" class="form-control" ng-model="myModel.userMobile" name="mobilenumber" placeholder="Mobile Number"
|
||||
ng-minlength="10" ng-maxlength="12" ng-pattern="/^[0-9]*$/" required>
|
||||
<input type="text" class="form-control" ng-model="myModel.userMobile" name="mobilenumber" placeholder="Mobile Number / Employee Id"
|
||||
ng-minlength="4" ng-maxlength="12" required>
|
||||
<i class="fa fa-mobile"></i>
|
||||
</span>
|
||||
<span class="error text-small block" ng-if="Form.mobilenumber.$dirty && Form.mobilenumber.$error.required"> mobile number is required. </span>
|
||||
<span class="error text-small block" ng-if="Form.mobilenumber.$error.maxlength || Form.mobilenumber.$error.minlength || Form.mobilenumber.$error.pattern">Enter a valid mobile number</span>
|
||||
<span class="error text-small block" ng-if="Form.mobilenumber.$error.maxlength || Form.mobilenumber.$error.minlength || Form.mobilenumber.$error.pattern">Enter a valid mobile number / Employee Id</span>
|
||||
</div>
|
||||
|
||||
<div class="form-group" ng-class="{'has-error':Form.password.$dirty && Form.password.$invalid, 'has-success':Form.password.$valid}">
|
||||
|
||||
@ -138,10 +138,10 @@
|
||||
<a href class="dropdown-toggle" dropdown-toggle>
|
||||
<i class="ti-world"></i> {{ getCurrentBran.BranchName }}
|
||||
</a>
|
||||
<ul role="menu" class="dropdown-menu dropdown-light fadeInUpShort">
|
||||
<ul role="menu" class="dropdown-menu dropdown-light fadeInUpShort" ng-if="getCurrentBran.BranchName !== 'All'">
|
||||
<li ng-repeat="branch in loginUser.branchList">
|
||||
<a ng-click="upDateLocalBran(branch.BranchCode)" class="menu-toggler">
|
||||
{{branch.BranchName}}
|
||||
<a ng-click="upDateLocalBran(branch.BranchCode, branch.ListCode, branch.FinanceModuleAccess)" class="menu-toggler">
|
||||
{{branch.BranchName}} - {{branch.ListName}}
|
||||
</a>
|
||||
<!--<a href="#" class="menu-toggler">
|
||||
ALL
|
||||
|
||||
Loading…
Reference in New Issue
Block a user