DMC/scipro
7
0
Fork 0
Code Issues45 Pull Requests6 Actions Projects1 Releases Wiki Activity

3064 PO review 1) more detailed information about missing active participations

Browse Source
This commit is contained in:
Andreas Svanberg 2023-09-27 10:27:21 +02:00
parent 68373ff250
commit 0492746493
3 changed files with 15 additions and 7 deletions

3
view/src/main/java/se/su/dsv/scipro/grading/IndividualAuthorAssessment.html

@ -63,7 +63,8 @@
<span class="fa fa-exclamation-triangle text-warning"></span>
<wicket:message key="active_participations_missing">
Not all required active participations have been registered in SciPro.
Make sure they have performed <strong wicket:id="count">[2]</strong> before sending to the examiner.
Make sure they have performed <strong wicket:id="required">[2]</strong> before sending to the examiner.
They have <strong wicket:id="completed">[1]</strong> approved participation(s) in SciPro.
</wicket:message>
</wicket:container>
<wicket:container wicket:id="active_participations_completed">

14
view/src/main/java/se/su/dsv/scipro/grading/IndividualAuthorAssessment.java

@ -103,12 +103,15 @@ public class IndividualAuthorAssessment extends GenericPanel<User> {
Project project = projectModel.getObject();
return project.getProjectType().getProjectTypeSettings().getMinimumActiveParticipationsToBeGraded();
});
IModel<Boolean> completedActiveParticipationsRequirement = LoadableDetachableModel.of(() -> {
IModel<Integer> completedParticipations = LoadableDetachableModel.of(() -> {
Project project = projectModel.getObject();
List<FinalSeminarActiveParticipation> participations = finalSeminarService.findUserParticipating(project, authorModel.getObject());
int completedParticipations = participations.size();
return completedParticipations >= minimumActiveParticipationsToBeGraded.getObject();
List<FinalSeminarActiveParticipation> participations = finalSeminarService.findUserParticipating(
project,
authorModel.getObject());
return participations.size();
});
IModel<Boolean> completedActiveParticipationsRequirement = LoadableDetachableModel.of(() ->
completedParticipations.getObject() >= minimumActiveParticipationsToBeGraded.getObject());
WebMarkupContainer activeParticipationsMissing = new WebMarkupContainer("active_participations_missing") {
@Override
@ -118,7 +121,8 @@ public class IndividualAuthorAssessment extends GenericPanel<User> {
}
};
add(activeParticipationsMissing);
activeParticipationsMissing.add(new Label("count", minimumActiveParticipationsToBeGraded));
activeParticipationsMissing.add(new Label("required", minimumActiveParticipationsToBeGraded));
activeParticipationsMissing.add(new Label("completed", completedParticipations));
WebMarkupContainer activeParticipationsCompleted = new WebMarkupContainer("active_participations_completed") {
@Override

5
view/src/main/java/se/su/dsv/scipro/grading/IndividualAuthorAssessment.utf8.properties

@ -16,5 +16,8 @@ send_to_examiner_explanation_1 = Once you've finished all the steps and the indi
send_to_examiner_explanation_2 = If all steps have been completed, click the button below, if not, finish the \
remaining tasks first and you will be able to send it.
active_participations_missing = Not all required active participations have been registered in SciPro. \
Make sure they have performed ${count} before sending to the examiner.
Please be aware that the student has performed ${completed} of the mandatory participations, \
so the student needs to perform ${required} before you can send the grading basis to the examiner. \
If the student has performed all mandatory participations anyway, you might still submit the thesis \
for examination by choosing "Send to examiner".
active_participations_completed = All required active participations performed.