DMC/scipro
7
0
Fork 0
Code Issues41 Pull Requests8 Actions Projects1 Releases Wiki Activity

3064 PO text improvements

Browse Source
This commit is contained in:
Andreas Svanberg 2023-10-13 10:35:23 +02:00
parent 261fcd4629
commit 97de2b159f
3 changed files with 13 additions and 4 deletions

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

@ -69,8 +69,14 @@
<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="required">[2]</strong> before sending to the examiner.
They have <strong wicket:id="completed">[1]</strong> approved participation(s) in SciPro.
Please be aware that the student has performed <strong wicket:id="completed"></strong>
of the <strong wicket:id="required"></strong> mandatory participations.
The student needs to perform <strong wicket:id="left_to_do"></strong> more 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".
</wicket:message>
</wicket:container>
<wicket:container wicket:id="active_participations_completed">

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

@ -112,6 +112,8 @@ public class IndividualAuthorAssessment extends GenericPanel<User> {
authorModel.getObject());
return participations.size();
});
IModel<Integer> leftToDo = minimumActiveParticipationsToBeGraded
.combineWith(completedParticipations, (required, completed) -> required - completed);
IModel<Boolean> completedActiveParticipationsRequirement = LoadableDetachableModel.of(() ->
completedParticipations.getObject() >= minimumActiveParticipationsToBeGraded.getObject());
@ -125,6 +127,7 @@ public class IndividualAuthorAssessment extends GenericPanel<User> {
add(activeParticipationsMissing);
activeParticipationsMissing.add(new Label("required", minimumActiveParticipationsToBeGraded));
activeParticipationsMissing.add(new Label("completed", completedParticipations));
activeParticipationsMissing.add(new Label("left_to_do", leftToDo));
WebMarkupContainer activeParticipationsCompleted = new WebMarkupContainer("active_participations_completed") {
@Override

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

@ -16,8 +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. \
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. \
Please be aware that the student has performed ${completed} of the ${required} mandatory participations. \
The student needs to perform ${left_to_do} more 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.