Skip to content

gargantext
gargantext
Commit c7b2ff9c authored by delanoe's avatar delanoe
Browse files
Options

[ERGO] MyGraph + Authors page 

- List cleaned
- Dynamic graph saved each time
- Removing page authors (for later)
parent e70c8412
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 22 deletions
gargantext/constants.py
View file @ c7b2ff9c
...@@ -360,7 +360,7 @@ DEFAULT_N_DOCS_HAVING_NGRAM = 5 ...@@ -360,7 +360,7 @@ DEFAULT_N_DOCS_HAVING_NGRAM = 5
# Graph constraints to compute the graph: # Graph constraints to compute the graph:
# Modes: live graph generation, graph asynchronously computed or errors detected # Modes: live graph generation, graph asynchronously computed or errors detected
# here are the maximum size of corpus and maplist required to compute the graph # here are the maximum size of corpus and maplist required to compute the graph
graph_constraints = {'corpusMax' : 1001 graph_constraints = {'corpusMax' : 599
,'corpusMin' : 40 ,'corpusMin' : 40
,'mapList' : 50 ,'mapList' : 50
} }
graph/graph.py
View file @ c7b2ff9c
...@@ -151,7 +151,7 @@ def get_graph( request=None , corpus=None ...@@ -151,7 +151,7 @@ def get_graph( request=None , corpus=None
, start=start , end =end , start=start , end =end
, mapList_id=mapList_id , groupList_id=groupList_id , mapList_id=mapList_id , groupList_id=groupList_id
, isMonopartite=True , threshold = threshold , isMonopartite=True , threshold = threshold
, save_on_db = False , save_on_db = True
#, limit=size #, limit=size
) )
else: else:
......
templates/pages/corpora/myGraphs.html
View file @ c7b2ff9c
...@@ -26,29 +26,39 @@ ...@@ -26,29 +26,39 @@
<div class="col-md-5 content"> <div class="col-md-5 content">
<li> <li>
Graph created at {{cooc.date}} {{cooc.date}}
{% for key, value in coocs_count.items %} {% for key, value in coocs_count.items %}
{% if key == cooc.id %} {% if key == cooc.id %}
{% if value > 0 %} {% if value > 0 %}
with {{ value }} nodes :
<ul> <ul>
<!-- <li>{{cooc.id}}</li> --!> <!-- <li>{{cooc.id}}</li> --!>
<li>Start period: {% if not cooc.hyperdata.start %} begin of corpus {% else %} {{cooc.hyperdata.start}} {% endif %} </li> <li>From: {% if not cooc.hyperdata.start %} begin of corpus {% else %} {{cooc.hyperdata.start}} {% endif %}
<li>End period: {% if not cooc.hyperdata.end %} end of corpus {% else %} {{cooc.hyperdata.end}} {% endif %} </li> , To: {% if not cooc.hyperdata.end %} end of corpus {% else %} {{cooc.hyperdata.end}} {% endif %}
<li>Distances: </li>
<li> {{ value }} nodes with distances:
<ul> <ul>
<li> <span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span> <li>
Conditional with bridgeness <a href="/projects/{{project.id}}/corpora/{{corpus.id}}/explorer?cooc_id={{cooc.id}}&distance=distributional&bridgeness=5">
<a href="/projects/{{project.id}}/corpora/{{corpus.id}}/explorer?cooc_id={{cooc.id}}&distance=conditional&bridgeness=5">5</a> <span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span>
or <a href="/projects/{{project.id}}/corpora/{{corpus.id}}/explorer?cooc_id={{cooc.id}}&distance=conditional&bridgeness=10">10</a> Conditional
</a>
(with bridgeness
<a href="/projects/{{project.id}}/corpora/{{corpus.id}}/explorer?cooc_id={{cooc.id}}&distance=conditional&bridgeness=10">10</a>
or <a href="/projects/{{project.id}}/corpora/{{corpus.id}}/explorer?cooc_id={{cooc.id}}&distance=conditional&bridgeness=20">20</a> or <a href="/projects/{{project.id}}/corpora/{{corpus.id}}/explorer?cooc_id={{cooc.id}}&distance=conditional&bridgeness=20">20</a>
or <a href="/projects/{{project.id}}/corpora/{{corpus.id}}/explorer?cooc_id={{cooc.id}}&distance=conditional&bridgeness=30">30</a>
<li> <span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span> )
Distributional with bridgeness </li>
<a href="/projects/{{project.id}}/corpora/{{corpus.id}}/explorer?cooc_id={{cooc.id}}&distance=distributional&bridgeness=5">5</a> <li>
or <a href="/projects/{{project.id}}/corpora/{{corpus.id}}/explorer?cooc_id={{cooc.id}}&distance=distributional&bridgeness=10">10</a> <a href="/projects/{{project.id}}/corpora/{{corpus.id}}/explorer?cooc_id={{cooc.id}}&distance=distributional&bridgeness=5">
<span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span>
Distributional
</a>
(with bridgeness
<a href="/projects/{{project.id}}/corpora/{{corpus.id}}/explorer?cooc_id={{cooc.id}}&distance=distributional&bridgeness=10">10</a>
or <a href="/projects/{{project.id}}/corpora/{{corpus.id}}/explorer?cooc_id={{cooc.id}}&distance=distributional&bridgeness=20">20</a> or <a href="/projects/{{project.id}}/corpora/{{corpus.id}}/explorer?cooc_id={{cooc.id}}&distance=distributional&bridgeness=20">20</a>
or <a href="/projects/{{project.id}}/corpora/{{corpus.id}}/explorer?cooc_id={{cooc.id}}&distance=distributional&bridgeness=30">30</a>
)
</li> </li>
</ul> </ul>
</ul> </ul>
......
templates/pages/menu.html
View file @ c7b2ff9c
...@@ -81,19 +81,22 @@ ...@@ -81,19 +81,22 @@
<li> <li>
<a type="button" class="btn btn-default {% if view == 'titles' %} active {% endif %}" <a type="button" class="btn btn-default {% if view == 'titles' %} active {% endif %}"
onclick="javascript:location.href='/projects/{{project.id}}/corpora/{{ corpus.id }}/'" onclick="javascript:location.href='/projects/{{project.id}}/corpora/{{ corpus.id }}/'"
data-target='#' href='#'>Documents data-target='#' href='#'>
<span class="glyphicon glyphicon-folder-open" aria-hidden="true"></span> <span class="glyphicon glyphicon-folder-open" aria-hidden="true"></span>
&nbsp;Documents
</a> </a>
</li> </li>
<li> <li>
<a type="button" class="btn btn-default {% if view == 'journals' %} active {% endif %}" <a type="button" class="btn btn-default {% if view == 'journals' %} active {% endif %}"
onclick="javascript:location.href='/projects/{{project.id}}/corpora/{{ corpus.id }}/journals'" onclick="javascript:location.href='/projects/{{project.id}}/corpora/{{ corpus.id }}/journals'"
data-target='#' href='#'>Journals data-target='#' href='#'>
<span class="glyphicon glyphicon-globe" aria-hidden="true"></span> <span class="glyphicon glyphicon-globe" aria-hidden="true"></span>
Journals
</a> </a>
</li> </li>
<!--
<li> <li>
<a type="button" class="btn btn-default {% if view == 'authors' %} active {% endif %}" <a type="button" class="btn btn-default {% if view == 'authors' %} active {% endif %}"
onclick="javascript:location.href='/projects/{{project.id}}/corpora/{{ corpus.id }}/authors'" onclick="javascript:location.href='/projects/{{project.id}}/corpora/{{ corpus.id }}/authors'"
...@@ -101,7 +104,7 @@ ...@@ -101,7 +104,7 @@
<span class="glyphicon glyphicon-user" aria-hidden="true"></span> <span class="glyphicon glyphicon-user" aria-hidden="true"></span>
</a> </a>
</li> </li>
--!>
{% for state in corpus.hyperdata.statuses %} {% for state in corpus.hyperdata.statuses %}
{% if state.action == "Workflow" %} {% if state.action == "Workflow" %}
...@@ -110,16 +113,17 @@ ...@@ -110,16 +113,17 @@
<li> <li>
<a type="button" class="btn btn-default {% if view == 'terms' %} active {% endif %}" <a type="button" class="btn btn-default {% if view == 'terms' %} active {% endif %}"
onclick="javascript:location.href='/projects/{{project.id}}/corpora/{{ corpus.id }}/terms'" onclick="javascript:location.href='/projects/{{project.id}}/corpora/{{ corpus.id }}/terms'"
data-target='#' href='#'>Terms data-target='#' href='#'>
<span class="glyphicon glyphicon-text-width" aria-hidden="true"></span> <span class="glyphicon glyphicon-text-width" aria-hidden="true"></span>
Terms
</a> </a>
</li> </li>
<li class="dropdown"> <li class="dropdown">
<a href="#graph" role="button" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" title="That is your username"> <a href="#graph" role="button" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" title="That is your username">
Graphs
<span class="glyphicon glyphicon-map-marker" aria-hidden="true"></span> <span class="glyphicon glyphicon-map-marker" aria-hidden="true"></span>
Graphs
</a> </a>
<i class="caret"></i> <i class="caret"></i>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
...@@ -148,8 +152,8 @@ ...@@ -148,8 +152,8 @@
onclick="javascript:location.href='/projects/{{project.id}}/corpora/{{ corpus.id }}/analytics'" onclick="javascript:location.href='/projects/{{project.id}}/corpora/{{ corpus.id }}/analytics'"
data-target='#' href='#'> data-target='#' href='#'>
Analytics
<span class="glyphicon glyphicon-signal" aria-hidden="true"></span> <span class="glyphicon glyphicon-signal" aria-hidden="true"></span>
Analytics
</a> </a>
</li> </li>
......
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