Jannex
/
admin-dashboard-web
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

checkbox

main
alex 2023-11-01 20:19:28 +01:00
parent 4fed6f4540
commit 4fbad6fb0a
2 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Pages/GroupTasks/Overview/GroupTasksViewModal.js
View File

@ -174,7 +174,7 @@ export default function GroupTasksViewModal({ isOpen }) {
if (specifiedTaskInputs.length > 0) { if (specifiedTaskInputs.length > 0) {
for (let i = 0; i < specifiedTaskInputs.length; i++) { for (let i = 0; i < specifiedTaskInputs.length; i++) {
if (specifiedTaskInputs[i].type === "search") { if (specifiedTaskInputs[i].type === "search") {
foundSelectInputs.push(specifiedTaskInputs[i].id); foundSelectInputs.push(specifiedTaskInputs[i].id.split("-")[6]);
continue; continue;
} }
@ -206,8 +206,8 @@ export default function GroupTasksViewModal({ isOpen }) {
break; break;
} }
taskInputs[specifiedTaskInputs[i].id.split("-")[6]] = { taskInputs[specifiedTaskTextareas[i].id.split("-")[6]] = {
value: specifiedTaskInputs[i].value, value: specifiedTaskTextareas[i].value,
}; };
} }
} }
@ -221,16 +221,12 @@ export default function GroupTasksViewModal({ isOpen }) {
if (!selectInputsObjectKeys.includes(foundSelectInputs[i])) { if (!selectInputsObjectKeys.includes(foundSelectInputs[i])) {
canTaskContinued = false; canTaskContinued = false;
break; break;
}
}
} else { } else {
selectInputsObjectKeys.forEach( taskInputs[foundSelectInputs[i]] = {
(key) => value: groupTasksContext.selectInputs[foundSelectInputs[i]].value,
(taskInputs[key] = { };
value: groupTasksContext.selectInputs[key].value, }
data: groupTasksContext.selectInputs[key].data, }
})
);
} }
if (!canTaskContinued) { if (!canTaskContinued) {
@ -245,6 +241,8 @@ export default function GroupTasksViewModal({ isOpen }) {
return; return;
} }
console.log("send", taskInputs);
webSocketContext.SendSocketMessage( webSocketContext.SendSocketMessage(
SentMessagesCommands.TaskContinueTaskStep, SentMessagesCommands.TaskContinueTaskStep,
{ {
@ -923,8 +921,7 @@ function InputRequiredHandler({
isGlobal={groupTaskParameter.global} isGlobal={groupTaskParameter.global}
> >
<SelectMachineComponent <SelectMachineComponent
// id needed for the validation to check if task continue is possible id={`${currentGroupTask.Id}-${step}-${groupTaskParameter.parameterName}`}
id={groupTaskParameter.parameterName}
disabled={taskLockedByUserId !== ""} disabled={taskLockedByUserId !== ""}
t={t} t={t}
notificationApi={notificationApi} notificationApi={notificationApi}
@ -955,6 +952,7 @@ function InputRequiredHandler({
}} }}
> >
<Checkbox <Checkbox
id={`${currentGroupTask.Id}-${step}-${groupTaskParameter.parameterName}`}
disabled={taskLockedByUserId !== ""} disabled={taskLockedByUserId !== ""}
checked={ checked={
groupTasksContext.selectInputs[ groupTasksContext.selectInputs[
@ -994,8 +992,7 @@ function InputRequiredHandler({
isGlobal={groupTaskParameter.global} isGlobal={groupTaskParameter.global}
> >
<SelectComponent <SelectComponent
// id needed for the validation to check if task continue is possible id={`${currentGroupTask.Id}-${step}-${groupTaskParameter.parameterName}`}
id={groupTaskParameter.parameterName}
t={t} t={t}
disabled={taskLockedByUserId !== ""} disabled={taskLockedByUserId !== ""}
options={groupTaskParameter.options} options={groupTaskParameter.options}

27
src/Pages/GroupTasks/Overview/GroupTypeSelectionModal.js
View File

@ -322,7 +322,6 @@ export function SelectMachineComponent({
globalInput, globalInput,
onSelectChange, onSelectChange,
disabled, disabled,
defaultValue,
}) { }) {
const groupTasksContext = useGroupTasksContext(); const groupTasksContext = useGroupTasksContext();
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
@ -395,6 +394,32 @@ export function SelectMachineComponent({
setOptions(finalOptions); setOptions(finalOptions);
responseData.current = data; responseData.current = data;
setLoading(false); setLoading(false);
if (
groupTasksContext.selectInputs[globalInput.parameterName] !==
undefined &&
groupTasksContext.selectInputs[globalInput.parameterName] !== null
) {
const parsedNotes = JSON.parse(
responseData.current[
groupTasksContext.selectInputs[globalInput.parameterName].value
].Notes
);
if (
parsedNotes !== undefined ||
parsedNotes !== null ||
parsedNotes !== ""
) {
groupTasksContext.setSelectInputs((prevState) => ({
...prevState,
[globalInput.parameterName]: {
value: parsedNotes.displayName,
data: parsedNotes,
},
}));
}
}
}); });
}, []); }, []);