Skip to content

Commit

Permalink
Bumping to v0.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim-Intellipharm committed Aug 10, 2015
1 parent 393b4cb commit a27da44
Show file tree
Hide file tree
Showing 30 changed files with 246 additions and 54 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "dc-addons",
"description": "These are additional charts that extend dc.js",
"version": "0.9.1",
"version": "0.10.0",
"homepage": "https://github.com/intellipharm/dc-addons",
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions dist/angular/angular-dc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* dc-addons v0.9.1
* dc-addons v0.10.0
*
* 2015-07-31 13:51:20
* 2015-08-11 08:06:00
*
*/
(function () {
Expand Down
4 changes: 2 additions & 2 deletions dist/angular/angular-dc.min.js

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

4 changes: 2 additions & 2 deletions dist/bubble-cloud/dc-bubble-cloud.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* dc-addons v0.9.1
* dc-addons v0.10.0
*
* 2015-07-31 13:51:20
* 2015-08-11 08:06:00
*
*/
// Code copied and changed from https://github.com/vlandham/gates_bubbles
Expand Down
4 changes: 2 additions & 2 deletions dist/bubble-cloud/dc-bubble-cloud.min.js

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

112 changes: 112 additions & 0 deletions dist/crossfilter-server/crossfilter-server.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
/*!
* dc-addons v0.10.0
*
* 2015-08-11 08:06:00
*
*/
(function () {
'use strict';

var crossfilter = {};

//------------------------
// dimension
//------------------------

function _filterChanged () {
var list = dc.chartRegistry.list();

for (var e in list) {
var chart = list[e];
var group = chart.group();

if (group) {
group._filterChanged = true;
}
}
}

crossfilter.dimension = {};
crossfilter.dimension.filter = _filterChanged;
crossfilter.dimension.filterExact = _filterChanged;
crossfilter.dimension.filterRange = _filterChanged;
crossfilter.dimension.filterFunction = _filterChanged;
crossfilter.dimension.filterAll = _filterChanged;

//------------------------
// group
//------------------------

function _getFilters () {
var result = {};
var list = dc.chartRegistry.list();

for (var e in list) {
var chart = list[e];
result[chart.chartID()] = chart.filters();
}

return result;
}

function _fetchData () {
var filters = _getFilters();
var list = dc.chartRegistry.list();

for (var chartId in filters) {
for (var x in list) {
if (list[x].chartID() === parseInt(chartId, 10)) {
var chart = list[x];
var group = chart.group();

if (group && group._filterChanged) {
group._filterChanged = false;
_fetch(group, chart, filters, chartId);
}
break;
}
}
}
}

function _fetch (group, chart, filters, chartId) {
var dummyGroup = group;
group.fetch(filters, chartId, function (data) {
dummyGroup._currentData = data;
chart.redraw();
});
}

crossfilter.group = function (fetch) {
return {
_filterChanged: true,
_currentData: [],
all: function () {
_fetchData();
return this._currentData;
},
top: function (e) {
_fetchData();
return this._currentData;
},
fetch: fetch,
};
};

//------------------------
// quicksort
//------------------------

crossfilter.quicksort = {};
crossfilter.quicksort.by = function (sort) {
return function (data) {
return data;
};
};

window.crossfilterServer = crossfilter;

if (!window.crossfilter) {
window.crossfilter = crossfilter;
}
})();
7 changes: 7 additions & 0 deletions dist/crossfilter-server/crossfilter-server.min.js

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

4 changes: 2 additions & 2 deletions dist/dc-addons.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* dc-addons v0.9.1
* dc-addons v0.10.0
*
* 2015-07-31 13:51:20
* 2015-08-11 08:06:00
*
*/
(function () {
Expand Down
4 changes: 2 additions & 2 deletions dist/dc-addons.min.js

Large diffs are not rendered by default.

66 changes: 66 additions & 0 deletions dist/elastic-search/elastic-search.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/*!
* dc-addons v0.10.0
*
* 2015-08-11 08:06:00
*
*/
(function () {
'use strict';

window.crossfilterServer.elasticSearch = {
filter: function (filters, chartId, query, mapping) {
var q = JSON.parse(JSON.stringify(query));

if (!q.hasOwnProperty('query')) {
q.query = {};
}

if (!q.query.hasOwnProperty('filtered')) {
q.query.filtered = {};
}

if (!q.query.filtered.hasOwnProperty('filter')) {
q.query.filtered.filter = {};
}

if (!q.query.filtered.filter.hasOwnProperty('bool')) {
q.query.filtered.filter.bool = {};
}

if (!q.query.filtered.filter.bool.hasOwnProperty('must')) {
q.query.filtered.filter.bool.must = [];
}

for (var f in filters) {
if (f !== chartId && mapping[f]) {
if (filters[f].length > 0) {
var term = {};

if (Array.isArray(filters[f][0])) {
term.range = {};
term.range[mapping[f]] = {
gte: filters[f][0][0] instanceof Date ? d3.time.format('%Y-%m-%d %H:%M:%S')(filters[f][0][0]) : filters[f][0][0],
lte: filters[f][0][1] instanceof Date ? d3.time.format('%Y-%m-%d %H:%M:%S')(filters[f][0][1]) : filters[f][0][1],
};
q.query.filtered.filter.bool.must.push(term);
} else {
term.terms = {};
term.terms[mapping[f]] = filters[f];
q.query.filtered.filter.bool.must.push(term);
}
}
}
}

return JSON.stringify(q);
},

send: function (filters, chartId, url, query, mapping, callback) {
var q = this.filter(filters, chartId, query, mapping);
d3.xhr(url).post(q, function (error, xhr) {
var data = JSON.parse(xhr.responseText);
callback(data);
});
},
};
})();
7 changes: 7 additions & 0 deletions dist/elastic-search/elastic-search.min.js

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

4 changes: 2 additions & 2 deletions dist/google-map/dc-google.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* dc-addons v0.9.1
* dc-addons v0.10.0
*
* 2015-07-31 13:51:20
* 2015-08-11 08:06:00
*
*/
(function () {
Expand Down
4 changes: 2 additions & 2 deletions dist/google-map/dc-google.min.js

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

4 changes: 2 additions & 2 deletions dist/leaflet-map/dc-leaflet.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* dc-addons v0.9.1
* dc-addons v0.10.0
*
* 2015-07-31 13:51:20
* 2015-08-11 08:06:00
*
*/
(function () {
Expand Down
Loading

0 comments on commit a27da44

Please sign in to comment.