97: Reformat code
This commit is contained in:
parent
9475937177
commit
53fb3e983a
@ -1,6 +1,9 @@
|
||||
package se.su.dsv.scipro.grading;
|
||||
|
||||
import jakarta.inject.Inject;
|
||||
import java.time.LocalDate;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import org.apache.wicket.markup.html.WebMarkupContainer;
|
||||
import org.apache.wicket.markup.html.basic.Label;
|
||||
import org.apache.wicket.markup.html.list.ListItem;
|
||||
@ -13,10 +16,6 @@ import se.su.dsv.scipro.report.GradeLimit;
|
||||
import se.su.dsv.scipro.report.GradingReportTemplate;
|
||||
import se.su.dsv.scipro.system.DegreeType;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class TemplatePanel extends Panel {
|
||||
|
||||
public static final String BACHELOR_CONTAINER = "bachelorContainer";
|
||||
@ -49,14 +48,18 @@ public class TemplatePanel extends Panel {
|
||||
final DegreeType degreeType = project.getProjectType().getDegreeType();
|
||||
|
||||
IModel<GradingReportTemplate> grtModel = LoadableDetachableModel.of(() ->
|
||||
gradingReportTemplateService.getCurrentTemplate(projectIModel.getObject().getProjectType(),
|
||||
projectIModel.getObject().getStartDate()));
|
||||
gradingReportTemplateService.getCurrentTemplate(
|
||||
projectIModel.getObject().getProjectType(),
|
||||
projectIModel.getObject().getStartDate()
|
||||
)
|
||||
);
|
||||
|
||||
final WebMarkupContainer upto16 = new WebMarkupContainer("upto2016") {
|
||||
@Override
|
||||
protected void onConfigure() {
|
||||
super.onConfigure();
|
||||
setVisibilityAllowed(grtModel.getObject() == null &&
|
||||
setVisibilityAllowed(
|
||||
grtModel.getObject() == null &&
|
||||
GradingCategory.fromProjectStartDate(projectIModel.getObject().getStartDate()) ==
|
||||
GradingCategory.UP_TO_2016
|
||||
);
|
||||
@ -69,7 +72,8 @@ public class TemplatePanel extends Panel {
|
||||
@Override
|
||||
protected void onConfigure() {
|
||||
super.onConfigure();
|
||||
setVisibilityAllowed(grtModel.getObject() == null &&
|
||||
setVisibilityAllowed(
|
||||
grtModel.getObject() == null &&
|
||||
GradingCategory.fromProjectStartDate(projectIModel.getObject().getStartDate()) ==
|
||||
GradingCategory.BETWEEN_2017_202410
|
||||
);
|
||||
@ -133,7 +137,7 @@ public class TemplatePanel extends Panel {
|
||||
return list;
|
||||
}
|
||||
|
||||
private record GradeWithPointRange (String grade, int lowerLimit, int upperLimit) { }
|
||||
private record GradeWithPointRange(String grade, int lowerLimit, int upperLimit) {}
|
||||
|
||||
private class GradeLimitsContainer extends WebMarkupContainer {
|
||||
|
||||
@ -147,9 +151,7 @@ public class TemplatePanel extends Panel {
|
||||
protected void populateItem(ListItem<GradeWithPointRange> item) {
|
||||
IModel<String> s = item
|
||||
.getModel()
|
||||
.map(
|
||||
gpr -> "[" + gpr.grade() + "] " + gpr.lowerLimit() + " - " + gpr.upperLimit()
|
||||
);
|
||||
.map(gpr -> "[" + gpr.grade() + "] " + gpr.lowerLimit() + " - " + gpr.upperLimit());
|
||||
item.add(new Label("gradewithlimits", s));
|
||||
add(item);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user