DMC/scipro
7
0
Fork 0
Code Issues31 Pull Requests5 Actions Projects1 Releases Wiki Activity

3381 Fix NPE when supervisors fill in individual criteria before final thesis is uploaded

Browse Source
This commit is contained in:
Andreas Svanberg 2024-05-03 15:11:13 +02:00
parent 8ccd6156b7
commit a6d2502ebb
1 changed files with 13 additions and 4 deletions

17
view/src/main/java/se/su/dsv/scipro/grading/SendToExaminer.java

@ -264,11 +264,20 @@ public class SendToExaminer extends GenericPanel<Project> {
.map(instant -> instant.atZone(ZoneId.systemDefault()))
.map(ZonedDateTime::toLocalDate);
if (seminarDate.isPresent() && seminarDate.get().isAfter(finalThesis.getUploadDate())) {
return seminarDate.get();
}
else {
boolean hasFinalThesis = finalThesis != null;
boolean hasSeminarDate = seminarDate.isPresent();
if (hasFinalThesis && hasSeminarDate) {
if (finalThesis.getUploadDate().isAfter(seminarDate.get())) {
return finalThesis.getUploadDate();
} else {
return seminarDate.get();
}
} else if (hasFinalThesis) {
return finalThesis.getUploadDate();
} else if (hasSeminarDate) {
return seminarDate.get();
} else {
return null;
}
}