Skip to content

Commit

Permalink
remove duplicate query recency column - duplicate headers caused #159
Browse files Browse the repository at this point in the history
  • Loading branch information
@samussiah
samussiah committed Jul 19, 2019
1 parent c8d71e3 commit 3421917
Show file tree
Hide file tree
Showing 10 changed files with 117 additions and 101 deletions.
2 changes: 1 addition & 1 deletion package-lock.json
View file

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

113 changes: 63 additions & 50 deletions queryOverview.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -695,8 +695,10 @@
'.qo-component--controls .wc-controls {' +
' margin-bottom: 0;' +
' display: flex;' +
' width: 90%;' +
' width: 100%;' +
' justify-content: space-around;' +
' border-bottom: 1px solid #aaa;' +
' margin-bottom: 5px;' +
'}',
'.qo-control-grouping {' + ' display: inline-block;' + '}',
'.qo-button {' + ' float: left;' + ' display: block;' + '}',
Expand All @@ -716,22 +718,22 @@
Other controls
\---------------------------------------------------------------------------------****/
'.qo-control-grouping--other-controls {' +
' float: left;' +
' display: flex;' +
' flex-wrap: wrap;' +
' justify-content: space-evenly;' +
' float: right;' + //' display: flex;' +
//' flex-wrap: wrap;' +
//' justify-content: space-evenly;' +
' width: 25%;' +
'}',
'.qo-control-grouping--other-controls .control-group {' +
' width: 100%;' +
' margin-bottom: 15px;' +
' margin-bottom: 5px;' +
'}',
'.qo-control-grouping--other-controls .control-group:nth-child(n+3) {' +
' border-top: 1px solid #aaa;' +
'}',
'.qo-control-grouping--other-controls .control-group .wc-control-label {' +
' text-align: center;' +
' font-size: 110%;' +
' width: 100%;' +
'}', //dropdowns
'.qo-dropdown {' + '}',
'.qo-dropdown .wc-control-label {' + '}',
Expand Down Expand Up @@ -779,8 +781,11 @@
'.qo-component--chart {' +
' width: 100%;' +
' margin: 0 auto;' +
' margin-bottom: 5px;' +
' padding-bottom: 5px;' +
' float: left;' +
' position: relative;' +
' border-bottom: 1px solid #aaa;' +
'}',
'.qo-button--reset-chart {' +
' position: absolute;' +
Expand All @@ -799,6 +804,7 @@
' padding: 3px 0;' +
'}',
'.qo-component--chart .wc-chart {' + ' z-index: 1;' + '}',
'.qo-component--chart .legend {' + ' width: auto;' + '}',
'.qo-component--chart .legend-title {' + ' cursor: help;' + '}',
'.qo-component--chart .legend-item {' +
' cursor: pointer;' +
Expand Down Expand Up @@ -852,49 +858,37 @@
}

function defineListingSettings() {
var _this = this;

this.listing.config.cols = this.config.details
? this.config.details.map(function(d) {
return d.value_col;
})
: Object.keys(this.raw_data[0]).filter(function(key) {
return key !== 'Form: Field';
});
return ['Form: Field', _this.config.recency_category_col].indexOf(key) < 0;
}); // remove derived variables (recency_category_col is captured in variable queryrecency, derived in ./defineNewVariables)

this.listing.config.headers = this.config.details
? this.config.details.map(function(d) {
return d.label;
})
: Object.keys(this.raw_data[0]).filter(function(key) {
return key !== 'Form: Field';
return ['Form: Field', _this.config.recency_category_col].indexOf(key) < 0;
});
}

function defineNewVariables() {
var _this = this;

var queryAgeCol = this.config.status_groups.find(function(status_group) {
return status_group.label === 'Query Age';
}).value_col;
var queryRecencyCol = this.config.filters.find(function(filter) {
return filter.label === 'Query Recency';
}).value_col;
var queryAgeCol = this.config.status_groups.find(function(status_group) {
return status_group.label === 'Query Age';
}).value_col;
this.raw_data.forEach(function(d) {
//Concatenate form and field to avoid duplicates across forms.
d['Form: Field'] = d[_this.config.form_col] + ': ' + d[_this.config.field_col]; //Define query age.

if (_this.config.age_statuses.indexOf(d[_this.config.status_col]) < 0)
d[queryAgeCol] = d[_this.config.status_col];
else {
var age = +d[_this.config.age_col];

_this.config.ageRanges.forEach(function(ageRange, i) {
if (i === 0 && ageRange[0] <= age && age <= ageRange[1])
d[queryAgeCol] = _this.config.ageRangeCategories[i];
else if (i === _this.config.ageRanges.length - 1 && ageRange[0] < age)
d[queryAgeCol] = _this.config.ageRangeCategories[i];
else if (ageRange[0] < age && age <= ageRange[1])
d[queryAgeCol] = _this.config.ageRangeCategories[i];
});
} //Define query recency.
d['Form: Field'] = d[_this.config.form_col] + ': ' + d[_this.config.field_col]; //Define query recency.

if (d.hasOwnProperty(_this.config.recency_category_col)) {
d[queryRecencyCol] = d[_this.config.recency_category_col] || 'N/A';
Expand All @@ -912,6 +906,21 @@
else if (recencyRange[0] < recency && recency <= recencyRange[1])
d[queryRecencyCol] = _this.config.recencyRangeCategories[i];
});
} //Define query age.

if (_this.config.age_statuses.indexOf(d[_this.config.status_col]) < 0)
d[queryAgeCol] = d[_this.config.status_col];
else {
var age = +d[_this.config.age_col];

_this.config.ageRanges.forEach(function(ageRange, i) {
if (i === 0 && ageRange[0] <= age && age <= ageRange[1])
d[queryAgeCol] = _this.config.ageRangeCategories[i];
else if (i === _this.config.ageRanges.length - 1 && ageRange[0] < age)
d[queryAgeCol] = _this.config.ageRangeCategories[i];
else if (ageRange[0] < age && age <= ageRange[1])
d[queryAgeCol] = _this.config.ageRangeCategories[i];
});
}
});
}
Expand Down Expand Up @@ -2305,21 +2314,6 @@
onDestroy: onDestroy
};

function removeHeaderlessColumns() {
var col_index = this.config.headers.indexOf('');

if (col_index !== -1) {
console.warn('Column(s) without headers were detected and removed from listing. '); // delete data for headerless column

this.data.raw.forEach(function(d) {
return delete d[''];
}); // remove headerless column placeholder from config too ... LEAVE NO TRACE

this.config.headers.splice(col_index, 1);
this.config.cols.splice(col_index, 1);
}
}

function applyVariableMetadata() {
var _this = this;

Expand Down Expand Up @@ -2403,12 +2397,6 @@
description:
'Number of days between query open date and data extraction date, regardless of query status.'
},
{
variable: this.chart.initialSettings.recency_category_col,
label: 'Query Recency',
description:
'Number of days by category between query open date and data extraction date, regardless of query status. Categories include last 7, 14, and 30 days.'
},
{
variable: 'queryrecency',
label: 'Query Recency',
Expand Down Expand Up @@ -2450,7 +2438,6 @@
}

function onInit$1() {
removeHeaderlessColumns.call(this);
applyVariableMetadata.call(this);
}

Expand Down Expand Up @@ -2671,7 +2658,33 @@
}

function onDraw$1() {
var _this = this;

//console.log(this.table.selectAll('thead tr th'));
//console.log(this.table.selectAll('tbody tr:first-child td'));
var variables = Object.keys(this.data.raw[0]) //.sort(d3.ascending)
.map(function(variable, i) {
return {
variable: variable,
column: _this.config.cols.find(function(col) {
return col === variable;
}),
columnIndex: _this.config.cols.findIndex(function(col) {
return col === variable;
}),
header:
_this.config.headers[
_this.config.cols.findIndex(function(col) {
return col === variable;
})
],
headerIndex: _this.config.headers.findIndex(function(col) {
return col === variable;
})
};
}); //console.table(variables.sort((a,b) => a.index - b.index));
//Add tooltips to column headers.

addHeaderTooltips.call(this); //Update default Webcharts column sorting.

updateColumnSorting.call(this); //Truncate cells with length greater than `settings.truncation_cutoff`.
Expand Down
8 changes: 6 additions & 2 deletions src/chart/onInit/defineListingSettings.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
export default function defineListingSettings() {
this.listing.config.cols = this.config.details
? this.config.details.map(d => d.value_col)
: Object.keys(this.raw_data[0]).filter(key => key !== 'Form: Field');
: Object.keys(this.raw_data[0]).filter(
key => ['Form: Field', this.config.recency_category_col].indexOf(key) < 0
); // remove derived variables (recency_category_col is captured in variable queryrecency, derived in ./defineNewVariables)
this.listing.config.headers = this.config.details
? this.config.details.map(d => d.label)
: Object.keys(this.raw_data[0]).filter(key => key !== 'Form: Field');
: Object.keys(this.raw_data[0]).filter(
key => ['Form: Field', this.config.recency_category_col].indexOf(key) < 0
);
}
34 changes: 17 additions & 17 deletions src/chart/onInit/defineNewVariables.js
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,14 @@
export default function defineNewVariables() {
const queryRecencyCol = this.config.filters.find(filter => filter.label === 'Query Recency')
.value_col;
const queryAgeCol = this.config.status_groups.find(
status_group => status_group.label === 'Query Age'
).value_col;
const queryRecencyCol = this.config.filters.find(filter => filter.label === 'Query Recency')
.value_col;

this.raw_data.forEach(d => {
//Concatenate form and field to avoid duplicates across forms.
d['Form: Field'] = d[this.config.form_col] + ': ' + d[this.config.field_col];

//Define query age.
if (this.config.age_statuses.indexOf(d[this.config.status_col]) < 0)
d[queryAgeCol] = d[this.config.status_col];
else {
const age = +d[this.config.age_col];
this.config.ageRanges.forEach((ageRange, i) => {
if (i === 0 && ageRange[0] <= age && age <= ageRange[1])
d[queryAgeCol] = this.config.ageRangeCategories[i];
else if (i === this.config.ageRanges.length - 1 && ageRange[0] < age)
d[queryAgeCol] = this.config.ageRangeCategories[i];
else if (ageRange[0] < age && age <= ageRange[1])
d[queryAgeCol] = this.config.ageRangeCategories[i];
});
}

//Define query recency.
if (d.hasOwnProperty(this.config.recency_category_col)) {
d[queryRecencyCol] = d[this.config.recency_category_col] || 'N/A';
Expand All @@ -38,5 +23,20 @@ export default function defineNewVariables() {
d[queryRecencyCol] = this.config.recencyRangeCategories[i];
});
}

//Define query age.
if (this.config.age_statuses.indexOf(d[this.config.status_col]) < 0)
d[queryAgeCol] = d[this.config.status_col];
else {
const age = +d[this.config.age_col];
this.config.ageRanges.forEach((ageRange, i) => {
if (i === 0 && ageRange[0] <= age && age <= ageRange[1])
d[queryAgeCol] = this.config.ageRangeCategories[i];
else if (i === this.config.ageRanges.length - 1 && ageRange[0] < age)
d[queryAgeCol] = this.config.ageRangeCategories[i];
else if (ageRange[0] < age && age <= ageRange[1])
d[queryAgeCol] = this.config.ageRangeCategories[i];
});
}
});
}
14 changes: 14 additions & 0 deletions src/listing/onDraw.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,20 @@ import truncateCellText from './onDraw/truncateCellText';
import moveScrollBarLeft from './onDraw/moveScrollBarLeft';

export default function onDraw() {
//console.log(this.table.selectAll('thead tr th'));
//console.log(this.table.selectAll('tbody tr:first-child td'));
const variables = Object.keys(this.data.raw[0])
//.sort(d3.ascending)
.map((variable, i) => {
return {
variable,
column: this.config.cols.find(col => col === variable),
columnIndex: this.config.cols.findIndex(col => col === variable),
header: this.config.headers[this.config.cols.findIndex(col => col === variable)],
headerIndex: this.config.headers.findIndex(col => col === variable)
};
});
//console.table(variables.sort((a,b) => a.index - b.index));
//Add tooltips to column headers.
addHeaderTooltips.call(this);

Expand Down
2 changes: 0 additions & 2 deletions src/listing/onInit.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import removeHeaderlessColumns from './onInit/removeHeaderlessColumns';
import applyVariableMetadata from './onInit/applyVariableMetadata';

export default function onInit() {
removeHeaderlessColumns.call(this);
applyVariableMetadata.call(this);
}
6 changes: 0 additions & 6 deletions src/listing/onInit/applyVariableMetadata.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,6 @@ export default function applyVariableMetadata() {
description:
'Number of days between query open date and data extraction date, regardless of query status.'
},
{
variable: this.chart.initialSettings.recency_category_col,
label: 'Query Recency',
description:
'Number of days by category between query open date and data extraction date, regardless of query status. Categories include last 7, 14, and 30 days.'
},
{
variable: 'queryrecency',
label: 'Query Recency',
Expand Down
14 changes: 0 additions & 14 deletions src/listing/onInit/removeHeaderlessColumns.js
View file

This file was deleted.

Loading

0 comments on commit 3421917

Please sign in to comment.