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 +24
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 791ec65633 - Show all commits

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

@ -30,6 +30,17 @@
</div>
</div>
<wicket:enclosure>
<div class="alert alert-info">
<p>
You've requested improvements to the opposition report with the below comment.
If they do not make the requested improvements in time, they will get an automatic failing grade.
The system will notify you when they've submitted a new report.
</p>
<span wicket:id="improvements_requested"></span>
</div>
</wicket:enclosure>
<div class="mb-3">
<label>Points:</label>
<select class="form-select" wicket:id="points"></select>

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

@ -249,6 +249,19 @@ public class SeminarOppositionPanel extends Panel {
}
);
IModel<String> improvementComment = finalSeminarOpposition.map(
FinalSeminarOpposition::getSupervisorCommentForImprovements
);
add(
new Label("improvements_requested", improvementComment) {
@Override
protected void onConfigure() {
super.onConfigure();
setVisible(!getDefaultModelObjectAsString().isBlank());
}
}
);
FormComponent<OppositionCriteria.Point> pointsField = new DropDownChoice<>(
POINTS,
pointsModel,