DMC/scipro
7
0
Fork 0
Code Issues42 Pull Requests4 Actions Projects1 Releases Wiki Activity

2984 PO 3) Fix stale state when completing steps

Browse Source
This commit is contained in:
Andreas Svanberg 2023-10-25 12:31:06 +02:00
parent 841dfbc8a8
commit 7047618682
1 changed files with 3 additions and 3 deletions

6
view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingReportPage.java

@ -65,19 +65,19 @@ public class SupervisorGradingReportPage extends AbstractSupervisorProjectDetail
super(pp);
IModel<Boolean> hasApprovedFinalThesis =
LoadableDetachableModel.of(() -> finalThesisService.findByProject(projectModel.getObject()))
projectModel.map(finalThesisService::findByProject)
.filter(ft -> ft.getStatus() == FinalThesis.Status.APPROVED)
.isPresent();
add(newGreenHighlight("step_final_thesis", hasApprovedFinalThesis, new ResourceModel("step_final_thesis")));
IModel<Boolean> hasCheckedForPlagiarism =
LoadableDetachableModel.of(() -> finalThesisService.findByProject(projectModel.getObject()))
projectModel.map(finalThesisService::findByProject)
.map(FinalThesis::getTextMatchingDocument)
.isPresent();
add(newGreenHighlight("step_plagiarism", hasCheckedForPlagiarism, new ResourceModel("step_plagiarism")));
IModel<Boolean> hasProvidedPublicationMetadata =
LoadableDetachableModel.of(() -> publicationMetadataService.getByProject(projectModel.getObject()))
projectModel.map(publicationMetadataService::getByProject)
.filter(metadata -> notBlank(metadata.getAbstractEnglish()) || notBlank(metadata.getAbstractSwedish()))
.filter(metadata -> notBlank(metadata.getKeywordsEnglish()) || notBlank(metadata.getKeywordsSwedish()))
.isPresent();