Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #6409 - Datatable: ColumnGroup refactoring #9872

Draft
wants to merge 31 commits into
base: master
Choose a base branch
from
Draft

Fix #6409 - Datatable: ColumnGroup refactoring #9872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
11d68d5
Fix #3409 - Datatable: ColumnGroup refactoring
Rapster Mar 5, 2023
3d09a9e
Fix #3409 - Datatable: ColumnGroup refactoring
Rapster Mar 5, 2023
132d10e
fix var names
Rapster Mar 5, 2023
812f303
better handling of UIColumn#rendered but far from perfect
Rapster Mar 6, 2023
0cfce9d
rename
Rapster Mar 7, 2023
4ed43a4
checkstyle
Rapster Mar 7, 2023
37c3e53
fix uicolumns rendered
Rapster Mar 10, 2023
341c239
support of new ColumnGroup in UIData & co
Rapster Mar 10, 2023
b9f06ff
exporter
Rapster Mar 20, 2023
109f651
missing header
Rapster Mar 25, 2023
e7265cd
clean up
Rapster Apr 11, 2023
ce8f273
something something
Rapster Apr 12, 2023
3c83d30
docs
Rapster Apr 13, 2023
4b359d7
idk
Rapster May 5, 2023
cd38fdb
space trim
Rapster May 5, 2023
a7d9c46
merge master
Rapster Jul 8, 2023
f2af690
refacto
Rapster Jul 8, 2023
66a5779
fix merge
Rapster Oct 14, 2023
b6fef71
fix merge and more
Rapster Oct 15, 2023
07eb0a7
more
Rapster Oct 15, 2023
ed95e62
merge
Rapster Apr 23, 2024
425b190
fix
Rapster May 3, 2024
0a2efac
fix
Rapster May 11, 2024
5d91fa8
support subTable
Rapster May 23, 2024
fdac884
support treeTable
Rapster May 26, 2024
d014007
fix
Rapster May 26, 2024
fea67f5
clean up
Rapster May 27, 2024
bb223b5
more refacto
Rapster Jun 1, 2024
ef8750b
more refacto
Rapster Jun 2, 2024
59fe18b
deprecate SortTableComparator
Rapster Jun 8, 2024
38a1bed
fix merge
Rapster Jun 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion primefaces-showcase/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@
<jsf.project.stage>Development</jsf.project.stage>
</properties>
<build>
<defaultGoal>clean jetty:run</defaultGoal>
<defaultGoal>jetty:run</defaultGoal>
</build>
</profile>

Expand Down
28 changes: 22 additions & 6 deletions primefaces-showcase/src/main/java/org/primefaces/showcase/view/data/datatable/GroupView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,28 @@
*/
package org.primefaces.showcase.view.data.datatable;

import jakarta.faces.view.ViewScoped;
import org.primefaces.showcase.domain.Player;
import org.primefaces.showcase.domain.Sale;

import jakarta.annotation.PostConstruct;
import jakarta.inject.Named;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;

import jakarta.annotation.PostConstruct;
import jakarta.faces.view.ViewScoped;
import jakarta.inject.Named;
import org.primefaces.showcase.domain.Player;
import org.primefaces.showcase.domain.Sale;

@Named("dtGroupView")
@ViewScoped
public class GroupView implements Serializable {

private static final String[] MANUFACTORS;
private static final String[] PLAYER_NAMES;

private boolean frozenColumns = false;
private int nbFrozenColumns = 0;

private List<Sale> sales;
private Integer lastYearTotal;
private Integer thisYearTotal;
Expand Down Expand Up @@ -144,4 +147,17 @@ private Map<Integer, Integer> generateRandomGoalStatsData() {
private int getRandomGoals() {
return (int) (Math.random() * 50);
}

public boolean isFrozenColumns() {
return frozenColumns;
}

public void setFrozenColumns(boolean frozenColumns) {
this.nbFrozenColumns = frozenColumns ? 1 : 0;
this.frozenColumns = frozenColumns;
}

public int getNbFrozenColumns() {
return nbFrozenColumns;
}
}
72 changes: 24 additions & 48 deletions primefaces-showcase/src/main/webapp/ui/data/datatable/columnResize.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,62 +75,38 @@
<p:dataTable var="sale" value="#{dtGroupView.sales}" resizableColumns="true" resizeMode="expand"
showGridlines="true">

<p:columnGroup type="header">
<p:row>
<p:column rowspan="3" headerText="Product"/>
<p:column colspan="4" headerText="Sale Rate"/>
</p:row>
<p:row>
<p:column colspan="2" headerText="Sales"/>
<p:column colspan="2" headerText="Profit"/>
</p:row>
<p:row>
<p:column headerText="Last Year"/>
<p:column headerText="This Year"/>
<p:column headerText="Last Year"/>
<p:column headerText="This Year"/>
</p:row>
<f:facet name="header">
<h:outputText value="Product Sales"/>
</f:facet>

<p:column headerText="Product" field="manufacturer"/>

<p:columnGroup headerText="Sale Rate">
<p:columnGroup headerText="Sales">
<p:column headerText="Last Year" field="lastYearSale"/>
<p:column headerText="This Year" field="thisYearSale"/>
</p:columnGroup>
<p:columnGroup headerText="Profit">
<p:column headerText="Last Year" field="lastYearProfit"/>
<p:column headerText="This Year" field="thisYearProfit"/>
</p:columnGroup>
</p:columnGroup>

<p:column>
<h:outputText value="#{sale.manufacturer}"/>
</p:column>
<p:column>
<h:outputText value="#{sale.lastYearProfit}%"/>
</p:column>
<p:column>
<h:outputText value="#{sale.thisYearProfit}%"/>
</p:column>
<p:column>
<h:outputText value="#{sale.lastYearSale}">
<f:convertNumber type="currency" currencySymbol="$"/>
</h:outputText>
</p:column>
<p:column>
<h:outputText value="#{sale.thisYearSale}">
<f:convertNumber type="currency" currencySymbol="$"/>
</h:outputText>
</p:column>

<p:columnGroup type="footer">
<f:facet name="tfooter">
<p:row>
<p:column colspan="3" style="text-align:right" footerText="Totals:"/>
<p:column colspan="3" style="text-align:right">Totals:</p:column>
<p:column>
<f:facet name="footer">
<h:outputText value="#{dtGroupView.lastYearTotal}">
<f:convertNumber type="currency" currencySymbol="$"/>
</h:outputText>
</f:facet>
<h:outputText value="#{dtGroupView.lastYearTotal}">
<f:convertNumber type="currency" currencySymbol="$"/>
</h:outputText>
</p:column>
<p:column>
<f:facet name="footer">
<h:outputText value="#{dtGroupView.thisYearTotal}">
<f:convertNumber type="currency" currencySymbol="$"/>
</h:outputText>
</f:facet>
<h:outputText value="#{dtGroupView.thisYearTotal}">
<f:convertNumber type="currency" currencySymbol="$"/>
</h:outputText>
</p:column>
</p:row>
</p:columnGroup>
</f:facet>
</p:dataTable>
</div>
</h:form>
Expand Down
145 changes: 65 additions & 80 deletions primefaces-showcase/src/main/webapp/ui/data/datatable/group.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@
xmlns:f="jakarta.faces.core"
xmlns:p="primefaces" template="/WEB-INF/template.xhtml">

<ui:define name="head">
<style>
.ui-datatable-frozenlayout-left {
width: 20%;
}

.ui-datatable-frozenlayout-right {
width: 80%;
}
</style>
</ui:define>

<ui:define name="title">
DataTable <span class="subitem">Group</span>
</ui:define>
Expand All @@ -17,112 +29,85 @@

<ui:define name="implementation">
<div class="card">
<h:form>
<h:form id="form">
<div class="flex justify-content-between">
<div>
</div>
<div>
<p:commandButton value="XLSX" styleClass="mr-2 mb-2" >
<p:dataExporter type="xlsxstream" target="tblSales tblPlayers" fileName="grouped"/>
</p:commandButton>

<p:commandButton value="PDF" styleClass="mr-2 mb-2" >
<p:dataExporter type="pdf" target="tblSales tblPlayers" fileName="grouped"/>
</p:commandButton>
</div>
<div>
Frozen columns
<p:selectBooleanButton value="#{dtGroupView.frozenColumns}">
<p:ajax update=":form"/>
</p:selectBooleanButton>
</div>
<div>
<p:commandButton value="XLSX" styleClass="mr-2 mb-2">
<p:dataExporter type="xlsxstream" target="tblSales tblPlayers" fileName="grouped"/>
</p:commandButton>

<p:commandButton value="PDF" styleClass="mr-2 mb-2">
<p:dataExporter type="pdf" target="tblSales tblPlayers" fileName="grouped"/>
</p:commandButton>
</div>
</div>
<p:dataTable id="tblSales" var="sale" value="#{dtGroupView.sales}">

<p:dataTable id="tblSales" var="sale" value="#{dtGroupView.sales}" columnGroupLegacyEnabled="false"
scrollable="#{dtGroupView.frozenColumns}" frozenColumns="#{dtGroupView.nbFrozenColumns}"
scrollWidth="500">
<f:facet name="header">
<h:outputText value="Product Sales"/>
</f:facet>

<p:columnGroup type="header">
<p:row>
<p:column rowspan="3" headerText="Product"/>
<p:column colspan="4" headerText="Sale Rate"/>
</p:row>
<p:row>
<p:column colspan="2" headerText="Sales"/>
<p:column colspan="2" headerText="Profit"/>
</p:row>
<p:row>
<p:column headerText="Last Year"/>
<p:column headerText="This Year"/>
<p:column headerText="Last Year"/>
<p:column headerText="This Year"/>
</p:row>
<p:column headerText="Product" field="manufacturer"
footerText="Table footer (tfoot) using column footer facet"/>

<p:columnGroup headerText="Sale Rate">
<p:columnGroup headerText="Sales">
<p:column headerText="Last Year" field="lastYearSale" footerText="A"/>
<p:column headerText="This Year" field="thisYearSale" footerText="B"/>
</p:columnGroup>
<p:columnGroup headerText="Profit">
<p:column headerText="Last Year" field="lastYearProfit" footerText="C"/>
<p:column headerText="This Year" field="thisYearProfit" footerText="D"/>
</p:columnGroup>
</p:columnGroup>

<p:column>
<h:outputText value="#{sale.manufacturer}"/>
</p:column>
<p:column>
<h:outputText value="#{sale.lastYearProfit}%"/>
</p:column>
<p:column>
<h:outputText value="#{sale.thisYearProfit}%"/>
</p:column>
<p:column>
<h:outputText value="#{sale.lastYearSale}">
<f:convertNumber type="currency" />
</h:outputText>
</p:column>
<p:column>
<h:outputText value="#{sale.thisYearSale}">
<f:convertNumber type="currency" />
</h:outputText>
</p:column>

<p:columnGroup type="footer">
<p:row>
<p:column colspan="3" style="text-align:right" footerText="Totals:"/>
<f:facet name="tfooter">
<p:row >
<p:column>Table footer (tfoot) using table tfooter</p:column>
<p:column colspan="2" style="text-align:right">Totals:</p:column>
<p:column>
<f:facet name="footer">
<h:outputText value="#{dtGroupView.lastYearTotal}">
<f:convertNumber type="currency" currencySymbol="$"/>
</h:outputText>
</f:facet>
<h:outputText value="#{dtGroupView.lastYearTotal}">
<f:convertNumber type="currency" currencySymbol="$"/>
</h:outputText>
</p:column>
<p:column>
<f:facet name="footer">
<h:outputText value="#{dtGroupView.thisYearTotal}">
<f:convertNumber type="currency" currencySymbol="$"/>
</h:outputText>
</f:facet>
<h:outputText value="#{dtGroupView.thisYearTotal}">
<f:convertNumber type="currency" currencySymbol="$"/>
</h:outputText>
</p:column>
</p:row>
</p:columnGroup>
</f:facet>

<f:facet name="footer">
<h:outputText value="Data between 2013-2014"/>
</f:facet>
</p:dataTable>

<p:dataTable id="tblPlayers" var="player" value="#{dtGroupView.players}" style="margin-top:40px">
<p:dataTable id="tblPlayers" var="player" value="#{dtGroupView.players}" style="margin-top:40px"
columnGroupLegacyEnabled="false" scrollable="#{dtGroupView.frozenColumns}" frozenColumns="#{dtGroupView.nbFrozenColumns}"
scrollWidth="500">
<f:facet name="header">
<h:outputText value="Dynamic Columns"/>
</f:facet>

<p:columnGroup type="header">
<p:row>
<p:column rowspan="2" headerText="Player"/>
<p:column colspan="#{dtGroupView.yearCount}" headerText="Goals"/>
</p:row>
<p:row>
<p:columns var="year" value="#{dtGroupView.years}" sortBy="#{player.getGoals(year)}" filterBy="#{player.getGoals(year)}" headerText="#{year}"/>
</p:row>
</p:columnGroup>

<p:column>
<h:outputText value="#{player.name}"/>
</p:column>
<p:column field="name" />

<p:columns value="#{dtGroupView.years}" var="year">
<h:outputText value="#{player.getGoals(year)}"/>
</p:columns>
<p:columnGroup headerText="Goals">
<p:columns var="year" value="#{dtGroupView.years}" sortBy="#{player.getGoals(year)}" filterBy="#{player.getGoals(year)}" headerText="#{year}">
<h:outputText value="#{player.getGoals(year)}"/>
</p:columns>
</p:columnGroup>

<f:facet name="footer">
<h:outputText value="Data between 2010-2014" styleClass="font-bold" />
<h:outputText value="Data between 2010-2014" styleClass="font-bold"/>
</f:facet>
</p:dataTable>
</h:form>
Expand Down
44 changes: 19 additions & 25 deletions primefaces-showcase/src/main/webapp/ui/data/datatable/subtable.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,37 +24,31 @@
NBA Teams
</f:facet>

<p:columnGroup type="header">
<p:row>
<p:column rowspan="2" headerText="Team"/>
<p:column colspan="2" headerText="Stats"/>
</p:row>
<p:row>
<p:column headerText="Wins"/>
<p:column headerText="Losses"/>
</p:row>
</p:columnGroup>

<p:subTable var="stats" value="#{team.stats}">
<f:facet name="header">
<h:outputText value="#{team.name}"/>
</f:facet>
<p:column>
<h:outputText value="#{stats.season}"/>
</p:column>
<p:column>
<h:outputText value="#{stats.win}"/>
</p:column>
<p:column>
<h:outputText value="#{stats.loss}"/>
</p:column>
<p:columnGroup type="footer">

<p:column headerText="Team" field="season" sortable="false" filterable="false"/>

<p:columnGroup headerText="Stats">
<p:column headerText="Wins" field="win" sortable="false" filterable="false"/>
<p:column headerText="Losses" field="loss" sortable="false" filterable="false"/>
</p:columnGroup>

<f:facet name="footer">
<p:row>
<p:column footerText="Totals: " class="text-right font-bold"/>
<p:column footerText="#{team.allWins}" class="font-bold"/>
<p:column footerText="#{team.allLosses}" class="font-bold"/>
<p:column class="text-right font-bold">
Totals:
</p:column>
<p:column class="font-bold">
#{team.allWins}
</p:column>
<p:column class="font-bold">
#{team.allLosses}
</p:column>
</p:row>
</p:columnGroup>
</f:facet>
</p:subTable>
</p:dataTable>
</div>
Expand Down