Skip to content

Commit

Permalink
fix(batchTestReAssignemnt/Cancelation): page console.error fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@adityadeshlahre
adityadeshlahre committed Aug 12, 2024
1 parent 7589da2 commit 94790fb
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 38 deletions.
104 changes: 67 additions & 37 deletions ...ponents/admin/BatchTestReassignmentAndCancellation/BatchTestReassignmentAndCancelation.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ function BatchTestReassignmentAndCancelation() {
[],
);
const [jsonWad, setJsonWad] = useState({
// current: "HIV+rapid+test+HIV",
// sampleType: "Plasma",
current: "",
sampleType: "",
changeNotStarted: [],
Expand All @@ -83,6 +81,7 @@ function BatchTestReassignmentAndCancelation() {
noChangeTechReject: [],
noChangeBioReject: [],
noChangeNotValidated: [],
replace: "",
});
const [changesToShow, setChangesToShow] = useState(false);

Expand Down Expand Up @@ -289,8 +288,8 @@ function BatchTestReassignmentAndCancelation() {
} else {
updatedArray.splice(index, 1);
}
const isChecked = updatedArray.includes(id);
const noChangeArray =
let isChecked = updatedArray.includes(id);
let noChangeArray =
prevJsonWad[`noChange${capitalizeFirstLetter(sectionKey)}`];
const noChangeIndex = noChangeArray.indexOf(id);

Expand Down Expand Up @@ -333,26 +332,41 @@ function BatchTestReassignmentAndCancelation() {
(item) => item.id === selectedTestId,
);

let updatedList;
if (existingIndex !== -1) {
const updatedList = [...sampleTestTypeToGetTagList];
updatedList = [...sampleTestTypeToGetTagList];
updatedList.splice(existingIndex, 1);
setSampleTestTypeToGetTagList(updatedList);
} else {
const selectedTest = {
id: selectedTestId,
name: testName,
};
setSampleTestTypeToGetTagList([
...sampleTestTypeToGetTagList,
selectedTest,
]);
updatedList = [...sampleTestTypeToGetTagList, selectedTest];
setSampleTestTypeToGetTagList(updatedList);
}

const updatedReplace = updatedList.map((item) => item.id).join(",");
setJsonWad((prevJsonWad) => ({
...prevJsonWad,
replace: updatedReplace,
}));
};

function handleRemoveSampleTypeListSelectIdTestTag(indexToRemove) {
setSampleTestTypeToGetTagList((prevTags) =>
prevTags.filter((_, index) => index !== indexToRemove),
);
setSampleTestTypeToGetTagList((prevTags) => {
const updatedTags = prevTags.filter(
(_, index) => index !== indexToRemove,
);

const updatedReplace = updatedTags.map((item) => item.id).join(",");
setJsonWad((prevJsonWad) => ({
...prevJsonWad,
replace: updatedReplace,
}));

return updatedTags;
});
}

useEffect(() => {
Expand Down Expand Up @@ -500,6 +514,20 @@ function BatchTestReassignmentAndCancelation() {
checked={replaceWith}
onChange={() => {
setReplaceWith(!replaceWith);
if (replaceWith) {
setJsonWad((prevJsonWad) => ({
...prevJsonWad,
replace: "",
}));
} else {
const selectedTestIds = sampleTestTypeToGetTagList
.map((item) => item.id)
.join(",");
setJsonWad((prevJsonWad) => ({
...prevJsonWad,
replace: selectedTestIds,
}));
}
}}
/>
<br />
Expand Down Expand Up @@ -598,9 +626,7 @@ function BatchTestReassignmentAndCancelation() {
<Checkbox
id={`notStartedCheckbox_${index}`}
value={item.id}
labelText={intl.formatMessage({
id: item.labNo,
})}
labelText={item.labNo}
checked={jsonWad.changeNotStarted.includes(item.id)}
onChange={() => {
handleCheckboxChange(item.id, "notStarted");
Expand Down Expand Up @@ -641,9 +667,7 @@ function BatchTestReassignmentAndCancelation() {
<Checkbox
id={`technicianRejectionCheckbox_${index}`}
value={item.id}
labelText={intl.formatMessage({
id: item.labNo,
})}
labelText={item.labNo}
checked={jsonWad.changeTechReject.includes(item.id)}
onChange={() => {
handleCheckboxChange(item.id, "techReject");
Expand Down Expand Up @@ -684,9 +708,7 @@ function BatchTestReassignmentAndCancelation() {
<Checkbox
id={`biologistRejectionCheckbox_${index}`}
value={item.id}
labelText={intl.formatMessage({
id: item.labNo,
})}
labelText={item.labNo}
checked={jsonWad.changeBioReject.includes(item.id)}
onChange={() => {
handleCheckboxChange(item.id, "bioReject");
Expand Down Expand Up @@ -727,9 +749,7 @@ function BatchTestReassignmentAndCancelation() {
<Checkbox
id={`notValidatedCheckbox_${index}`}
value={item.id}
labelText={intl.formatMessage({
id: item.labNo,
})}
labelText={item.labNo}
checked={jsonWad.changeNotValidated.includes(item.id)}
onChange={() => {
handleCheckboxChange(item.id, "notValidated");
Expand All @@ -752,7 +772,7 @@ function BatchTestReassignmentAndCancelation() {
setChangesToShow(true);
setBatchTestPost((prevBatchTestPost) => ({
...prevBatchTestPost,
jsonWad: jsonWad,
jsonWad: JSON.stringify(jsonWad),
}));
}}
type="button"
Expand Down Expand Up @@ -802,7 +822,7 @@ function BatchTestReassignmentAndCancelation() {
item && (
<div key={id}>
<br />
<FormattedMessage id={item.labNo} />
{item.labNo}
<br />
</div>
)
Expand All @@ -821,7 +841,7 @@ function BatchTestReassignmentAndCancelation() {
item && (
<div key={id}>
<br />
<FormattedMessage id={item.labNo} />
{item.labNo}
<br />
</div>
)
Expand All @@ -840,7 +860,7 @@ function BatchTestReassignmentAndCancelation() {
item && (
<div key={id}>
<br />
<FormattedMessage id={item.labNo} />
{item.labNo}
<br />
</div>
)
Expand All @@ -859,7 +879,7 @@ function BatchTestReassignmentAndCancelation() {
item && (
<div key={id}>
<br />
<FormattedMessage id={item.labNo} />
{item.labNo}
<br />
</div>
)
Expand Down Expand Up @@ -887,7 +907,7 @@ function BatchTestReassignmentAndCancelation() {
item && (
<div key={id}>
<br />
<FormattedMessage id={item.labNo} />
{item.labNo}
<br />
</div>
)
Expand All @@ -906,7 +926,7 @@ function BatchTestReassignmentAndCancelation() {
item && (
<div key={id}>
<br />
<FormattedMessage id={item.labNo} />
{item.labNo}
<br />
</div>
)
Expand All @@ -925,7 +945,7 @@ function BatchTestReassignmentAndCancelation() {
item && (
<div key={id}>
<br />
<FormattedMessage id={item.labNo} />
{item.labNo}
<br />
</div>
)
Expand All @@ -944,7 +964,7 @@ function BatchTestReassignmentAndCancelation() {
item && (
<div key={id}>
<br />
<FormattedMessage id={item.labNo} />
{item.labNo}
<br />
</div>
)
Expand All @@ -957,7 +977,13 @@ function BatchTestReassignmentAndCancelation() {
<hr />
<Button
disabled={saveButton}
onClick={batchTestReassignmentPostCall}
onClick={() => {
setBatchTestPost((prevBatchTestPost) => ({
...prevBatchTestPost,
jsonWad: JSON.stringify(jsonWad),
}));
batchTestReassignmentPostCall();
}}
type="button"
>
<FormattedMessage id="column.name.accept" />
Expand Down Expand Up @@ -1029,12 +1055,16 @@ function BatchTestReassignmentAndCancelation() {
>
jsonWad
</button>
<button
onClick={() => {
console.log(sampleTestTypeToGetTagList);
}}
>
sampleTestTypeToGetTagList
</button>
</div>
</>
);
}

export default injectIntl(BatchTestReassignmentAndCancelation);

// post call checkup
// batchTestReassignmentPostCall final call pending
2 changes: 1 addition & 1 deletion ...ain/java/org/openelisglobal/test/controller/rest/BatchTestReassignmentRestController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public BatchTestReassignmentForm showBatchTestReassignmentUpdate(HttpServletRequ

formValidator.validate(form, result);
if (result.hasErrors()) {
saveErrors(result);
// saveErrors(result);
// return findForward(FWD_FAIL_INSERT, form);
return form;
}
Expand Down

0 comments on commit 94790fb

Please sign in to comment.