Merge branch 'master' of ssh://delanoe.org:1979/gargantext into mat-master

gargantext_web/views.py

@@ -474,7 +474,7 @@ def subcorpusJSON(request, project_id, corpus_id, start , end ):
                 filtered_docs.append(doc)
 
     # ordering from most recent to the older.
-    ordered = sorted(filtered_docs, key=lambda x: x.date, reverse=True)
+    ordered = sorted(filtered_docs, key=lambda x: x.date)
 
     # pages of 10 elements. Like a sir.
     paginator = Paginator(ordered, 10)
@@ -503,24 +503,6 @@ def subcorpusJSON(request, project_id, corpus_id, start , end ):
     return HttpResponse( serializer.data , content_type='application/json')
 
 
-# for pagexample.html
-from django.core.paginator import Paginator, InvalidPage, EmptyPage
-def get_pagination_page(page=1):
-    items = range(0, 100)
-    paginator = Paginator(items, 10)
-    try:
-        page = int(page)
-    except ValueError:
-        page = 1
-
-    try:
-        items = paginator.page(page)
-    except (EmptyPage, InvalidPage):
-        items = paginator.page(paginator.num_pages)
-
-    return items
-
-
 
 def delete_project(request, node_id):
     Node.objects.filter(id=node_id).all().delete()

init/requirements.txt

@@ -6,7 +6,7 @@ Pillow==2.5.3
 Pygments==1.6
 SQLAlchemy==0.9.8
 South==1.0
-# aldjemy==0.3.51
+aldjemy==0.3.10
 amqp==1.4.6
 anyjson==0.3.3
 billiard==3.3.0.18
@@ -31,9 +31,9 @@ graphviz==0.4
 ipython==2.2.0
 kombu==3.0.23
 lxml==3.3.6
-#matplotlib==1.4.0
+matplotlib==1.4.0
 networkx==1.9
-#nltk==3.0a4
+nltk==3.0a4
 nose==1.3.4
 numpy==1.8.2
 pandas==0.14.1

templates/corpus.html

@@ -224,11 +224,32 @@ d3.csv("/chart/corpus/{{ corpus.id }}/data.csv", function (data) {
             var dateFormat = d3.time.format("%Y/%m/%d");
             var numberFormat = d3.format(".2f");
 
+            var justdates = {}
             data.forEach(function (e) {
                 e.dd = dateFormat.parse(e.date);
                 e.month = d3.time.month(e.dd); // pre-calculate month for better performance
+                justdates[e.date] = true;
             });
 
+            var orderDates = Object.keys(justdates).reverse();
+            
+            var latest = orderDates[0].split("/")
+            var oldest = orderDates[orderDates.length-1].split("/")
+
+            pr("latest:")
+            pr(latest)
+            pr("oldest:")
+            pr(oldest)
+
+            var t0_year = oldest[0]
+            var t0_month = oldest[1]
+            var t0_day = oldest[2]
+
+
+            var t1_year = latest[0]
+            var t1_month = latest[1]
+            var t1_day = latest[2]
+
             // feed it through crossfilter
             var ndx = crossfilter(data);
             var all = ndx.groupAll();
@@ -280,7 +301,7 @@ d3.csv("/chart/corpus/{{ corpus.id }}/data.csv", function (data) {
                     .valueAccessor(function (d) {
                         return d.value.avg;
                     })
-										.x(d3.time.scale().domain([new Date(1990,01,01), new Date(2015,01,31)]))
+					.x(d3.time.scale().domain([new Date(t0_year,t0_month,t0_day), new Date(t1_year,t1_month,t1_day)]))
                     .round(d3.time.month.round)
                     .xUnits(d3.time.months)
                     .elasticY(true)
@@ -310,7 +331,7 @@ d3.csv("/chart/corpus/{{ corpus.id }}/data.csv", function (data) {
                     .group(volumeByMonthGroup)
                     .centerBar(true)
                     .gap(0)
-                    .x(d3.time.scale().domain([new Date(1990, 01, 01), new Date(2015, 01, 11)]))
+                    .x(d3.time.scale().domain([new Date(t0_year,t0_month,t0_day), new Date(t1_year,t1_month,t1_day)]))
                     .round(d3.time.month.round)
                     .xUnits(d3.time.months)
                     .renderlet(function (chart) {

templates/subcorpus.html

@@ -26,7 +26,7 @@
 <ul>
 {% for doc in documents %}
     {% if doc.date %}
-    <li> <b>{{ doc.date }}</b>, <a href="/admin/node/document/{{doc.id}}">id:{{ doc.id}} title:{{ doc.name}}</a></li>
+    <li> <b>{{ doc.date }}</b>: <a target="_blank" href="/nodeinfo/{{doc.id}}">{{ doc.name}}</a> , @ {{ doc.metadata.source}}</li>
     {% endif %}
 {% endfor %}
 </ul>