Skip to content

Commit

Permalink
fix(batchTestReAssignemnt/Cancelation): POST(updates-on-backend) requ…
Browse files Browse the repository at this point in the history 
…est working
  • Loading branch information
@adityadeshlahre
adityadeshlahre committed Aug 12, 2024
1 parent 94790fb commit a301070
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 85 deletions.
65 changes: 4 additions & 61 deletions ...ponents/admin/BatchTestReassignmentAndCancellation/BatchTestReassignmentAndCancelation.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function BatchTestReassignmentAndCancelation() {
const [saveButton, setSaveButton] = useState(true);
const [isLoading, setIsLoading] = useState(true);
const [currentTest, setCurrentTest] = useState(true);
const [replaceWith, setReplaceWith] = useState(false);
const [replaceWith, setReplaceWith] = useState(true);
const [batchTestGet, setBatchTestGet] = useState(null);
const [batchTestPost, setBatchTestPost] = useState(null);
const [sampleTypeListShow, setSampleTypeListShow] = useState([]);
Expand All @@ -81,7 +81,6 @@ function BatchTestReassignmentAndCancelation() {
noChangeTechReject: [],
noChangeBioReject: [],
noChangeNotValidated: [],
replace: "",
});
const [changesToShow, setChangesToShow] = useState(false);

Expand Down Expand Up @@ -346,7 +345,7 @@ function BatchTestReassignmentAndCancelation() {
setSampleTestTypeToGetTagList(updatedList);
}

const updatedReplace = updatedList.map((item) => item.id).join(",");
const updatedReplace = updatedList.map((item) => item.id);
setJsonWad((prevJsonWad) => ({
...prevJsonWad,
replace: updatedReplace,
Expand All @@ -359,7 +358,7 @@ function BatchTestReassignmentAndCancelation() {
(_, index) => index !== indexToRemove,
);

const updatedReplace = updatedTags.map((item) => item.id).join(",");
const updatedReplace = updatedTags.map((item) => item.id);
setJsonWad((prevJsonWad) => ({
...prevJsonWad,
replace: updatedReplace,
Expand Down Expand Up @@ -517,7 +516,7 @@ function BatchTestReassignmentAndCancelation() {
if (replaceWith) {
setJsonWad((prevJsonWad) => ({
...prevJsonWad,
replace: "",
replace: [],
}));
} else {
const selectedTestIds = sampleTestTypeToGetTagList
Expand Down Expand Up @@ -1006,62 +1005,6 @@ function BatchTestReassignmentAndCancelation() {
<></>
)}
</div>
<button
onClick={() => {
console.log(batchTestGet.sampleList);
}}
>
batchTestGet.sampleList
</button>
<button
onClick={() => {
console.log(batchTestPost);
}}
>
batchTestPost
</button>
<button
onClick={() => {
console.log(sampleTypeToGetId);
}}
>
sampleTypeToGetId
</button>
<button
onClick={() => {
console.log(sampleTypeToGetIdData);
}}
>
sampleTypeToGetIdData
</button>
<button
onClick={() => {
console.log(sampleTypeToGetIdDataTag);
}}
>
sampleTypeToGetIdDataTag
</button>
<button
onClick={() => {
console.log(sampleTypeTestIdToGetIdPendingData);
}}
>
sampleTypeTestIdToGetIdPendingData
</button>
<button
onClick={() => {
console.log(jsonWad);
}}
>
jsonWad
</button>
<button
onClick={() => {
console.log(sampleTestTypeToGetTagList);
}}
>
sampleTestTypeToGetTagList
</button>
</div>
</>
);
Expand Down
47 changes: 23 additions & 24 deletions ...ain/java/org/openelisglobal/test/controller/rest/BatchTestReassignmentRestController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,14 @@ private void manageAnalysis(String jsonString, List<Analysis> cancelAnalysis, Li
try {
JSONObject obj = (JSONObject) parser.parse(jsonString);
List<Test> newTests = getNewTestsFromJson(obj, parser);
List<Analysis> changedNotStarted = getAnalysisFromJson((String) obj.get("changeNotStarted"), parser);
List<Analysis> noChangedNotStarted = getAnalysisFromJson((String) obj.get("noChangeNotStarted"), parser);
List<Analysis> changeTechReject = getAnalysisFromJson((String) obj.get("changeTechReject"), parser);
List<Analysis> noChangeTechReject = getAnalysisFromJson((String) obj.get("noChangeTechReject"), parser);
List<Analysis> changeBioReject = getAnalysisFromJson((String) obj.get("changeBioReject"), parser);
List<Analysis> noChangeBioReject = getAnalysisFromJson((String) obj.get("noChangeBioReject"), parser);
List<Analysis> changeNotValidated = getAnalysisFromJson((String) obj.get("changeNotValidated"), parser);
List<Analysis> noChangeNotValidated = getAnalysisFromJson((String) obj.get("noChangeNotValidated"), parser);
List<Analysis> changedNotStarted = getAnalysisFromJson(obj.get("changeNotStarted"), parser);
List<Analysis> noChangedNotStarted = getAnalysisFromJson(obj.get("noChangeNotStarted"), parser);
List<Analysis> changeTechReject = getAnalysisFromJson(obj.get("changeTechReject"), parser);
List<Analysis> noChangeTechReject = getAnalysisFromJson(obj.get("noChangeTechReject"), parser);
List<Analysis> changeBioReject = getAnalysisFromJson(obj.get("changeBioReject"), parser);
List<Analysis> noChangeBioReject = getAnalysisFromJson(obj.get("noChangeBioReject"), parser);
List<Analysis> changeNotValidated = getAnalysisFromJson(obj.get("changeNotValidated"), parser);
List<Analysis> noChangeNotValidated = getAnalysisFromJson(obj.get("noChangeNotValidated"), parser);

verifyStatusNotChanged(changedNotStarted, noChangedNotStarted, StatusService.AnalysisStatus.NotStarted,
changeBeans);
Expand Down Expand Up @@ -236,38 +236,37 @@ private String getStatusName(StatusService.AnalysisStatus status) {
private List<Test> getNewTestsFromJson(JSONObject obj, JSONParser parser) {
List<Test> replacementTestList = new ArrayList<>();

String replacementTests = (String) obj.get("replace");
if (replacementTests == null) {
return replacementTestList;
}

JSONArray replacementTestArray;
try {
replacementTestArray = (JSONArray) parser.parse(replacementTests);
} catch (ParseException e) {
LogEvent.logDebug(e);
JSONArray replacementTestArray = (JSONArray) obj.get("replace");
if (replacementTestArray == null) {
return replacementTestList;
}

for (Object testIdObject : replacementTestArray) {
replacementTestList.add(SpringContext.getBean(TestService.class).get((String) testIdObject));
String testId = (String) testIdObject;
replacementTestList.add(SpringContext.getBean(TestService.class).get((String) testId));
}

return replacementTestList;
}

private List<Analysis> getAnalysisFromJson(String sampleIdList, JSONParser parser) {
private List<Analysis> getAnalysisFromJson(Object sampleIdList, JSONParser parser) {
List<Analysis> analysisList = new ArrayList<>();

if (sampleIdList == null) {
return analysisList;
}

JSONArray modifyAnalysisArray;
try {
modifyAnalysisArray = (JSONArray) parser.parse(sampleIdList);
} catch (ParseException e) {
LogEvent.logDebug(e);
if (sampleIdList instanceof String) {
try {
modifyAnalysisArray = (JSONArray) parser.parse((String) sampleIdList);
} catch (ParseException e) {
LogEvent.logDebug(e);
return analysisList;
}
} else if (sampleIdList instanceof JSONArray) {
modifyAnalysisArray = (JSONArray) sampleIdList;
} else {
return analysisList;
}

Expand Down

0 comments on commit a301070

Please sign in to comment.