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

Merge commit '219c312441eeeba79df4b7295d9fd63542b65cd1' into HEAD

Browse Source
This commit is contained in:
Jenkins 2025-02-07 22:43:10 +01:00
commit ed59368920
2 changed files with 8 additions and 2 deletions
pom.xml
view/src/main/java/se/su/dsv/scipro/grading
ReflectionModalBodyPanel.java

2
pom.xml

@ -24,7 +24,7 @@
<!-- Dependency versions --> <!-- Dependency versions -->
<slf4j.version>2.0.7</slf4j.version> <slf4j.version>2.0.7</slf4j.version>
<log4j2.version>2.20.0</log4j2.version> <log4j2.version>2.20.0</log4j2.version>
<wicket.version>10.1.0</wicket.version> <wicket.version>10.4.0</wicket.version>
<!-- See https://hibernate.org/orm/releases/ for which version Hibernate implements --> <!-- See https://hibernate.org/orm/releases/ for which version Hibernate implements -->
<jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version> <jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version>

8
view/src/main/java/se/su/dsv/scipro/grading/ReflectionModalBodyPanel.java

@ -178,7 +178,13 @@ class ReflectionModalBodyPanel extends Panel {
public SupervisorEditReflectionForm(String id, IModel<Reflection> reflectionModel) { public SupervisorEditReflectionForm(String id, IModel<Reflection> reflectionModel) {
super(id, reflectionModel); super(id, reflectionModel);
IModel<String> reflectionTextModel = new Model<>(getReflectionText(reflectionModel.getObject())); IModel<String> reflectionTextModel = new Model<>();
Reflection reflection = reflectionModel.getObject();
if (reflection instanceof Reflection.Submitted submitted) {
reflectionTextModel.setObject(submitted.reflection());
} else if (reflection instanceof Reflection.ImprovementsNeeded improvementsNeeded) {
reflectionTextModel.setObject(improvementsNeeded.oldReflection());
}
TextArea<String> reflectionTextArea = new TextArea<>("reflection", reflectionTextModel); TextArea<String> reflectionTextArea = new TextArea<>("reflection", reflectionTextModel);
reflectionTextArea.setRequired(true); reflectionTextArea.setRequired(true);