diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 7220821..42391cd 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -34,7 +34,7 @@ $routes->post('pasien/aktifkan', 'Pasien::aktifkan'); $routes->get('pasien/list', 'Pasien::list'); $routes->get('pasien/detail/(:num)', 'Pasien::detail/$1'); -$routes->match(['get','post'], 'pasien/hapus/(:num)', 'Pasien::hapus/$1'); +$routes->post('pasien/hapus/(:num)', 'Pasien::hapus/$1'); // BIODATA PASIEN $routes->get('pasien/biodata/(:any)', 'Pasien::biodata/$1'); diff --git a/app/Controllers/Dashboard.php b/app/Controllers/Dashboard.php index 0f9a9cc..05b95ae 100644 --- a/app/Controllers/Dashboard.php +++ b/app/Controllers/Dashboard.php @@ -6,11 +6,16 @@ class Dashboard extends BaseController { public function index() { - // Cek apakah user sudah login + // Cek login if (!session()->get('logged_in')) { return redirect()->to('/login'); } - return view('dashboard'); + // ambil versi aplikasi + $app = include(APPPATH . '../app_version.php'); + + return view('dashboard', [ + 'app' => $app + ]); } } \ No newline at end of file diff --git a/app/Controllers/Pasien.php b/app/Controllers/Pasien.php index 8a0c68c..805c44b 100644 --- a/app/Controllers/Pasien.php +++ b/app/Controllers/Pasien.php @@ -399,6 +399,7 @@ class Pasien extends BaseController 'tujuan' => $this->request->getPost('tujuan') ?? '', 'tujuan_detail' => $this->request->getPost('tujuan_detail') ?? '', 'informasi_lain'=> $this->request->getPost('informasi_lain') ?? '', + 'kie_transfer' => $this->request->getPost('kie_transfer') ?? '', 'persetujuan' => $this->request->getPost('persetujuan') ?? 'menunggu', 'biaya' => $this->request->getPost('biaya') ?? 0, @@ -563,17 +564,34 @@ class Pasien extends BaseController r.order_type, r.fase, r.status, + r.alasan_batal, r.created_at, p.nama, p.atribut, p.gender, p.alamat, p.tgl_lahir, - o.tujuan + o.tujuan, + pg.nama AS petugas_predispatch '); - $builder->join('pasien p', 'p.rm = r.rm', 'left'); - $builder->join('pasien_order o', 'o.register_id = r.id', 'left'); + $builder->join( + 'pasien_order o', + 'o.register_id = r.id', + 'left' + ); + + $builder->join( + 'pegawai pg', + 'pg.id = o.petugas_id', + 'left' + ); + + $builder->join( + 'pasien p', + 'p.rm = r.rm', + 'left' + ); // filter bulan $builder->where('MONTH(r.created_at)', $bulan); @@ -724,6 +742,7 @@ class Pasien extends BaseController 'persetujuan' => $this->request->getPost('persetujuan'), 'biaya' => $this->request->getPost('biaya'), 'informasi_lain' => $this->request->getPost('informasi_lain') ?? '', + 'kie_transfer' => $this->request->getPost('kie_transfer') ?? '', 'validasi' => $this->request->getPost('validasi'), 'petugas_id' => $petugasId, ]; @@ -756,14 +775,20 @@ class Pasien extends BaseController return view('list', $data); } - public function detail($id) + public function detail($id) { $db = \Config\Database::connect(); $pasien = $db->table('register_ambulans r') - ->select('r.*, p.nama, p.alamat, p.gender') + ->select(' + r.*, + p.nama, + p.alamat, + p.gender, + p.tgl_lahir + ') ->join('pasien p', 'p.rm = r.rm', 'left') - ->where('r.id', $id) // ๐ฅ INI KUNCI + ->where('r.id', $id) ->get() ->getRowArray(); diff --git a/app/Controllers/Pegawai.php b/app/Controllers/Pegawai.php index 5ae1abf..6771967 100644 --- a/app/Controllers/Pegawai.php +++ b/app/Controllers/Pegawai.php @@ -17,7 +17,7 @@ class Pegawai extends BaseController ->orLike('jabatan', $term) ->groupEnd() ->orderBy('nama', 'ASC') - ->findAll(10); + ->findAll(16); $result = []; diff --git a/app/Views/dashboard.php b/app/Views/dashboard.php index 318c7b4..0da4b02 100644 --- a/app/Views/dashboard.php +++ b/app/Views/dashboard.php @@ -220,7 +220,7 @@ body{