diff --git a/EnigmePython/cryptarithme.py b/EnigmePython/Multi/cryptarithme.py similarity index 100% rename from EnigmePython/cryptarithme.py rename to EnigmePython/Multi/cryptarithme.py diff --git a/EnigmePython/genCryptarythme.py b/EnigmePython/Multi/genCryptarythme.py similarity index 100% rename from EnigmePython/genCryptarythme.py rename to EnigmePython/Multi/genCryptarythme.py diff --git a/EnigmePython/chouette.py b/EnigmePython/Solo/chouette.py similarity index 100% rename from EnigmePython/chouette.py rename to EnigmePython/Solo/chouette.py diff --git a/EnigmePython/chuckNorris.py b/EnigmePython/Solo/chuckNorris.py similarity index 100% rename from EnigmePython/chuckNorris.py rename to EnigmePython/Solo/chuckNorris.py diff --git a/EnigmePython/codeCesarEncodage.py b/EnigmePython/Solo/codeCesarEncodage.py similarity index 100% rename from EnigmePython/codeCesarEncodage.py rename to EnigmePython/Solo/codeCesarEncodage.py diff --git a/EnigmePython/hanoi.py b/EnigmePython/Solo/hanoi.py similarity index 100% rename from EnigmePython/hanoi.py rename to EnigmePython/Solo/hanoi.py diff --git a/EnigmePython/palindrome.py b/EnigmePython/Solo/palindrome.py similarity index 100% rename from EnigmePython/palindrome.py rename to EnigmePython/Solo/palindrome.py diff --git a/EnigmePython/triangleDePascal.py b/EnigmePython/Solo/triangleDePascal.py similarity index 100% rename from EnigmePython/triangleDePascal.py rename to EnigmePython/Solo/triangleDePascal.py diff --git a/EnigmePython/itertools b/EnigmePython/itertools deleted file mode 100644 index e69de29b..00000000 diff --git a/EnigmePython/np b/EnigmePython/np deleted file mode 100644 index e69de29b..00000000 diff --git a/EnigmePython/re b/EnigmePython/re deleted file mode 100644 index e69de29b..00000000 diff --git a/WEB/View/src/JS/dashboard.js b/WEB/View/src/JS/dashboard.js index 15dc3f35..3f9f146e 100644 --- a/WEB/View/src/JS/dashboard.js +++ b/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 = [] - data.push(v1); - data.push(v2); + ///dataPoints=[{x:0,y:0},{x:1,y:300}] + + + + ///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", {