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

ItEr49S04ValidacionEProbasFuncionaisItEr48S04: [Bug #354] Replaced the filter combo box in Criterions tab in Worker edition with a checkbox.

Browse source 
This change made the filter work correctly.
This commit is contained in:
Jacobo Aragunde Pérez 2010-03-01 18:13:03 +01:00 • committed by Javier Moran Rua
parent 5382d6f109
commit 962dd89a69
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java
View file

@ -30,9 +30,8 @@ import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.InputEvent;
import org.zkoss.zk.ui.util.GenericForwardComposer;
import org.zkoss.zul.Bandbox;
import org.zkoss.zul.Checkbox;
import org.zkoss.zul.Column;
import org.zkoss.zul.Combobox;
import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Constraint;
import org.zkoss.zul.Datebox;
import org.zkoss.zul.Grid;
@ -52,7 +51,7 @@ import org.zkoss.zul.SimpleListModel;
public class CriterionsController extends GenericForwardComposer {
private IAssignedCriterionsModel assignedCriterionsModel;
private Combobox comboboxfilter;
private Checkbox criterionFilterCheckbox;
private Grid listingCriterions;
private IMessagesForUser messages;
private Component messagesContainer;
@ -86,8 +85,7 @@ public class CriterionsController extends GenericForwardComposer {
public List<CriterionSatisfactionDTO> getCriterionSatisfactionDTOs() {
List<CriterionSatisfactionDTO> list = new ArrayList<CriterionSatisfactionDTO>();
Comboitem comboitem = comboboxfilter.getSelectedItem();
if((comboitem != null) && (comboitem.getLabel().equals("Currents"))) {
if(criterionFilterCheckbox.isChecked()) {
list.addAll(assignedCriterionsModel.getFilterCriterionSatisfactions());
}else{
list.addAll(assignedCriterionsModel.getAllCriterionSatisfactions());

8
navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul
View file

@ -5,12 +5,8 @@
<separator bar="false" spacing="20px" orient="vertical"/>
<button onClick="assignedCriterionsController.addCriterionSatisfaction();"
label="${i18n:_('Add criterion')}" />
<label class="subtitulo" value="${i18n:_('Filters')}:" />
<combobox id="comboboxfilter"
onSelect="assignedCriterionsController.reload();">
<comboitem label="${i18n:_('All')}" />
<comboitem label="${i18n:_('Current')}" />
</combobox>
<label class="subtitulo" value="${i18n:_('Show only current satisfied criteria')}" />
<checkbox id="criterionFilterCheckbox" onCheck="assignedCriterionsController.reload();" />
<separator bar="false" spacing="20px" orient="vertical"/>
</hbox>
<newdatasortablegrid id="listingCriterions" mold="paging" pageSize="10" fixedLayout="true"