Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
9b93485e4d
@ -58,9 +58,33 @@ class UserController extends AdminController
|
|||||||
|
|
||||||
$userData = $this->request->getPost();
|
$userData = $this->request->getPost();
|
||||||
$userData['created_by'] = get_session_userid();
|
$userData['created_by'] = get_session_userid();
|
||||||
|
$temp_team = $userData['team'];
|
||||||
unset($userData['team']);
|
unset($userData['team']);
|
||||||
$insert = $this->userModel->insert($userData);
|
$insert = $this->userModel->insert($userData);
|
||||||
if($insert){
|
if($insert){
|
||||||
|
$db = \Config\Database::connect();
|
||||||
|
$tableName = 'hdz_staff';
|
||||||
|
|
||||||
|
if($userData['role'] == 1){
|
||||||
|
$admin = 1;
|
||||||
|
}else{
|
||||||
|
$admin = 0;
|
||||||
|
}
|
||||||
|
foreach ($temp_team as $key => $value) {
|
||||||
|
if($value == 2){
|
||||||
|
$hdz_staff = [
|
||||||
|
'emp_code' => $userData['emp_code'],
|
||||||
|
'fullname' => $userData['first_name'],
|
||||||
|
'username' => strtolower($userData['first_name']),
|
||||||
|
'email' => $userData['email'],
|
||||||
|
'admin' => $admin,
|
||||||
|
'registration' => time(),
|
||||||
|
];
|
||||||
|
|
||||||
|
$db->table($tableName)->insert($hdz_staff);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$teamData['user_id'] = $insert ;
|
$teamData['user_id'] = $insert ;
|
||||||
foreach ($teams as $value) {
|
foreach ($teams as $value) {
|
||||||
$teamData['team_id'] = $value;
|
$teamData['team_id'] = $value;
|
||||||
@ -99,6 +123,35 @@ class UserController extends AdminController
|
|||||||
$update = $this->userModel->where('id', $id )->set($userData)->update();
|
$update = $this->userModel->where('id', $id )->set($userData)->update();
|
||||||
|
|
||||||
if($update){
|
if($update){
|
||||||
|
|
||||||
|
$db = \Config\Database::connect();
|
||||||
|
$tableName = 'hdz_staff';
|
||||||
|
|
||||||
|
if($userData['role'] == 1){
|
||||||
|
$admin = 1;
|
||||||
|
}else{
|
||||||
|
$admin = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($userData['team'] as $key => $value) {
|
||||||
|
if($value == 2){
|
||||||
|
$hdz_staff = [
|
||||||
|
'emp_code' => $userData['emp_code'],
|
||||||
|
'fullname' => $userData['first_name'],
|
||||||
|
'username' => strtolower($userData['first_name']),
|
||||||
|
'email' => $userData['email'],
|
||||||
|
'admin' => $admin,
|
||||||
|
];
|
||||||
|
|
||||||
|
|
||||||
|
$db->table($tableName)->where('emp_code', $userData['emp_code'])
|
||||||
|
->where('email', $userData['email'])
|
||||||
|
->set($userData)
|
||||||
|
->update();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
$this->userTeamsModel->where('user_id', $id)->delete();
|
$this->userTeamsModel->where('user_id', $id)->delete();
|
||||||
if($teams){
|
if($teams){
|
||||||
$teamData['user_id'] = $id ;
|
$teamData['user_id'] = $id ;
|
||||||
@ -120,6 +173,12 @@ class UserController extends AdminController
|
|||||||
$deactive = $model->where('id', $id)->set(['is_active' => 0])->update();
|
$deactive = $model->where('id', $id)->set(['is_active' => 0])->update();
|
||||||
if($deactive)
|
if($deactive)
|
||||||
{
|
{
|
||||||
|
// $db = \Config\Database::connect();
|
||||||
|
// $tableName = 'hdz_staff';
|
||||||
|
|
||||||
|
// $db->table($tableName)->insert($hdz_staff);
|
||||||
|
|
||||||
|
|
||||||
echo json_encode(array("status" => true));
|
echo json_encode(array("status" => true));
|
||||||
}else{
|
}else{
|
||||||
echo json_encode(array("status" => false));
|
echo json_encode(array("status" => false));
|
||||||
|
|||||||
@ -303,8 +303,9 @@ var form = document.getElementById("UserForm");
|
|||||||
// Add submit event listener to the form
|
// Add submit event listener to the form
|
||||||
form.addEventListener("submit", function(event) {
|
form.addEventListener("submit", function(event) {
|
||||||
// Disable the submit button to avoid multiple submissions
|
// Disable the submit button to avoid multiple submissions
|
||||||
document.getElementById("btnSubmit").disabled = true;
|
// document.getElementById("btnSubmit").disabled = true;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user