{
const {
onChange,
+ setClientData,
fieldsVisibility,
requiredFields,
translation,
data: { client, T, errorFields },
} = props;
- const [clientData, setClientData] = useState({ ...client });
const legalDocOptions = [
{
@@ -45,7 +45,8 @@ export default (props) => {
if (typeof field !== "object") {
client[field] = value;
- setClientData({ ...client });
+ (prev => [...prev, { ...client }])
+ setClientData(prev => ({...prev, ...client }))
}
};
diff --git a/app/javascript/components/NewClientForm/referralInfo.js b/app/javascript/components/NewClientForm/referralInfo.js
index 041446ddc3..1629554ce6 100644
--- a/app/javascript/components/NewClientForm/referralInfo.js
+++ b/app/javascript/components/NewClientForm/referralInfo.js
@@ -47,6 +47,7 @@ export default (props) => {
traffickingTypes,
},
} = props;
+
const callerRelationship = callerRelationships.map((relationship) => ({
label: T.translate("callerRelationship." + relationship.label),
value: relationship.value,
@@ -97,6 +98,7 @@ export default (props) => {
label: province[0],
options: province[1].map((value) => ({ label: value[0], value: value[1] })),
}));
+
const [districts, setDistricts] = useState(currentDistricts);
const [communes, setCommunes] = useState(currentCommunes);
const [villages, setVillages] = useState(currentVillages);
@@ -707,7 +709,6 @@ export default (props) => {
current_organization={current_organization}
callFrom="referralInfo"
outside={client.outside || false}
- translation={translation}
onChange={onChange}
data={{
addressTypes,
diff --git a/app/javascript/components/NewClientForm/riskAssessment.js b/app/javascript/components/NewClientForm/riskAssessment.js
new file mode 100644
index 0000000000..47c98566c3
--- /dev/null
+++ b/app/javascript/components/NewClientForm/riskAssessment.js
@@ -0,0 +1,296 @@
+import React, { useState } from "react";
+import {
+ SelectInput,
+ DateInput,
+ TextInput,
+ RadioGroup,
+ TextArea,
+} from "../Commons/inputs";
+import T from 'i18n-react'
+import TaskList from "./taskList";
+
+export default (props) => {
+ const {
+ onChange, protectionConcerns, historyOfHarms, historyOfHighRiskBehaviours, reasonForFamilySeparations, historyOfDisabilities,
+ setRiskAssessmentData, isError, setIsError,
+ data: {
+ assessment_date, protection_concern, other_protection_concern_specification, client_perspective, has_known_chronic_disease,
+ has_disability, has_hiv_or_aid, known_chronic_disease_specification, disability_specification, hiv_or_aid_specification,
+ relevant_referral_information, level_of_risk, history_of_disability_id, history_of_harm_id, history_of_high_risk_behaviour_id,
+ history_of_family_separation_id, labels, tasks_attributes: tasks
+ }
+ } = props
+
+ const [riskLevel, setRiskLevel] = useState(level_of_risk === 'high')
+ const [newTasks, setNewTasks] = useState(tasks)
+
+ const createTask = (task) => {
+ setNewTasks(prev => [...prev, { ...task, complete: false }])
+ setRiskAssessmentData(prev => ({...prev, tasks_attributes: newTasks}))
+ setIsError(false)
+ };
+
+ const deleteTask = (index) => {
+ const removedTask = newTasks.find((element, elementIndex) => elementIndex === index && element ) || {}
+ const updatedTasks = newTasks.map((task, taskIndex) => {
+ if (task.id && (task.id === removedTask.id) || taskIndex === index)
+ return {
+ id: removedTask.id,
+ _destroy: true
+ }
+ else
+ return task
+ })
+
+ setNewTasks(updatedTasks)
+ setRiskAssessmentData(prev => ({...prev, tasks_attributes: updatedTasks}))
+ }
+
+ const yesNoOpts = [
+ { label: T.translate("newCall.refereeInfo.yes"), value: true },
+ { label: T.translate("newCall.refereeInfo.no"), value: false },
+ ];
+
+ const levelOfRisk = [
+ { label: labels.level_of_risks.high, value: 'high'},
+ { label: labels.level_of_risks.medium, value: 'medium'},
+ { label: labels.level_of_risks.low, value: 'low'},
+ { label: labels.level_of_risks.no_action, value: 'no action'},
+ ]
+
+ const onLevelOfRiskSelected = (e) => {
+ if (e.data === 'high')
+ setRiskLevel(true)
+ else
+ setRiskLevel(false)
+
+ setRiskAssessmentData(prev => ({...prev, level_of_risk: e.data}))
+ }
+
+ const handleAppendTasks = e => {
+ e.preventDefault();
+ createTask({name: '', expected_date: null, complete: false})
+ }
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {
+ riskLevel &&
+
+
+
+ {
+ (newTasks[0] ? newTasks : [{name: '', expected_date: null}]).filter(task => task._destroy === undefined ).map((task, index) => {
+ return (
+
+ )
+ })
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+
+
+ {
+ task.completed ?
+
+
{task.name}
+
+ :
+
+ }
+
+
+
+ { task.completed ?
+
+
{task.expected_date}
+
+ :
+
+ }
+
+
+ { !task.completed && }
+
+