Chart js2.8

src/ChartJs-Core-Tests/Chart2dDataTest.class.st → src/ChartJs-Core-Tests/ChartDataTest.class.st

@@ -2,18 +2,18 @@
 A Chart2dDataTest is a test class for testing the behavior of Chart2dData
 "
 Class {
-	#name : #Chart2dDataTest,
+	#name : #ChartDataTest,
 	#superclass : #ChartDataAbstractTest,
 	#category : #'ChartJs-Core-Tests'
 }
 
 { #category : #helpers }
-Chart2dDataTest >> actualClass [
-	^ Chart2dData
+ChartDataTest >> actualClass [
+	^ ChartData
 ]
 
 { #category : #tests }
-Chart2dDataTest >> testHasData [
+ChartDataTest >> testHasData [
 	| datas |
 	datas := self actualClass
 		xObjects: {'Eating' . 'Drinking' . 'Sleeping' . 'Designing' . 'Coding' . 'Cycling' . 'Running'}

src/ChartJs-Core-Tests/ChartTypeTest.class.st

@@ -0,0 +1,40 @@
+Class {
+	#name : #ChartTypeTest,
+	#superclass : #TestCase,
+	#category : #'ChartJs-Core-Tests'
+}
+
+{ #category : #tests }
+ChartTypeTest >> testNeoJsonOnData [
+	| json chart stream colorConst |
+	chart := ChartData
+		xObjects: {'Eating' . 'Drinking'}
+		multiYObjects: {('Cyril' -> #(28 48))}.
+	chart dataSets
+		do: [ :ds | 
+			ds styleSheet pointHoverBackgroundColor: Color red.
+			ds styleSheet pointBackgroundColor: Color red.
+			ds styleSheet fillColor: Color red.
+			ds styleSheet borderColor: Color red.
+			ds styleSheet pointHoverBorderColor: Color red.
+			ds styleSheet pointBorderColor: Color red.
+			ds styleSheet backgroundColor: Color red ].
+	stream := '' writeStream.
+	json := (NeoJSONWriter on: stream) nextPut: chart.
+	colorConst := '"fill":false,"pointBackgroundColor":"rgba(255,0,0,1.0)","pointBorderColor":"rgba(255,0,0,1.0)","borderColor":"rgba(255,0,0,1.0)","pointHoverBorderColor":"rgba(255,0,0,1.0)","backgroundColor":"rgba(255,0,0,1.0)"'.
+	self
+		assert: stream contents
+		equals:
+			'{"labels":["Eating","Drinking"],"datasets":[{' , colorConst
+				, ',"label":"Cyril","data":[28,48]}]}'
+]
+
+{ #category : #tests }
+ChartTypeTest >> testNeoJsonOnOnlyType [
+	| json chart stream |
+	chart := ChartBar new.
+	stream := '' writeStream.
+	json := (NeoJSONWriter on: stream) nextPut: chart.
+
+	self assert: stream contents equals: '{"type":"bar"}'
+]

src/ChartJs-Core/Boolean.extension.st

@@ -0,0 +1,6 @@
+Extension { #name : #Boolean }
+
+{ #category : #'*ChartJs-Core' }
+Boolean >> forChartJs [
+
+]

src/ChartJs-Core/ChartBar.class.st

@@ -12,14 +12,9 @@ ChartBar class >> dataFunction [
 	^ 'bars'
 ]
 
-{ #category : #ChartJs }
-ChartBar class >> eventsCode [
-	^ 'getBarsAtEvent(evt)'
-]
-
 { #category : #ChartJs }
 ChartBar class >> forChartJS [
-	^ 'Bar'
+	^ 'bar'
 ]
 
 { #category : #testing }

src/ChartJs-Core/ChartBoxPlot.class.st

@@ -12,14 +12,9 @@ ChartBoxPlot class >> dataFunction [
 	^ 'bars'
 ]
 
-{ #category : #ChartJs }
-ChartBoxPlot class >> eventsCode [
-	^ 'getBarsAtEvent(evt)'
-]
-
 { #category : #ChartJs }
 ChartBoxPlot class >> forChartJS [
-	^ 'BoxPlot'
+	^ 'boxplot'
 ]
 
 { #category : #testing }