mahdahar/pbmc-cmod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Users pada role Admin, Perbaikan pada User Afrita dan Login

Browse Source
This commit is contained in:
mikael-zakaria 2025-01-28 13:48:24 +07:00
parent 14a05c0efb
commit 3e6db15d58
4 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Controllers/API_Users.php
View File

@ -8,10 +8,19 @@ class API_Users extends ResourceController {
public function index() { public function index() {
$db = \Config\Database::connect(); $db = \Config\Database::connect();
$sql = "select u.USERID, u.USERNAME, u1.USERROLEID, ur.USERROLENAME from cmod.dbo.CM_USERS u1
full join USERS u on u.USERID=u1.USERID $usercityid = session()->get('usercityid');
left join cmod.dbo.CM_USERROLES ur on ur.USERROLEID=u1.USERROLEID if($usercityid==1){$filterquery=" AND uc.CITYID = 1";}
where ( u.LOCKEDACCOUNT is null or u.LOCKEDACCOUNT=0 )"; else if($usercityid==2){$filterquery=" AND uc.CITYID = 2";}
else{$filterquery=" ";}
$sql = "select u.USERID, u.USERNAME, uc.CITYNAME ,u1.USERROLEID, ur.USERROLENAME
from cmod.dbo.CM_USERS u1
full join USERS u on u.USERID=u1.USERID
left join cmod.dbo.CM_USERS us on us.USERID=u.USERID
left join cmod.dbo.CM_USERSCITY uc on uc.CITYID=us.CITYID
left join cmod.dbo.CM_USERROLES ur on ur.USERROLEID=u1.USERROLEID
where ( u.LOCKEDACCOUNT is null or u.LOCKEDACCOUNT=0 ) $filterquery";
$query = $db->query($sql); $query = $db->query($sql);
$results = $query->getResultArray(); $results = $query->getResultArray();

13
app/Controllers/Auth.php
View File

@ -19,14 +19,15 @@ class Auth extends BaseController {
$db = \Config\Database::connect(); $db = \Config\Database::connect();
$sql = "SELECT u.USERID, u.USERNAME, u1.PASSWORD, u1.CITYID, ur.USERROLENAME $sql = "SELECT u.USERID, u.USERNAME, u1.PASSWORD, u1.CITYID, ur.USERROLENAME
FROM USERS u FROM USERS u
left join cmod.dbo.CM_USERS u1 on u.USERID=u1.USERID left join cmod.dbo.CM_USERS u1 on u.USERID=u1.USERID
left join cmod.dbo.CM_USERROLES ur on u1.USERROLEID=ur.USERROLEID left join cmod.dbo.CM_USERROLES ur on u1.USERROLEID=ur.USERROLEID
WHERE u.USERID='$userid'"; WHERE u.USERID='$userid'";
$query = $db->query($sql); $query = $db->query($sql);
$result = $query->getResultArray(); $result = $query->getResultArray();
$row = $result[0];
if(isset($row)) { if(isset($result[0])) {
$row = $result[0];
$qpassword = $row['PASSWORD']; $qpassword = $row['PASSWORD'];
$userid = $row['USERID']; $userid = $row['USERID'];
$username = $row['USERNAME']; $username = $row['USERNAME'];

4
app/Views/admin/users_index.php
View File

@ -13,6 +13,7 @@
<th>Userid</th> <th>Userid</th>
<th>Name</th> <th>Name</th>
<th>Role</th> <th>Role</th>
<th>Site</th>
<th>Action</th> <th>Action</th>
</tr> </tr>
</thead> </thead>
@ -93,6 +94,7 @@ function index() {
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
let userid = data[i].USERID; let userid = data[i].USERID;
let username = data[i].USERNAME; let username = data[i].USERNAME;
let site = data[i].CITYNAME == null ? "-": data[i].CITYNAME;
let userroleid = data[i].USERROLEID; let userroleid = data[i].USERROLEID;
if(userroleid === null) {userroleid = '';} if(userroleid === null) {userroleid = '';}
let userrolename = ''; let userrolename = '';
@ -100,7 +102,7 @@ function index() {
let editBtn = '<button class="btn btn-sm btn-secondary" ' + ' onclick="editRole(\'' + userid + '\',\''+ userroleid +'\')">Edit Role' + '</button> '; let editBtn = '<button class="btn btn-sm btn-secondary" ' + ' onclick="editRole(\'' + userid + '\',\''+ userroleid +'\')">Edit Role' + '</button> ';
editBtn += '<button class="btn btn-sm btn-warning" ' + ' onclick="editPass(\'' + userid + '\')">Edit Password' + '</button> '; editBtn += '<button class="btn btn-sm btn-warning" ' + ' onclick="editPass(\'' + userid + '\')">Edit Password' + '</button> ';
let datarow = '<tr class="align-middle">' + let datarow = '<tr class="align-middle">' +
'<td>' + userid + '</td>' + '<td>' + username + '</td>' + '<td>' + userrolename + '</td>' + '<td>' + editBtn + '</td>' + '<td>' + userid + '</td>' + '<td>' + username + '</td>' + '<td>' + userrolename + '</td>' + '<td>' + site + '</td>' + '<td>' + editBtn + '</td>' +
'</tr>'; '</tr>';
$("#table-body").append(datarow); $("#table-body").append(datarow);
} }

7
app/Views/auth_login.php
View File

@ -19,6 +19,7 @@
</style> </style>
</head> </head>
<body> <body>
<section id="wrapper" class="login-register login-sidebar bg-login"> <section id="wrapper" class="login-register login-sidebar bg-login">
<div class="login-box card rounded-0"> <div class="login-box card rounded-0">
<div class="card-body"> <div class="card-body">
@ -42,6 +43,12 @@
</div> </div>
</div> </div>
</form> </form>
<?php if (session()->getFlashdata('error')): ?>
<div class="alert alert-danger mt-5">
<?= session()->getFlashdata('error') ?>
</div>
<?php endif; ?>
</div> </div>
<div class='card-footer'> <div class='card-footer'>
<p class='ms-auto'>&copy; 4SKA1 2024 - 2025</p> <p class='ms-auto'>&copy; 4SKA1 2024 - 2025</p>