From 867fc480670f9ffc2a72d7f36091c9c286afe0d3 Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Tue, 23 May 2023 11:36:35 +0700 Subject: [PATCH 1/2] Fix import nik --- src/views/SimproV2/CreatedProyek/ImportActivity/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/SimproV2/CreatedProyek/ImportActivity/index.js b/src/views/SimproV2/CreatedProyek/ImportActivity/index.js index 5e98e96..835812d 100644 --- a/src/views/SimproV2/CreatedProyek/ImportActivity/index.js +++ b/src/views/SimproV2/CreatedProyek/ImportActivity/index.js @@ -199,6 +199,8 @@ const ImportActivity = ({ params }) => { let index = dataUserToProject.findIndex((x) => columnData == x.join_first_ktp_number); if(index >= 0) { columnData = dataUserToProject[index].join_first_ktp_number; + } else { + columnData = ''; } } } From 2eec2bf17fe6d92bced78c2219c5b34e3a5f0aa0 Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Tue, 23 May 2023 15:50:19 +0700 Subject: [PATCH 2/2] Fix currency --- src/views/SimproV2/CreatedProyek/ViewProject.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/SimproV2/CreatedProyek/ViewProject.js b/src/views/SimproV2/CreatedProyek/ViewProject.js index b9f42f8..580b34e 100644 --- a/src/views/SimproV2/CreatedProyek/ViewProject.js +++ b/src/views/SimproV2/CreatedProyek/ViewProject.js @@ -19,6 +19,7 @@ const ViewProject = ({ openDialog, closeDialog, toggleDialog, projectCharter, pr const [projectSuccess, setProjectSuccess] = useState("") const [participants, setParticipants] = useState("") const [budget, setBudget] = useState("") + const [currency, setCurrency] = useState("") const [testing, setTesting] = useState("") const [milestone, setMilestone] = useState("") const [potentialRisks, setPotentialRisks] = useState("") @@ -32,6 +33,7 @@ const ViewProject = ({ openDialog, closeDialog, toggleDialog, projectCharter, pr setProjectSuccess("") setParticipants([]) setBudget("") + setCurrency("") setTesting("") setMilestone([]) setPotentialRisks("") @@ -48,6 +50,7 @@ const ViewProject = ({ openDialog, closeDialog, toggleDialog, projectCharter, pr setBudget(projectCharter.rencana_biaya); setPotentialRisks(projectCharter.potential_risk); setTesting(projectCharter.testing_environment); + setCurrency(projectCharter.currency_symbol); } }, [projectCharter]); @@ -187,7 +190,7 @@ const ViewProject = ({ openDialog, closeDialog, toggleDialog, projectCharter, pr Budget: -
Rp {formatThousand(budget)}
+
{currency} {formatThousand(budget)}
@@ -265,4 +268,4 @@ const ViewProject = ({ openDialog, closeDialog, toggleDialog, projectCharter, pr } -export default ViewProject; \ No newline at end of file +export default ViewProject;