feat: Add data source organism on species page (#538) #588
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
juggler31
force-pushed
the
graph_origin_species_data
branch
3 times, most recently
from
08062e4 to
857786a
Compare
juggler31
requested review from
amandine-sahl,
marcantoinedupre,
camillemonchicourt and
submarcos
|
Je crois qu'il faut activer ce graphique, seulement si les ORGANISMES sont activés globalement : Est-ce le cas ? |
juggler31
force-pushed
the
graph_origin_species_data
branch
from
857786a to
7ca06ee
Compare
Un graphique de provenance des données a été rajouté afin de visualiser la participation de chaques organismes a l'observation d'un Taxon.
juggler31
force-pushed
the
graph_origin_species_data
branch
3 times, most recently
from
ff8201c to
bfe1779
Compare
Un graphique de provenance des données a été rajouté afin de visualiser la participation de chaques organismes a l'observation d'un Taxon.
juggler31
force-pushed
the
graph_origin_species_data
branch
from
bfe1779 to
6fabcc7
Compare
| @@ -232,6 +233,7 @@ def ficheEspece(cd_nom): | |||
| taxon = vmTaxrefRepository.searchEspece(connection, cd_ref) | |||
| altitudes = vmAltitudesRepository.getAltitudesChilds(connection, cd_ref) | |||
| months = vmMoisRepository.getMonthlyObservationsChilds(connection, cd_ref) | |||
| data_source_values = vmCorTaxonOrganism.getTaxonOrganism(connection, cd_ref) | |||
There was a problem hiding this comment.
J’appellerais cette variable organism_stats ou organism_plot_data
| @@ -274,6 +276,7 @@ def ficheEspece(cd_nom): | |||
| cd_ref=cd_ref, | |||
| altitudes=altitudes, | |||
| months=months, | |||
| data_source_values=data_source_values, | |||
| @@ -138,7 +138,35 @@ class Meta: | |||
| AFFICHAGE_NOUVELLES_ESPECES = fields.Boolean(load_default=True) | |||
| AFFICHAGE_RECHERCHE_AVANCEE = fields.Boolean(load_default=False) | |||
| AFFICHAGE_GRAPH_ALTITUDES = fields.Boolean(load_default=True) | |||
| AFFICHAGE_GRAPH_PHENOLOGIE = fields.Boolean(load_default=True) | |||
| AFFICHAGE_GRAPH_PHENOLOGIE = fields.Boolean(load_default=False) | |||
There was a problem hiding this comment.
Pourquoi masquer le graphique des phénologie par défaut ?
| @@ -41,7 +41,9 @@ | |||
| var months_name = {{ configuration.AVAILABLE_LANGUAGES[g.lang_code]['months'] | tojson }}; | |||
| {% else %} | |||
| var months_name = {{ configuration.AVAILABLE_LANGUAGES[configuration.DEFAULT_LANGUAGE]['months'] | tojson }}; | |||
|
|
|||
| {% endif %} | |||
| {% if configuration.ORGANISM_MODULE and configuration.AFFICHAGE_GRAPH_PROVENANCE_DONNEE %} | |||
There was a problem hiding this comment.
Si on veut afficher les stats par organisme mais pas la fiche organisme on ne peut pas.
Je dirais : soit on fait un seul paramètre qui contrôle les deux, soit on en fait deux différents, mais qui n'interfèrent pas les uns avec les autres.
Je penche plus pour la deuxième option
|
|
||
| {% endif %} | ||
| {% if configuration.ORGANISM_MODULE and configuration.AFFICHAGE_GRAPH_PROVENANCE_DONNEE %} | ||
| var data_source_values = {{ data_source_values | tojson}}; |
There was a problem hiding this comment.
A renommer (voir plus haut)
| @@ -12,5 +12,11 @@ <h4 class="title-bar title-spaced center strong">{{ _('monthly.obs') }}</h4> | |||
| <canvas id="monthChart"></canvas> | |||
| </div> | |||
| {% endif %} | |||
| {% if configuration.ORGANISM_MODULE and configuration.AFFICHAGE_GRAPH_PROVENANCE_DONNEE %} | |||
| }, | ||
| title: { | ||
| display: false, | ||
| text: 'Graphique des provenances de données' |
There was a problem hiding this comment.
Le titre n'est pas utilisé, et pas traduit. Je pense qu'on peut le retirer du JS ?
| labels: labels, | ||
| datasets: [ | ||
| { | ||
| label: 'Dataset 1', |
There was a problem hiding this comment.
Pour le pie chart, le "label" n'a pas l'air d'être utilisé. Pour moi on peut l'enlevé aussi
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Un graphique de provenance des données a été rajouté afin de visualiser la participation de chaques organismes a l'observation d'un Taxon.
#538