Actions Support + Minor Bug + gitignore

.gitignore

@@ -0,0 +1,29 @@
+# Created by .ignore support plugin (hsz.mobi)
+### macOS template
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+

Core/Data.php

@@ -30,7 +30,7 @@ public function __construct()
     public function encode(): array {
         $lines = array();
         $labels = array();
-        /** @var Line $item */
+        /** @var Line $line */
         foreach ($this->lines as $line) {
             $encode = $line->encode();
             $labels = $encode["labels"];

Core/Graph.php

@@ -47,14 +47,20 @@ class Graph
      */
     private $method;
 
+    /**
+     * @var array
+     */
+    private $actions;
+
 
-    public function __construct(string $id, string $type, string $title, string $service, string $method)
+    public function __construct(string $id, string $type, string $title, string $service, string $method, array $actions)
     {
         $this->id = $id;
         $this->type = $type;
         $this->title = $title;
         $this->service = $service;
         $this->method = $method;
+        $this->actions = $actions;
         $this->data = new Data();
     }
 
@@ -64,6 +70,7 @@ public function __construct(string $id, string $type, string $title, string $ser
     public function encode() : array {
         return array(
             "informations" => $this->encodeGraphInformations(),
+            "actions" => $this->actions,
             "data" => $this->data->encode()
         );
     }
@@ -171,4 +178,8 @@ public function setService(string $service)
     {
         $this->service = $service;
     }
+
+    public static function fromArray(array $data): ?Graph {
+        return new Graph($data["id"], $data["type"], $data["title"], $data["service"], $data["method"], $data["actions"]);
+    }
 }

Core/Line.php

@@ -91,6 +91,8 @@ public function defaultLabelForDate(string $format, string $increments, $value =
             if ($lastDate == null || $lastDate < $item->getDate())
                 $lastDate = $item->getDate();
         }
+        if ($firstDate == null || $lastDate == null)
+            return;
         $date = clone $firstDate;
         $date->modify($increments);
         if ($date <= $firstDate)
@@ -135,7 +137,9 @@ public function setValueForItemWithLabel(string $label, float $value, bool $desi
 
     public function encode(): array {
         $res = array(
-            "label" => $this->label
+            "label" => $this->label,
+            "labels" => array(),
+            "data" => array()
         );
         /** @var DataItem $item */
         foreach ($this->items as $item)

DependencyInjection/Configuration.php

@@ -64,6 +64,14 @@ private function addEntitiesSection(ArrayNodeDefinition $node)
                             ->enumNode('type')->isRequired()->cannotBeEmpty()
                                 ->values(Configuration::TYPES)
                             ->end()
+                            ->arrayNode('actions')
+                                ->prototype('array')->addDefaultsIfNotSet()
+                                    ->children()
+                                        ->scalarNode('title')->isRequired()->cannotBeEmpty()->end()
+                                        ->scalarNode('id')->cannotBeEmpty()->end()
+                                    ->end()
+                                ->end()
+                            ->end()
                         ->end()
                     ->end()
                 ->end()

DependencyInjection/DBStatisticExtension.php

@@ -44,13 +44,10 @@ private function loadBase(array $config, ContainerBuilder $container)
      */
     private function loadGraphs(array $config, ContainerBuilder $container)
     {
-        foreach ($config['graphs'] as $name => $values) {
+        foreach ($config['graphs'] as $name => &$values) {
             $values['id'] = $name;
-
             if (!isset($values['service']))
                 $values['service'] = $config['service'];
-
-            $config['graphs'][$name] = $values;
         }
         $container->setParameter($this->getAlias().'.graphs', $config['graphs']);
     }

Manager/GraphManager.php

@@ -58,7 +58,10 @@ public function getGraphWithID(string $graphID, array $parameters) : ?Graph {
     }
 
     private function decodeGraphs(array $graphs) {
-        foreach ($graphs as $graph)
-            $this->graphs[$graph["id"]] = new Graph($graph["id"], $graph["type"], $graph["title"], $graph["service"], $graph["method"]);
+        foreach ($graphs as $graph) {
+            $g = Graph::fromArray($graph);
+            if ($g != null)
+                $this->graphs[$graph["id"]] = $g;
+        }
     }
 }

Resources/public/js/statcore.js

@@ -2,20 +2,20 @@
  * Created by hugofouquet on 26/03/2017.
  */
 
-function loadGraph(gId) {
+function loadGraph(gID) {
     $.ajax({
-        url: "/statistic/data/" + gId,
+        url: "/statistic/data/" + gID,
         data: null,
         success: function( res ) {
             var graph = res.graph;
             var response = res.response;
             var container = $("div[data-id='" + response.id + "']");
             if (response.statusCode === 200) {
-                var elementID =  "elm_" + gId;
+                var elementID =  "elm_" + graph.informations.id;
                 $('<canvas>').attr({
                     id: elementID
                 }).appendTo(container);
-                insertButtons([{title:"hello", id:"helloid"}], container);
+                insertActions(graph, container);
                 showGraph(graph, elementID);
             } else {
                 container.append("<h3 class='graph-error graph-error-title'>Error Loading Graph</h3>");
@@ -26,23 +26,44 @@ function loadGraph(gId) {
 }
 
 function showGraph(graph, elemId){
-    new Chart(elemId, {
+    window["graphs"][graph.informations.id] = new Chart(elemId, {
         type: graph.informations.type,
         data: graph.data,
         options: graph.options
     });
 }
 
-function insertButtons(buttons, parent) {
-    var buttonsContainer = $('<div>').attr({
-        class: "buttons-container"
-    }).prependTo(parent);
+function updateGraph(gID, action) {
+    $.ajax({
+        url: "/statistic/data/" + gID,
+        data: action,
+        success: function( res ) {
+            var chart = window["graphs"][res.response.id];
+            if (res.response.statusCode === 200 && typeof chart !== "undefined") {
+                chart.data.labels = res.graph.data.labels;
+                chart.data.datasets = res.graph.data.datasets;
+                chart.update();
+            } else
+                console.error("Impossible to update graph with id : " + gID);
+        }
+    });
+}
 
-    for (var i = 0; i < buttons.length; i++) {
-        var button = buttons[i];
-        $('<button>').attr({
-            id: button.id
-        }).text(button.title).prependTo(buttonsContainer);
+function insertActions(graph, parent) {
+    var actionsContainer = $('<div>').attr({
+        class: "actions-container"
+    }).prependTo(parent);
+    for (var i = 0; i < graph.actions.length; i++) {
+        var action = graph.actions[i];
+        $('<button>')
+            .text(action.title)
+            .prependTo(actionsContainer)
+            .data("id", graph.informations.id)
+            .data("action", action)
+            .click(function () {
+                var data = $(this).data();
+                updateGraph(data.id, data.action);
+        });
     }
 }
 

Resources/views/Default/index.html.twig

@@ -5,7 +5,7 @@
         display: inline-block;
         background-color: #cdcdcd;
     }
-    div[data-type=graph] div.buttons-container {
+    div[data-type=graph] div.actions-container {
         text-align: center;
     }