Skip to content

Commit aa63eac

Browse files
authored
Merge pull request #187 from xdev-software/develop
Release
2 parents 16a2676 + 8d0d79a commit aa63eac

File tree

2 files changed

+121
-0
lines changed

2 files changed

+121
-0
lines changed

Diff for: CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## 2.0.1
2+
* Restored ``DisplayFormats`` #186
3+
14
## 2.0.0
25
* Scales have been reworked and are now nearly identical to the [types defined in ChartJS](https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts)
36
* The use of ``Color`` for various coloring related options is no longer required.

Diff for: chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/time/TimeScaleOptions.java

+118
Original file line numberDiff line numberDiff line change
@@ -204,4 +204,122 @@ public Adapters setDate(final Object date)
204204
return this;
205205
}
206206
}
207+
208+
209+
/**
210+
* Reference structure for {@link TimeScaleOptions#time}.
211+
*
212+
* @see <a href="https://www.chartjs.org/docs/latest/axes/cartesian/time.html#display-formats">ChartJS Docs</a>
213+
*/
214+
public static class DisplayFormats
215+
{
216+
protected String millisecond;
217+
protected String second;
218+
protected String minute;
219+
protected String hour;
220+
protected String day;
221+
protected String week;
222+
protected String month;
223+
protected String quarter;
224+
protected String year;
225+
226+
public String getMillisecond()
227+
{
228+
return this.millisecond;
229+
}
230+
231+
public DisplayFormats setMillisecond(final String millisecond)
232+
{
233+
this.millisecond = millisecond;
234+
return this;
235+
}
236+
237+
public String getSecond()
238+
{
239+
return this.second;
240+
}
241+
242+
public DisplayFormats setSecond(final String second)
243+
{
244+
this.second = second;
245+
return this;
246+
}
247+
248+
public String getMinute()
249+
{
250+
return this.minute;
251+
}
252+
253+
public DisplayFormats setMinute(final String minute)
254+
{
255+
this.minute = minute;
256+
return this;
257+
}
258+
259+
public String getHour()
260+
{
261+
return this.hour;
262+
}
263+
264+
public DisplayFormats setHour(final String hour)
265+
{
266+
this.hour = hour;
267+
return this;
268+
}
269+
270+
public String getDay()
271+
{
272+
return this.day;
273+
}
274+
275+
public DisplayFormats setDay(final String day)
276+
{
277+
this.day = day;
278+
return this;
279+
}
280+
281+
public String getWeek()
282+
{
283+
return this.week;
284+
}
285+
286+
public DisplayFormats setWeek(final String week)
287+
{
288+
this.week = week;
289+
return this;
290+
}
291+
292+
public String getMonth()
293+
{
294+
return this.month;
295+
}
296+
297+
public DisplayFormats setMonth(final String month)
298+
{
299+
this.month = month;
300+
return this;
301+
}
302+
303+
public String getQuarter()
304+
{
305+
return this.quarter;
306+
}
307+
308+
public DisplayFormats setQuarter(final String quarter)
309+
{
310+
this.quarter = quarter;
311+
return this;
312+
}
313+
314+
public String getYear()
315+
{
316+
return this.year;
317+
}
318+
319+
public DisplayFormats setYear(final String year)
320+
{
321+
this.year = year;
322+
return this;
323+
}
324+
}
207325
}

0 commit comments

Comments
 (0)