Skip to content

Bugfix/gantlabel #122

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bugfix/gantlabel #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0bfda3
fixes the xsd to allow labelExpression with gant series
ohteampbde Feb 26, 2020
8034062
fixing dtd too
ohteampbde Feb 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion jasperreports/src/net/sf/jasperreports/engine/dtds/jasperreport.dtd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,10 +662,11 @@

<!ELEMENT ganttChart (chart, ganttDataset, barPlot)>
<!ELEMENT ganttDataset (dataset?, ganttSeries*)>
<!ELEMENT ganttSeries (seriesExpression?, taskExpression, subtaskExpression, startDateExpression?, endDateExpression?, percentExpression?)>
<!ELEMENT ganttSeries (seriesExpression?, taskExpression, subtaskExpression, startDateExpression?, endDateExpression?, percentExpression?, labelExpression?)>
<!ELEMENT taskExpression (#PCDATA)>
<!ELEMENT subtaskExpression (#PCDATA)>
<!ELEMENT percentExpression (#PCDATA)>
<!ELEMENT labelExpression (#PCDATA)>

<!ELEMENT crosstab (reportElement, crosstabParameter*, parametersMapExpression?, crosstabDataset?, crosstabHeaderCell?, rowGroup*, columnGroup*, measure*, crosstabCell*, whenNoDataCell?)>
<!ATTLIST crosstab
Expand Down
9 changes: 9 additions & 0 deletions jasperreports/src/net/sf/jasperreports/engine/dtds/jasperreport.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7369,6 +7369,7 @@ property.
<element ref="jr:startDateExpression" minOccurs="0" maxOccurs="1"/>
<element ref="jr:endDateExpression" minOccurs="0" maxOccurs="1"/>
<element ref="jr:percentExpression" minOccurs="0" maxOccurs="1"/>
<element ref="jr:labelExpression" minOccurs="0" maxOccurs="1"/>
</sequence>
</complexType>
</element>
Expand Down Expand Up @@ -7397,6 +7398,14 @@ property.
</complexType>
</element>

<element name="labelExpression">
<annotation>
<documentation>Defines a label in a <elem>pieDataset</elem> or <elem>ganttSeries</elem>.</documentation>
</annotation>
<complexType mixed="true">
</complexType>
</element>

<element name="componentElement">
<annotation>
<documentation></documentation>
Expand Down