Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

aql tabular output

This commit is contained in:
hkernbach 2016-07-20 10:48:36 +02:00
parent 8d1e818d79
commit 6e62c003b5
2 changed files with 120 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
js/apps/system/_admin/aardvark/APP/frontend/js/views/queryView.js
View File

@ -1475,13 +1475,19 @@
var result = self.analyseQuery(data.result);
console.log('Using ' + result.defaultType + ' as data format.');
if (result.defaultType === 'table') {
$('#outputEditorWrapper' + counter).append('<div id="outputTable' + counter + '"></div>');
$('#outputEditorWrapper' + counter + ' .arangoToolbarTop').after('<div id="outputTable' + counter + '"></div>');
$('#outputTable' + counter).show();
self.renderOutputTable(result, counter);
// apply max height for table output dynamically
var maxHeight = $('.centralRow').height() - 250;
$('.outputEditorWrapper .tableWrapper').css('max-height', maxHeight);
$('#outputEditor' + counter).hide();
} else if (result.defaultType === 'graph') {
$('#outputEditorWrapper' + counter).append('<div id="outputGraph' + counter + '"></div>');
$('#outputEditorWrapper' + counter + ' .arangoToolbarTop').after('<div id="outputGraph' + counter + '"></div>');
$('#outputGraph' + counter).show();
self.renderOutputGraph(result, data);
$('#outputEditor' + counter).hide();
}
@ -1618,82 +1624,92 @@
// check if result could be displayed as graph
// case a) result has keys named vertices and edges
if (result[0].vertices && result[0].edges) {
var hitsa = 0;
var totala = 0;
if (result[0]) {
if (result[0].vertices && result[0].edges) {
var hitsa = 0;
var totala = 0;
_.each(result, function (obj) {
if (obj.edges) {
totala += obj.edges.length;
_.each(result, function (obj) {
if (obj.edges) {
totala += obj.edges.length;
_.each(obj.edges, function (edge) {
if (edge._from && edge._to) {
hitsa++;
}
});
_.each(obj.edges, function (edge) {
if (edge._from && edge._to) {
hitsa++;
}
});
}
});
var percentagea = hitsa / totala * 100;
if (percentagea >= 95) {
found = true;
toReturn.defaultType = 'graph';
}
});
} else {
// case b) 95% have _from and _to attribute
var hitsb = 0;
var totalb = result.length;
var percentagea = hitsa / totala * 100;
_.each(result, function (obj) {
if (obj._from && obj._to) {
hitsb++;
}
});
if (percentagea >= 95) {
found = true;
toReturn.defaultType = 'graph';
}
} else {
// case b) 95% have _from and _to attribute
var hitsb = 0;
var totalb = result.length;
var percentageb = hitsb / totalb * 100;
_.each(result, function (obj) {
if (obj._from && obj._to) {
hitsb++;
if (percentageb >= 95) {
found = true;
toReturn.defaultType = 'graph';
// then display as graph
}
});
var percentageb = hitsb / totalb * 100;
if (percentageb >= 95) {
found = true;
toReturn.defaultType = 'graph';
// then display as graph
}
}
// check if result could be displayed as table
if (!found) {
var maxAttributeCount = 0;
var check = true;
var length;
var attributes = {};
_.each(result, function (obj) {
length = _.keys(obj).length;
if (result.length <= 1) {
check = false;
}
if (length > maxAttributeCount) {
maxAttributeCount = length;
}
if (check) {
_.each(result, function (obj) {
length = _.keys(obj).length;
_.each(obj, function (value, key) {
if (attributes[key]) {
attributes[key] = attributes[key] + 1;
} else {
attributes[key] = 1;
if (length > maxAttributeCount) {
maxAttributeCount = length;
}
_.each(obj, function (value, key) {
if (attributes[key]) {
attributes[key] = attributes[key] + 1;
} else {
attributes[key] = 1;
}
});
});
var rate;
console.log(attributes);
_.each(attributes, function (val, key) {
rate = (val / result.length) * 100;
console.log(rate);
if (check !== false) {
if (rate <= 95) {
check = false;
}
}
});
});
var rate;
var check = true;
_.each(attributes, function (val, key) {
rate = (val / result.length) * 100;
if (check !== false) {
if (rate <= 95) {
check = false;
}
}
});
}
if (check) {
found = true;
@ -1784,6 +1800,42 @@
});
},
renderOutputTable: function (data, counter) {
var tableDescription = {
id: 'outputTableData' + counter,
titles: [],
rows: []
};
var first = true;
var part = [];
// self.tableDescription.rows.push(;
_.each(data.original, function (obj) {
if (first === true) {
tableDescription.titles = Object.keys(obj);
first = false;
}
_.each(obj, function (val) {
if (typeof val === 'object') {
val = JSON.stringify(val);
}
part.push(val);
});
tableDescription.rows.push(part);
part = [];
});
console.log(counter);
$('#outputTable' + counter).append(this.table.render({content: tableDescription}));
console.log(tableDescription.titles);
console.log(tableDescription.rows);
},
renderOutputGraph: function () {
},
getAQL: function (originCallback) {
var self = this;

11
js/apps/system/_admin/aardvark/APP/frontend/scss/_queryView.scss
View File

@ -328,7 +328,6 @@
.ui-resizable-e {
cursor: ew-resize;
}
}
.queryContent {
@ -356,6 +355,16 @@
padding-top: 20px;
width: 100%;
.tableWrapper {
max-width: 100%;
overflow-x: scroll;
.arango-table {
border-left: 1px solid $c-content-border;
border-right: 1px solid $c-content-border;
}
}
.switchAce {
background-color: rgba(0, 0, 0, .6);
border-radius: 3px;