diff --git a/app/Controllers/Certificates.php b/app/Controllers/Certificates.php index 4176edc..11a56b8 100644 --- a/app/Controllers/Certificates.php +++ b/app/Controllers/Certificates.php @@ -19,12 +19,12 @@ class Certificates extends BaseController { public function installationIndex() { // Index return view('certificate_installation_index'); } - public function getDataIndexInstallation() { // Untuk API Get Data + public function getDataIndexMaintenance() { $userPosId = session()->get('userposid'); $userId = session()->get('userid'); $certificateModel = new CertificateModel(); - + // 1. Mulai Query Builder $builder = $certificateModel->select(' certificates.cert_id, @@ -43,7 +43,7 @@ class Certificates extends BaseController { ') ->join('activities', 'activities.actid = certificates.actid', 'left') ->join('users', 'users.userid = certificates.user_id', 'left') - ->where('certificates.cert_type', 'BAI'); + ->where('certificates.cert_type', 'IC');; // 2. Filter berdasarkan Role if (in_array($userPosId, [1, 3, 5])) { // Manager & IT: Tidak perlu filter tambahan (lihat semua) @@ -64,31 +64,6 @@ class Certificates extends BaseController { return $this->response->setJSON($allData); } - public function createinstallationPreview($certid = null) { // Untuk Preview Sertifikat - //Melakukan search data dari database - - if (!$certid) { - return $this->response->setStatusCode(400)->setJSON(['error' => 'Certificate ID is required']); - } - - // Get certificate data Berdasarkan certid - $certificate = [ - 'certid' => 'f353ca91-4fc5-49f2-9b9e-304f83d11914', - 'certname' => 'Jokoh Calibration Certificate', - 'productname' => 'Jokoh', - 'productnumber' => 'SN-2024-001', - 'issuedate' => '2024-01-15', - 'expirydate' => '2025-01-15', - 'vendor' => 'Summit Calibration Lab', - 'isval' => null - ]; - - if (empty($certificate)) { // JIka Tidak Ada - return $this->response->setStatusCode(404)->setJSON(['error' => 'Maintenance certificate not found']); - } - - return $this->previewPdf($certificate, 'installation'); // Preview PDF - } // Untuk Sertifikat Maintenance [2] @@ -725,7 +700,8 @@ class Certificates extends BaseController { 'metadata_keywords' => $certificate['certtype'] . ' Certificate' ]; } - public function view($uuid) { + + public function view($uuid) { // Untuk lihat Sertifikat try { $certificateModel = new CertificateModel(); diff --git a/app/Views/certificate_maintenance_index.php b/app/Views/certificate_maintenance_index.php index c065b96..facb6b4 100644 --- a/app/Views/certificate_maintenance_index.php +++ b/app/Views/certificate_maintenance_index.php @@ -395,7 +395,7 @@ $(function () { '', { certid }, function (data) { - console.log(data); + // console.log(data); // Populate modal with data $('#modalCertName').text(data.cert_name || '-'); $('#modalCertNumber').text(data.cert_number || '-'); diff --git a/app/Views/certificates/certificate_installation.php b/app/Views/certificates/certificate_installation.php index 9d5940c..b5bce68 100644 --- a/app/Views/certificates/certificate_installation.php +++ b/app/Views/certificates/certificate_installation.php @@ -2,14 +2,15 @@ - Maintenance Installation - <?= $certificate['certname'] ?> + <?= $certificate['certname'] ?> -
+ + + + +
+ +
-

<<Nama Alat>>

+

-

at <<Nama Rumah Sakit / Laboratorium - Kota>>

+

at

-

Serial Number: <<Serial Number>>

+

Serial Number:

-

has completed through a series of <<Jenis Sertifikat>>

+

has completed through a series of

and the final result:

PASSED

-

Date of <<Jenis Sertifikat>> and Inspection: <<Tanggal Terbit>>

-

<<Valid>> <<Tanggal Berakhir>>

+

Date of Instrument Maintenance and Inspection:

+
+ - +
+ + - <<Nama TSO>> - <<Jabatan>> -
-

<<FO>>

+

FO.IV.01/20.00/2020

+ +
-

<<Nama Alat>>

+

-

at <<Nama Rumah Sakit / Laboratorium - Kota>>

+

at

-

Serial Number: <<Serial Number>>

+

Serial Number:

-

has completed through a series of <<Jenis Sertifikat>>

+

has completed through a series of

and the final result:

PASSED

-

Date of <<Jenis Sertifikat>> and Inspection: <<Tanggal Terbit>>

-

<<Valid>> <<Tanggal Berakhir>>

+

Date of Instrument Maintenance and Inspection:

+
- -
- Adhitya Pranata Putra - Technical Support Manager - - <<Nama TSO>> - <<Jabatan>> +
-

<<FO>>

+

FO.IV.01/20.00/2020

- + diff --git a/app/Views/layouts/_sidebar.php b/app/Views/layouts/_sidebar.php index 3eb9f18..9e4344a 100644 --- a/app/Views/layouts/_sidebar.php +++ b/app/Views/layouts/_sidebar.php @@ -40,8 +40,8 @@