Author: adubovsky Date: 2008-10-20 12:42:32 -0400 (Mon, 20 Oct 2008) New Revision: 10845 Modified: trunk/test-applications/jsp/src/main/java/extendedDataTable/ExtendedDataTableBB.java trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTable.jsp trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTableProperty.jsp Log: Changes in "Show selection" functionality in scrollableDataTable Modified: trunk/test-applications/jsp/src/main/java/extendedDataTable/ExtendedDataTableBB.java =================================================================== --- trunk/test-applications/jsp/src/main/java/extendedDataTable/ExtendedDataTableBB.java 2008-10-20 15:58:21 UTC (rev 10844) +++ trunk/test-applications/jsp/src/main/java/extendedDataTable/ExtendedDataTableBB.java 2008-10-20 16:42:32 UTC (rev 10845) @@ -10,9 +10,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.richfaces.component.html.HtmlExtendedDataTable; import org.richfaces.model.ExtendedTableDataModel; import org.richfaces.model.selection.SimpleSelection; +import util.data.Data; + /** * @author mvitenkov * @@ -25,8 +28,26 @@ private String tableState = null; private ExtendedTableDataModel<DemoPatient> dataModel; private Integer patientsNumber = 100; + private boolean a4jRendered = true; + private HtmlExtendedDataTable extDTable = null; - public ExtendedDataTableBB() { + public HtmlExtendedDataTable getExtDTable() { + return extDTable; + } + + public void setExtDTable(HtmlExtendedDataTable extDTable) { + this.extDTable = extDTable; + } + + public boolean isA4jRendered() { + return a4jRendered; + } + + public void setA4jRendered(boolean a4jRendered) { + this.a4jRendered = a4jRendered; + } + + public ExtendedDataTableBB() { } public ExtendedTableDataModel<DemoPatient> getDataModel(){ Modified: trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTable.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTable.jsp 2008-10-20 15:58:21 UTC (rev 10844) +++ trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTable.jsp 2008-10-20 16:42:32 UTC (rev 10845) @@ -35,76 +35,82 @@ height: 100%; } </style> - <rich:extendedDataTable id="demoTable" - value="#{extendedDataTableBean.dataModel}" var="patient" - style="margin: 0 auto;" - rows="#{extendedDataTableControlBean.rowsNumber}" - width="#{extendedDataTableControlBean.width}" - height="#{extendedDataTableControlBean.height}" - selectedClass="dataTableSelectedRow" footerClass="demo-footer" - sortMode="#{extendedDataTableControlBean.sortMode}" - selectionMode="#{extendedDataTableControlBean.selectionMode}" - selection="#{extendedDataTableBean.selection}" rowKeyVar="rkvar" - tableState="#{extendedDataTableBean.tableState}" - binding="#{extendedDataTableControlBean.extDTable}" - onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" - onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" - onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" - onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" - onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" - onRowClick="#{event.onRowClick}" - onRowDblClick="#{event.onRowDblClick}" - onRowMouseDown="#{event.onRowMouseDown}" - onRowMouseMove="#{event.onRowMouseMove}" - onRowMouseOut="#{event.onRowMouseOut}" - onRowMouseOver="#{event.onRowMouseOver}" - onRowMouseUp="#{event.onRowMouseUp}" - onselectionchange="#{event.onselectionchange}" - border="#{extendedDataTableControlBean.border}" - cellpadding="#{extendedDataTableControlBean.cellpadding}" - cellspacing="#{extendedDataTableControlBean.cellspacing}" - dir="#{extendedDataTableControlBean.dir}" - first="#{extendedDataTableControlBean.first}" - frame="#{extendedDataTableControlBean.frame}" - groupingColumn="#{extendedDataTableControlBean.groupingColumn}" - rendered="#{extendedDataTableControlBean.rendered}" - sortPriority="#{extendedDataTableControlBean.sortPriority}"> - <rich:column id="firstName" headerClass="dataTableHeader" width="25%" - label="First name" sortable="true" - sortBy="#{patient.firstName}" filterBy="#{patient.firstName}" - filterEvent="onkeyup"> - <f:facet name="header"> - <h:outputText value="First name" /> - </f:facet> - <h:outputText id="text" value="#{patient.firstName}"> - <rich:toolTip value="sasasasasasa" /> - </h:outputText> - - </rich:column> - <rich:column id="lastName" headerClass="dataTableHeader" width="25%" - label="Last name" sortable="true" - sortBy="#{patient.lastName}" filterBy="#{patient.lastName}" - filterEvent="onkeyup"> - <f:facet name="header"> - <h:outputText value="Last name" /> - </f:facet> - <h:outputText value="#{patient.lastName}" /> - </rich:column> - <rich:column id="admissionDate" headerClass="dataTableHeader" - width="50%" label="Admission name" sortable="true" - sortBy="#{patient.admissionDate}"> - <f:facet name="header"> - <h:outputText value="Admission name" /> - </f:facet> - <h:outputText value="#{patient.admissionDate}" /> - </rich:column> - <a4j:support event="onselectionchange" - action="#{extendedDataTableBean.takeSelection}" - reRender="selectedPatients"> - </a4j:support> - </rich:extendedDataTable> - <rich:datascroller - style="width: #{extendedDataTableControlBean.width}" - rendered="#{extendedDataTableControlBean.paginated}" for="demoTable"> - </rich:datascroller> + <rich:extendedDataTable id="demoTable" + value="#{extendedDataTableBean.dataModel}" var="patient" + style="margin: 0 auto;" + rows="#{extendedDataTableControlBean.rowsNumber}" + width="#{extendedDataTableControlBean.width}" + height="#{extendedDataTableControlBean.height}" + selectedClass="dataTableSelectedRow" footerClass="demo-footer" + sortMode="#{extendedDataTableControlBean.sortMode}" + selectionMode="#{extendedDataTableControlBean.selectionMode}" + selection="#{extendedDataTableBean.selection}" rowKeyVar="rkvar" + tableState="#{extendedDataTableBean.tableState}" + binding="#{extendedDataTableBean.extDTable}" + onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" + onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" + onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" + onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" + onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" + onRowClick="#{event.onRowClick}" + onRowDblClick="#{event.onRowDblClick}" + onRowMouseDown="#{event.onRowMouseDown}" + onRowMouseMove="#{event.onRowMouseMove}" + onRowMouseOut="#{event.onRowMouseOut}" + onRowMouseOver="#{event.onRowMouseOver}" + onRowMouseUp="#{event.onRowMouseUp}" + onselectionchange="#{event.onselectionchange}" + border="#{extendedDataTableControlBean.border}" + cellpadding="#{extendedDataTableControlBean.cellpadding}" + cellspacing="#{extendedDataTableControlBean.cellspacing}" + dir="#{extendedDataTableControlBean.dir}" + first="#{extendedDataTableControlBean.first}" + frame="#{extendedDataTableControlBean.frame}" + groupingColumn="#{extendedDataTableControlBean.groupingColumn}" + rendered="#{extendedDataTableControlBean.rendered}" + sortPriority="#{extendedDataTableControlBean.sortPriority}"> + + <rich:column id="id" headerClass="dataTableHeader" width="25%" + label="First name" sortable="true" sortBy="#{patient.firstName}" + filterBy="#{patient.id}" filterEvent="onkeyup"> + <f:facet name="header"> + <h:outputText value="id" /> + </f:facet> + <h:outputText value="#{patient.id}" /> + </rich:column> + <rich:column id="firstName" headerClass="dataTableHeader" width="25%" + label="First name" sortable="true" sortBy="#{patient.firstName}" + filterBy="#{patient.firstName}" filterEvent="onkeyup"> + <f:facet name="header"> + <h:outputText value="First name" /> + </f:facet> + <h:outputText id="text" value="#{patient.firstName}"> + <rich:toolTip value="#{patient.firstName}" /> + </h:outputText> + </rich:column> + <rich:column id="lastName" headerClass="dataTableHeader" width="25%" + label="Last name" sortable="true" sortBy="#{patient.lastName}" + filterBy="#{patient.lastName}" filterEvent="onkeyup"> + <f:facet name="header"> + <h:outputText value="Last name" /> + </f:facet> + <h:outputText value="#{patient.lastName}" /> + </rich:column> + <rich:column id="admissionDate" headerClass="dataTableHeader" + width="50%" label="Admission name" sortable="true" + sortBy="#{patient.admissionDate}"> + <f:facet name="header"> + <h:outputText value="Admission name" /> + </f:facet> + <h:outputText value="#{patient.admissionDate}" /> + </rich:column> + <a4j:support event="onselectionchange" + rendered="#{extendedDataTableBean.a4jRendered}" + action="#{extendedDataTableBean.takeSelection}" + reRender="selectedPatients"> + </a4j:support> + </rich:extendedDataTable> + <rich:datascroller style="width: #{extendedDataTableControlBean.width}" + rendered="#{extendedDataTableControlBean.paginated}" for="demoTable"> + </rich:datascroller> </f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTableProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTableProperty.jsp 2008-10-20 15:58:21 UTC (rev 10844) +++ trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTableProperty.jsp 2008-10-20 16:42:32 UTC (rev 10845) @@ -25,8 +25,7 @@ <a4j:support event="onchange" reRender="demoTable"></a4j:support> </h:inputText> - <h:outputLabel value="Sort mode" - for="tableSortModeSelect" /> + <h:outputLabel value="Sort mode" for="tableSortModeSelect" /> <h:selectOneMenu id="tableSortModeSelect" value="#{extendedDataTableControlBean.sortMode}"> <f:selectItems @@ -34,8 +33,7 @@ <a4j:support event="onchange" reRender="demoTable"></a4j:support> </h:selectOneMenu> - <h:outputLabel value="Selection mode" - for="tableSelectionModeSelect" /> + <h:outputLabel value="Selection mode" for="tableSelectionModeSelect" /> <h:selectOneMenu id="tableSelectionModeSelect" value="#{extendedDataTableControlBean.selectionMode}"> <f:selectItems @@ -47,8 +45,7 @@ <h:selectBooleanCheckbox id="paginatedCheckbox" value="#{extendedDataTableControlBean.paginated}" onclick="submit()" /> - <h:outputLabel value="Number of rows" - for="tableRowsNumberInput" /> + <h:outputLabel value="Number of rows" for="tableRowsNumberInput" /> <h:inputText id="tableRowsNumberInput" value="#{extendedDataTableControlBean.rowsNumber}"> <a4j:support event="onchange" reRender="demoTable"></a4j:support> @@ -120,11 +117,23 @@ <rich:spacer height="5px" width="100%"> </rich:spacer> + <h:outputText value="Render selection: " /> + <h:selectBooleanCheckbox value="#{extendedDataTableBean.a4jRendered}" + onclick="submit()" /> <rich:dataTable id="selectedPatients" + rendered="#{extendedDataTableBean.a4jRendered}" value="#{extendedDataTableBean.selectedItems}" var="selectedPatient"> <f:facet name="header"> <h:outputText value="Selected patient" /> </f:facet> + <rich:column id="selectedID" headerClass="dataTableHeader" + label="id"> + <f:facet name="header"> + <h:outputText value="id" /> + </f:facet> + <h:outputText value="#{selectedPatient.id}" /> + </rich:column> + <%-- <rich:column id="selectedFirstName" headerClass="dataTableHeader" label="First name"> <f:facet name="header"> @@ -139,6 +148,7 @@ </f:facet> <h:outputText value="#{selectedPatient.lastName}" /> </rich:column> + --%> </rich:dataTable> <rich:messages> </rich:messages>