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

Refactor ResourceLoadController

Browse source 
Now each filter has its own class.

FEA: ItEr75S11PreventLooseChangesWIP
This commit is contained in:
Óscar González Fernández 2011-08-08 16:57:05 +02:00
parent 9c366dc1fa
commit 0efe2782ca
3 changed files with 668 additions and 352 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
View file

@ -95,7 +95,7 @@ public class ResourcesLoadPanel extends HtmlMacroComponent {
private int filterByNamePosition = 0;
private int numberOfGroupsByName = 10;
private int lastSelectedName = 0;
private PaginationType paginationType;
private final PaginationType paginationType;
private WeakReferencedListeners<IPaginationFilterChangedListener> nameFilterListener =
WeakReferencedListeners.create();
@ -540,14 +540,14 @@ public class ResourcesLoadPanel extends HtmlMacroComponent {
public void setInternalPaginationDisabled(boolean disabled) {
Combobox combo = ((Combobox) getFellow("filterByNameCombo"));
if(combo.isDisabled() != disabled) {
if (combo != null && combo.isDisabled() != disabled) {
filterByNamePosition = disabled? -1 :
((Integer)combo.getSelectedItemApi().getValue()).intValue();
combo.setDisabled(disabled);
}
}
public void addNameFilterListener(
public void addPaginationFilterListener(
IPaginationFilterChangedListener iFilterChangedListener) {
nameFilterListener.addListener(iFilterChangedListener);
}

1007
navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
View file

File diff suppressed because it is too large Load diff

7
navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
View file

@ -350,6 +350,13 @@ public class ResourceLoadModel implements IResourceLoadModel {
return date.toDateTimeAtStartOfDay().toDate();
}
public static LocalDate toLocal(Date date) {
if (date == null) {
return null;
}
return LocalDate.fromDateFields(date);
}
private void reattachCriteriaToShow() {
for (Criterion each : criteriaToShowList) {
criterionDAO.reattachUnmodifiedEntity(each);