Merge branch 'master' of https://codefirst.iut.uca.fr/git/nathan.boileau/Scripted

WEB/View/src/JS/dashboard.js

@@ -49,6 +49,7 @@ window.onload = function () {
         ]
     }
 
+
     v2 = {
         type: "line",
         xValueFormatString: "Noe",
@@ -62,9 +63,35 @@ window.onload = function () {
         ]
     }
 
-    data = []
+    ///dataPoints=[{x:0,y:0},{x:1,y:300}]
-    data.push(v1);
+
-    data.push(v2);
+    
+
+    ///v3={type:"line",xValueFormatString:"test",dataPoints};
+
+    data = [];
+
+    v = {}
+    v.type="line";
+    v.xValueFormatString="test";
+    v.dataPoints=[];
+    v.dataPoints.push({x:0,y:0});
+    v.dataPoints.push({x:0.5,y:300});
+
+    data.push(v);
+
+    v = {}
+    v.type="line";
+    v.xValueFormatString="toto";
+    v.dataPoints=[{ x: 0, y: 0 },
+        { x: 1, y: 100 },
+        { x: 2, y: 100 },
+        { x: 3, y: 200 },
+        { x: 4, y: 250 },
+        { x: 5, y: 300 },];
+
+    data.push(v);
+    ///data.push(v3);
     console.log(data);
 
     var chart = new CanvasJS.Chart("chartContainer", {