Irap db Integration

Feed database with charges from irap csv file

Irap db Integration
Feed database with charges from irap csv file
hitier
2 parents c25197fc f8f2c15b
Showing 14 changed files with 330 additions and 121 deletions Show diff stats
CHANGELOG.md
INSTALL.md
VERSION.txt
app/auth/templates/login.html
app/commands/commands.py
app/db_mgr.py
app/main/static/js/charges.js
app/main/templates/agent.html
app/main/templates/project.html
app/templates/base_page.html
app/templates/heads.html
migrations/versions/c5743e70ac8b_.py
resources/flaskenv
resources/lesia-btp.sqlite
@@ -24,6 +24,15 @@ or major refactoring improvments.
  
 ## Unreleased
  
+## [0.3.pre-1] - 2021-04-16 - Irap db integration
+### New
+Irap db feed from csv file
+Versionize static assets
+User management commands
+
+### Changed
+Tiny chart enhancements
+
 ## [0.2.1] - 2021-04-15 - Password Encryption
 ### New
 Password encrypted in database
@@ -12,7 +12,7 @@
     export GIT_SSL_NO_VERIFY=1
     git clone https://gitlab.irap.omp.eu/PDC-IRAP/pdc-web.git
     cd pdc-web
-    git checkout dev # éventuellement travailler avec la branche la plus à jour
+    git checkout dev # pour éventuellement travailler avec la branche la plus à jour
  
 ### Installer l'environment python
  
@@ -24,57 +24,66 @@
 ### Configurer l'application
  
 Les fichiers de configuration fournis dans le répertoire ./resources sont à copier à la racine du projet,
-mais peuvent être laissés tels quels pour un premier test aprés installation.
+mais peuvent être laissés tels quels pour un premier test après installation.
  
-Il est bon d'y jeter un oeil, les commentaires sont là pour aider.
+Il est bon d'y jeter un oeil, les commentaires sont là pour vous aider.
+(mais en anglais comme tout le code source du projet)
  
     # D'abord les accès base de donnée
     #
-    cp resources/db_config.py .
+    cp ./resources/db_config.py ./
     $(EDITOR) db_config.py 
  
     # Puis le fichier pour l'application elle même
     #
-    cp resources/pdc_config.py .
+    cp ./resources/pdc_config.py ./
     $(EDITOR) pdc_config.py 
  
-    # Enfin le contrôle de la commande flask
-    # également chargé par l'application grace à l'instruction:
+    # Enfin le contrôle de la commande flask est assuré par son propre fichier de configuration
+    # Celui ci est également chargé par l'application grace à l'instruction:
     # app/__init__.py: load_dotenv(env_file, verbose=True)
     #
-    cp resources/flaskenv .flaskenv # ! noter le '.' devant le fichier destination
+    cp ./resources/flaskenv ./.flaskenv # ! noter le '.' devant le fichier destination
     $(EDITOR) .flaskenv
  
 ### Créer la base de données 
  
-Dans un premier temps pour tester l'installation, on peut s'appuyer sur une base déjà disponible.
+Dans un premier temps, pour tester l'installation, on peut s'appuyer sur une base déjà disponible.
  
 Il s'agit de l'import d'une base de type Lesia dont les noms d'agents, de projets, de métiers et de services ont été
-réécrit avec des chantiers du batiment. Cela afin de ne pas diffuser des données réelles du Lesia et permettre la
-diffusion de ces données de test avec le projet plan-de-charge.
+réécrit avec des chantiers du batiment. Cela fut fait afin de ne pas diffuser des données réelles du Lesia et permettre
+la diffusion de ces données de test avec le projet plan-de-charge.
  
     cp resources/lesia-btp.sqlite ./pdc-dev.db
  
-Vérifier que ce chemin correspond avec celui configuré dans le fichier `db_config.py`
+Vérifier que ce chemin correspond avec celui configuré dans le fichier `db_config.py` pour la
+variable `sqlalchemy_devdb_uri`.
+C'est le cas dans le fichier initial pour une variable `FLASK_ENV` positionnée à 'development'.
+
+Pour un usage plus avancé, voyez l'outil en ligne de commande fourni avec l'application.
+(sinon, passez directement à la section suivante )
  
-Pour un usage plus avancé, il y a l'outil de ligne de commande fourni avec l'application.
  
     # Créer la structure de la base
     #
     flask pdc_db create_db
  
-    # Il est aussi possible d'importer une base de type Lesia
+    # Il est possible d'importer une base de type Lesia
     # cela suppose de disposer d'une telle base, et de l'avoir configurée dans db_config.py
     #
     flask pdc_db feed_from_lesia 
  
     # Voire de l'anonymiser en changeant
-    #   - les noms de projet
-    #   - les noms de service
+    #   - les noms de projets
+    #   - les noms de services
     #   - les noms de fonctions
     #
     flask pdc_db fake_lesia_names
  
+    # D'autre commandes d'importation sont disponibles:
+    #
+    flask pdc_db feed_from_irap --csv-file 2021_03_30_PDC_v0-1.csv
+
     # Plus d'info sur les outils en ligne de commande:
     #
     flask --help
@@ -84,7 +93,7 @@ Pour un usage plus avancé, il y a l&#39;outil de ligne de commande fourni avec l&#39;ap
 ## Jouer les tests et exécuter un serveur local
  
     pip install -r requirements-tests.txt
-    cp resources/lesia-btp.sqlite ./pdc-test.db # ou le chemin configuré dans `db_config.py`
+    cp resources/lesia-btp.sqlite ./pdc-test.db # ou le chemin configuré dans `db_config.py` pour sqlalchemy_testdb_uri
 	PYTHONPATH=. pytest
  
     # éventuellement voir le taux de couverture
@@ -131,6 +140,8 @@ Enfin, ouvrir un serveur sur localhost:5000 et y accéder avec son navigateur.
  
 ## Mise à jour 
  
+### git pull
+
 ### git autodeploy
  
 Les fichiers concernés:
@@ -150,7 +161,16 @@ La procédure:
  
     git push to repo
  
+## Gestion des utilisateurs
  
+La table `users` stocke les utilisateur qui se connectent à l'applicationa avec leur rôle et les droits associés.
+Un ensemble de commandes permet de les gérer:
+
+    flask pdc_db user_show_all  # liste existante
+    flask pdc_db user_add       # ajouter un nouveau login
+    flask pdc_db user_update    # modifier un login existant
+    flask pdc_db user_delete    # effacer un login existant
+    flask pdc_db show_roles     # lister les rôles disponibles
  
 ## Intégration Pycharm 
  
@@ -168,10 +188,15 @@ Dans le menu &#39;Edit Configurations&#39;, changer les champs:
 - et dans le champs 'Parameters' choisir 'run'
  
  
-Normalement, cette configuration permet de lire les variables positionées dans le fichier .flaskenv
+Cette configuration permet de lire les variables positionées dans le fichier .flaskenv
  
     FLASK_ENV=development
     FLASK_APP=pdc_web
  
  
 Ainsi fait, exécutez votre projet depuis pycharm et essayez sur un navigateur à l'adresse localhost:5000.
+
+## Troubleshooting
+
+* Q: parfois le module Flask-Migrate n'est pas correctement chargé aprés son installation.
+* R: simplement recharger l'environnement virtuel avec `source venv/bin/activate`
-0.2.1
+0.3.pre-1
@@ -2,15 +2,15 @@
 <html lang="fr">
 <head>
   {% include 'heads.html' %}
-  <link href="{{ url_for('static', filename='css/style.css') }}" rel="stylesheet" type="text/css"/>
-  <link href="{{ url_for('auth.static', filename='signin.css') }}" rel="stylesheet" type="text/css"/>
+  <link href="{{ url_for('static', filename='css/style.css', version=config.VERSION) }}" rel="stylesheet" type="text/css"/>
+  <link href="{{ url_for('auth.static', filename='signin.css', version=config.VERSION) }}" rel="stylesheet" type="text/css"/>
 </head>
 <body class="text-center">
   <form action="{{ url_for('auth.login')}}" class="form-signin" method="POST">
     {% include 'flash-messages.html' %}
  
     <a href="{{url_for('main.index')}}">
-      <img class="mb-4 {{config.PDC_SITE_CLASS}}" height="72" src="{{ url_for('static', filename='img/pdc.png') }}" width="72">
+      <img class="mb-4 {{config.PDC_SITE_CLASS}}" height="72" src="{{ url_for('static', filename='img/pdc.png', version=config.VERSION) }}" width="72">
     </a>
     <h1 class="h3 font-weight-normal mb-3">{{config.PDC_APP_NAME}} - {{config.PDC_SITE_NAME}}</h1>
     <h1 class="h3 font-weight-normal mb-3">Connectez vous</h1>
@@ -6,77 +6,144 @@ import random
  
 from flask import current_app
 from sqlalchemy.exc import OperationalError, IntegrityError
+from sqlalchemy.orm.exc import NoResultFound
 from sqlalchemy.sql import func
 from sqlalchemy.ext.automap import automap_base
 from sqlalchemy.orm import Session
 from sqlalchemy import create_engine
  
 from app.models import db, Agent, Service, Project, Capacity, Period, Charge
-from app.auth.models import User, _nameToRole
+from app.auth.models import User, _nameToRole, _roleToName
  
 from . import bp
  
  
-@bp.cli.command("fake_lesia_names")
-def fake_lesia_names():
+@bp.cli.command('create_db')
+def create_db():
     """
-    Extract fake name from resources files to change names in db.
-    Mainly after a lesia import, for confidential reasons
+    Create the database structure. Database should be empty.
  
-    Changes nams in tables:
+    configure the proper database uri in the db_config.py file.
+    """
+    db.create_all()
+    admin = User(email='admin@nowhere.org', name='admin', login='admin', role='admin')
+    admin.set_password('admin')
+    sqlite_uri = db.engine.url.__str__() if 'sqlite' in db.engine.url.__str__() else None
+    try:
+        db.session.add(admin)
+        db.session.commit()
+    except IntegrityError:
+        current_app.logger.error("User admin already exists, database should be empty at create")
+        if sqlite_uri:
+            current_app.logger.error("see " + sqlite_uri)
+        sys.exit(-1)
  
-        - services
-        - capacities
-        - projects
+    if sqlite_uri:
+        current_app.logger.info("Created sqlite db: " + sqlite_uri)
+
+
+@bp.cli.command("feed_from_irap")
+@click.option('--csv-file', '-f', 'csv_file_name', help="the csv file path to feed from")
+def feed_from_irap(csv_file_name):
+    """
+    Use an Irap csv charges files and feed db with
+
+    :param csv_file_name:
     :return:
     """
  
-    current_app.logger.info("Faking names from resources files")
-    # get  resources files
+    rows = []
+
+    with open(csv_file_name, newline='') as csvfile:
+        csvreader = csv.DictReader(csvfile, delimiter=',', quotechar='"')
+        for row in csvreader:
+            # print('\n'.join(row.keys()))
+            # break
+            # Remove any leading/trailing spaces
+            row = {k: v.strip() for k, v in row.items()}
+            rows.append(row)
+
+    firstname_key = 'NOM'
+    secondname_key = 'prénom'
+    project_key = 'PROJETS'
+    service_key = 'Groupe métier'
+    # typology_title = 'TYPOLOGIE'
+    # thematic_title = 'thématique'
+
+    # Get the columns values
     #
-    # 1- projects
+    projects = [r[project_key] for r in rows]
+    projects = sorted(set(projects))
+    agents = [(r[firstname_key], r[secondname_key].strip()) for r in rows]
+    agents = sorted(set(agents))
+    services = [r[service_key] for r in rows]
+    services = sorted(set(services))
+
+    # thematics = [r[thematic_title] for r in rows]
+    # thematics = sorted(set(thematics))
+    # typologies = [r[typology_title] for r in rows]
+    # typologies = sorted(set(typologies))
+
+    # Feed agents from column
     #
-    fake_projects_file = os.path.join(current_app.config['PDC_RESOURCES_DIR'], 'fake-db-names', 'fake-projects.txt')
-    with open(fake_projects_file, newline='') as csvfile:
-        spamreader = csv.reader(csvfile, delimiter=';', quotechar='|')
-        fake_projects_names = [', '.join(row) for row in spamreader]
-    fake_projects_names_iterator = iter(fake_projects_names)
+    for a in agents:
+        n_a = Agent(firstname=a[0], secondname=a[1])
+        db.session.add(n_a)
+    db.session.commit()
  
-    # 2- functions/capacities
+    # Feed projects from column
     #
-    fake_capacities_file = os.path.join(current_app.config['PDC_RESOURCES_DIR'], 'fake-db-names',
-                                        'fake-capacities.txt')
-    with open(fake_capacities_file, newline='') as csvfile:
-        spamreader = csv.reader(csvfile, delimiter=';', quotechar='|')
-        fake_capacities_names = [row for [row] in spamreader]
-    fake_capacities_names_iterator = iter(fake_capacities_names)
+    for p in projects:
+        n_p = Project(name=p)
+        db.session.add(n_p)
+    db.session.commit()
  
-    # 3- services
+    # Feed services from column
     #
-    fake_services_file = os.path.join(current_app.config['PDC_RESOURCES_DIR'], 'fake-db-names',
-                                      'fake-services.txt')
-    with open(fake_services_file, newline='') as csvfile:
-        spamreader = csv.reader(csvfile, delimiter=';', quotechar='|')
-        fake_services_names = [row for row in spamreader]
-    fake_services_names_iterator = iter(fake_services_names)
+    for s in services:
+        n_s = Service(name=s)
+        db.session.add(n_s)
+    db.session.commit()
  
-    # Skip columns names
+    # Feed periods names
+    # Todo: are statically built,
+    #       should come from year column name.
     #
-    next(fake_projects_names_iterator)
-    next(fake_capacities_names_iterator)
-    next(fake_services_names_iterator)
-
-    for s in Service.query.all():
-        next_service = next(fake_services_names_iterator)
-        s.name = next_service[0]
-        s.abbr = next_service[1]
-
-    for p in Project.query.all():
-        p.name = next(fake_projects_names_iterator)
+    for p in range(2011, 2030):
+        n_p = Period(name=f"{p}")
+        db.session.add(n_p)
+    db.session.commit()
  
-    for c in Capacity.query.all():
-        c.name = next(fake_capacities_names_iterator)
+    # Add one default capacity
+    db.session.add(Capacity(name="Travailleur"))
+    db.session.commit()
  
+    # Now feed the charges.
+    #
+    # At least one for each csv row
+    # At most one for each year
+    #
+    for r in rows:
+        p = Project.query.filter(Project.name == r[project_key]).one()
+        a = Agent.query.filter(Agent.firstname == r[firstname_key], Agent.secondname == r[secondname_key]).one()
+        s = Service.query.filter(Service.name == r[service_key]).one()
+        c = Capacity.query.first()
+        for period_name in range(2011, 2030):
+            t = Period.query.filter(Period.name == period_name).one()
+            charge = r[f"{period_name}"]
+            try:
+                charge = int(100 * float(charge))
+            except ValueError:
+                charge = 0
+            if charge == 0:
+                continue
+            n_c = Charge(agent_id=a.id,
+                         project_id=p.id,
+                         service_id=s.id,
+                         capacity_id=c.id,
+                         period_id=t.id,
+                         charge_rate=charge)
+            db.session.add(n_c)
     db.session.commit()
  
  
@@ -133,6 +200,69 @@ def feed_from_lesia():
     db.session.commit()
  
  
+@bp.cli.command("fake_lesia_names")
+def fake_lesia_names():
+    """
+    Extract fake name from resources files to change names in db.
+    Mainly after a lesia import, for confidential reasons
+
+    Changes nams in tables:
+
+        - services
+        - capacities
+        - projects
+    :return:
+    """
+
+    current_app.logger.info("Faking names from resources files")
+    # get  resources files
+    #
+    # 1- projects
+    #
+    fake_projects_file = os.path.join(current_app.config['PDC_RESOURCES_DIR'], 'fake-db-names', 'fake-projects.txt')
+    with open(fake_projects_file, newline='') as csvfile:
+        spamreader = csv.reader(csvfile, delimiter=';', quotechar='|')
+        fake_projects_names = [', '.join(row) for row in spamreader]
+    fake_projects_names_iterator = iter(fake_projects_names)
+
+    # 2- functions/capacities
+    #
+    fake_capacities_file = os.path.join(current_app.config['PDC_RESOURCES_DIR'], 'fake-db-names',
+                                        'fake-capacities.txt')
+    with open(fake_capacities_file, newline='') as csvfile:
+        spamreader = csv.reader(csvfile, delimiter=';', quotechar='|')
+        fake_capacities_names = [row for [row] in spamreader]
+    fake_capacities_names_iterator = iter(fake_capacities_names)
+
+    # 3- services
+    #
+    fake_services_file = os.path.join(current_app.config['PDC_RESOURCES_DIR'], 'fake-db-names',
+                                      'fake-services.txt')
+    with open(fake_services_file, newline='') as csvfile:
+        spamreader = csv.reader(csvfile, delimiter=';', quotechar='|')
+        fake_services_names = [row for row in spamreader]
+    fake_services_names_iterator = iter(fake_services_names)
+
+    # Skip columns names
+    #
+    next(fake_projects_names_iterator)
+    next(fake_capacities_names_iterator)
+    next(fake_services_names_iterator)
+
+    for s in Service.query.all():
+        next_service = next(fake_services_names_iterator)
+        s.name = next_service[0]
+        s.abbr = next_service[1]
+
+    for p in Project.query.all():
+        p.name = next(fake_projects_names_iterator)
+
+    for c in Capacity.query.all():
+        c.name = next(fake_capacities_names_iterator)
+
+    db.session.commit()
+
+
 @bp.cli.command("feed_periods")
 @click.option('--begin-year', '-b', 'begin_year', default=2005, help="the start year to begin periods with")
 @click.option('--end-year', '-e', 'end_year', default=2025, help="the last year to end periods with")
@@ -182,39 +312,6 @@ def feed_random_charges(agent):
         db.session.commit()
  
  
-@bp.cli.command('user_delete')
-@click.argument('user_id')
-def user_delete(user_id):
-    """Delete the user by given id (see user_show_all")."""
-    user = User.query.get(user_id)
-    db.session.delete(user)
-    db.session.commit()
-
-
-@bp.cli.command('create_db')
-def create_db():
-    """
-    Create the database structure. Database should be empty.
-
-    configure the proper database uri in the db_config.py file.
-    """
-    db.create_all()
-    admin = User(email='admin@nowhere.org', name='admin', login='admin', role='admin')
-    admin.set_password('admin')
-    sqlite_uri = db.engine.url.__str__() if 'sqlite' in db.engine.url.__str__() else None
-    try:
-        db.session.add(admin)
-        db.session.commit()
-    except IntegrityError:
-        current_app.logger.error("User admin already exists, database should be empty at create")
-        if sqlite_uri:
-            current_app.logger.error("see " + sqlite_uri)
-        sys.exit(-1)
-
-    if sqlite_uri:
-        current_app.logger.info("Created sqlite db: " + sqlite_uri)
-
-
 @bp.cli.command('user_add')
 @click.argument('email')
 @click.argument('name')
@@ -233,6 +330,44 @@ def user_add(email, name, login, password, role):
     current_app.logger.info(f"added {name}")
  
  
+@bp.cli.command('user_update')
+@click.option('--name', '-n', 'name', default=None, help="the name to set for that user")
+@click.option('--role', '-r', 'role', default=None, help="the role to set for that user")
+@click.option('--email', '-e', 'email', default=None, help="the email to set for that user")
+@click.option('--password', '-p', 'password', default=None, help="the password to set for that user")
+@click.argument('user_id')
+def user_update(user_id, name, role, email, password):
+    """Update the user by given id and given parameters."""
+    user = User.query.get(user_id)
+    if not user:
+        current_app.logger.error(f"such user_id doesnt exists {user_id}")
+        return
+    if name:
+        user.name = name
+        print(f"User --{user.name}-- name updated to {user.name}")
+    if role:
+        user.set_role(role)
+        print(f"User --{user.name}-- role updated to {_roleToName[user.role]}")
+    if email:
+        user.email=email
+        print(f"User --{user.name}-- email updated to {user.email}")
+    if password:
+        print(f"User --{user.name}-- password updated")
+        user.set_password(password)
+    if not ( name or role or email or password):
+        print(f"No update for user --{user.name}--")
+    db.session.commit()
+
+
+@bp.cli.command('user_delete')
+@click.argument('user_id')
+def user_delete(user_id):
+    """Delete the user by given id (see user_show_all")."""
+    user = User.query.get(user_id)
+    db.session.delete(user)
+    db.session.commit()
+
+
 @bp.cli.command('show_roles')
 def show_roles():
     """ List all available roles for a user"""
@@ -242,14 +377,13 @@ def show_roles():
 @bp.cli.command('user_show_all')
 def user_show_all():
     """ Show all users in db."""
-    print("{:<5} {:<15} {:<15} {:<15} {:<15}".format('id', 'name', 'login', 'passwd', 'email'))
-    print("{:<5} {:<15} {:<15} {:<15} {:<15}".format('-' * 5, '-' * 15, '-' * 15, '-' * 15, '-' * 15))
+    print("{:<5} {:<15} {:<15} {:<15}".format('id', 'name', 'login', 'email'))
+    print("{:<5} {:<15} {:<15} {:<15}".format('-' * 5, '-' * 15, '-' * 15, '-' * 15))
     for user in User.query.all():
         print(user.login)
-        print("{:<5} {:<15} {:<15} {:<15} {:<15}".format(
+        print("{:<5} {:<15} {:<15} {:<15}".format(
             user.id,
             user.name,
             user.login,
-            user.password,
             user.email
         ))
@@ -3,36 +3,38 @@ from app.models import db
  
 def projects():
     """
-    Build the list of all agents, with their charges summed up in one total
+    Build the list of all agents, with their charges for the current period
     :return:
     """
+    current_period_id = get_current_period()
     sql_txt = """
             select p.id, p.name, sum(tc.charge_rate) as total_charge
             from project as p left join
-               ( select c.project_id, c.charge_rate from charge c )
+               ( select c.project_id, c.charge_rate from charge c where c.period_id = {})
             tc
             on p.id = tc.project_id
             group by p.id
             order by total_charge desc;
-            """
+            """.format(current_period_id)
     all_projects = db.session.execute(sql_txt).fetchall()
     return all_projects
  
  
 def agents():
     """
-    Build the list of all agents, with their charges summed up in one total
+    Build the list of all agents, with their charges for the current period
     :return:
     """
+    current_period_id = get_current_period()
     sql_txt = """
             select a.id, a.firstname, a.secondname, sum(tc.charge_rate) as total_charge
             from agent as a left join
-               ( select c.agent_id, c.charge_rate from charge c )
+               ( select c.agent_id, c.charge_rate from charge c where c.period_id = {})
             tc
             on a.id = tc.agent_id
             group by a.id
             order by total_charge desc;
-            """
+            """.format(current_period_id)
     all_agents = db.session.execute(sql_txt).fetchall()
  
     return all_agents
@@ -198,3 +200,11 @@ def charges_by_agent(agent_id):
         else:
             all_charges.append([p, 0])
     return all_charges
+
+
+def get_current_period():
+    """
+    :return:  the id of the period of current day
+    """
+    # TODO: request on dates as soon as periods are dated
+    return 14
@@ -302,6 +302,9 @@ function build_chart(div_selector, data_url, entity_name, category_type) {
         var categories_total_charge = {}
         data.forEach(function (d) {
             Object.keys(d).forEach(function (k) {
+                    if (k === 'period') {
+                        return;
+                    }
                     if (categories_total_charge.hasOwnProperty(k)) {
                         categories_total_charge[k] += +d[k]
                     } else {
 {% extends "base_page.html" %}
  
 {% block more_heads %}
-<link href="{{ url_for('main.static', filename='css/charges.css') }}" rel="stylesheet" type="text/css"/>
+<link href="{{ url_for('main.static', filename='css/charges.css', version=config.VERSION) }}" rel="stylesheet" type="text/css"/>
 {% endblock %}
  
 {% block content %}
@@ -30,11 +30,11 @@
  
 {% block more_scripts %}
 {% include 'd3js-includes.html' %}
-<script src="{{ url_for('main.static', filename='js/charges.js') }}" type="text/javascript"></script>
+<script src="{{ url_for('main.static', filename='js/charges.js', version=config.VERSION) }}" type="text/javascript"></script>
 <script>
   build_chart("#projects_chart",
       "{{url_for('main.charge_agent_csv', agent_id=agent.id)}}",
-      "{{agent.name}}",
+      "{{agent.secondname}}"+ " {{agent.firstname}}",
       "project");
 </script>
 {% endblock %}
 {% extends "base_page.html" %}
  
 {% block more_heads %}
-<link href="{{ url_for('main.static', filename='css/charges.css') }}" rel="stylesheet" type="text/css"/>
+<link href="{{ url_for('main.static', filename='css/charges.css', version=config.VERSION) }}" rel="stylesheet" type="text/css"/>
 {% endblock %}
  
 {% block content %}
@@ -31,7 +31,7 @@
  
 {% block more_scripts %}
 {% include 'd3js-includes.html' %}
-<script src="{{ url_for('main.static', filename='js/charges.js') }}" type="text/javascript"></script>
+<script src="{{ url_for('main.static', filename='js/charges.js', version=config.VERSION) }}" type="text/javascript"></script>
 <script>
   build_chart("#project_services_chart",
       "{{url_for('main.charge_project_csv', project_id=project.id, category='service')}}",
@@ -2,14 +2,14 @@
 <html lang="fr">
 <head>
   {% include 'heads.html' %}
-  <link href="{{ url_for('static', filename='css/style.css') }}" rel="stylesheet" type="text/css"/>
+  <link href="{{ url_for('static', filename='css/style.css', version=config.VERSION) }}" rel="stylesheet" type="text/css"/>
   {% block more_heads %}
   {% endblock %}
 </head>
 <body>
   <nav class="navbar navbar-dark sticky-top bg-dark navbar-expand-lg p-1">
     <a class="navbar-brand col-sm-3 col-md-2 " href="{{url_for('main.index')}}">
-      <img class="m-0 mr-1 {{config.PDC_SITE_CLASS}}" src="{{ url_for('static', filename='img/pdc-ico.png') }}" height="30" width="30"/>
+      <img class="m-0 mr-1 {{config.PDC_SITE_CLASS}}" src="{{ url_for('static', filename='img/pdc-ico.png', version=config.VERSION) }}" height="30" width="30"/>
       {{config.PDC_APP_NAME}} - {{config.PDC_SITE_NAME}}</a>
     <ul class="navbar-nav ml-auto">
       {% if not current_user.is_anonymous %}
   <meta charset="utf-8">
   <meta content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport">
-  <link href="{{ url_for('static', filename='img/pdc-ico.png') }}" rel="icon"/>
+  <link href="{{ url_for('static', filename='img/pdc-ico.png', version=config.VERSION) }}" rel="icon"/>
   <link href="{{ url_for('static', filename='css/bootstrap.min.css') }}" rel="stylesheet" type="text/css"/>
   <title>{% if title %} {{title}} {% else %}{{config.PDC_APP_NAME}} - {{config.PDC_SITE_NAME}}{%endif%}</title>
 \ No newline at end of file
@@ -0,0 +1,28 @@
+"""empty message
+
+Revision ID: c5743e70ac8b
+Revises: 4d5e5e207063
+Create Date: 2021-04-15 16:48:32.103879
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'c5743e70ac8b'
+down_revision = '4d5e5e207063'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('user', sa.Column('password_hash', sa.String(length=128), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('user', 'password_hash')
+    # ### end Alembic commands ###
@@ -4,12 +4,12 @@
 # and https://flask.palletsprojects.com/en/1.1.x/config/
 #
  
-# Default set to 'production',
+# Default environment set to 'production',
 # but 'development' value adds debuging facities.
 #
 FLASK_ENV=development
  
-# Is set to the python application wrapper
-# you shouldnt edit.
+# Default app name is set to the python application wrapper.
+# You shouldnt edit unless you know what you're doing.
 #
 FLASK_APP=pdc_web