From ae9649d552d9f387fafc7018d320ce6f29443325 Mon Sep 17 00:00:00 2001
From: ardhi <ardhi.irfan.syabani@gmail.com>
Date: Tue, 21 Feb 2023 17:59:42 +0700
Subject: [PATCH] column project name on Laporan K3

---
 src/const/en.json            | 1 +
 src/const/id.json            | 1 +
 src/views/Report/k3/index.js | 9 +++++++++
 3 files changed, 11 insertions(+)

diff --git a/src/const/en.json b/src/const/en.json
index bbaf507..7e2f728 100644
--- a/src/const/en.json
+++ b/src/const/en.json
@@ -90,6 +90,7 @@
     "ownershipName": "Ownership Name",
     "parentMenu": "Parent Menu",
     "phase": "Project Phase",
+    "projectName": "Project Name",
     "projectType": "Add Project Type",
     "projectPhase": "Add Project Phase",
     "presenceIn": "Presence In",
diff --git a/src/const/id.json b/src/const/id.json
index 3d63238..353a609 100644
--- a/src/const/id.json
+++ b/src/const/id.json
@@ -93,6 +93,7 @@
     "ownershipName": "Nama Pemilik",
     "parentMenu": "Menu Induk",
     "phase": "Fase Proyek",
+    "projectName": "Nama Proyek",
     "projectType": "Tambah Tipe Proyek",
     "projectPhase": "Tambah Fase Proyek",
     "presenceIn": "Waktu Masuk",
diff --git a/src/views/Report/k3/index.js b/src/views/Report/k3/index.js
index ec0f2ab..66f9ad2 100644
--- a/src/views/Report/k3/index.js
+++ b/src/views/Report/k3/index.js
@@ -162,6 +162,13 @@ class index extends Component {
           "column_results": [
             "name",
           ]
+        },
+        {
+          "name": "m_proyek",
+          "column_join": "proyek_id",
+          "column_results": [
+            "nama"
+          ]
         }
       ],
       "orders": {
@@ -439,6 +446,7 @@ class index extends Component {
           return (
             <tr key={n.id}>
               <td>{n.join_first_name ? n.join_first_name : "-"}</td>
+              <td>{n.join_second_nama ? n.join_second_nama : "-"}</td>
               <td>{n.report_date ? moment(n.report_date).format("DD-MM-YYYY") : "-"}</td>
               <td>{n.k3_checked.length ? n.k3_checked.join() : "-"}</td>
               <td>{n.k3_not_checked.length ? n.k3_not_checked.join() : "-"}</td>
@@ -507,6 +515,7 @@ class index extends Component {
   render() {
     const column = [
       { name: this.props.t('nameHR') },
+      { name: this.props.t('projectName') },
       { name: this.props.t('dateReport') },
       { name: this.props.t('gearUse') },
       { name: this.props.t('gearNotUse') },