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

ItEr59S07RFAspectosGraficosRecursoLimitantesItEr58S08: Fixed behaviour and defective states of pagination buttons

Browse source
This commit is contained in:
Lorenzo Tilve 2010-06-09 17:56:41 +02:00 • committed by Javier Moran Rua
parent 6a2a21f7bd
commit 95ca059c4a
3 changed files with 26 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -136,12 +136,6 @@ public interface ILimitingResourceQueueModel {
void removeUnassignedLimitingResourceQueueElement(
LimitingResourceQueueElement element);
List<LimitingResourceQueue> getAssignableQueues(
LimitingResourceQueueElement element);
void init(LimitingResourceQueueElement element);
boolean userCanRead(Order order, String loginName);
}

1
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java
View file

@ -60,6 +60,7 @@ import org.zkoss.zul.Checkbox;
import org.zkoss.zul.Grid;
import org.zkoss.zul.Hbox;
import org.zkoss.zul.Label;
import org.zkoss.zul.Listbox;
import org.zkoss.zul.Messagebox;
import org.zkoss.zul.Row;
import org.zkoss.zul.RowRenderer;

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

@ -94,17 +94,15 @@ public class LimitingResourcesPanel extends HtmlMacroComponent {
private Component insertionPointTimetracker;
public void paginationDown() {
paginatorFilter.previous();
reloadPanelComponents();
horizontalPagination.setSelectedIndex(Math.max(0, horizontalPagination
.getSelectedIndex()) + 1);
horizontalPagination.setSelectedIndex(horizontalPagination
.getSelectedIndex() - 1);
goToSelectedHorizontalPage();
}
public void paginationUp() {
paginatorFilter.next();
reloadPanelComponents();
horizontalPagination.setSelectedIndex(Math.max(0, horizontalPagination
.getSelectedIndex()) + 1);
horizontalPagination.setSelectedIndex(Math.max(1, horizontalPagination
.getSelectedIndex() + 1));
goToSelectedHorizontalPage();
}
@Autowired
@ -153,7 +151,8 @@ public class LimitingResourcesPanel extends HtmlMacroComponent {
treeModel = createModelForTree();
timeTrackerComponent = timeTrackerForLimitingResourcesPanel(timeTracker);
queueListComponent = new QueueListComponent(timeTracker, treeModel);
queueListComponent = new QueueListComponent(this, timeTracker,
treeModel);
leftPane = new LimitingResourcesLeftPane(treeModel, queueListComponent);
registerNeededScripts();
@ -267,7 +266,7 @@ public class LimitingResourcesPanel extends HtmlMacroComponent {
.setSelectedIndex(timeTracker.getDetailLevel().ordinal() - 2);
// Pagination stuff
paginationUpButton.setDisabled(isLastPage());
paginationUpButton.setDisabled(paginatorFilter.isLastPage());
paginatorFilter.setInterval(timeTracker.getRealInterval());
timeTracker.setFilter(paginatorFilter);
@ -302,8 +301,6 @@ public class LimitingResourcesPanel extends HtmlMacroComponent {
// Position in first page
paginatorFilter.goToHorizontalPage(0);
reloadComponent();
queueListComponent.invalidate();
queueListComponent.afterCompose();
rebuildDependencies();
}
@ -364,10 +361,6 @@ public class LimitingResourcesPanel extends HtmlMacroComponent {
}
}
private boolean isLastPage() {
return true;
}
private LimitingDependencyList generateDependencyComponentsList() {
Map<LimitingResourceQueueElement, QueueTask> queueElementsMap = queueListComponent
.getLimitingResourceElementToQueueTaskMap();
@ -456,17 +449,9 @@ public class LimitingResourcesPanel extends HtmlMacroComponent {
public void goToSelectedHorizontalPage() {
paginatorFilter.goToHorizontalPage(horizontalPagination
.getSelectedIndex());
doDirectPaginationStuff();
reloadComponent();
queueListComponent.invalidate();
queueListComponent.afterCompose();
rebuildDependencies();
// paginatorFilter.populateHorizontalListbox();
}
private void reloadComponent() {
@ -481,6 +466,8 @@ public class LimitingResourcesPanel extends HtmlMacroComponent {
timeTracker.setFilter(paginatorFilter);
}
});
queueListComponent.invalidate();
queueListComponent.afterCompose();
}
private class PaginatorFilter implements IDetailItemFilter {
@ -532,18 +519,17 @@ public class LimitingResourcesPanel extends HtmlMacroComponent {
}
public void paginationDown() {
paginatorFilter.previous();
reloadPanelComponents();
horizontalPagination.setSelectedIndex(horizontalPagination
paginatorFilter.goToHorizontalPage(horizontalPagination
.getSelectedIndex() - 1);
reloadComponent();
rebuildDependencies();
}
public void paginationUp() {
paginatorFilter.next();
reloadPanelComponents();
horizontalPagination.setSelectedIndex(Math.max(0,
horizontalPagination.getSelectedIndex()) + 1);
paginatorFilter.goToHorizontalPage(horizontalPagination
.getSelectedIndex() + 1);
reloadComponent();
rebuildDependencies();
}
@Override
@ -622,16 +608,6 @@ public class LimitingResourcesPanel extends HtmlMacroComponent {
paginationUpButton.setDisabled(isLastPage());
}
public void next() {
paginatorStart = paginatorStart.plus(intervalIncrease());
paginatorEnd = paginatorEnd.plus(intervalIncrease());
// Avoid reduced last intervals
if ((paginatorEnd.plus(intervalIncrease()).isAfter(intervalEnd))) {
paginatorEnd = paginatorEnd.plus(intervalIncrease());
}
updatePaginationButtons();
}
public void previous() {
paginatorStart = paginatorStart.minus(intervalIncrease());
paginatorEnd = paginatorEnd.minus(intervalIncrease());
@ -639,8 +615,14 @@ public class LimitingResourcesPanel extends HtmlMacroComponent {
}
public boolean isFirstPage() {
return !(paginatorStart.isAfter(intervalStart));
return (horizontalPagination.getSelectedIndex() <= 0)
|| horizontalPagination.isDisabled();
}
private boolean isLastPage() {
return (horizontalPagination.getItemCount() == (horizontalPagination
.getSelectedIndex() + 1))
|| horizontalPagination.isDisabled();
}
}
}