Commit ef3c3a2b by nurchamim

menghilangkan session status khusus

parent 23931417
...@@ -92,14 +92,12 @@ class Auth extends MY_Controller ...@@ -92,14 +92,12 @@ class Auth extends MY_Controller
users.id_company, users.id_company,
tb_paket.komponen_web, tb_paket.komponen_web,
tb_paket.komponen, tb_paket.komponen,
master_jabatan.level_user, master_jabatan.level_user")
IF(p_notification.notif_hrd = '1','1',IF(p_notification.notif_finance = '1','6','0')) AS level_khusus")
->from("users") ->from("users")
->join("data_karyawan", "data_karyawan.id_karyawan = users.id_karyawan") ->join("data_karyawan", "data_karyawan.id_karyawan = users.id_karyawan")
->join("master_company", "data_karyawan.id_company = master_company.id_company") ->join("master_company", "data_karyawan.id_company = master_company.id_company")
->join("tb_paket", "tb_paket.id_tb_paket = master_company.id_tb_paket") ->join("tb_paket", "tb_paket.id_tb_paket = master_company.id_tb_paket")
->join("master_jabatan", "master_jabatan.id_jabatan = data_karyawan.id_jabatan") ->join("master_jabatan", "master_jabatan.id_jabatan = data_karyawan.id_jabatan")
->join("p_notification", "p_notification.id_karyawan = data_karyawan.id_karyawan", "LEFT")
->where("users.username", $username) ->where("users.username", $username)
->where("data_karyawan.status IN ('1','2','3','4')"); ->where("data_karyawan.status IN ('1','2','3','4')");
...@@ -295,7 +293,6 @@ class Auth extends MY_Controller ...@@ -295,7 +293,6 @@ class Auth extends MY_Controller
'id_departemen_arr' => $id_departemen_arr, 'id_departemen_arr' => $id_departemen_arr,
'id_jabatan' => $rows->id_jabatan, 'id_jabatan' => $rows->id_jabatan,
'level_user' => $level_user, 'level_user' => $level_user,
'level_khusus' => $rows->level_khusus,
'is_sales' => ($is_sales && $is_sales->num_rows() > 0) ? true : false, 'is_sales' => ($is_sales && $is_sales->num_rows() > 0) ? true : false,
'is_sales_skip_approval' => ($is_sales && $is_sales->row()->approval == '0') || ($level_user == '1') ? true : false, 'is_sales_skip_approval' => ($is_sales && $is_sales->row()->approval == '0') || ($level_user == '1') ? true : false,
'is_sales_atasan' => ($is_sales_atasan > 0) ? true : false, 'is_sales_atasan' => ($is_sales_atasan > 0) ? true : false,
...@@ -439,8 +436,7 @@ class Auth extends MY_Controller ...@@ -439,8 +436,7 @@ class Auth extends MY_Controller
$_SESSION['id_cabang'], $_SESSION['id_cabang'],
$_SESSION['id_departemen'], $_SESSION['id_departemen'],
$_SESSION['id_jabatan'], $_SESSION['id_jabatan'],
$_SESSION['level_user'], $_SESSION['level_user']
$_SESSION['level_khusus']
); );
redirect(route('login')); redirect(route('login'));
......
...@@ -21,12 +21,10 @@ class Auto_login extends CI_Controller{ ...@@ -21,12 +21,10 @@ class Auto_login extends CI_Controller{
data_karyawan.id_jabatan, data_karyawan.id_jabatan,
data_karyawan.foto, data_karyawan.foto,
users.id_company, users.id_company,
master_jabatan.level_user, master_jabatan.level_user")
IF(p_notification.notif_hrd = '1','1',IF(p_notification.notif_finance = '1','6','0')) AS level_khusus")
->from("users") ->from("users")
->join("data_karyawan","data_karyawan.id_karyawan = users.id_karyawan") ->join("data_karyawan","data_karyawan.id_karyawan = users.id_karyawan")
->join("master_jabatan","master_jabatan.id_jabatan = data_karyawan.id_jabatan") ->join("master_jabatan","master_jabatan.id_jabatan = data_karyawan.id_jabatan")
->join("p_notification","p_notification.id_karyawan = data_karyawan.id_karyawan","LEFT")
->where("users.username",$username) ->where("users.username",$username)
->where("data_karyawan.status IN ('1','2','3','4')"); ->where("data_karyawan.status IN ('1','2','3','4')");
$select_user = $this->db->get(); $select_user = $this->db->get();
...@@ -52,8 +50,7 @@ class Auto_login extends CI_Controller{ ...@@ -52,8 +50,7 @@ class Auto_login extends CI_Controller{
'id_departemen' =>$rows->id_departemen, 'id_departemen' =>$rows->id_departemen,
'id_departemen_arr' =>$id_departemen_arr, 'id_departemen_arr' =>$id_departemen_arr,
'id_jabatan' =>$rows->id_jabatan, 'id_jabatan' =>$rows->id_jabatan,
'level_user' =>$level_user, 'level_user' =>$level_user);
'level_khusus' =>$rows->level_khusus);
$session_v2 = array('id_user' => $id_user, $session_v2 = array('id_user' => $id_user,
'usergroup' => $level_user, 'usergroup' => $level_user,
......
...@@ -360,10 +360,9 @@ class Dropdown_menu extends MY_Controller ...@@ -360,10 +360,9 @@ class Dropdown_menu extends MY_Controller
$search = $this->input->get("q"); $search = $this->input->get("q");
$id_company = $this->id_company; $id_company = $this->id_company;
$level_user = $this->level_user; $level_user = $this->level_user;
$level_khusus = $this->level_khusus;
$id_cabang = $this->id_cabang; $id_cabang = $this->id_cabang;
if ($level_user != "1" && $level_khusus != "1") { if ($level_user != "1") {
$this->db->where("id_cabang", $id_cabang); $this->db->where("id_cabang", $id_cabang);
} }
......
...@@ -36,7 +36,7 @@ class Jabatan extends MY_Controller ...@@ -36,7 +36,7 @@ class Jabatan extends MY_Controller
$row[] = $field->nama; $row[] = $field->nama;
$row[] = $field->level; $row[] = $field->level;
if (in_array($this->level_user, array("1")) || in_array($this->session->userdata('level_khusus'), array("1"))) { if (in_array($this->level_user, array("1"))) {
if ($field->kode_jabatan == 'HR') { if ($field->kode_jabatan == 'HR') {
$row[] = ''; $row[] = '';
} else { } else {
......
...@@ -39,7 +39,7 @@ class Lokasi extends MY_Controller ...@@ -39,7 +39,7 @@ class Lokasi extends MY_Controller
$row[] = $dt->lat_asli; $row[] = $dt->lat_asli;
$row[] = $dt->long_asli; $row[] = $dt->long_asli;
$row[] = $dt->jarak; $row[] = $dt->jarak;
if (in_array($this->session->userdata('level_user'), array("1", "5")) || in_array($this->session->userdata('level_khusus'), array("1"))) { if (in_array($this->session->userdata('level_user'), array("1", "5"))) {
if ($paket == 15) { if ($paket == 15) {
$row[] = ' <a href="' . site_url("master/lokasi/edit") . '/' . md5($dt->id_kantor) . '" title="Ubah" style="color:#f0ad4e"> $row[] = ' <a href="' . site_url("master/lokasi/edit") . '/' . md5($dt->id_kantor) . '" title="Ubah" style="color:#f0ad4e">
<i class="btn_edit fa fa-edit (alias) "> </i> <i class="btn_edit fa fa-edit (alias) "> </i>
......
...@@ -64,7 +64,7 @@ class Pengalaman_kerja extends MY_Controller ...@@ -64,7 +64,7 @@ class Pengalaman_kerja extends MY_Controller
$btn_delete = '<a href="#" class="btn_delete_pengalaman text-danger" onclick="modal_delete(`' . md5($field->id_riwayat_pekerjaan) . '`)"title="' . strtoupper($this->lang->line('hapus')) . '"> $btn_delete = '<a href="#" class="btn_delete_pengalaman text-danger" onclick="modal_delete(`' . md5($field->id_riwayat_pekerjaan) . '`)"title="' . strtoupper($this->lang->line('hapus')) . '">
<i class="fa fa-trash"></i> <i class="fa fa-trash"></i>
</a>'; </a>';
if (in_array($this->session->userdata('level_user'), array("1")) || in_array($this->session->userdata('level_khusus'), ["1"])) { if (in_array($this->session->userdata('level_user'), array("1"))) {
$row[] = $btn_detail . " " . $btn_edit . " " . $btn_delete; $row[] = $btn_detail . " " . $btn_edit . " " . $btn_delete;
} else { } else {
$row[] = $btn_detail; $row[] = $btn_detail;
......
...@@ -45,7 +45,7 @@ class Pengumuman extends MY_Controller ...@@ -45,7 +45,7 @@ class Pengumuman extends MY_Controller
$row[] = $this->_target_pengumuman($field->target, $field->target_id, $field->id_cabang); $row[] = $this->_target_pengumuman($field->target, $field->target_id, $field->id_cabang);
if ($this->session->userdata('level_user') == '1' || $this->session->userdata('level_khusus') == '1') { if ($this->session->userdata('level_user') == '1') {
$row[] = '<a href="' . route('informasi.pengumuman.detail') . '/' . md5($field->id_pengumuman) . '" class="text-primary" title="DETAIL"> $row[] = '<a href="' . route('informasi.pengumuman.detail') . '/' . md5($field->id_pengumuman) . '" class="text-primary" title="DETAIL">
<i class="btn_detail fa fa-info-circle (alias) "> </i></a>&nbsp; <i class="btn_detail fa fa-info-circle (alias) "> </i></a>&nbsp;
<a href="' . route('informasi.pengumuman.form.edit') . '/' . md5($field->id_pengumuman) . '" class="text-warning" title="EDIT"> <a href="' . route('informasi.pengumuman.form.edit') . '/' . md5($field->id_pengumuman) . '" class="text-warning" title="EDIT">
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
"bSortable": false "bSortable": false
} }
<?php <?php
if (in_array($this->level_user, array("1")) || in_array($this->session->userdata('level_khusus'), array("1"))) { if (in_array($this->level_user, array("1"))) {
?>, ?>,
{ {
"aTargets": [4], "aTargets": [4],
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
}); });
<?php <?php
if (in_array($this->level_user, array("1")) || in_array($this->session->userdata('level_khusus'), array("1"))) { if (in_array($this->level_user, array("1"))) {
?> ?>
$('td:eq(4)', nRow).css({ $('td:eq(4)', nRow).css({
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
</div> </div>
<div class="content-header-right col-md-6 col-12"> <div class="content-header-right col-md-6 col-12">
<?php <?php
if (in_array($this->level_user, array("1")) || in_array($this->session->userdata('level_khusus'), array("1"))) { if (in_array($this->level_user, array("1"))) {
?> ?>
<div class="float-md-right"> <div class="float-md-right">
<button type="button" class="btn_tambah btn btn-biru"> <button type="button" class="btn_tambah btn btn-biru">
...@@ -271,7 +271,7 @@ ...@@ -271,7 +271,7 @@
<th class="text-left text-uppercase"><?= $this->lang->line('nama') ?></th> <th class="text-left text-uppercase"><?= $this->lang->line('nama') ?></th>
<th class="text-left">LEVEL</th> <th class="text-left">LEVEL</th>
<?php <?php
if (in_array($this->level_user, array("1")) || in_array($this->session->userdata('level_khusus'), array("1"))) { if (in_array($this->level_user, array("1"))) {
?> ?>
<th class="text-center"><?= $this->lang->line('aksi') ?></th> <th class="text-center"><?= $this->lang->line('aksi') ?></th>
<?php <?php
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
echo $tab . "<br>"; echo $tab . "<br>";
} ?> } ?>
<?php <?php
if (in_array($this->session->userdata('level_user'), array("1")) || in_array($this->session->userdata('level_khusus'), array("1"))) { if (in_array($this->session->userdata('level_user'), array("1"))) {
?> ?>
<div class="row mb-2"> <div class="row mb-2">
<div class="col-md-12 text-right"> <div class="col-md-12 text-right">
...@@ -133,7 +133,7 @@ if (in_array($this->session->userdata('level_user'), array("1")) || in_array($th ...@@ -133,7 +133,7 @@ if (in_array($this->session->userdata('level_user'), array("1")) || in_array($th
</fieldset> </fieldset>
</div> </div>
</div> </div>
<div class="row"> <!-- <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="form-label" for="no_bpjs_kes"><?= $this->lang->line('no_bpjs_kes') ?></label> <label class="form-label" for="no_bpjs_kes"><?= $this->lang->line('no_bpjs_kes') ?></label>
...@@ -146,13 +146,13 @@ if (in_array($this->session->userdata('level_user'), array("1")) || in_array($th ...@@ -146,13 +146,13 @@ if (in_array($this->session->userdata('level_user'), array("1")) || in_array($th
<p class="form-control-static"><?= $row->no_bpjs_tk != '' ? $row->no_bpjs_tk : '-' ?></p> <p class="form-control-static"><?= $row->no_bpjs_tk != '' ? $row->no_bpjs_tk : '-' ?></p>
</div> </div>
</div> </div>
</div> </div> -->
<div class="row"> <!-- <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<label class="form-label" for="jml_anak"><?= $this->lang->line('jml_anak') ?></label> <label class="form-label" for="jml_anak"><?= $this->lang->line('jml_anak') ?></label>
<p class="form-control-static"><?= $row->jml_anak != '' ? $row->jml_anak : '-' ?></p> <p class="form-control-static"><?= $row->jml_anak != '' ? $row->jml_anak : '-' ?></p>
</div> </div>
</div> </div> -->
<div class="row mt-3"> <div class="row mt-3">
<div class="col-md-12 text-primary"> <div class="col-md-12 text-primary">
......
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
<th class="text-left">LONGITUDE</th> <th class="text-left">LONGITUDE</th>
<th class="text-center">RADIUS (METER)</th> <th class="text-center">RADIUS (METER)</th>
<?php <?php
if(in_array($this->session->userdata('level_user'), array("1","5")) || in_array($this->session->userdata('level_khusus'), array("1"))) { if(in_array($this->session->userdata('level_user'), array("1","5"))) {
?> ?>
<th>AKSI</th> <th>AKSI</th>
<?php <?php
......
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
<th class="text-left">LONGITUDE</th> <th class="text-left">LONGITUDE</th>
<th class="text-center">RADIUS (METER)</th> <th class="text-center">RADIUS (METER)</th>
<?php <?php
if (in_array($this->session->userdata('level_user'), array("1", "5")) || in_array($this->session->userdata('level_khusus'), array("1"))) { if (in_array($this->session->userdata('level_user'), array("1", "5"))) {
?> ?>
<th><?= $this->lang->line('aksi') ?></th> <th><?= $this->lang->line('aksi') ?></th>
<?php <?php
......
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
</div> </div>
<div class="content-header-right col-md-6 col-12"> <div class="content-header-right col-md-6 col-12">
<?php <?php
if(in_array($this->level_user, array("1")) || in_array($this->level_khusus, array("1"))) { if(in_array($this->level_user, array("1"))) {
?> ?>
<div class="float-md-right"> <div class="float-md-right">
<button type="button" class="btn_tambah btn btn-biru"> <button type="button" class="btn_tambah btn btn-biru">
......
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
</div> </div>
<div class="content-header-right col-md-6 col-12"> <div class="content-header-right col-md-6 col-12">
<?php <?php
if (in_array($this->level_user, array("1", "5")) || in_array($this->session->userdata('level_khusus'), array("1"))) { if (in_array($this->level_user, array("1", "5"))) {
?> ?>
<div class="float-md-right"> <div class="float-md-right">
<button type="button" class="btn_tambah btn btn-biru"> <button type="button" class="btn_tambah btn btn-biru">
...@@ -271,7 +271,7 @@ ...@@ -271,7 +271,7 @@
<div class="card-body"> <div class="card-body">
<div class="row filter"> <div class="row filter">
<?php <?php
if (in_array($this->level_user, array("1", "4")) || in_array($this->khusus, array("1")) || $this->multi_cabang == true) { if (in_array($this->level_user, array("1", "4")) || $this->multi_cabang == true) {
?> ?>
<div class="col-md-4"> <div class="col-md-4">
<select id="id_cabang" class="form-control select2"></select> <select id="id_cabang" class="form-control select2"></select>
...@@ -305,7 +305,7 @@ ...@@ -305,7 +305,7 @@
<th class="text-center text-uppercase"><?= $this->lang->line('jam_pulang_shift') ?></th> <th class="text-center text-uppercase"><?= $this->lang->line('jam_pulang_shift') ?></th>
<th class="text-center text-uppercase"><?= $this->lang->line('max_jam_pulang_shift') ?></th> <th class="text-center text-uppercase"><?= $this->lang->line('max_jam_pulang_shift') ?></th>
<?php <?php
if (in_array($this->level_user, array("1", "5")) || in_array($this->session->userdata('level_khusus'), array("1"))) { if (in_array($this->level_user, array("1", "5"))) {
?> ?>
<th class="text-center"><?= $this->lang->line('aksi') ?></th> <th class="text-center"><?= $this->lang->line('aksi') ?></th>
<?php <?php
...@@ -371,7 +371,7 @@ ...@@ -371,7 +371,7 @@
"bSortable": false "bSortable": false
}, },
<?php <?php
if (in_array($this->level_user, array("1", "5")) || in_array($this->session->userdata('level_khusus'), array("1"))) { if (in_array($this->level_user, array("1", "5"))) {
?> { ?> {
"aTargets": [-1], "aTargets": [-1],
"bSortable": false "bSortable": false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment