dev-cobiodiv-organisms

.gitignore

@@ -1,4 +1,5 @@
 *.pyc
+<<<<<<< HEAD
 log/*
 atlas/static/conf/custom.js
 atlas/debug.py
@@ -10,7 +11,16 @@ venv3/*
 
 atlas/configuration/config.py
 atlas/configuration/settings.ini
+=======
+atlas/debug.py
+
+atlas/configuration/settings.ini
+atlas/configuration/config.py
+>>>>>>> dev-cobiodiv-specie-improve
 
+atlas/static/conf/custom.js
+atlas/static/territoire.json
+atlas/static/images/ancien
 atlas/static/node_modules
 atlas/static/territoire.json
 atlas/static/images/ancie

atlas/app.py

@@ -81,6 +81,9 @@ def get_locale():
  app.register_blueprint(api, url_prefix="/api")
  compress.init_app(app)
 
+
+
+
  app.wsgi_app = ReverseProxied(
  app.wsgi_app, script_name=valid_config["URL_APPLICATION"]
  )

atlas/atlasRoutes.py

@@ -20,6 +20,7 @@
 from atlas.configuration import config
 from atlas.modeles.entities import vmTaxons, vmCommunes
 from atlas.modeles.repositories import (
+ vmOrganismesRepository,
  vmTaxonsRepository,
  vmObservationsRepository,
  vmAltitudesRepository,
@@ -77,6 +78,50 @@ def especeMedias(image):
  + image
  )
 
+# Activating organisms sheets routes
+if config.ORGANISM_MODULE:
+ @main.route("/organisme/<int:id_organisme>", methods=["GET", "POST"])
+ def ficheOrganisme(id_organisme):
+ db_session = utils.loadSession()
+ connection = utils.engine.connect()
+
+ infos_organisme = vmOrganismesRepository.statOrganisme(connection, id_organisme)
+
+ stat = vmObservationsRepository.statIndex(connection)
+
+ mostObsTaxs=vmOrganismesRepository.topObsOrganism(connection, id_organisme)
+
+ top_taxons=list()
+ photos=list()
+
+ for taxons in mostObsTaxs:
+ top_taxons.append(vmTaxrefRepository.searchEspece(connection, taxons['cd_ref']))
+ photos.append(vmMedias.getFirstPhoto(connection, taxons['cd_ref'], current_app.config["ATTR_MAIN_PHOTO"]))
+
+ stats_group=vmOrganismesRepository.getTaxonRepartitionOrganisme(connection, id_organisme)
+
+ connection.close()
+ db_session.close()
+
+ return render_template( 
+ "templates/organismSheet/_main.html",
+ nom_organisme = infos_organisme['nom_organisme'],
+ adresse_organisme = infos_organisme['adresse_organisme'],
+ cp_organisme = infos_organisme['cp_organisme'],
+ ville_organisme = infos_organisme['ville_organisme'],
+ tel_organisme = infos_organisme['tel_organisme'],
+ url_organisme = infos_organisme['url_organisme'],
+ url_logo = infos_organisme['url_logo'],
+ nb_taxons = infos_organisme['nb_taxons'],
+ nb_obs = infos_organisme['nb_obs'],
+
+ stat = stat,
+ mostObsTaxs = mostObsTaxs,
+ top_taxons = top_taxons,
+ photos = photos,
+ stats_group = stats_group
+ )
+
 
 @main.route(
  "/commune/" + current_app.config["REMOTE_MEDIAS_PATH"] + "<image>",
@@ -134,15 +179,15 @@ def index():
  current_app.logger.debug("start AFFICHAGE_MAILLE")
  observations = vmObservationsMaillesRepository.lastObservationsMailles(
  connection,
- current_app.config["NB_DAY_LAST_OBS"],
+ str(current_app.config["NB_DAY_LAST_OBS"]) + ' day',
  current_app.config["ATTR_MAIN_PHOTO"],
  )
  current_app.logger.debug("end AFFICHAGE_MAILLE")
  else:
  current_app.logger.debug("start AFFICHAGE_PRECIS")
  observations = vmObservationsRepository.lastObservations(
  connection,
- current_app.config["NB_DAY_LAST_OBS"],
+ str(current_app.config["NB_DAY_LAST_OBS"]) + ' day',
  current_app.config["ATTR_MAIN_PHOTO"],
  )
  current_app.logger.debug("end AFFICHAGE_PRECIS")
@@ -225,6 +270,9 @@ def ficheEspece(cd_ref):
  )
  observers = vmObservationsRepository.getObservers(connection, cd_ref)
 
+ organisms = vmOrganismesRepository.getListOrganisme(connection, cd_ref)
+
+
  connection.close()
  db_session.close()
 
@@ -245,6 +293,7 @@ def ficheEspece(cd_ref):
  articles=articles,
  taxonDescription=taxonDescription,
  observers=observers,
+ organisms=organisms
  )
 
 

atlas/configuration/config.py.example

@@ -27,6 +27,14 @@ NOM_APPLICATION = "Nom de l application"
 # ex "/atlas" pour une URL: http://mon-domaine/atlas OU "" si l'application est accessible à la racine du domaine
 URL_APPLICATION = ""
 
+#################################
+#################################
+###### Modules activation #######
+#################################
+#################################
+
+# Organism module : organism's sheet + organism participation on specie sheet
+ORGANISM_MODULE = False
 
 ###########################
 ###### Multilingual #######

atlas/configuration/config.py.sample

@@ -21,6 +21,14 @@ NOM_APPLICATION = "Nom de l application"
 # ex "/atlas" pour une URL: http://mon-domaine/atlas OU "" si l'application est accessible à la racine du domaine
 URL_APPLICATION = "/atlas"
 
+#################################
+#################################
+###### Modules activation #######
+#################################
+#################################
+
+# Organism module : organism's sheet + organism participation on specie sheet
+ORGANISM_MODULE = False
 
 ###########################
 ###### Multilingual #######
@@ -35,7 +43,9 @@ MULTILINGUAL = True
 ###########################
 # If multilingual is activated configure under
 
-# Available languages
+# Available languages 
+# Don't delete even if you uninstall MULTILINGUAL
+# You need to add your own default language(BABEL_DEFAULT_LOCALE) here if it's not present 
 # Check documentation for adding another language
 LANGUAGES = {
  'en': {

atlas/configuration/config_schema.py

@@ -66,6 +66,7 @@ class AtlasConfig(Schema):
  BABEL_DEFAULT_LOCALE = fields.String(missing="")
  MULTILINGUAL = fields.Boolean(missing=True)
  ID_GOOGLE_ANALYTICS = fields.String(missing="UA-xxxxxxx-xx")
+ ORGANISM_MODULE = fields.Boolean(missing="False")
  GLOSSAIRE = fields.Boolean(missing=False)
  IGNAPIKEY = fields.String(missing="")
  AFFICHAGE_INTRODUCTION = fields.Boolean(missing=True)

atlas/messages.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-07-30 16:52+0200\n"
+"POT-Creation-Date: 2021-08-05 09:33+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
+#: static/custom/templates/introduction.html:6
+msgid "welcome.message"
+msgstr ""
+
+#: static/custom/templates/introduction.html:8
+msgid "home.introduction.message"
+msgstr ""
+
+#: static/custom/templates/introduction.html:11
+#: templates/specieSheet/blocInfos.html:17
+msgid "read.more"
+msgstr ""
+
 #: static/custom/templates/presentation.html:11
 msgid "My custom presentation"
 msgstr ""
@@ -55,13 +68,15 @@ msgstr ""
 
 #: templates/core/listTaxons.html:80 templates/core/statHierarchy.html:5
 #: templates/home/globalStats.html:13 templates/home/lastObs.html:7
-#: templates/specieSheet/map.html:15
+#: templates/organismSheet/topSpecie.html:60 templates/specieSheet/map.html:15
 msgid "observation"
 msgstr ""
 
 #: templates/core/listTaxons.html:81 templates/core/statHierarchy.html:5
 #: templates/core/tabTaxons.html:19 templates/home/globalStats.html:13
-#: templates/home/lastObs.html:7 templates/specieSheet/identityCard.html:131
+#: templates/home/lastObs.html:7 templates/organismSheet/statsInfos.html:12
+#: templates/organismSheet/topSpecie.html:60
+#: templates/specieSheet/identityCard.html:131
 #: templates/specieSheet/map.html:15
 msgid "observations"
 msgstr ""
@@ -71,12 +86,14 @@ msgid "last.obs.in"
 msgstr ""
 
 #: templates/core/listTaxons.html:86 templates/core/tabTaxons.html:85
-#: templates/home/lastObs.html:42 templates/specieSheet/identityCard.html:173
+#: templates/home/lastObs.html:42 templates/organismSheet/topSpecie.html:65
+#: templates/specieSheet/identityCard.html:173
 msgid "check.specie.sheet"
 msgstr ""
 
 #: templates/core/listTaxons.html:87 templates/home/lastObs.html:43
 #: templates/home/mostViewNow.html:31 templates/home/taxoRank.html:57
+#: templates/organismSheet/topSpecie.html:66
 msgid "specie.sheet"
 msgstr ""
 
@@ -103,7 +120,7 @@ msgid "gallery.title"
 msgstr ""
 
 #: templates/core/statHierarchy.html:9 templates/home/globalStats.html:22
-#: templates/home/taxoRank.html:28
+#: templates/home/taxoRank.html:28 templates/organismSheet/statsInfos.html:22
 msgid "species"
 msgstr ""
 
@@ -112,12 +129,12 @@ msgid "specie"
 msgstr ""
 
 #: templates/core/statHierarchy.html:12 templates/specieSheet/map.html:25
-#: templates/specieSheet/otherInformations.html:19
+#: templates/specieSheet/otherInformations.html:23
 msgid "observers"
 msgstr ""
 
 #: templates/core/statHierarchy.html:12 templates/specieSheet/map.html:25
-#: templates/specieSheet/otherInformations.html:19
+#: templates/specieSheet/otherInformations.html:23
 msgid "observer"
 msgstr ""
 
@@ -202,6 +219,30 @@ msgstr ""
 msgid "species.to.discover"
 msgstr ""
 
+#: templates/organismSheet/blocInfos.html:4
+msgid "other.informations"
+msgstr ""
+
+#: templates/organismSheet/groupChart.html:3
+msgid "part.graph"
+msgstr ""
+
+#: templates/organismSheet/mapObs.html:5
+msgid "map.observations"
+msgstr ""
+
+#: templates/organismSheet/statsInfos.html:4
+msgid "organism.stats"
+msgstr ""
+
+#: templates/organismSheet/statsInfos.html:17
+msgid "atlas.participation"
+msgstr ""
+
+#: templates/organismSheet/topSpecie.html:5
+msgid "top.specie"
+msgstr ""
+
 #: templates/photoGalery/_main.html:64
 msgid "all.groups.tooltip"
 msgstr ""
@@ -220,14 +261,10 @@ msgstr ""
 
 #: templates/specieSheet/blocInfos.html:14
 #: templates/specieSheet/descriptionMedia.html:16
-#: templates/specieSheet/otherInformations.html:57
+#: templates/specieSheet/otherInformations.html:63
 msgid "description"
 msgstr ""
 
-#: templates/specieSheet/blocInfos.html:17
-msgid "read.more"
-msgstr ""
-
 #: templates/specieSheet/blocInfos.html:19
 msgid "environment"
 msgstr ""
@@ -259,7 +296,7 @@ msgid "monthly.obs"
 msgstr ""
 
 #: templates/specieSheet/descriptionMedia.html:12
-#: templates/specieSheet/otherInformations.html:30
+#: templates/specieSheet/otherInformations.html:36
 msgid "author"
 msgstr ""
 
@@ -275,14 +312,30 @@ msgstr ""
 msgid "first.obs"
 msgstr ""
 
-#: templates/specieSheet/otherInformations.html:29
+#: templates/specieSheet/otherInformations.html:19
+msgid "organisms"
+msgstr ""
+
+#: templates/specieSheet/otherInformations.html:19
+msgid "organism"
+msgstr ""
+
+#: templates/specieSheet/otherInformations.html:35
 msgid "title"
 msgstr ""
 
-#: templates/specieSheet/otherInformations.html:59
+#: templates/specieSheet/otherInformations.html:65
 msgid "date"
 msgstr ""
 
+#: templates/specieSheet/otherInformations.html:137
+msgid "check.organism.sheet"
+msgstr ""
+
+#: templates/specieSheet/otherInformations.html:138
+msgid "organism.sheet"
+msgstr ""
+
 #: templates/taxoRankSheet/_main.html:47
 msgid "specie.obs.for.tax"
 msgstr ""

atlas/modeles/entities/vmOrganismes.py

@@ -0,0 +1,29 @@
+# -*- coding:utf-8 -*-
+
+from sqlalchemy import Column, Integer, MetaData, String, Table, Float
+from sqlalchemy.ext.declarative import declarative_base
+
+from atlas.utils import engine
+
+Base = declarative_base()
+metadata = MetaData()
+
+class VmOrganismes(Base):
+ __table__=Table(
+ 'vm_organismes',
+ metadata,
+ Column('nb_observations', Integer),
+ Column('id_organisme', Integer, primary_key=True, unique =True),
+ Column ('nom_organisme',String(500)),
+ Column ('adresse_organisme', String (128)),
+ Column ('cp_organisme', String(5)),
+ Column ('ville_organisme', String(100)),
+ Column ('tel_organisme',String(14)),
+ Column ('email_organisme', String(100)),
+ Column ('url_organisme', String(255)),
+ Column ('url_logo', String(255)),
+ Column('cd_ref',Integer),
+ schema="atlas",
+ autoload=True,
+ autoload_with=engine
+ )