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

OO-1068: only show toolbar if needed, don't show efficiency statement without title

parent 3013c780
No related branches found
No related tags found
No related merge requests found
......@@ -2,6 +2,7 @@
#if ($tableEmpty)
<div class="o_table_empty o_info">$tableEmptyMessage</div>
#else
#if(($hasTableSearch && !$tableEmpty) || $tableConfig.isDisplayRowCount() || ($hasFilters && $filters.size() > 0) || $hasSorters || $tableConfig.isPreferencesOffered() || $tableConfig.isDownloadOffered())
<div class="row clearfix o_table_toolbar">
<div class="col-lg-6">
#if ($hasTableSearch && !$tableEmpty)
......@@ -9,12 +10,14 @@
#end
</div>
<div class="col-lg-3 o_table_row_count">
#if ($tableConfig.isDisplayRowCount())
$numberOfElements
#if ($numberOfElements == "1")
$r.translate("table.entry")
#else
$r.translate("table.entries")
#end
#end
</div>
<div class="col-lg-3"><div class="pull-right o_table_tools">
#if ($hasFilters && $filters.size() > 0)
......@@ -52,6 +55,7 @@
#end
</div></div>
</div>
#end
$r.render("table", $tableConfig.getCssPrefix())
#end
</div>
......
......@@ -57,6 +57,7 @@ import org.olat.core.gui.translator.Translator;
import org.olat.core.id.Identity;
import org.olat.core.id.context.BusinessControl;
import org.olat.core.id.context.BusinessControlFactory;
import org.olat.core.util.StringHelper;
import org.olat.core.util.event.GenericEventListener;
import org.olat.course.CourseModule;
import org.olat.course.assessment.model.UserEfficiencyStatementLight;
......@@ -143,7 +144,9 @@ public class EfficiencyStatementsPortletRunController extends AbstractPortletRun
private List<PortletEntry<UserEfficiencyStatementLight>> convertEfficiencyStatementToPortletEntryList(List<UserEfficiencyStatementLight> items) {
List<PortletEntry<UserEfficiencyStatementLight>> convertedList = new ArrayList<PortletEntry<UserEfficiencyStatementLight>>();
for(UserEfficiencyStatementLight item:items) {
convertedList.add(new EfficiencyStatementPortletEntry(item));
if(StringHelper.containsNonWhitespace(item.getShortTitle())) {
convertedList.add(new EfficiencyStatementPortletEntry(item));
}
}
return convertedList;
}
......@@ -152,20 +155,19 @@ public class EfficiencyStatementsPortletRunController extends AbstractPortletRun
*
* @see org.olat.core.gui.control.generic.portal.AbstractPortletRunController#reloadModel(org.olat.core.gui.UserRequest, org.olat.core.gui.control.generic.portal.SortingCriteria)
*/
protected void reloadModel(SortingCriteria sortingCriteria) {
if (sortingCriteria.getSortingType() == SortingCriteria.AUTO_SORTING) {
EfficiencyStatementManager esm = EfficiencyStatementManager.getInstance();
List<UserEfficiencyStatementLight> efficiencyStatementsList = esm.findEfficiencyStatementsLight(getIdentity());
protected void reloadModel(SortingCriteria sortingCriteria) {
if (sortingCriteria.getSortingType() == SortingCriteria.AUTO_SORTING) {
EfficiencyStatementManager esm = EfficiencyStatementManager.getInstance();
List<UserEfficiencyStatementLight> efficiencyStatementsList = esm.findEfficiencyStatementsLight(getIdentity());
efficiencyStatementsList = getSortedList(efficiencyStatementsList, sortingCriteria);
List<PortletEntry<UserEfficiencyStatementLight>> entries = convertEfficiencyStatementToPortletEntryList(efficiencyStatementsList);
efficiencyStatementsListModel = new EfficiencyStatementsTableDataModel(entries,2);
tableCtr.setTableDataModel(efficiencyStatementsListModel);
tableCtr.setTableDataModel(efficiencyStatementsListModel);
efficiencyStatementsList = getSortedList(efficiencyStatementsList, sortingCriteria);
List<PortletEntry<UserEfficiencyStatementLight>> entries = convertEfficiencyStatementToPortletEntryList(efficiencyStatementsList);
efficiencyStatementsListModel = new EfficiencyStatementsTableDataModel(entries,2);
tableCtr.setTableDataModel(efficiencyStatementsListModel);
} else {
reloadModel(this.getPersistentManuallySortedItems());
reloadModel(getPersistentManuallySortedItems());
}
}
}
/**
*
......
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