DMC/scipro
7
0
Fork 0
Code Issues 32 Pull Requests 3 Actions Projects 1 Wiki Activity

WIP: Allow supervisors to request improvements from final seminar opponents #78

Draft
ansv7779 wants to merge 23 commits from opponent-completion into develop
pull from: opponent-completion
merge into: DMC:develop
Conversation 1 Commits 23 Files Changed 42 +22 -3
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 45c21e3fe4 - Show all commits

20
view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanel.java
View File

@ -2,6 +2,9 @@ package se.su.dsv.scipro.finalseminar;
import com.google.common.eventbus.EventBus;
import jakarta.inject.Inject;
import java.time.Duration;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@ -357,8 +360,21 @@ public class SeminarOppositionPanel extends Panel {
@Override
protected void onSubmit() {
System.out.println("Request improvements submitted");
System.out.println("Feedback to opponent: " + feedbackToOpponentModel.getObject());
// TODO: return deadline
finalSeminarOppositionService.requestImprovements(getModelObject(), feedbackToOpponentModel.getObject());
record ImprovementFeedback(String fullName, ZonedDateTime deadline) {}
ZonedDateTime deadline = getModelObject()
.getFinalSeminar()
.getStartDate()
.toInstant()
.plus(Duration.ofDays(10))
.atZone(ZoneId.of("Europe/Stockholm"));
success(
getString("feedback.opponent.requested.improvements", () ->
new ImprovementFeedback(getModelObject().getUser().getFullName(), deadline)
)
);
}
}
}

5
view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanel.properties
View File

@ -16,4 +16,7 @@ removed= Opponent ${user.fullName} successfully removed
opposition.report.removed= Opposition report successfully removed
are.you.sure= Are you sure you want to remove this opponent report?
no.opponents= There are no opponents registered yet.
noOppositionReportYet= No opposition report has been submitted yet.
noOppositionReportYet= No opposition report has been submitted yet.
feedback.opponent.requested.improvements = You've requested improvements from ${fullName}. \
They have until ${deadline} to make the changes. If they fail to resubmit by that point they \
will automatically get a failing grade.