[FEAT] Advanced charts.

gargantext_web/urls.py

@@ -31,8 +31,9 @@ urlpatterns = patterns('',
     url(r'^project/(\d+)/corpus/(\d+)/corpus.csv$', views.corpus_csv),
     
     # Visualizations
-    url(r'^corpus/(\d+)/explorer$', views.explorer_graph),
-    url(r'^corpus/(\d+)/matrix$', views.explorer_matrix),
+    url(r'^project/(\d+)/corpus/(\d+)/chart$', views.chart),
+    url(r'^corpus/(\d+)/explorer$', views.graph),
+    url(r'^corpus/(\d+)/matrix$', views.matrix),
     
     # Data management
     url(r'^chart/corpus/(\d+)/data.csv$', views.send_csv),

gargantext_web/views.py

@@ -285,8 +285,8 @@ def corpus(request, project_id, corpus_id):
     project = Node.objects.get(id=project_id)
     corpus  = Node.objects.get(id=corpus_id)
     
-    #documents  = corpus.children.all()
-    #number = corpus.children.count()
+    type_doc = NodeType.objects.get(name="Document")
+    number = Node.objects.filter(parent=corpus, type=type_doc).count()
 
 #    try:
 #        sources = defaultdict(int)
@@ -357,7 +357,7 @@ def corpus(request, project_id, corpus_id):
             'project': project,\
             'corpus' : corpus,\
             'documents': documents,\
-    #        'number' : number,\
+            'number' : number,\
             'dates' : chart,\
             }))
     
@@ -371,8 +371,22 @@ def delete_corpus(request, project_id, corpus_id):
     Node.objects.filter(id=corpus_id).all().delete()
     return HttpResponseRedirect('/project/' + project_id)
 
-def explorer_graph(request, corpus_id):
-    t = get_template('explorer.html')
+
+def chart(request, project_id, corpus_id):
+    ''' Charts to compare, filter, count'''
+    t = get_template('chart.html')
+    user = request.user
+    date = datetime.datetime.now()
+    project = Node.objects.get(id=project_id)
+    html = t.render(Context({
+        'user': user,
+        'date': date,
+        'project' : project,
+    }))    
+    return HttpResponse(html)
+
+def matrix(request, corpus_id):
+    t = get_template('matrix.html')
     user = request.user
     date = datetime.datetime.now()
     corpus = Node.objects.get(id=corpus_id)
@@ -385,8 +399,8 @@ def explorer_graph(request, corpus_id):
     
     return HttpResponse(html)
 
-def explorer_matrix(request, corpus_id):
-    t = get_template('matrix.html')
+def graph(request, corpus_id):
+    t = get_template('explorer.html')
     user = request.user
     date = datetime.datetime.now()
     corpus = Node.objects.get(id=corpus_id)
@@ -399,6 +413,10 @@ def explorer_matrix(request, corpus_id):
     
     return HttpResponse(html)
 
+
+
+
+
 def exploration(request):
     t = get_template('exploration.html')
     user = request.user

templates/corpus.html

@@ -105,7 +105,7 @@
 		<div class="row">
 				<div class="col-md-4">
 						<div class="jumbotron">
-						<h3><a href="/corpus/{{corpus.id}}/charts">Advanced charts</a></h3>
+						<h3><a href="/project/{{project.id}}/corpus/{{corpus.id}}/chart">Advanced charts</a></h3>
 						<ol>
 								<li>Count</li> <!-- read, compute -->
 								<li>Filter</li> <!-- count, compute -->