Merge branch 'samuel'

Intégration Samuels work

gargantext_web/urls.py

@@ -48,6 +48,7 @@ urlpatterns = patterns('',
 
     url(r'^graph-it$', views.graph_it),
     url(r'^ngrams$', views.ngrams),
+    url(r'^nodeinfo/(\d+)$', views.nodeinfo),
     url(r'^tests/mvc$', views.tests_mvc),
 )
 

gargantext_web/views.py

@@ -527,6 +527,22 @@ def ngrams(request):
     }))    
     return HttpResponse(html)
 
+
+def nodeinfo(request , node_id):
+    '''Structure of the popUp for topPapers div '''
+    t = get_template('node-info.html')
+    ngrams_list = ["hola","mundo"]
+    
+    user = request.user
+    date = datetime.datetime.now()
+    html = t.render(Context({
+        'user': user,
+        'date': date,
+        'node_id' : node_id,
+    }))    
+    return HttpResponse(html)
+
+
 def tfidf(request, corpus_id, ngram_id):
     """
     Takes IDs of corpus and ngram and returns list of relevent documents in json format
@@ -538,25 +554,33 @@ def tfidf(request, corpus_id, ngram_id):
     corpus = Node.objects.get(id=corpus_id)
     ngram  = Ngram.objects.get(id=ngramsids[0])#not used
     
-    # print("********-1*******")
+    print("********web/views.tfidf*******")
+    print("first ngram:")
+    print(ngram)
     node_node_ngrams = NodeNodeNgram.objects.filter(nodex=corpus, ngram__in=ngramsids).order_by('-score')
     # print(node_node_ngrams)
-    # print("********-1*******")
-    
-# only for tests
-# TODO add test if metadata present
-    tfidf_list = [ dict(
-        id=x.nodey.id,
-        title=x.nodey.metadata['title'],
-        publication_date=x.nodey.metadata['publication_date'],
-        journal=x.nodey.metadata['journal'],
-        #abstract=x.nodey.metadata['abstract'],
-        )
-        for x in node_node_ngrams]
+    goodDict = {}
+    for x in node_node_ngrams:
+        goodDict[x.nodey.id] = x.nodey
+    # print("imma here")
+    # print("arguments... nodes ids:")
+    # print(ngramsids)
+    # print ("with tfidf:")
+    # print(node_node_ngrams)
+    # print("corpus:")
+    # print(NodeNodeNgram.objects.filter(nodex=corpus))
+    tfidf_list = []
+    for x in goodDict:
+        pub = goodDict[x] # getting the unique publication
+        finalpub = {}
+        finalpub["id"] = pub.id
+        if "title" in pub.metadata: finalpub["title"] = pub.metadata['title']
+        if "publication_date" in pub.metadata: finalpub["publication_date"] = pub.metadata['publication_date']
+        if "journal" in pub.metadata: finalpub["journal"] = pub.metadata['journal']
+        if "authors" in pub.metadata: finalpub["authors"] = pub.metadata['authors']
+        if "fields" in pub.metadata: finalpub["fields"] = pub.metadata['fields']
+        tfidf_list.append(finalpub) # doing a dictionary with only available atributes
+        if len(tfidf_list)==6: break # max 6 papers
     
-    data = json.dumps(tfidf_list[:6]) # max 6 papers
+    data = json.dumps(tfidf_list) 
     return JsonHttpResponse(data)
-
-
-
-

templates/add_corpus.html

@@ -11,6 +11,10 @@
 
 {% block content %}
 
+<div id="loading" style="position:absolute; top:50%; left:40%; width:80px; display: none;" >
+
+    <img src="{% static "img/ajax-loader.gif" %}" alt="" />
+</div>
 
 <div class="container theme-showcase" role="main">
 		<div class="jumbotron">
@@ -25,4 +29,11 @@
 </div>
 </div>
 
+<script>
+function showLoader(){
+  $('#loading').setStyle('display', 'block');
+  $('submit_btn').disabled = true;
+};
+</script>
+
 {% endblock %}

templates/matrix.html

@@ -70,7 +70,7 @@ var x = d3.scale.ordinal().rangeBands([0, width]),
 var svg = d3.select("body").append("svg")
     .attr("width", "100%")
     .attr("height", "100%")
-    .style("margin-left", "25%")
+    .style("margin-left", "15%")
   .append("g")
     .attr("transform", "translate(" + "300" + "," + "300" + ")");//challenge: to calculate both parameters! maybe do something with the labels length
 

templates/node-info.html

+
+{% block css %}
+{% load staticfiles %}
+
+<link rel="stylesheet" href="{% static "css/bootstrap.css" %}">
+<link rel="stylesheet" href="{% static "css/bootstrap-theme.min.css" %}">
+<link rel="stylesheet" href="{% static "js/libs/jquery/jquery-ui.css" %}" media="screen">
+
+{% endblock %}
+
+
+
+{% block content %}
+{% if node_id %}
+<div id="nodeid" style="visibility: hidden;" >{{node_id}}</div>
+<div id="metadata"></div>
+{% endif %}
+
+	<script src="{% static "js/jquery/jquery.min.js" %}" type="text/javascript"></script>
+	<script src="{% static "js/libs/jquery/jquery-ui.js" %}" type="text/javascript"></script>
+
+    <script src="{% static "js/libs/jquery/jquery.ba-dotimeout.min.js" %}" type="text/javascript"></script>    
+    
+    <!--<script src="{% static "js/libs/bootstrap/js/bootstrap.min.js" %}"></script>-->
+    <script src="{% static "js/libs/bootstrap/js/bootstrap-modal.js" %}" type="text/javascript"></script>
+    <script src="{% static "js/libs/bootstrap/js/bootstrap-hover-dropdown.min.js" %}" type="text/javascript"></script>
+
+
+
+
+    <script type="text/javascript">
+
+    var node_id = $("#nodeid").html()
+	var img = '<center><img src="'+window.location.origin+'/static/img/ajax-loader.gif" width="30%"></img></center>';
+	$("#metadata").html(img);
+
+    $.ajax({
+        type: 'GET',
+        url: window.location.origin+'/api/nodes/'+node_id,
+        //contentType: "application/json",
+        //dataType: 'json',
+        success : function(data){
+        	console.log( window.location.origin+'/api/nodes/'+node_id )
+        	jsondata = data.metadata
+        	console.log(jsondata)
+        	var output = ""
+        	if(jsondata.title) output += "Title:<br>"+jsondata.title+"<br>";
+        	if(jsondata.publication_date) output += jsondata.publication_date.split(" ")[0]+"<br><br>";
+        	if(jsondata.authors) output += "Authors:<br>"+jsondata.authors+"<br><br>";
+        	if(jsondata.fields) output += "Keywords:<br>"+jsondata.fields+"<br><br>";
+        	if(jsondata.abstract) output += "Abstract:<br>"+jsondata.abstract+"<br><br>";
+
+            $("#metadata").html(output);
+        },
+        error: function(){ 
+            console.log('Page Not found: getTopPapers()');
+        }
+    });
+    </script>
+
+{% endblock %}