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

[Bug #803] Change Zoom level in LimitingResources launches Validation exception

Browse source 
Remove validation and add method to refresh all queues

FEA: ItEr68S04BugFixing
This commit is contained in:
Diego Pino Garcia 2011-01-13 23:40:59 +01:00
parent a3d5c4a3b8
commit f88026a010
4 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ganttzk/src/main/java/org/zkoss/ganttz/util/Interval.java
View file

@ -79,7 +79,6 @@ public class Interval {
}
public Fraction getProportion(DateTime date) {
Validate.isTrue(!date.isAfter(endExclusive.toDateTimeAtStartOfDay()));
Days fromStartToDate = Days.daysBetween(startInclusive,
date.toLocalDate());
Fraction fraction = Fraction.getFraction(fromStartToDate.getDays(),

10
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java
View file

@ -36,8 +36,8 @@ import org.navalplanner.business.resources.daos.IResourceDAO;
import org.navalplanner.business.resources.entities.LimitingResourceQueue;
import org.springframework.beans.factory.annotation.Autowired;
import org.zkoss.ganttz.timetracker.TimeTracker;
import org.zkoss.ganttz.timetracker.TimeTrackerComponent;
import org.zkoss.ganttz.timetracker.TimeTracker.IDetailItemFilter;
import org.zkoss.ganttz.timetracker.TimeTrackerComponent;
import org.zkoss.ganttz.timetracker.zoom.DetailItem;
import org.zkoss.ganttz.timetracker.zoom.IZoomLevelChangedListener;
import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
@ -430,6 +430,7 @@ public class LimitingResourcesPanel extends HtmlMacroComponent {
dependencyList.clear();
queueListComponent.invalidate();
queueListComponent.afterCompose();
queueListComponent.refreshQueues();
rebuildDependencies();
}
@ -543,9 +544,10 @@ public class LimitingResourcesPanel extends HtmlMacroComponent {
}
}
horizontalPagination.setSelectedIndex(0);
if (horizontalPagination.getItems().size() < 2) {
horizontalPagination.setDisabled(true);
}
// Disable pagination if there's only one page
int size = horizontalPagination.getItems().size();
horizontalPagination.setDisabled(size == 1);
}
public void goToHorizontalPage(int interval) {

6
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueListComponent.java
View file

@ -106,6 +106,12 @@ public class QueueListComponent extends HtmlMacroComponent implements
queueComponent.removeQueueElement(element);
}
public void refreshQueues() {
for (QueueComponent each: fromQueueToComponent.values()) {
each.invalidate();
}
}
public void refreshQueue(LimitingResourceQueue queue) {
QueueComponent queueComponent = fromQueueToComponent.get(queue);
queueComponent.setLimitingResourceQueue(queue);

18
navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul
View file

@ -62,15 +62,17 @@
onSelect="limitingResourcesPanel.setZoomLevel(self.selectedItem.value);" >
</listbox>
<separator/>
<label>${i18n:_('Pagination')}:</label>
<button tooltiptext="${i18n:_('Page down')}" image="/common/img/ico_left.png" id="paginationDownButton"
onClick="limitingResourcesPanel.paginationDown();" disabled="true" />
<listbox mold="select" rows="1" visible="true" id="horizontalPagination"
onSelect="limitingResourcesPanel.goToSelectedHorizontalPage();" />
<button tooltiptext="${i18n:_('Page up')}" image="/common/img/ico_right.png" id="paginationUpButton"
onClick="limitingResourcesPanel.paginationUp();" />
<separator/>
<label>${i18n:_('Pagination')}:</label>
<button id="paginationDownButton" tooltiptext="${i18n:_('Page down')}" disabled="true"
image="/common/img/ico_left.png"
onClick="limitingResourcesPanel.paginationDown();" />
<listbox id="horizontalPagination" mold="select" rows="1" visible="true"
onSelect="limitingResourcesPanel.goToSelectedHorizontalPage();" />
<button id="paginationUpButton" tooltiptext="${i18n:_('Page up')}"
image="/common/img/ico_right.png"
onClick="limitingResourcesPanel.paginationUp();" />
</hbox>
</north>