Skip to content

Commit

Permalink
replace renderer folder metadatum with main property of package.json
Browse files Browse the repository at this point in the history
  • Loading branch information
samussiah committed Feb 13, 2019
1 parent 48a6a10 commit 5863e49
Show file tree
Hide file tree
Showing 15 changed files with 483 additions and 418 deletions.
387 changes: 212 additions & 175 deletions build/cat.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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://rawgit.com/RhoInc/viz-library/master/util/web/data/dataFiles.js'></script>
<script type = 'text/javascript' src = 'https://cdn.jsdelivr.net/gh/RhoInc/data-library/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'>
Expand Down
45 changes: 16 additions & 29 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
var myCatConfig = {
useServer: false,
rootURL: 'https://cdn.jsdelivr.net/gh/RhoInc',
dataURL: 'https://raw.githubusercontent.com/RhoInc/viz-library/master/data/',
dataURL: 'https://raw.githubusercontent.com/RhoInc/data-library/master/data/',
renderers: [
{
name: 'web-codebook',
main: 'webcodebook',
sub: 'createChart',
css: 'css/webcodebook.css',
schema: 'settings-schema.json',
folder: 'build',
defaultData: 'iris.csv'
defaultData: 'miscellaneous/iris.csv'
},

/**-------------------------------------------------------------------------------------------\
Safety Explorer Suite
Safety Explorer Suite
\-------------------------------------------------------------------------------------------**/

/***--------------------------------------------------------------------------------------\
Adverse Events
Adverse Events
\--------------------------------------------------------------------------------------***/

{
Expand All @@ -27,21 +26,19 @@ var myCatConfig = {
sub: 'createChart',
css: 'css/aeTable.css',
schema: 'settings-schema.json',
folder: 'build',
defaultData: 'safetyData/ADAE.csv'
defaultData: 'clinical-trials/adam/adae.csv'
},
{
name: 'aetimelines',
main: 'aeTimelines',
sub: null,
css: null,
schema: 'settings-schema.json',
folder: 'build',
defaultData: 'safetyData/ADAE.csv'
defaultData: 'clinical-trials/adam/adae.csv'
},

/***--------------------------------------------------------------------------------------\
Medical Signs
Medical Signs
\--------------------------------------------------------------------------------------***/

{
Expand All @@ -50,58 +47,52 @@ var myCatConfig = {
sub: null,
css: null,
schema: 'settings-schema.json',
folder: 'build',
defaultData: 'safetyData/ADBDS.csv'
defaultData: 'clinical-trials/renderer-specific/adbds.csv'
},
{
name: 'safety-outlier-explorer',
main: 'safetyOutlierExplorer',
sub: null,
css: null,
schema: 'settings-schema.json',
folder: 'build',
defaultData: 'safetyData/ADBDS.csv'
defaultData: 'clinical-trials/renderer-specific/adbds.csv'
},
{
name: 'paneled-outlier-explorer',
main: 'paneledOutlierExplorer',
sub: null,
css: null,
schema: 'settings-schema.json',
folder: 'build',
defaultData: 'safetyData/ADBDS.csv'
defaultData: 'clinical-trials/renderer-specific/adbds.csv'
},
{
name: 'safety-results-over-time',
main: 'safetyResultsOverTime',
sub: null,
css: null,
schema: 'settings-schema.json',
folder: 'build',
defaultData: 'safetyData/ADBDS.csv'
defaultData: 'clinical-trials/renderer-specific/adbds.csv'
},
{
name: 'safety-shift-plot',
main: 'safetyShiftPlot',
sub: null,
css: null,
schema: 'settings-schema.json',
folder: 'build',
defaultData: 'safetyData/ADBDS.csv'
defaultData: 'clinical-trials/renderer-specific/adbds.csv'
},
{
name: 'safety-eDISH',
main: 'safetyedish',
sub: null,
css: null,
schema: 'settings-schema.json',
folder: 'build',
defaultData: 'safetyData/ADBDS.csv',
defaultData: 'clinical-trials/renderer-specific/adbds.csv',
rootURL: 'https://cdn.jsdelivr.net/gh/ASA-DIA-InteractiveSafetyGraphics',
},

/**-------------------------------------------------------------------------------------------\
Data Cleaning
Data Cleaning
\-------------------------------------------------------------------------------------------**/

{
Expand All @@ -110,7 +101,6 @@ var myCatConfig = {
sub: null,
css: null,
schema: 'settings-schema.json',
folder: 'build',
defaultData: 'dataCleaning/queries/queries.csv'
},
{
Expand All @@ -119,7 +109,6 @@ var myCatConfig = {
sub: null,
css: null,
schema: 'settings-schema.json',
folder: 'build',
defaultData: 'dataCleaning/forms/dmc_DataPage.csv'
},
{
Expand All @@ -128,12 +117,11 @@ var myCatConfig = {
sub: null,
css: null,
schema: 'settings-schema.json',
folder: '',
defaultData: 'dataCleaning/visits/dmv_Visits.csv'
},

/**-------------------------------------------------------------------------------------------\
Miscellaneous
Miscellaneous
\-------------------------------------------------------------------------------------------**/

{
Expand All @@ -142,8 +130,7 @@ var myCatConfig = {
sub: null,
css: null,
schema: 'settings-schema.json',
folder: 'build',
defaultData: 'safetyData/ADTIMELINES.csv'
defaultData: 'clinical-trials/renderer-specific/ADTIMELINES.csv'
}
]
};
Expand Down
31 changes: 17 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

70 changes: 35 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
{
"name": "cat",
"version": "0.8.5",
"description": "The Charting Application Tester (CAT) lets users make and adjust web graphics on the fly.",
"module": "./src/index.js",
"main": "./build/cat.js",
"scripts": {
"build": "npm audit fix && npm run bundle && npm run format",
"bundle": "rollup -c",
"format": "npm run format-src && npm run format-bundle",
"format-src": "prettier --print-width=100 --tab-width=4 --single-quote --write \"./src/**/*.js\"",
"format-bundle": "prettier --print-width=100 --tab-width=4 --single-quote --write ./build/cat.js",
"watch": "rollup -c -w",
"start": "node server/app.js",
"initServer": "node server/initServer.js"
},
"author": "Rho, Inc.",
"license": "MIT",
"dependencies": {
"d3": "^3.5.14",
"webcharts": "~1",
"jquery": "~3",
"json5": "^0.5.1",
"express": "~4",
"body-parser": "~1"
},
"devDependencies": {
"babel-plugin-external-helpers": "^6.22.0",
"babel-preset-env": "^1.7.0",
"jimp": "^0.2.27",
"jsdom": "~7",
"prettier": "^1.7.4",
"rollup": "^0.66.6",
"rollup-plugin-babel": "^2.7.1",
"showdown": "~1"
}
"name": "cat",
"version": "0.8.5",
"description": "The Charting Application Tester (CAT) lets users make and adjust web graphics on the fly.",
"module": "./src/index.js",
"main": "./build/cat.js",
"scripts": {
"build": "npm audit fix && npm run bundle && npm run format",
"bundle": "rollup -c",
"format": "npm run format-src && npm run format-bundle",
"format-src": "prettier --print-width=100 --tab-width=4 --single-quote --write \"./src/**/*.js\"",
"format-bundle": "prettier --print-width=100 --tab-width=4 --single-quote --write ./build/cat.js",
"watch": "rollup -c -w",
"start": "node server/app.js",
"initServer": "node server/initServer.js"
},
"author": "Rho, Inc.",
"license": "MIT",
"dependencies": {
"d3": "^3.5.14",
"webcharts": "~1",
"jquery": "~3",
"json5": "^0.5.1",
"express": "~4",
"body-parser": "~1"
},
"devDependencies": {
"babel-plugin-external-helpers": "^6.22.0",
"babel-preset-env": "^1.7.0",
"jimp": "^0.2.27",
"jsdom": "~7",
"prettier": "^1.7.4",
"rollup": "^0.66.6",
"rollup-plugin-babel": "^2.7.1",
"showdown": "~1"
}
}
1 change: 1 addition & 0 deletions src/cat/controls/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { initEnvConfig } from './initEnvConfig';

export function init(cat) {
cat.current = cat.config.renderers[0];
cat.current.version = 'master';
initSubmit(cat);
initRendererSelect(cat);
initDataSelect(cat);
Expand Down
31 changes: 8 additions & 23 deletions src/cat/controls/initRendererSelect.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import updateRenderer from './initRendererSelect/updateRenderer';

export function initRendererSelect(cat) {
cat.controls.rendererWrap.append('h3').text('1. Choose a Charting Library');
cat.controls.rendererWrap.append('span').text('Library: ');
Expand All @@ -8,36 +10,19 @@ export function initRendererSelect(cat) {
.data(cat.config.renderers)
.enter()
.append('option')
.text(function(d) {
return d.name;
});

cat.controls.rendererSelect.on('change', function(d) {
cat.current = d3
.select(this)
.select('option:checked')
.data()[0];

//update the chart type configuration to the defaults for the selected renderer
cat.controls.mainFunction.node().value = cat.current.main;
cat.controls.versionSelect.node().value = 'master';
cat.controls.subFunction.node().value = cat.current.sub;
cat.controls.schema.node().value = cat.current.schema;
.text(d => d.name);

//update the selected data set to the default for the new rendererSection
cat.controls.dataFileSelect.selectAll('option').property('selected', function(e) {
return cat.current.defaultData == e.label ? true : null;
});

//Re-initialize the chart config section
cat.settings.set(cat);
cat.controls.rendererSelect.on('change', function() {
updateRenderer.call(cat, this);
});
cat.controls.rendererWrap.append('br');
cat.controls.rendererWrap.append('span').text('Version: ');
cat.controls.versionSelect = cat.controls.rendererWrap.append('input');
cat.controls.versionSelect.node().value = 'master';
cat.controls.versionSelect.on('input', function() {
cat.current.version = this.value;
});
cat.controls.versionSelect.on('change', function() {
//checkVersion()
cat.settings.set(cat);
});
cat.controls.rendererWrap.append('br');
Expand Down
21 changes: 21 additions & 0 deletions src/cat/controls/initRendererSelect/updateRenderer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
export default function updateRenderer(select) {
this.current = d3
.select(select)
.select('option:checked')
.data()[0];
this.current.version = 'master';

//update the chart type configuration to the defaults for the selected renderer
this.controls.mainFunction.node().value = this.current.main;
this.controls.versionSelect.node().value = 'master';
this.controls.subFunction.node().value = this.current.sub;
this.controls.schema.node().value = this.current.schema;

//update the selected data set to the default for the new rendererSection
this.controls.dataFileSelect
.selectAll('option')
.property('selected', d => this.current.defaultData === d.label);

//Re-initialize the chart config section
this.settings.set(this);
}
Loading

0 comments on commit 5863e49

Please sign in to comment.