merge dev-v0.9.4

RhoInc · Aug 13, 2019 · a85d405 · a85d405
2 parents e156f54 + 0a937da
commit a85d405
Show file tree

Hide file tree

Showing 10 changed files with 100 additions and 36 deletions.
diff --git a/build/cat.js b/build/cat.js
@@ -614,7 +614,10 @@
         return new Promise(function(resolve, reject) {
             cat.current.url =
                 cat.current.version === 'master'
-                    ? (cat.current.rootURL || cat.config.rootURL) + '/' + cat.current.name
+                    ? (cat.current.rootURL || cat.config.rootURL) +
+                      '/' +
+                      cat.current.name +
+                      '@latest'
                     : (cat.current.rootURL || cat.config.rootURL) +
                       '/' +
                       cat.current.name +
@@ -800,21 +803,27 @@
         });
         var version = cat.controls.versionSelect.node().value;
         cat.current.main = cat.controls.mainFunction.node().value;
-        cat.current.sub = cat.controls.subFunction.node().value;
+        cat.current.sub = cat.controls.subFunction.node().value.split('.');
 
         function render(error, data) {
+            var myChart = void 0;
             if (error) {
                 cat.status.loadStatus(cat.statusDiv, false, dataFilePath);
             } else {
                 cat.status.loadStatus(cat.statusDiv, true, dataFilePath);
-                if (cat.current.sub) {
-                    var myChart = window[cat.current.main][cat.current.sub](
-                        '.cat-chart',
-                        cat.current.config
+                if (cat.current.sub.join('') !== '') {
+                    myChart = window[cat.current.main];
+                    cat.current.sub.forEach(function(subsub) {
+                        myChart = myChart[subsub];
+                    });
+                    myChart = myChart('.cat-chart', cat.current.config);
+                    cat.status.chartCreateStatus(
+                        cat.statusDiv,
+                        cat.current.main,
+                        cat.current.sub[0]
                     );
-                    cat.status.chartCreateStatus(cat.statusDiv, cat.current.main, cat.current.sub);
                 } else {
-                    var myChart = window[cat.current.main]('.cat-chart .chart', cat.current.config);
+                    myChart = window[cat.current.main]('.cat-chart .chart', cat.current.config);
                     cat.status.chartCreateStatus(cat.statusDiv, cat.current.main);
                 }
 
@@ -933,7 +942,7 @@
         var cssPath =
             version !== 'master'
                 ? cat.config.rootURL + '/Webcharts@' + version + '/css/webcharts.css'
-                : cat.config.rootURL + '/Webcharts/css/webcharts.css';
+                : cat.config.rootURL + '/Webcharts@latest/css/webcharts.css';
 
         var current_css = getCSS().filter(function(f) {
             return f.link == cssPath;
@@ -961,8 +970,8 @@
         // --- load js --- //
         var rendererPath =
             version !== 'master'
-                ? cat.config.rootURL + '/' + library + '@' + version + '/build/webcharts.js'
-                : cat.config.rootURL + '/Webcharts/build/webcharts.js';
+                ? cat.config.rootURL + '/Webcharts@' + version + '/build/webcharts.js'
+                : cat.config.rootURL + '/Webcharts@latest/build/webcharts.js';
 
         var current_js = getJS().filter(function(f) {
             return f.link == rendererPath;
@@ -1065,6 +1074,9 @@
             .data(cat.config.renderers)
             .enter()
             .append('option')
+            .attr('label', function(d) {
+                return d.sub ? d.name + ' (' + d.sub.split('.').pop() + ')' : d.name;
+            })
             .text(function(d) {
                 return d.name;
             });
@@ -1521,7 +1533,7 @@
             cat.current.rootURL || cat.config.rootURL,
             cat.current.version !== 'master'
                 ? cat.current.name + '@' + cat.current.version
-                : cat.current.name,
+                : cat.current.name + '@latest',
             cat.current.schema
         ].join('/');
 

diff --git a/index.html b/index.html
@@ -20,7 +20,7 @@
         <script type = 'text/javascript' src = 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js'></script>
         <script type = 'text/javascript' src = '//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js'></script>
         <script type = 'text/javascript' src = './build/cat.js'></script>
-        <script type = 'text/javascript' src = 'https://cdn.jsdelivr.net/gh/RhoInc/data-library/dataFiles.js'></script>
+        <script type = 'text/javascript' src = 'https://cdn.jsdelivr.net/gh/RhoInc/data-library@latest/dataFiles.js'></script>
 
         <link type = 'text/css' rel = 'stylesheet' href = './css/cat.css'>
         <link type = 'text/css' rel = 'stylesheet' href = 'https://cdn.rawgit.com/RhoInc/webcharts/master/css/webcharts.css'>

diff --git a/index.js b/index.js
@@ -3,6 +3,7 @@ var myCatConfig = {
     rootURL: 'https://cdn.jsdelivr.net/gh/RhoInc',
     dataURL: 'https://raw.githubusercontent.com/RhoInc/data-library/master/data/',
     renderers: [
+
         {
             name: 'web-codebook',
             main: 'webcodebook',
@@ -120,6 +121,59 @@ var myCatConfig = {
             defaultData: 'clinical-trials/data-cleaning/visits.csv'
         },
 
+    /**-------------------------------------------------------------------------------------------\
+      Dashboard charts
+    \-------------------------------------------------------------------------------------------**/
+
+        {
+            name: 'dashboard-charts',
+            main: 'dashboardCharts',
+            sub: 'renderers.accrual',
+            css: null,
+            schema: 'src/accrual/settings-schema.json',
+            defaultData: 'clinical-trials/data-cleaning/dashboard-accrual.csv'
+        },
+        {
+            name: 'dashboard-charts',
+            main: 'dashboardCharts',
+            sub: 'renderers.accrualOverTimeDerived',
+            css: null,
+            schema: 'src/accrual-over-time/settings-schema.json',
+            defaultData: 'clinical-trials/data-cleaning/dashboard-accrual.csv'
+        },
+        {
+            name: 'dashboard-charts',
+            main: 'dashboardCharts',
+            sub: 'renderers.accrualOverTime',
+            css: null,
+            schema: 'src/accrual-over-time/settings-schema.json',
+            defaultData: 'clinical-trials/data-cleaning/dashboard-accrual-over-time.csv'
+        },
+        {
+            name: 'dashboard-charts',
+            main: 'dashboardCharts',
+            sub: 'renderers.forms',
+            css: null,
+            schema: 'src/accrual/settings-schema.json',
+            defaultData: 'clinical-trials/data-cleaning/dashboard-forms.csv'
+        },
+        {
+            name: 'dashboard-charts',
+            main: 'dashboardCharts',
+            sub: 'renderers.queries',
+            css: null,
+            schema: 'src/accrual/settings-schema.json',
+            defaultData: 'clinical-trials/data-cleaning/dashboard-queries.csv'
+        },
+        {
+            name: 'dashboard-charts',
+            main: 'dashboardCharts',
+            sub: 'renderers.visitCompletion',
+            css: null,
+            schema: 'src/accrual/settings-schema.json',
+            defaultData: 'clinical-trials/data-cleaning/dashboard-visit-completion.csv'
+        },
+
     /**-------------------------------------------------------------------------------------------\
       Miscellaneous
     \-------------------------------------------------------------------------------------------**/

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "cat",
-    "version": "0.9.5",
+    "version": "0.9.4",
     "description": "The Charting Application Tester (CAT) lets users make and adjust web graphics on the fly.",
     "module": "./src/index.js",
     "main": "./build/cat.js",

diff --git a/src/cat/controls/initRendererSelect.js b/src/cat/controls/initRendererSelect.js
@@ -10,6 +10,7 @@ export function initRendererSelect(cat) {
         .data(cat.config.renderers)
         .enter()
         .append('option')
+        .attr('label', d => (d.sub ? d.name + ' (' + d.sub.split('.').pop() + ')' : d.name))
         .text(d => d.name);
 
     cat.controls.rendererSelect.on('change', function() {

diff --git a/src/cat/loadLibrary.js b/src/cat/loadLibrary.js
@@ -11,7 +11,7 @@ export function loadLibrary(cat) {
     var cssPath =
         version !== 'master'
             ? cat.config.rootURL + '/Webcharts@' + version + '/css/webcharts.css'
-            : cat.config.rootURL + '/Webcharts/css/webcharts.css';
+            : cat.config.rootURL + '/Webcharts@latest/css/webcharts.css';
 
     var current_css = getCSS().filter(f => f.link == cssPath);
     var css_loaded = current_css.length > 0;
@@ -35,8 +35,8 @@ export function loadLibrary(cat) {
     // --- load js --- //
     var rendererPath =
         version !== 'master'
-            ? cat.config.rootURL + '/' + library + '@' + version + '/build/webcharts.js'
-            : cat.config.rootURL + '/Webcharts/build/webcharts.js';
+            ? cat.config.rootURL + '/Webcharts@' + version + '/build/webcharts.js'
+            : cat.config.rootURL + '/Webcharts@latest/build/webcharts.js';
 
     var current_js = getJS().filter(f => f.link == rendererPath);
     var js_loaded = current_js.length > 0;

diff --git a/src/cat/loadRenderer/loadPackageJson.js b/src/cat/loadRenderer/loadPackageJson.js
@@ -2,7 +2,7 @@ export default function loadPackageJson(cat) {
     return new Promise(function(resolve, reject) {
         cat.current.url =
             cat.current.version === 'master'
-                ? `${cat.current.rootURL || cat.config.rootURL}/${cat.current.name}`
+                ? `${cat.current.rootURL || cat.config.rootURL}/${cat.current.name}@latest`
                 : `${cat.current.rootURL || cat.config.rootURL}/${cat.current.name}@${
                       cat.current.version
                   }`;

diff --git a/src/cat/renderChart.js b/src/cat/renderChart.js
@@ -9,21 +9,23 @@ export function renderChart(cat) {
     var dataObject = cat.config.dataFiles.find(f => f.label == dataFile);
     var version = cat.controls.versionSelect.node().value;
     cat.current.main = cat.controls.mainFunction.node().value;
-    cat.current.sub = cat.controls.subFunction.node().value;
+    cat.current.sub = cat.controls.subFunction.node().value.split('.');
 
     function render(error, data) {
+        let myChart;
         if (error) {
             cat.status.loadStatus(cat.statusDiv, false, dataFilePath);
         } else {
             cat.status.loadStatus(cat.statusDiv, true, dataFilePath);
-            if (cat.current.sub) {
-                var myChart = window[cat.current.main][cat.current.sub](
-                    '.cat-chart',
-                    cat.current.config
-                );
-                cat.status.chartCreateStatus(cat.statusDiv, cat.current.main, cat.current.sub);
+            if (cat.current.sub.join('') !== '') {
+                myChart = window[cat.current.main];
+                cat.current.sub.forEach(subsub => {
+                    myChart = myChart[subsub];
+                });
+                myChart = myChart('.cat-chart', cat.current.config);
+                cat.status.chartCreateStatus(cat.statusDiv, cat.current.main, cat.current.sub[0]);
             } else {
-                var myChart = window[cat.current.main]('.cat-chart .chart', cat.current.config);
+                myChart = window[cat.current.main]('.cat-chart .chart', cat.current.config);
                 cat.status.chartCreateStatus(cat.statusDiv, cat.current.main);
             }
 

diff --git a/src/cat/settings/set.js b/src/cat/settings/set.js
@@ -8,7 +8,7 @@ export function set(cat) {
         cat.current.rootURL || cat.config.rootURL,
         cat.current.version !== 'master'
             ? cat.current.name + '@' + cat.current.version
-            : cat.current.name,
+            : cat.current.name + '@latest',
         cat.current.schema
     ].join('/');