Browse Source

Merge pull request 'staging upload 23-05-24' (#49) from staging into master

Reviewed-on: ordo/adw-frontend#49
pull/2/head
ibnu 2 years ago
parent
commit
b38e6652fb
  1. 2
      src/views/SimproV2/CreatedProyek/ImportActivity/index.js
  2. 7
      src/views/SimproV2/CreatedProyek/ViewProject.js

2
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); let index = dataUserToProject.findIndex((x) => columnData == x.join_first_ktp_number);
if(index >= 0) { if(index >= 0) {
columnData = dataUserToProject[index].join_first_ktp_number; columnData = dataUserToProject[index].join_first_ktp_number;
} else {
columnData = '';
} }
} }
} }

7
src/views/SimproV2/CreatedProyek/ViewProject.js

@ -19,6 +19,7 @@ const ViewProject = ({ openDialog, closeDialog, toggleDialog, projectCharter, pr
const [projectSuccess, setProjectSuccess] = useState("") const [projectSuccess, setProjectSuccess] = useState("")
const [participants, setParticipants] = useState("") const [participants, setParticipants] = useState("")
const [budget, setBudget] = useState("") const [budget, setBudget] = useState("")
const [currency, setCurrency] = useState("")
const [testing, setTesting] = useState("") const [testing, setTesting] = useState("")
const [milestone, setMilestone] = useState("") const [milestone, setMilestone] = useState("")
const [potentialRisks, setPotentialRisks] = useState("") const [potentialRisks, setPotentialRisks] = useState("")
@ -32,6 +33,7 @@ const ViewProject = ({ openDialog, closeDialog, toggleDialog, projectCharter, pr
setProjectSuccess("") setProjectSuccess("")
setParticipants([]) setParticipants([])
setBudget("") setBudget("")
setCurrency("")
setTesting("") setTesting("")
setMilestone([]) setMilestone([])
setPotentialRisks("") setPotentialRisks("")
@ -48,6 +50,7 @@ const ViewProject = ({ openDialog, closeDialog, toggleDialog, projectCharter, pr
setBudget(projectCharter.rencana_biaya); setBudget(projectCharter.rencana_biaya);
setPotentialRisks(projectCharter.potential_risk); setPotentialRisks(projectCharter.potential_risk);
setTesting(projectCharter.testing_environment); setTesting(projectCharter.testing_environment);
setCurrency(projectCharter.currency_symbol);
} }
}, [projectCharter]); }, [projectCharter]);
@ -187,7 +190,7 @@ const ViewProject = ({ openDialog, closeDialog, toggleDialog, projectCharter, pr
Budget: Budget:
</td> </td>
<td className='td-charter td-value plr-10'> <td className='td-charter td-value plr-10'>
<div>Rp {formatThousand(budget)}</div> <div>{currency} {formatThousand(budget)}</div>
</td> </td>
</tr> </tr>
<tr className='tr-charter'> <tr className='tr-charter'>
@ -265,4 +268,4 @@ const ViewProject = ({ openDialog, closeDialog, toggleDialog, projectCharter, pr
} }
export default ViewProject; export default ViewProject;

Loading…
Cancel
Save