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 (