Skip to content

Commit 2ceaa9e

Browse files
author
Jelte Lagendijk
committed
Fix issue #79, fixing various scales, gridlines and color
1 parent 5d50e73 commit 2ceaa9e

File tree

9 files changed

+61
-74
lines changed

9 files changed

+61
-74
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ChartJS",
3-
"version": "3.5.0",
3+
"version": "3.5.1",
44
"description": "This widget is a wrapper for the ChartJS library and you can use it to visualize your aggregated data.",
55
"license": "Apache License, Version 2",
66
"author": "Mendix",

‎src/ChartJS/widgets/BarChart/BarChart.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,10 @@
259259
<category>Settings</category>
260260
<description>Whether the scale should start at zero, or an order of magnitude down from the lowest value</description>
261261
</property>
262-
<property key="scaleShowGridLines" type="boolean" required="true" defaultValue="true">
263-
<caption>Show grid lines</caption>
262+
<property key="scaleShow" type="boolean" required="true" defaultValue="true">
263+
<caption>Show scales</caption>
264264
<category>Settings</category>
265-
<description>Whether grid lines are shown across the chart.</description>
265+
<description>Whether scales are shown. This will enable/disable scales, scale labels and gridlines</description>
266266
</property>
267267
<property key="scaleGridLineColor" type="string" required="true" defaultValue="rgba(0,0,0,.05)">
268268
<caption>Grid line color</caption>

‎src/ChartJS/widgets/BarChart/widget/BarChart.js‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -109,45 +109,39 @@ define([
109109

110110
scales : {
111111
xAxes: [{
112+
display: this.scaleShow,
112113
scaleLabel: {
113114
display: (this.xLabel !== "") ? true : false,
114115
labelString: (this.xLabel !== "") ? this.xLabel : "",
115116
fontFamily: this._font
116117
},
117-
ticks : { fontFamily: this._font, }
118+
ticks : { fontFamily: this._font, },
119+
gridLines: {
120+
display: this.scaleShowVerticalLines,
121+
color: this.scaleGridLineColor,
122+
lineWidth: this.scaleLineWidth
123+
},
118124
}],
119125
yAxes: [{
126+
display: this.scaleShow,
120127
scaleLabel: {
121128
display: (this.yLabel !== "") ? true : false,
122129
labelString: (this.yLabel !== "") ? this.yLabel : "",
123130
fontFamily: this._font
124131
},
125132
ticks : {
126133
fontFamily: this._font,
127-
beginAtZero: this.scaleBeginAtZero
128-
}
129-
}],
130-
134+
beginAtZero: this.scaleBeginAtZero,
135+
display: this.scaleShowLabels
136+
},
137+
gridLines: {
138+
display: this.scaleShowHorizontalLines,
139+
color: this.scaleGridLineColor,
140+
lineWidth: this.scaleLineWidth
141+
},
142+
}]
131143
},
132144

133-
//Boolean - Whether to show labels on the scale
134-
scaleShowLabels : this.scaleShowLabels,
135-
136-
//Boolean - Whether grid lines are shown across the chart
137-
scaleShowGridLines : this.scaleShowGridLines,
138-
139-
//String - Colour of the grid lines
140-
scaleGridLineColor : this.scaleGridLineColor,
141-
142-
//Number - Width of the grid lines
143-
scaleGridLineWidth : this.scaleGridLineWidth,
144-
145-
//Boolean - Whether to show horizontal lines (except X axis)
146-
scaleShowHorizontalLines: this.scaleShowHorizontalLines,
147-
148-
//Boolean - Whether to show vertical lines (except Y axis)
149-
scaleShowVerticalLines: this.scaleShowVerticalLines,
150-
151145
//Boolean - If there is a stroke on each bar
152146
barShowStroke : this.barShowStroke,
153147

‎src/ChartJS/widgets/LineChart/LineChart.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -276,10 +276,10 @@
276276
<category>Settings</category>
277277
<description>Whether the scale should start at zero, or an order of magnitude down from the lowest value</description>
278278
</property>
279-
<property key="scaleShowGridLines" type="boolean" required="true" defaultValue="true">
280-
<caption>Show grid lines</caption>
279+
<property key="scaleShow" type="boolean" required="true" defaultValue="true">
280+
<caption>Show scales</caption>
281281
<category>Settings</category>
282-
<description>Whether grid lines are shown across the chart.</description>
282+
<description>Whether scales are shown. This will enable/disable scales, scale labels and gridlines</description>
283283
</property>
284284
<property key="scaleGridLineColor" type="string" required="true" defaultValue="rgba(0,0,0,.05)">
285285
<caption>Grid line color</caption>
@@ -329,12 +329,12 @@
329329
<property key="scaleShowLabelsBottom" type="boolean" required="true" defaultValue="true">
330330
<caption>Show labels X-axis</caption>
331331
<category>Settings</category>
332-
<description>Whether to show labels on the Y-axis scale.</description>
332+
<description>Whether to show labels on the X-axis scale.</description>
333333
</property>
334334
<property key="scaleShowLabels" type="boolean" required="true" defaultValue="true">
335335
<caption>Show labels Y-axis</caption>
336336
<category>Settings</category>
337-
<description>Whether to show labels on X-axis the scale.</description>
337+
<description>Whether to show labels on Y-axis the scale.</description>
338338
</property>
339339
<property key="showTooltips" type="boolean" required="true" defaultValue="true">
340340
<caption>Show tooltip</caption>

‎src/ChartJS/widgets/LineChart/widget/LineChart.js‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -127,16 +127,23 @@ define([
127127

128128
scales : {
129129
yAxes: [{
130+
display: this.scaleShow,
130131
//If stacked is set to true, the Y-axis needs to be stacked for it to work
131132
stacked: this.isStacked,
132133
scaleLabel: {
133134
display: (this.yLabel !== "") ? true : false,
134135
labelString: (this.yLabel !== "") ? this.yLabel : "",
135136
fontFamily: this._font
136137
},
138+
gridLines: {
139+
display: this.scaleShowHorizontalLines,
140+
color: this.scaleGridLineColor,
141+
lineWidth: this.scaleLineWidth
142+
},
137143
ticks : {
138144
fontFamily: this._font,
139145
beginAtZero: this.scaleBeginAtZero,
146+
display: this.scaleShowLabels,
140147
callback: lang.hitch(this, function(value){
141148
var round = parseInt(this.roundY);
142149
if (!isNaN(round) && round >= 0) {
@@ -147,14 +154,21 @@ define([
147154
}
148155
}],
149156
xAxes: [{
157+
display: this.scaleShow,
150158
scaleLabel: {
151159
display: (this.xLabel !== "") ? true : false,
152160
labelString: (this.xLabel !== "") ? this.xLabel : "",
153161
fontFamily: this._font
154162
},
163+
gridLines: {
164+
display: this.scaleShowVerticalLines,
165+
color: this.scaleGridLineColor,
166+
lineWidth: this.scaleLineWidth
167+
},
155168
type: "category",
156169
id: "x-axis-0",
157170
ticks : {
171+
display: this.scaleShowLabelsBottom,
158172
fontFamily: this._font,
159173
maxTicksLimit: this.maxTickSize > 0 ? this.maxTickSize : null
160174
}
@@ -171,24 +185,6 @@ define([
171185
}
172186
},
173187

174-
//Boolean - Whether to show labels on the scale
175-
scaleShowLabels : this.scaleShowLabels,
176-
177-
///Boolean - Whether grid lines are shown across the chart
178-
scaleShowGridLines : this.scaleShowGridLines,
179-
180-
//String - Colour of the grid lines
181-
scaleGridLineColor : this.scaleGridLineColor,
182-
183-
//Number - Width of the grid lines
184-
scaleGridLineWidth : this.scaleGridLineWidth,
185-
186-
//Boolean - Whether to show horizontal lines (except X axis)
187-
scaleShowHorizontalLines : this.scaleShowHorizontalLines,
188-
189-
//Boolean - Whether to show vertical lines (except Y axis)
190-
scaleShowVerticalLines : this.scaleShowVerticalLines,
191-
192188
//Boolean - Whether or not to render as a stacked chart
193189
stacked : this.isStacked,
194190

‎src/ChartJS/widgets/StackedBarChart/StackedBarChart.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,10 @@
257257
<category>Settings</category>
258258
<description>Whether the scale should start at zero, or an order of magnitude down from the lowest value</description>
259259
</property>
260-
<property key="scaleShowGridLines" type="boolean" required="true" defaultValue="true">
261-
<caption>Show grid lines</caption>
260+
<property key="scaleShow" type="boolean" required="true" defaultValue="true">
261+
<caption>Show scales</caption>
262262
<category>Settings</category>
263-
<description>Whether grid lines are shown across the chart.</description>
263+
<description>Whether scales are shown. This will enable/disable scales, scale labels and gridlines</description>
264264
</property>
265265
<property key="scaleGridLineColor" type="string" required="true" defaultValue="rgba(0,0,0,.05)">
266266
<caption>Grid line color</caption>

‎src/ChartJS/widgets/StackedBarChart/widget/StackedBarChart.js‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -112,44 +112,41 @@ define([
112112

113113
scales: {
114114
xAxes: [{
115+
display: this.scaleShow,
115116
stacked: true,
116117
scaleLabel: {
117118
display: (this.xLabel !== "") ? true : false,
118119
labelString: (this.xLabel !== "") ? this.xLabel : "",
119120
fontFamily: this._font
120121
},
121-
ticks: {
122-
fontFamily: this._font
123-
}
122+
ticks : { fontFamily: this._font, },
123+
gridLines: {
124+
display: this.scaleShowVerticalLines,
125+
color: this.scaleGridLineColor,
126+
lineWidth: this.scaleLineWidth
127+
},
124128
}],
125129
yAxes: [{
130+
display: this.scaleShow,
126131
stacked: true,
127132
scaleLabel: {
128133
display: (this.yLabel !== "") ? true : false,
129134
labelString: (this.yLabel !== "") ? this.yLabel : "",
130135
fontFamily: this._font
131136
},
132-
ticks: {
137+
ticks : {
133138
fontFamily: this._font,
134-
beginAtZero: this.scaleBeginAtZero
135-
}
139+
beginAtZero: this.scaleBeginAtZero,
140+
display: this.scaleShowLabels
141+
},
142+
gridLines: {
143+
display: this.scaleShowHorizontalLines,
144+
color: this.scaleGridLineColor,
145+
lineWidth: this.scaleLineWidth
146+
},
136147
}]
137148
},
138149

139-
stacked: true,
140-
141-
//Boolean - Whether to show labels on the scale
142-
scaleShowLabels : this.scaleShowLabels,
143-
144-
//Boolean - Whether grid lines are shown across the chart
145-
scaleShowGridLines : this.scaleShowGridLines,
146-
147-
//String - Colour of the grid lines
148-
scaleGridLineColor : this.scaleGridLineColor,
149-
150-
//Number - Width of the grid lines
151-
scaleGridLineWidth : this.scaleGridLineWidth,
152-
153150
//Boolean - If there is a stroke on each bar
154151
barShowStroke : this.barShowStroke,
155152

‎src/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<package xmlns="http://www.mendix.com/package/1.0/">
3-
<clientModule name="ChartJS" version="3.5.0" xmlns="http://www.mendix.com/clientModule/1.0/">
3+
<clientModule name="ChartJS" version="3.5.1" xmlns="http://www.mendix.com/clientModule/1.0/">
44
<widgetFiles>
55
<widgetFile path="ChartJS/widgets/BarChart/BarChart.xml"/>
66
<widgetFile path="ChartJS/widgets/LineChart/LineChart.xml"/>

‎test/widgets/ChartJS.mpk‎

-133 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)