DMC/scipro
7
0
Fork 0
Code Issues 23 Pull Requests 2 Actions Projects 1 Releases Wiki Activity

Allow supervisors to request improvements from final seminar opponents #78

Merged
niat8586 merged 41 commits from opponent-completion into develop 2025-03-05 10:05:38 +01:00
Conversation 8 Commits 41 Files Changed 53 +12 -2
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1b36ad7987 - Show all commits

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

@ -58,6 +58,11 @@
</form>
<form wicket:id="request_improvements">
<p>
Once you request improvements the student have a limited time to make the requested changes.
If they do not make the requested improvements in time, they will get an automatic failing grade.
You will be notified when they've submitted a new report.
</p>
<div class="mb-3">
<label class="form-label" wicket:for="feedback_to_opponent">
Provide feedback to the opponent on how to improve the opposition

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

@ -323,12 +323,17 @@ public class SeminarOppositionPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
FinalSeminarOpposition opposition = getModelObject();
setVisibilityAllowed(
startDateHasPassed() &&
getModelObject().getPoints() == null &&
getModelObject().getFeedback() == null &&
opposition.getPoints() == null &&
opposition.getFeedback() == null &&
isHeadSupervisor()
);
boolean hasRequestedImprovements = opposition.getImprovementsRequestedAt() != null;
boolean reportIsSubmitted =
opposition.getOppositionReport() != null && opposition.getOppositionReport().isSubmitted();
setEnabled(!hasRequestedImprovements || reportIsSubmitted);
}
}