[FEAT ANALYTICS HISTORIES] Update to database change + debug + CSS.

gargantext/constants.py

@@ -67,7 +67,6 @@ INDEXED_HYPERDATA = {
         , 'convert_from_db': str
         },
 
-
     'authors':
         { 'id'             : 4
         , 'type'           : str

gargantext/views/api/urls.py

@@ -2,28 +2,34 @@ from django.conf.urls import url
 
 from . import nodes
 from . import ngramlists
+from . import analytics
 
-urlpatterns = [ url(r'^nodes$'                , nodes.NodeListResource.as_view())
-              , url(r'^nodes/(\d+)$'          , nodes.NodeResource.as_view()    )
-              , url(r'^nodes/(\d+)/having$'   , nodes.NodeListHaving.as_view()  )
+urlpatterns = [ url(r'^nodes$'                , nodes.NodeListResource.as_view()     )
+              , url(r'^nodes/(\d+)$'          , nodes.NodeResource.as_view()         )
+              , url(r'^nodes/(\d+)/having$'   , nodes.NodeListHaving.as_view()       )
+
+               # Analytics
+              , url(r'^nodes/(\d+)/histories$', analytics.NodeNgramsQueries.as_view())
+              , url(r'^ngrams/$'              , analytics.ApiNgrams.as_view()        )
+              , url(r'hyperdata$'             , analytics.ApiHyperdata.as_view()     )
                 # get a list of ngram_ids or ngram_infos by list_id
                 # url(r'^ngramlists/(\d+)$', ngramlists.List.as_view()),
 
-              , url(r'^nodes/(\d+)/facets$'   , nodes.CorpusFacet.as_view()     )
-              , url(r'^nodes/(\d+)/favorites$', nodes.CorpusFavorites.as_view()  )
+              , url(r'^nodes/(\d+)/facets$'   , nodes.CorpusFacet.as_view()          )
+              , url(r'^nodes/(\d+)/favorites$', nodes.CorpusFavorites.as_view()      )
               # in these two routes the node is supposed to be a *corpus* node
 
-              , url(r'^ngramlists/change$', ngramlists.ListChange.as_view()     )
+              , url(r'^ngramlists/change$', ngramlists.ListChange.as_view()          )
                 # add or remove ngram from a list
                 #  ex: add <=> PUT ngramlists/change?list=42&ngrams=1,2
                 #       rm <=> DEL ngramlists/change?list=42&ngrams=1,2
 
-              ,  url(r'^ngramlists/groups$', ngramlists.GroupChange.as_view())
+              ,  url(r'^ngramlists/groups$', ngramlists.GroupChange.as_view()        )
                 # modify grouping couples of a group node
                 #  ex: POST ngramlists/groups?node=43
                 # post data looks like : {"767":[209,640],"779":[436,265,385]}"
 
-              , url(r'^ngramlists/family$'     , ngramlists.ListFamily.as_view())
+              , url(r'^ngramlists/family$'     , ngramlists.ListFamily.as_view()     )
                 # entire combination of lists from a corpus, dedicated to termtable
                 # (or any combination of lists that go together :
                 #   - a mainlist
@@ -31,6 +37,6 @@ urlpatterns = [ url(r'^nodes$'                , nodes.NodeListResource.as_view()
                 #   - an optional maplist
                 #   - an optional grouplist
 
-              , url(r'^ngramlists/maplist$'     , ngramlists.MapListGlance.as_view())
+              , url(r'^ngramlists/maplist$'     , ngramlists.MapListGlance.as_view() )
                 # fast access to maplist, similarly formatted for termtable
               ]

gargantext/views/pages/corpora.py

@@ -43,12 +43,6 @@ def docs_by_titles(request, project_id, corpus_id):
         },
     )
 
-
-@requires_auth
-def chart(request, project_id, corpus_id):
-    authorized, user, project, corpus = _get_user_project_corpus(request, project_id, corpus_id)
-
-
 @requires_auth
 def docs_by_journals(request, project_id, corpus_id):
     '''
@@ -76,3 +70,25 @@ def docs_by_journals(request, project_id, corpus_id):
         },
     )
 
+@requires_auth
+def analytics(request, project_id, corpus_id):
+    authorized, user, project, corpus = _get_user_project_corpus(request, project_id, corpus_id)
+    if not authorized:
+        return HttpResponseForbidden()
+    # response!
+    return render(
+        template_name = 'pages/analytics/histories.html',
+        request = request,
+        context = {
+            'debug': DEBUG,
+            'date': datetime.now(),
+            'project': project,
+            'corpus': corpus,
+            'resourcename' : resourcename(corpus),
+            'view': 'analytics',
+            'user': request.user
+        },
+    )
+
+
+

gargantext/views/pages/urls.py

@@ -22,12 +22,13 @@ urlpatterns = [
 
     # corpora
     url(r'^projects/(\d+)/corpora/(\d+)/?$', corpora.docs_by_titles),
-    url(r'^projects/(\d+)/corpora/(\d+)/chart/?$', corpora.chart),
 
     # corpus by journals
     url(r'^projects/(\d+)/corpora/(\d+)/journals/?$', corpora.docs_by_journals),
 
     # terms table for the corpus
     url(r'^projects/(\d+)/corpora/(\d+)/terms/?$', terms.ngramtable),
-
+    
+    # Analytics
+    url(r'^projects/(\d+)/corpora/(\d+)/analytics/?$', corpora.analytics),
 ]

rest_v1_0/urls.py

+from django.conf.urls import patterns, url
+
+from gargantext_web import views_optimized
+
+from rest_v1_0 import api, ngrams, graph
+
+from annotations import views
+
+import tests.ngramstable.views as samtest
+
+urlpatterns = patterns('',
+    # REST URLS
+    # What is REST ?
+    # https://en.wikipedia.org/wiki/Representational_state_transfer
+    
+    #url(r'^api$', rest_v1_0.api.Root), # = ?
+    url(r'nodes$', api.NodesList.as_view()),
+    url(r'nodes/(\d+)$', api.Nodes.as_view()),
+    url(r'nodes/(\d+)/children/ngrams$', api.NodesChildrenNgrams.as_view()),  # => repeated children ?
+    url(r'nodes/(\d+)/children/ids$', api.NodesChildrenNgramsIds.as_view()),  # => repeated children ?
+
+    # NGRAMS table & annotations
+    url(r'node/(\d+)/ngrams$'      , ngrams.Ngrams.as_view()),
+    url(r'node/(\d+)/ngrams/group$', ngrams.Group.as_view()),
+    url(r'node/(\d+)/ngrams/keep$', ngrams.Keep.as_view()),
+    # url(r'node/(?P<list_id>[0-9]+)/ngrams/keep/(?P<ngram_ids>[0-9,\+]+)+$' , ngrams.Keep.as_view()),
+    url(r'node/(?P<list_id>[0-9]+)/ngrams/(?P<ngram_ids>[0-9,\+]+)+$', views.NgramEdit.as_view()),
+    url(r'node/(?P<corpus_id>[0-9]+)/ngrams/list/(?P<list_name>\w+)$' , ngrams.List.as_view()),
+    url(r'node/corpus/(?P<node_ids>[0-9,\+]+)+$' , samtest.get_corpuses),
+
+
+    #url(r'nodes/(\d+)/children/hyperdata$', api.NodesChildrenMetatadata.as_view()),
+    #url(r'nodes/(\d+)/children/hyperdata$', api.NodesChildrenMetatadata.as_view()),
+
+    url(r'nodes/(\d+)/children/queries$', api.NodesChildrenQueries.as_view()),
+    url(r'nodes/(\d+)/children/duplicates$', api.NodesChildrenDuplicates.as_view()),
+    # url(r'^api/nodes/(\d+)/children/duplicates/delete$', api.NodesChildrenDuplicates.delete ),
+    url(r'nodes/(\d+)/ngrams$', api.CorpusController.ngrams),
+    
+    url(r'nodes/(\d+)/graph$', graph.Graph.as_view()),
+    url(r'corpus/(\d+)/graph$', graph.Graph.as_view()),
+    
+    url(r'hyperdata$', api.ApiHyperdata.as_view()),
+    url(r'ngrams$', api.ApiNgrams.as_view()),
+    
+    url(r'tfidf/(\d+)/(\w+)$', views_optimized.tfidf),
+)
+

static/lib/ng-tags/ng-tags-input.min.css

+:after,:before,tags-input *{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}tags-input .host{position:relative;margin-top:5px;margin-bottom:5px}tags-input .host:active{outline:0}tags-input .tags{-moz-appearance:textfield;-webkit-appearance:textfield;padding:1px;overflow:hidden;word-wrap:break-word;cursor:text;background-color:#fff;border:1px solid #a9a9a9;box-shadow:1px 1px 1px 0 #d3d3d3 inset}tags-input .tags.focused{outline:0;-webkit-box-shadow:0 0 3px 1px rgba(5,139,242,.6);-moz-box-shadow:0 0 3px 1px rgba(5,139,242,.6);box-shadow:0 0 3px 1px rgba(5,139,242,.6)}tags-input .tags .tag-list{margin:0;padding:0;list-style-type:none}tags-input .tags .tag-item{margin:2px;padding:0 5px;display:inline-block;float:left;font:14px "Helvetica Neue",Helvetica,Arial,sans-serif;height:26px;line-height:25px;border:1px solid #acacac;border-radius:3px;background:-webkit-linear-gradient(top,#f0f9ff 0,#cbebff 47%,#a1dbff 100%);background:linear-gradient(to bottom,#f0f9ff 0,#cbebff 47%,#a1dbff 100%)}tags-input .tags .tag-item.selected{background:-webkit-linear-gradient(top,#febbbb 0,#fe9090 45%,#ff5c5c 100%);background:linear-gradient(to bottom,#febbbb 0,#fe9090 45%,#ff5c5c 100%)}tags-input .tags .tag-item .remove-button{margin:0 0 0 5px;padding:0;border:none;background:0 0;cursor:pointer;vertical-align:middle;font:700 16px Arial,sans-serif;color:#585858}tags-input .tags .tag-item .remove-button:active{color:red}tags-input .tags .input{border:0;outline:0;margin:2px;padding:0;padding-left:5px;float:left;height:26px;font:14px "Helvetica Neue",Helvetica,Arial,sans-serif}tags-input .tags .input.invalid-tag{color:red}tags-input .tags .input::-ms-clear{display:none}tags-input.ng-invalid .tags{-webkit-box-shadow:0 0 3px 1px rgba(255,0,0,.6);-moz-box-shadow:0 0 3px 1px rgba(255,0,0,.6);box-shadow:0 0 3px 1px rgba(255,0,0,.6)}tags-input .autocomplete{margin-top:5px;position:absolute;padding:5px 0;z-index:999;width:100%;background-color:#fff;border:1px solid rgba(0,0,0,.2);-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2)}tags-input .autocomplete .suggestion-list{margin:0;padding:0;list-style-type:none}tags-input .autocomplete .suggestion-item{padding:5px 10px;cursor:pointer;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;font:16px "Helvetica Neue",Helvetica,Arial,sans-serif;color:#000;background-color:#fff}tags-input .autocomplete .suggestion-item.selected,tags-input .autocomplete .suggestion-item.selected em{color:#fff;background-color:#0097cf}tags-input .autocomplete .suggestion-item em{font:normal bold 16px "Helvetica Neue",Helvetica,Arial,sans-serif;color:#000;background-color:#fff}
\ No newline at end of file

templates/pages/menu.html

@@ -111,7 +111,7 @@
                                         </a>
                                         <i class="caret"></i>
                                     <ul class="dropdown-menu">
-                                        {% if view != "graph" %}
+                                        {% if view == "titles" %}
                                             <li>
                                                 <a tabindex="-1"
                                                     data-url="/projects/{{project.id}}/corpora/{{ corpus.id }}/explorer?field1=ngrams&amp;field2=ngrams&amp;distance=conditional&amp;bridgeness=5" onclick='gotoexplorer(this)'  >With conditional distance        </a>
@@ -137,6 +137,15 @@
                                 {% endif %}
                         {% endfor %}
 
+
+                        <li>
+                                <a type="button" class="btn btn-default {% if view == 'analytics' %} active {% endif %}"
+                                    onclick="javascript:location.href='/projects/{{project.id}}/corpora/{{ corpus.id }}/analytics'"
+                                    data-target='#' href='#'>Analytics
+                                </a>
+                        </li>
+
+
                     </ul>
             </div>
             {% endif %}