Skip to content
Snippets Groups Projects
Commit ea8af5f5 authored by srosse's avatar srosse
Browse files

OO-2397: add show all in some filters list

parent f48e6926
No related branches found
No related tags found
No related merge requests found
Showing with 27 additions and 4 deletions
...@@ -35,6 +35,7 @@ public class FlexiTableFilter { ...@@ -35,6 +35,7 @@ public class FlexiTableFilter {
private final FlexiTableFilterIconRenderer renderer; private final FlexiTableFilterIconRenderer renderer;
private boolean selected; private boolean selected;
private boolean showAll = false;
public FlexiTableFilter(String label, String filter) { public FlexiTableFilter(String label, String filter) {
this.label = label; this.label = label;
...@@ -43,6 +44,14 @@ public class FlexiTableFilter { ...@@ -43,6 +44,14 @@ public class FlexiTableFilter {
this.iconLeftCSS = null; this.iconLeftCSS = null;
} }
public FlexiTableFilter(String label, String filter, boolean showAll) {
this.label = label;
this.filter = filter;
this.showAll = showAll;
this.renderer = null;
this.iconLeftCSS = null;
}
public FlexiTableFilter(String label, String filter, String iconLeftCSS) { public FlexiTableFilter(String label, String filter, String iconLeftCSS) {
this.label = label; this.label = label;
this.filter = filter; this.filter = filter;
...@@ -65,6 +74,14 @@ public class FlexiTableFilter { ...@@ -65,6 +74,14 @@ public class FlexiTableFilter {
return filter; return filter;
} }
public boolean isShowAll() {
return showAll;
}
public void setShowAll(boolean showAll) {
this.showAll = showAll;
}
public String getIconLeftCSS() { public String getIconLeftCSS() {
return iconLeftCSS; return iconLeftCSS;
} }
......
...@@ -271,7 +271,7 @@ public abstract class AbstractFlexiTableRenderer extends DefaultComponentRendere ...@@ -271,7 +271,7 @@ public abstract class AbstractFlexiTableRenderer extends DefaultComponentRendere
filter.getIconRenderer().render(sb, filter, ftE.getComponent(), ftE.getTranslator()); filter.getIconRenderer().render(sb, filter, ftE.getComponent(), ftE.getTranslator());
} }
sb.append(filter.getLabel()).append("</a></li>"); sb.append(filter.getLabel()).append("</a></li>");
if(filter.isSelected()) { if(filter.isSelected() && !filter.isShowAll()) {
selected = filter.getLabel(); selected = filter.getLabel();
} }
} }
......
...@@ -246,8 +246,8 @@ public class IdentityAssessmentOverviewController extends FormBasicController im ...@@ -246,8 +246,8 @@ public class IdentityAssessmentOverviewController extends FormBasicController im
if (allowTableFiltering) { if (allowTableFiltering) {
List<FlexiTableFilter> filters = new ArrayList<>(); List<FlexiTableFilter> filters = new ArrayList<>();
//filters.add(new FlexiTableFilter(translate("nodesoverview.filter.discardEmptyNodes"), "discardEmptyNodes")); filters.add(new FlexiTableFilter(translate("filter.showAll"), "showAll", true));
//filters.add(new FlexiTableFilter(translate("nodesoverview.filter.showEmptyNodes"), "showEmptyNodes")); filters.add(FlexiTableFilter.SPACER);
filters.add(new FlexiTableFilter(translate("filter.passed"), "passed")); filters.add(new FlexiTableFilter(translate("filter.passed"), "passed"));
filters.add(new FlexiTableFilter(translate("filter.failed"), "failed")); filters.add(new FlexiTableFilter(translate("filter.failed"), "failed"));
filters.add(new FlexiTableFilter(translate("filter.inProgress"), "inProgress")); filters.add(new FlexiTableFilter(translate("filter.inProgress"), "inProgress"));
......
...@@ -247,6 +247,8 @@ public class IdentityListCourseNodeController extends FormBasicController implem ...@@ -247,6 +247,8 @@ public class IdentityListCourseNodeController extends FormBasicController implem
tableEl.setMultiSelect(!coachCourseEnv.isCourseReadOnly()); tableEl.setMultiSelect(!coachCourseEnv.isCourseReadOnly());
List<FlexiTableFilter> filters = new ArrayList<>(); List<FlexiTableFilter> filters = new ArrayList<>();
filters.add(new FlexiTableFilter(translate("filter.showAll"), "showAll", true));
filters.add(FlexiTableFilter.SPACER);
filters.add(new FlexiTableFilter(translate("filter.passed"), "passed")); filters.add(new FlexiTableFilter(translate("filter.passed"), "passed"));
filters.add(new FlexiTableFilter(translate("filter.failed"), "failed")); filters.add(new FlexiTableFilter(translate("filter.failed"), "failed"));
filters.add(new FlexiTableFilter(translate("filter.inProgress"), "inProgress")); filters.add(new FlexiTableFilter(translate("filter.inProgress"), "inProgress"));
......
...@@ -83,6 +83,8 @@ public class IdentityListCourseNodeTableModel extends DefaultFlexiTableDataModel ...@@ -83,6 +83,8 @@ public class IdentityListCourseNodeTableModel extends DefaultFlexiTableDataModel
filteredRows.add(row); filteredRows.add(row);
} }
} }
} else {
filteredRows.addAll(backups);
} }
super.setObjects(filteredRows); super.setObjects(filteredRows);
} else { } else {
......
...@@ -29,6 +29,7 @@ filter.groups=$org.olat.modules.assessment.ui\:filter.groups ...@@ -29,6 +29,7 @@ filter.groups=$org.olat.modules.assessment.ui\:filter.groups
filter.inProgress=$org.olat.modules.assessment.ui\:filter.inProgress filter.inProgress=$org.olat.modules.assessment.ui\:filter.inProgress
filter.inReview=$org.olat.modules.assessment.ui\:filter.inReview filter.inReview=$org.olat.modules.assessment.ui\:filter.inReview
filter.passed=$org.olat.modules.assessment.ui\:filter.passed filter.passed=$org.olat.modules.assessment.ui\:filter.passed
filter.showAll=Alle anzeigen
generate.certificate=$org.olat.course.certificate.ui\:generate.certificate generate.certificate=$org.olat.course.certificate.ui\:generate.certificate
groups=Gruppen groups=Gruppen
msg.certificate.pending=$org.olat.course.certificate.ui\:msg.certificate.pending msg.certificate.pending=$org.olat.course.certificate.ui\:msg.certificate.pending
......
...@@ -29,6 +29,7 @@ filter.groups=$org.olat.modules.assessment.ui\:filter.groups ...@@ -29,6 +29,7 @@ filter.groups=$org.olat.modules.assessment.ui\:filter.groups
filter.inProgress=$org.olat.modules.assessment.ui\:filter.inProgress filter.inProgress=$org.olat.modules.assessment.ui\:filter.inProgress
filter.inReview=$org.olat.modules.assessment.ui\:filter.inReview filter.inReview=$org.olat.modules.assessment.ui\:filter.inReview
filter.passed=$org.olat.modules.assessment.ui\:filter.passed filter.passed=$org.olat.modules.assessment.ui\:filter.passed
filter.showAll=Show all
generate.certificate=$org.olat.course.certificate.ui\:generate.certificate generate.certificate=$org.olat.course.certificate.ui\:generate.certificate
groups=Groups groups=Groups
msg.certificate.pending=$org.olat.course.certificate.ui\:msg.certificate.pending msg.certificate.pending=$org.olat.course.certificate.ui\:msg.certificate.pending
......
...@@ -225,7 +225,7 @@ public class RepositoryEntryListController extends FormBasicController ...@@ -225,7 +225,7 @@ public class RepositoryEntryListController extends FormBasicController
private void initFilters(FlexiTableElement tableElement) { private void initFilters(FlexiTableElement tableElement) {
List<FlexiTableFilter> filters = new ArrayList<>(16); List<FlexiTableFilter> filters = new ArrayList<>(16);
filters.add(new FlexiTableFilter(translate("filter.show.all"), Filter.showAll.name())); filters.add(new FlexiTableFilter(translate("filter.show.all"), Filter.showAll.name(), true));
filters.add(FlexiTableFilter.SPACER); filters.add(FlexiTableFilter.SPACER);
filters.add(new FlexiTableFilter(translate("filter.current.courses"), Filter.currentCourses.name())); filters.add(new FlexiTableFilter(translate("filter.current.courses"), Filter.currentCourses.name()));
filters.add(new FlexiTableFilter(translate("filter.upcoming.courses"), Filter.upcomingCourses.name())); filters.add(new FlexiTableFilter(translate("filter.upcoming.courses"), Filter.upcomingCourses.name()));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment