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

ItEr39S05ValidacionEProbasFuncionaisItEr38S05 : Allows show the work reports list and the work report type list, orderly way.

Browse source
This commit is contained in:
Susana Montes Pedreira 2009-12-18 13:46:05 +01:00 • committed by Javier Moran Rua
parent d35dd9aa07
commit 3de4983fb6
5 changed files with 42 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java
View file

@ -60,6 +60,7 @@ import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;
import org.zkoss.zk.ui.util.GenericForwardComposer;
import org.zkoss.zul.Button;
import org.zkoss.zul.Column;
import org.zkoss.zul.Columns;
import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Datebox;
@ -127,7 +128,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
final URLHandler<IWorkReportCRUDControllerEntryPoints> handler = URLHandlerRegistry
.getRedirectorFor(IWorkReportCRUDControllerEntryPoints.class);
handler.registerListener(this, page);
getVisibility().showOnly(listWindow);
goToList();
}
/**
@ -1214,4 +1215,19 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
listWorkReportLines.setModel(new SimpleListModel(getWorkReportLines()
.toArray()));
}
public void sortWorkReports() {
Column columnDateStart = (Column) listWindow
.getFellow("columnDateStart");
if (columnDateStart != null) {
if (columnDateStart.getSortDirection().equals("ascending")) {
columnDateStart.sort(false, false);
columnDateStart.setSortDirection("ascending");
} else if (columnDateStart.getSortDirection().equals("descending")) {
columnDateStart.sort(true, false);
columnDateStart.setSortDirection("descending");
}
}
}
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java
View file

@ -248,7 +248,7 @@ public class WorkReportModel implements IWorkReportModel {
@Override
@Transactional(readOnly = true)
public List<WorkReportDTO> getWorkReportDTOs() {
// load the work reports
// load the work reports DTOs
List<WorkReport> listWorkReports = getAllWorkReports();
List<WorkReportDTO> resultDTOs = new ArrayList<WorkReportDTO>();
for (WorkReport workReport : listWorkReports) {

16
navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java
View file

@ -50,6 +50,7 @@ import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;
import org.zkoss.zk.ui.util.GenericForwardComposer;
import org.zkoss.zul.Button;
import org.zkoss.zul.Column;
import org.zkoss.zul.Combobox;
import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Constraint;
@ -995,4 +996,19 @@ public class WorkReportTypeCRUDController extends GenericForwardComposer
tab.setSelected(true);
}
}
public void sortWorkReportTypes() {
Column columnName = (Column) listWindow
.getFellow("workReportTypeName");
if (columnName != null) {
if (columnName.getSortDirection().equals("ascending")) {
columnName.sort(false, false);
columnName.setSortDirection("ascending");
} else if (columnName.getSortDirection().equals("descending")) {
columnName.sort(true, false);
columnName.setSortDirection("descending");
}
}
}
}

7
navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul
View file

@ -20,10 +20,11 @@
<window id="${arg.top_id}" title="${i18n:_('Work report listing')}">
<grid id="listing" mold="paging" pageSize="10"
model="@{controller.workReportDTOs}">
model="@{controller.workReportDTOs}"
onInitRender ="controller.sortWorkReports();">
<columns sizable="true">
<column label="${i18n:_('Date Start')}" sort="auto(dateStart)"/>
<column label="${i18n:_('Date Finish')}" sort="auto(dateFinish)"/>
<column id="columnDateStart" label="${i18n:_('Date Start')}" sort="auto(dateStart, dateFinish)" sortDirection="ascending"/>
<column id="columnDateFinish" label="${i18n:_('Date Finish')}" sort="auto(dateFinish, dateStart)" sortDirection="ascending"/>
<column label="${i18n:_('Type')}" sort="auto(type)"/>
<column label="${i18n:_('Actions')}" />
</columns>

7
navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul
View file

@ -19,10 +19,11 @@
-->
<window id="${arg.top_id}" title="${i18n:_('Work Report types')}">
<grid id="listing" model="@{controller.workReportTypes}" mold="paging"
pageSize="10">
<grid id="listing" mold="paging" pageSize="10"
model="@{controller.workReportTypes}"
onInitRender ="controller.sortWorkReportTypes();">
<columns>
<column label="${i18n:_('Name')}" sort="auto(name)" />
<column id="workReportTypeName" label="${i18n:_('Name')}" sort="auto(name)" sortDirection="descending"/>
<column label="${i18n:_('Operations')}" />
</columns>
<rows>