Changeset 2289894

Timestamp:

04/23/2020 07:58:36 AM (6 years ago)

Author:

maxicharts

Message:

parameterize columns

Location:

maxicharts-d3js-add-on/trunk

Files:

• js/dndTree.js (modified) (6 diffs)
• js/maxicharts-d3js-frontend.js (modified) (1 diff)
• maxicharts-d3js.php (modified) (3 diffs)

maxicharts-d3js-add-on/trunk/js/dndTree.js

@@ -27 +27 @@
 
 
-function processTreeList(root_input, width, height, containerName) {
-    const sample = treeList(width, height);
+function processTreeList(root_input, width, height, containerName, atts = null) {
+    const sample = treeList(width, height; atts);
     d3.select(containerName).datum(root_input).call(sample);
     //d3.select(containerName).attr()
@@ -39 +39 @@
 }
 
-function treeList(width, max_height) {
+function treeList(width, max_height, atts) {
     let margin = {top: 30, right: 20, bottom: 30, left: 30};
     //let width = 1000;
@@ -131 +131 @@
             .duration(200)      
             .style("opacity", .9);      
-        div .html("<b>Source originale:</b> "+d.data.id + "<br/><b>Accès lecture/écriture:</b> "+d.data.data['Accès restreint'] + "<br/><b>Remarques:</b> " + d.data.data['Remarques']) 
+        div .html("<b>Source originale:</b> "+d.data.id + "<br/><b>Accès lecture/écriture:</b> "+d.data.data[atts.more_infos_1_col] + "<br/><b>Remarques:</b> " + d.data.data[atts.more_infos_2_col])   
             .style("left", (d3.event.pageX + 200) + "px")       
             .style("top", (d3.event.pageY - 28) + "px");    
@@ -1049 +1049 @@
 var MaxiChartsCollapsibleTree = class {
     
-    constructor(url_of_input_file, jsonStrObject, width, height, containerName, csv_child_col_name = null, csv_parent_col_name = null,csv_description_col_name = null)  {
+    constructor(url_of_input_file, jsonStrObject, width, height, containerName, maxicharts_d3js_ajax_shortcode_param = null)  {
         console.log("Building collapsible tree with url:"+url_of_input_file);
         console.log("or object:");
@@ -1076 +1076 @@
                     console.log(data[0]);      
                     
-                    var childColumn = "Chemin source";
-                    var parentColumn = "Parent";
-                    var accessColumn = "Access";
-                    var descriptionColumn = "Description";
+                    /*
+                     * Acces: "SP + BA"
+Chemin source: "RESSOURCES_HUMAINES"
+Parent: "Partage"
+Remarques: "Trouver un nom qui indique la nature du partage"
+                     * 
+                     */
                     
+                    var childColumn = maxicharts_d3js_ajax_shortcode_param.child_col;//"Chemin source";
+                    var parentColumn = maxicharts_d3js_ajax_shortcode_param.child_col;//"Parent";
+                    /*var accessColumn = "Access";
+                    var descriptionColumn = "Description";*/
+                    // parent_col="Parent" child_col="Chemin source" more_infos_1_col="Acces" more_infos_1_col="Remarques"
 
                     var stratify = d3.stratify()
@@ -1092 +1100 @@
                     console.log("After stratify:");
                     console.log(root);
-                    processTreeList(root, width, height, containerName);
+                    processTreeList(root, width, height, containerName, maxicharts_d3js_ajax_shortcode_param);
                 
             })

maxicharts-d3js-add-on/trunk/js/maxicharts-d3js-frontend.js

@@ -105 +105 @@
                         } else if (type == "tree"){
                             // create tree from file - CSV or JSON
-                            var myTree = new MaxiChartsCollapsibleTree(element, null,  width, height,'#visualization');
+                            var myTree = new MaxiChartsCollapsibleTree(element, null,  width, height,'#visualization', maxicharts_d3js_ajax_object);
                         }
                     } else if (type == 'sunburst'){

maxicharts-d3js-add-on/trunk/maxicharts-d3js.php

@@ -595 +595 @@
             'height' => '500px',
             'groups' => '',
-            'type' => 'sunburst'
+            'type' => 'sunburst',
+            'parent_col' => 'parent',
+            'child_col' => 'child',
+            'more_infos_1_col' => 'Acces',
+            'more_infos_2_col' => 'Remarques',
         ), $attributes);
+        // parent_col="Parent" child_col="Chemin source" more_infos_1_col="Acces" more_infos_1_col="Remarques"
         $show_buttons = isset($a['show_buttons']) ? boolval($a['show_buttons']) : true;
         $data_path = isset($a['data_path']) ? $a['data_path'] : '';    
@@ -626 +631 @@
         $this->MCD3JS_enqueue_scripts($type);
         //$d3jsKey = 'network-frontend-js';
-        wp_localize_script($this->d3js_frontend_key, 'maxicharts_d3js_ajax_object', array(
+        $localized_array = array_merge($a, array(
             'ajax_url' => admin_url('admin-ajax.php'),
             'height' => $height,
@@ -634 +639 @@
             'gf_form_id' => $gf_form_id,
         ));
+        
+        wp_localize_script($this->d3js_frontend_key, 'maxicharts_d3js_ajax_object', $localized_array);
+        
+        
+        
         $buttons = '<p class="maxicharts_d3js_button_bar">
   <input type="button" id="lastMonth" value="Last month"><br>