97: Reformatting code
This commit is contained in:
parent
e84fc37cf6
commit
4c5e6ab961
@ -1,13 +1,12 @@
|
||||
package se.su.dsv.scipro.grading;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import org.apache.wicket.markup.html.WebMarkupContainer;
|
||||
import org.apache.wicket.markup.html.panel.Panel;
|
||||
import org.apache.wicket.model.IModel;
|
||||
import se.su.dsv.scipro.project.Project;
|
||||
import se.su.dsv.scipro.system.DegreeType;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
public class TemplatePanel extends Panel {
|
||||
|
||||
public static final String BACHELOR_CONTAINER = "bachelorContainer";
|
||||
@ -28,7 +27,6 @@ public class TemplatePanel extends Panel {
|
||||
} else {
|
||||
return (year <= 2024 && month < 11) ? BETWEEN_2017_202410 : FROM_202411;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -40,8 +38,10 @@ public class TemplatePanel extends Panel {
|
||||
@Override
|
||||
protected void onConfigure() {
|
||||
super.onConfigure();
|
||||
setVisibilityAllowed(GradingCategory.fromProjectStartDate(projectIModel.getObject().getStartDate())
|
||||
== GradingCategory.UP_TO_2016);
|
||||
setVisibilityAllowed(
|
||||
GradingCategory.fromProjectStartDate(projectIModel.getObject().getStartDate()) ==
|
||||
GradingCategory.UP_TO_2016
|
||||
);
|
||||
}
|
||||
};
|
||||
addTemplates(degreeType, upto16);
|
||||
@ -51,8 +51,10 @@ public class TemplatePanel extends Panel {
|
||||
@Override
|
||||
protected void onConfigure() {
|
||||
super.onConfigure();
|
||||
setVisibilityAllowed(GradingCategory.fromProjectStartDate(projectIModel.getObject().getStartDate())
|
||||
== GradingCategory.BETWEEN_2017_202410);
|
||||
setVisibilityAllowed(
|
||||
GradingCategory.fromProjectStartDate(projectIModel.getObject().getStartDate()) ==
|
||||
GradingCategory.BETWEEN_2017_202410
|
||||
);
|
||||
}
|
||||
};
|
||||
addTemplates(degreeType, between2017_202410);
|
||||
@ -62,8 +64,10 @@ public class TemplatePanel extends Panel {
|
||||
@Override
|
||||
protected void onConfigure() {
|
||||
super.onConfigure();
|
||||
setVisibilityAllowed(GradingCategory.fromProjectStartDate(projectIModel.getObject().getStartDate())
|
||||
== GradingCategory.FROM_202411);
|
||||
setVisibilityAllowed(
|
||||
GradingCategory.fromProjectStartDate(projectIModel.getObject().getStartDate()) ==
|
||||
GradingCategory.FROM_202411
|
||||
);
|
||||
}
|
||||
};
|
||||
addTemplates(degreeType, from202411);
|
||||
@ -99,8 +103,4 @@ public class TemplatePanel extends Panel {
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
private int getYear(final Project project) {
|
||||
return project.getStartDate().getYear();
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user