Commit 89c93f35 authored by Mathieu Rodic's avatar Mathieu Rodic

[BUG] graphs are now working properly on corpus view

parent 8a12394b
...@@ -37,8 +37,11 @@ class NodesList(APIView): ...@@ -37,8 +37,11 @@ class NodesList(APIView):
# filter by parent # filter by parent
if 'parent_id' in parameters: if 'parent_id' in parameters:
query = query.filter(Node.parent_id == parameters['parent_id']) query = query.filter(Node.parent_id == parameters['parent_id'])
# paginate the query # count
count = query.count() count = query.count()
# order
query = query.order_by(Node.hyperdata['publication_date'], Node.id)
# paginate the query
if parameters['pagination_limit'] == -1: if parameters['pagination_limit'] == -1:
query = query[parameters['pagination_offset']:] query = query[parameters['pagination_offset']:]
else: else:
......
function get_node_date(node) {
var hyperdata = node.hyperdata;
return new Date(
Number(hyperdata.publication_year),
Number(hyperdata.publication_month) - 1,
Number(hyperdata.publication_day)
);
};
function pr(msg) { function pr(msg) {
console.log(msg) console.log(msg)
} }
...@@ -89,19 +98,21 @@ function Final_UpdateTable( action ) { ...@@ -89,19 +98,21 @@ function Final_UpdateTable( action ) {
var TimeRange = AjaxRecords; var TimeRange = AjaxRecords;
var dataini = TheBuffer[0].toISOString().split("T")[0] var dataini = TheBuffer[0];
var datafin = TheBuffer[1].toISOString().split("T")[0] var datafin = TheBuffer[1];
pr("show me the pubs of the selected period") pr("show me the pubs of the selected period")
console.log( TheBuffer ) console.log( TheBuffer )
pr("\tfrom ["+dataini+"] to ["+datafin+"]") pr("\tfrom ["+dataini+"] to ["+datafin+"]")
TimeRange = [] TimeRange = []
for (var i in AjaxRecords) { console.log(dataini, datafin)
if(AjaxRecords[i].date>=dataini && AjaxRecords[i].date<=datafin){ $.each(AjaxRecords, function(i, node) {
if (node.date >= dataini && node.date >= dataini) {
// pr( AjaxRecords[i].date+" : "+AjaxRecords[i].id ) // pr( AjaxRecords[i].date+" : "+AjaxRecords[i].id )
TimeRange.push(AjaxRecords[i]) TimeRange.push(node);
} }
} });
console.log(TimeRange)
MyTable = $('#my-ajax-table').dynatable({ MyTable = $('#my-ajax-table').dynatable({
dataset: { dataset: {
...@@ -292,16 +303,10 @@ function Main_test( Data , SearchFilter ) { ...@@ -292,16 +303,10 @@ function Main_test( Data , SearchFilter ) {
// console.log(Data[i]["date"]+" : originalRecords["+arr_id+"] <- "+orig_id+" | "+Data[i]["name"]) // console.log(Data[i]["date"]+" : originalRecords["+arr_id+"] <- "+orig_id+" | "+Data[i]["name"])
} }
var get_date = function(node) { var t0 = get_node_date(AjaxRecords[0]);
var hyperdata = node.hyperdata; var t1 = get_node_date(AjaxRecords.slice(-1)[0]);
return new Date( oldest = t0;
Number(hyperdata.publication_year), latest = t1;
Number(hyperdata.publication_month) - 1,
Number(hyperdata.publication_day)
);
};
var t0 = get_date(AjaxRecords[0]);
var t1 = get_date(AjaxRecords.slice(-1)[0]);
console.log(t0, t1) console.log(t0, t1)
TheBuffer = [t0, t1]; TheBuffer = [t0, t1];
...@@ -310,15 +315,13 @@ function Main_test( Data , SearchFilter ) { ...@@ -310,15 +315,13 @@ function Main_test( Data , SearchFilter ) {
var arrayd3 = [] var arrayd3 = []
$.each(Data, function(i, node) { $.each(Data, function(i, node) {
var date = node.hyperdata.publication_date; if (node.date) {
if (justdates[date] != false) { arrayd3.push({
var info = {}; date: get_node_date(node),
info.date = date; dd: node.date,
info.dd = get_date(node); month: d3.time.month(node.date),
info.month = d3.time.month(info.dd); volume: justdates[date],
info.volume = justdates[date]; });
arrayd3.push(info);
justdates[date] = false;
} }
}); });
...@@ -529,7 +532,7 @@ $("#corpusdisplayer").hide() ...@@ -529,7 +532,7 @@ $("#corpusdisplayer").hide()
// FIRST portion of code to be EXECUTED: // FIRST portion of code to be EXECUTED:
// (3) Get records and hyperdata for paginator // (3) Get records and hyperdata for paginator
$.ajax({ $.ajax({
url: '/api/nodes?type[]=DOCUMENT&parent_id=' + corpus_id, url: '/api/nodes?type[]=DOCUMENT&pagination_limit=-1&parent_id=' + corpus_id,
success: function(data){ success: function(data){
$("#content_loader").remove(); $("#content_loader").remove();
$.each(data.records, function(i, record){ $.each(data.records, function(i, record){
...@@ -538,6 +541,7 @@ $.ajax({ ...@@ -538,6 +541,7 @@ $.ajax({
RecDict[orig_id] = arr_id; RecDict[orig_id] = arr_id;
record.title = record.name; record.title = record.name;
record.name = '<a target="_blank" href="/projects/' + project_id + '/corpora/'+ corpus_id + '/documents/' + record.id + '">' + record.name + '</a>'; record.name = '<a target="_blank" href="/projects/' + project_id + '/corpora/'+ corpus_id + '/documents/' + record.id + '">' + record.name + '</a>';
record.date = get_node_date(record);
record.del = false; record.del = false;
}); });
for (var i in data.records) { for (var i in data.records) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment