RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improved graphical appearance of filter parameters configuration widgets

Browse source 
FEA: ItEr77S15FilteringEnhancements
This commit is contained in:
Lorenzo Tilve Álvaro 2013-02-08 13:36:17 +01:00
parent 210c111b62
commit 8ab5db2195
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java
View file

@ -19,9 +19,11 @@
package org.libreplan.web.users.settings;
import java.util.Collections;
import java.util.List;
import org.apache.commons.lang.Validate;
import org.hibernate.annotations.Sort;
import org.libreplan.business.calendars.daos.IBaseCalendarDAO;
import org.libreplan.business.calendars.entities.BaseCalendar;
import org.libreplan.business.common.exceptions.InstanceNotFoundException;
@ -103,6 +105,7 @@ public class SettingsModel implements ISettingsModel {
for (Label label : allLabels) {
label.getType().getName();
}
Collections.sort(allLabels);
}
@Transactional(readOnly = true)
@ -112,6 +115,7 @@ public class SettingsModel implements ISettingsModel {
for (Criterion criterion : allCriteria) {
criterion.getType().getName();
}
Collections.sort(allCriteria);
}
@Transactional(readOnly = true)

14
libreplan-webapp/src/main/webapp/myaccount/settings.zul
View file

@ -127,11 +127,12 @@
id="projectsFilterLabelBandboxSearch"
finder="LabelBandboxFinder"
model="@{settingsController.allLabels}"
selectedElement="@{settingsController.projectsFilterLabel}" />
selectedElement="@{settingsController.projectsFilterLabel}"
widthListbox="450px" widthBandbox="200px"/>
<label value="${i18n:_('Projects since')}" />
<intbox id="projectsFilterPeriodSince" value="@{settingsController.projectsFilterPeriodSince}" />
<intbox id="projectsFilterPeriodSince" value="@{settingsController.projectsFilterPeriodSince}" width="50px"/>
<label value="${i18n:_('months to')}" />
<intbox id="projectsFilterPeriodTo" value="@{settingsController.projectsFilterPeriodTo}" />
<intbox id="projectsFilterPeriodTo" value="@{settingsController.projectsFilterPeriodTo}" width="50px"/>
</hbox>
</row>
<row>
@ -143,11 +144,12 @@
id="resourcesLoadFilterCriterionBandboxSearch"
finder="CriterionBandboxFinder"
model="@{settingsController.allCriteria}"
selectedElement="@{settingsController.resourcesLoadFilterCriterion}" />
selectedElement="@{settingsController.resourcesLoadFilterCriterion}"
widthListbox="450px" widthBandbox="200px"/>
<label value="${i18n:_('Resources load since')}" />
<intbox id="resourcesLoadFilterPeriodSince" value="@{settingsController.resourcesLoadFilterPeriodSince}" />
<intbox id="resourcesLoadFilterPeriodSince" value="@{settingsController.resourcesLoadFilterPeriodSince}" width="50px"/>
<label value="${i18n:_('months to')}" />
<intbox id="resourcesLoadFilterPeriodTo" value="@{settingsController.resourcesLoadFilterPeriodTo}" />
<intbox id="resourcesLoadFilterPeriodTo" value="@{settingsController.resourcesLoadFilterPeriodTo}" width="50px"/>
</hbox>
</row>
</rows>