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

3262 Improve information available to students about their ideas

Browse Source 
Show when the course starts
Better status message when it's not yet matched to a supervisor
This commit is contained in:
Andreas Svanberg 2024-04-03 14:15:34 +02:00
parent 44aa894322
commit 17306630c5
1 changed files with 19 additions and 1 deletions

20
view/src/main/java/se/su/dsv/scipro/match/ProjectMyIdeasPanel.java

@ -106,7 +106,25 @@ public class ProjectMyIdeasPanel extends Panel {
columns.add(new AbstractColumn<>(Model.of("Status"), "match.status") {
@Override
public void populateItem(Item<ICellPopulator<Idea>> item, String id, IModel<Idea> model) {
item.add(new StudentIdeaStatusColumnPanel(id, model));
item.add(new Label(id, model.map(idea -> switch (idea.getMatchStatus()) {
case UNMATCHED -> "Submitted, waiting for matching by administrator";
case MATCHED -> {
if (applicationPeriodService.courseStartHasPassed(idea.getApplicationPeriod())) {
yield "Matched, project creation delayed. This is under investigation and handled manually. No action needed from you.";
} else {
yield "Matched, awaiting course start date";
}
}
case COMPLETED -> "Matched, project started";
case INACTIVE -> "Inactive";
})));
}
});
columns.add(new AbstractColumn<>(Model.of("Course start date")) {
@Override
public void populateItem(Item<ICellPopulator<Idea>> item, String id, IModel<Idea> iModel) {
item.add(new Label(id, iModel.map(Idea::getApplicationPeriod).map(ApplicationPeriod::getCourseStartDate)));
}
});