Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Staging to main #35

Merged
merged 175 commits into from
Nov 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
175 commits
Select commit Hold shift + click to select a range
200f6d2
tg - trame page et premiers graphs sur page data
tgazagnes Mar 29, 2024
5ed8874
avancee deshboard
Vincentdata Apr 1, 2024
188a004
avancee dashboard
Vincentdata Apr 1, 2024
a7d8d3e
avancée dashboard
Vincentdata Apr 1, 2024
97df2ad
avancée dashboard onglet data streamlit
Vincentdata Apr 1, 2024
0b212c4
tg - add filters
tgazagnes Apr 3, 2024
bedb247
modif pour filtre top dechets
Vincentdata Apr 4, 2024
548350f
clear style.css
Vincentdata Apr 5, 2024
7dbdb0e
requirements minor edit + chiffres cles top dechets, echelle log
Apr 6, 2024
c69573e
V0 sous onglet secteurs et marques + minor edits
Apr 8, 2024
423a1ec
petite modif
Vincentdata Apr 10, 2024
0d7e792
ajout filtres donut 2 onglet data
Vincentdata Apr 10, 2024
9a93107
ajout filtres onglet data sous onglet secteurs marques
Vincentdata Apr 10, 2024
872fba3
Create a hotspot functions module and update the requirements.txt
DridrM Apr 10, 2024
2cef0e0
ajout de containers pour esthetique
Vincentdata Apr 10, 2024
b87ee5f
tg - filtres remontés sur home.py
tgazagnes Apr 11, 2024
6eb76de
[kb] 🔒️ Add authentication
KyllianBeguin Apr 12, 2024
d811f84
[kb] 🙈 Add streamlit credentials
KyllianBeguin Apr 12, 2024
0182479
[kb] 🔒️ Add registration
KyllianBeguin Apr 12, 2024
f2de3be
ajout metrics onglet 1 data , corrections filtres onglets 1 et 3 data
Vincentdata Apr 14, 2024
6b89f61
ajout metric nombre de collecte apres filtration
Vincentdata Apr 14, 2024
24aea8f
proposition alternative top dechets + couleurs secteurs et marques
Apr 14, 2024
d2e4ced
Merge pull request #11 from dataforgoodfr/10-authentification
KyllianBeguin Apr 14, 2024
5f66eb1
Add params.py into hotspots_function and first attempt to plot a map …
DridrM Apr 14, 2024
d2203cc
[tg] 🔧 Improve home page filters and remove dynamic-filters from req.txt
tgazagnes Apr 15, 2024
5d9c273
Modifications mineures
Vincentdata Apr 16, 2024
e96d597
[tg] remontée filtre géo, correction calculs metrics, amélioration gr…
tgazagnes Apr 16, 2024
8ab4976
Merge branch '7-onglet-data' of https://github.com/dataforgoodfr/12_z…
tgazagnes Apr 16, 2024
16c0a27
Hotspots tab adopted spots map released and functionnal
DridrM Apr 16, 2024
4760405
Copier coller du home.py (depuis l'onglet DATA) pour avoir les filtre…
Mendi33 Apr 17, 2024
e328556
ajout filtre année positionnement metrics, donut chart niveaux de car…
Vincentdata Apr 17, 2024
c5d295a
Carte choroplèthe
linh-dinh-1012 Apr 17, 2024
e8545eb
[kb] 🔀 Merge onglet action
KyllianBeguin Apr 17, 2024
b34796e
partie des modifications demandées pour cet onglet (voir issue)
Vincentdata Apr 18, 2024
1219923
Ajout carte
Vincentdata Apr 18, 2024
0cdabe9
Modification taille minimale des points sur la carte et deplacement d…
Vincentdata Apr 18, 2024
4dca7a7
Ajout d'un stop pour le bug en cas de non selection de territoire
Vincentdata Apr 18, 2024
1ddc10b
changement nom Dockerfile
Vincentdata Apr 18, 2024
f513668
suite modifications demandées par merterre (voir issue)
Vincentdata Apr 19, 2024
44c6af9
ajout message d'erreur si pas de selection de territoire
Vincentdata Apr 19, 2024
d6dd406
harmonisation requirements.txt onglets
Vincentdata Apr 19, 2024
a1eedcb
harmonisation requirements.txt onglets
Vincentdata Apr 19, 2024
c3d3d02
harmonisation requirements.txt onglets
Vincentdata Apr 19, 2024
1b81f85
rectification harmonisation requirements.txt onglets
Vincentdata Apr 19, 2024
0fa9023
rectification harmonisation requirements.txt onglets
Vincentdata Apr 19, 2024
4b6c95b
rectification harmonisation requirements.txt onglets
Vincentdata Apr 19, 2024
599043e
Delete dashboards/app/pages/hotspots_Linh.py
linh-dinh-1012 Apr 19, 2024
55134fe
rectification harmonisation requirements.txt onglets
Vincentdata Apr 19, 2024
b384b55
tg - test styles css et ajout theme config.toml
tgazagnes Apr 19, 2024
253cbe4
Ajoute carte de densité France + Tableaux lieu et milieu
linh-dinh-1012 Apr 19, 2024
1e35bb0
Merge branch '6-onglet-hotspots' of github.com:dataforgoodfr/12_zero_…
linh-dinh-1012 Apr 19, 2024
49685f6
tg - UI improvement (labels, etc)
tgazagnes Apr 19, 2024
434b811
Merge branch 'staging' into 7-onglet-data
KyllianBeguin Apr 19, 2024
98d7050
Revert "Merge branch 'staging' into 7-onglet-data"
KyllianBeguin Apr 19, 2024
f24af16
[kb] 🚑 Add authentication
KyllianBeguin Apr 19, 2024
7ee712c
Merge pull request #14 from dataforgoodfr/7-onglet-data
KyllianBeguin Apr 19, 2024
8853ade
[kb] 🚑 Add authentication
KyllianBeguin Apr 19, 2024
ad620e7
Merge branch 'staging' into 5-onglet-actions
KyllianBeguin Apr 19, 2024
d0b4a86
Merge pull request #15 from dataforgoodfr/5-onglet-actions
KyllianBeguin Apr 19, 2024
a7f4503
[kb] 🚑 Fix authentication
KyllianBeguin Apr 19, 2024
04f389c
[kb] 🚑 Fix authentication
KyllianBeguin Apr 19, 2024
5305262
Merge branch '7-onglet-data' into staging
KyllianBeguin Apr 19, 2024
7f0dec7
Merge branch '5-onglet-actions' into staging
KyllianBeguin Apr 19, 2024
fef1bfe
[kb] 🐛 Fix imports
KyllianBeguin Apr 19, 2024
104cef3
Merge branch '5-onglet-actions' into staging
KyllianBeguin Apr 19, 2024
6a3b5b2
[kb] 🎉 Add credentials for dev
KyllianBeguin Apr 20, 2024
9d06055
[kb] 🚚 Move creds to app
KyllianBeguin Apr 20, 2024
0c4bbb4
[kb] 🔥 Remove file
KyllianBeguin Apr 20, 2024
f9f1f6f
[kb] 🙈 Add streamlit credentials
KyllianBeguin Apr 20, 2024
a36f44d
first draft onglet structure
Apr 19, 2024
463ee76
Ajoute des graphs et les réorganiser en différents tabs
linh-dinh-1012 Apr 21, 2024
123f3d1
[kb] 📌 Add openpyxl
KyllianBeguin Apr 21, 2024
e8d8a57
Update requirements.txt
DridrM Apr 21, 2024
270d2b7
Merge branch '6-onglet-hotspots' of github.com:dataforgoodfr/12_zero_…
DridrM Apr 21, 2024
22c9624
Add style.css
DridrM Apr 22, 2024
a83defa
Add register.py and functionnal hotspots tab
DridrM Apr 22, 2024
8ca713d
[kb] 🚚 Move creds to app
KyllianBeguin Apr 20, 2024
6ad38f4
[kb] 🙈 Add streamlit credentials
KyllianBeguin Apr 20, 2024
0fcddc4
Update the filters_params, delete the region filter
DridrM Apr 22, 2024
b077988
Ajoute carte densité
linh-dinh-1012 Apr 23, 2024
7330348
correction message erreur si pas de selection de territoire (Home>Acc…
Vincentdata Apr 23, 2024
eccef41
reglage du zoom onglet top dechet en fonction du niveau de collectivi…
Vincentdata Apr 23, 2024
fe5c8c1
reglage du zoom carte et changement onglet home
Vincentdata Apr 23, 2024
2f346f5
reglage du zoom departement
Vincentdata Apr 23, 2024
478cc57
ajout du graph responsabilités dans top dechets
Vincentdata Apr 23, 2024
c90cd01
modifications mineures annotation code
Vincentdata Apr 23, 2024
c29137a
suppression dechets de secteurs vide et indeterminés dans le top 10
Vincentdata Apr 23, 2024
13f5a70
suppression labels abcisses barplots top 10
Vincentdata Apr 23, 2024
eeac0dd
formattage PEP8 data.py
Vincentdata Apr 23, 2024
bbd91b1
construct_admin_lvl_boundaries function finished
DridrM Apr 23, 2024
3e6c0bf
Merge with remote, re-add the NIVEAUX_ADMIN_GEOJSON_PATH_DICT
DridrM Apr 23, 2024
c01dc2f
modifications mineures (titres et ajout texte explicatif sous onglet …
Vincentdata Apr 23, 2024
27def21
modifications mineures (ajout labels ordonnée top10 marques et change…
Vincentdata Apr 23, 2024
f685c0c
Push pour MAJ avec Valérie.
Mendi33 Apr 24, 2024
5f53567
treemap rep et supression categorie vide avec message d'information
Vincentdata Apr 24, 2024
34edef2
titres fig echelles log + nom Verre et Papier + Part -> Proportion + …
Apr 24, 2024
56dfb8d
Correction of the construct_query_string and the scalable_filters_mul…
DridrM Apr 24, 2024
10eff9a
Correction of the construct_query_string and the scalable_filters_mul…
DridrM Apr 24, 2024
8210094
Fix problem non value entrée
linh-dinh-1012 Apr 24, 2024
439fb3f
[tg] - inversion ordre années dans liste déroulante onglets1/3
tgazagnes Apr 24, 2024
6fd91e4
[tg] - update legend in top dechets
tgazagnes Apr 24, 2024
d0d4eab
Add the create_contributors_table function
DridrM Apr 24, 2024
e1d413f
Correct zoom start level on the adopted waste spots map
DridrM Apr 24, 2024
2446d04
Last push before pull request
Mendi33 Apr 24, 2024
6f4d1d0
[tg] - format des metrics
tgazagnes Apr 24, 2024
e8b595c
commiting structure file cleaned
Apr 24, 2024
bd525f6
[tg] - taille police graphs et corrections orth
tgazagnes Apr 24, 2024
2b4035c
[tg] - update font size in charts
tgazagnes Apr 24, 2024
b0fd915
fixation bug
Vincentdata Apr 24, 2024
4d63e7f
Merge pull request #17 from dataforgoodfr/7-onglet-data
KyllianBeguin Apr 24, 2024
503e997
Ajoute filres pour carte densite
linh-dinh-1012 Apr 24, 2024
61c4bbe
taking into account new structure file
Apr 24, 2024
4c3ad30
[tg] - V1 folium map with structures
tgazagnes Apr 24, 2024
7ef6a61
[tg] adapt home.py for auth
tgazagnes Apr 24, 2024
c792432
[tg] center folium map on coordinates
tgazagnes Apr 24, 2024
e35b72e
[tg] - fixed filter bug
tgazagnes Apr 24, 2024
910f808
Dernière version de Home
linh-dinh-1012 Apr 24, 2024
869835d
Merge branch 'staging' into 6-onglet-hotspots
KyllianBeguin Apr 24, 2024
f71ef97
amelioration of dataframe resentation + selection of collectivity
Apr 24, 2024
60a4c4f
Merge branch '4-onglet-structures' of github.com:dataforgoodfr/12_zer…
Apr 24, 2024
f320876
Merge pull request #18 from dataforgoodfr/6-onglet-hotspots
KyllianBeguin Apr 24, 2024
c2f7c72
Merge branch 'staging' into 5-onglet-actions
KyllianBeguin Apr 24, 2024
191d46f
adding requirements
Apr 24, 2024
fc58f30
Merge pull request #16 from dataforgoodfr/5-onglet-actions
KyllianBeguin Apr 24, 2024
93259da
[kb] 🙈 Update gitignore
KyllianBeguin Apr 20, 2024
3165baf
[kb] 🚑 Fix authentication
KyllianBeguin Apr 24, 2024
544c91d
[kb] 🚚 Move creds to app
KyllianBeguin Apr 20, 2024
23febca
[kb] 🚑 Add authentication
KyllianBeguin Apr 24, 2024
a6e200b
taking into account all territory's structures
Apr 24, 2024
cd36ee5
Merge branch '4-onglet-structures' of github.com:dataforgoodfr/12_zer…
Apr 24, 2024
676ed4d
Merge branch 'staging' into 4-onglet-structures
KyllianBeguin Apr 25, 2024
8bec201
[kb] 🔥 Delete .credentials.yml
KyllianBeguin Apr 25, 2024
0468cc0
Merge pull request #19 from dataforgoodfr/4-onglet-structures
KyllianBeguin Apr 25, 2024
0246942
Debug probleme zoom
linh-dinh-1012 Apr 25, 2024
93abb97
Merge branch '6-onglet-hotspots' of github.com:dataforgoodfr/12_zero_…
linh-dinh-1012 Apr 25, 2024
92c056e
Merge pull request #20 from dataforgoodfr/6-onglet-hotspots
KyllianBeguin Apr 25, 2024
fb186a5
[tg] - valeurs par défaut des filtres et optimisation du layout des f…
tgazagnes May 22, 2024
2ad8ba5
[tg] - convert liters to m3
tgazagnes May 22, 2024
47049af
[tg] - wording sous onglet matériaux
tgazagnes May 22, 2024
1c9d037
[tg] - classement par ordre alphabétique dans les filtres
tgazagnes May 22, 2024
b941905
[tg] - wording sous-onglet top déchets
tgazagnes May 22, 2024
c19f74b
[tg] - top déchets : passage rayon en log2
tgazagnes May 23, 2024
55e4894
[tg] - chart labels templates
tgazagnes May 23, 2024
5c17732
[tg] - amélioration format nombres utilisant locale.set_locale
tgazagnes May 24, 2024
042e133
[tg] - bug corrigé
tgazagnes May 24, 2024
f224645
[tg] - note méthodo et exclusion des 100%Autres
tgazagnes May 24, 2024
e1c7a80
[tg} - infobulles dans les graphiques en langage naturel
tgazagnes May 27, 2024
dc7a302
[tg] - onglet matériaux : tableau avec nb collectes par milieu
tgazagnes May 27, 2024
34b0996
[tg] - onglet matériaux - améliorations table nb déchets
tgazagnes May 27, 2024
9f1b0e4
[tg] - séparateurs décimaux et milliers dans les graphiques
tgazagnes May 29, 2024
0835d03
[tg] - sous-onglet matériaux : filtrer sur milieux avec plus de 3 col…
tgazagnes May 29, 2024
9225aea
[tg] - ajout des filtres sur top10 déchets
tgazagnes May 29, 2024
3f24729
[tg] inversion graphs marques et REP
tgazagnes May 29, 2024
5334ee7
[tg] - sous-onglet 3 : filtre sur niveaux 4 (secteurs/REP) et 2à4 (ma…
tgazagnes May 29, 2024
4c048eb
[tg] - retrait des VIDES et INDETERMINES dans les metrics de l'onglet 3
tgazagnes May 29, 2024
f7dc00c
[tg] - ajout %déchets dans graph par secteurs
tgazagnes May 29, 2024
fb43f53
[tg] - amélioration layout 3 onglets
tgazagnes Jun 6, 2024
a9ff5f1
[tg] - optimisation du code des filtres
tgazagnes Jun 6, 2024
858bb7a
[tg] Améliorations suite point Merterre
tgazagnes Jun 6, 2024
0c42b3b
[tg] Ajout détail données utilisées + rayon carto top déchets
tgazagnes Jun 18, 2024
9ddfbed
[tg] remove line from poetry.lock to solve precommit fail
tgazagnes Jun 19, 2024
ba83666
[tg] update poetry.lock to solve precommit conflicts
tgazagnes Jun 20, 2024
8cc6880
[tg] black reformat to hotspots.py
tgazagnes Jun 20, 2024
bf87a14
Amélioration de l'onglet Actions suite aux retours de MerTerre :
Mendi33 Jun 20, 2024
4525563
update poetry.lock to solve precommit conflicts
Mendi33 Jun 20, 2024
301fc1a
upload hotspot.py from data
Mendi33 Jun 20, 2024
e919f14
[tg] corrections suite retours Kyllian
tgazagnes Jun 25, 2024
dfaa73c
Merge pull request #29 from dataforgoodfr/22-onglet-data-améliorations
tgazagnes Jul 6, 2024
17dcc63
Ajout docstring de :
Mendi33 Jul 9, 2024
1795f72
Correction erreur dernier commit
Mendi33 Jul 9, 2024
1bc5340
Merge pull request #30 from dataforgoodfr/23-onglet-actions-améliorat…
Mendi33 Jul 9, 2024
76a2c38
[kb] 🐛 Fix fr_FR locale #31
KyllianBeguin Jul 26, 2024
09aca6e
[kb] 🐛 Fix fr_FR locale #31
KyllianBeguin Jul 26, 2024
467a412
Merge pull request #33 from dataforgoodfr/31-bug-locale-fr_fr-introuv…
KyllianBeguin Oct 14, 2024
0581672
[kb] 📄 Update README
KyllianBeguin Nov 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ ipython_config.py
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
#poetry.lock
poetry.lock

# pdm
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
Expand Down Expand Up @@ -131,6 +131,8 @@ venv/
ENV/
env.bak/
venv.bak/
.venv*
venv*

# Spyder project settings
.spyderproject
Expand Down Expand Up @@ -160,4 +162,12 @@ dmypy.json
cython_debug/

# Precommit hooks: ruff cache
.ruff_cache
.ruff_cache

etl/zds/.file_versions/*

# Dossier sauvegarde Thibaut
TG_sauv

# Streamlit: credentials
dashboards/app/.credentials.yml
Binary file not shown.
561 changes: 561 additions & 0 deletions Exploration_visualisation/data/structures_export_cleaned.csv

Large diffs are not rendered by default.

95 changes: 42 additions & 53 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,53 +1,42 @@
Template DataForGood
================

<!-- WARNING: THIS FILE WAS AUTOGENERATED! DO NOT EDIT! -->

This file will become your README and also the index of your
documentation.

# Contributing


## Use a venv

python3 -m venv name-of-your-venv

source name-of-your-venv/bin/activate


## Utiliser Poetry

[Installer Poetry](https://python-poetry.org/docs/):

python3 -m pip install "poetry==1.4.0"

Installer les dépendances:

poetry install

Ajouter une dépendance:

poetry add pandas

Mettre à jour les dépendances:

poetry update

## Utiliser Jupyter Notebook

jupyter notebook

and check your browser !

## Lancer les precommit-hook localement

[Installer les precommit](https://pre-commit.com/)


pre-commit run --all-files


## Utiliser Tox pour tester votre code

tox -vv
```
_____ YAao,
|__ /___ _ __ ___ Y8888b,
/ // _ \ '__/ _ \ ,oA8888888b,
/ /| __/ | | (_) | ,aaad8888888888888888bo,
/____\___|_| \___/ _ _ ,d888888888888888888888888888b,
| _ \ ___ ___| |__ ___| |_ ,888888888888888888888888888888888b,
| | | |/ _ \/ __| '_ \ / _ \ __| d8888888888888888888888888888888888888,
| |_| | __/ (__| | | | __/ |_ d888888888888888888888888888888888888888b
|____/_\___|\___|_| |_|\___|\__| d888888P' `Y888888888888,
/ ___| __ _ _ ___ ____ _ __ _ ___ 88888P' Ybaaaa8888888888l
\___ \ / _` | | | \ \ / / _` |/ _` |/ _ \ a8888' `Y8888P' `V888888
___) | (_| | |_| |\ V / (_| | (_| | __/ d8888888a `Y8888
|____/ \__,_|\__,_| \_/ \__,_|\__, |\___| AY/'' `\Y8b ``Y8b
|___/ Y' `YP ~~
```

# Zéro Déchat Sauvage
## À propos
[Zéro Déchet Sauvage](http://zds-app.duckdns.org/) (ZDS) est une application de visualisation de données de déchets diffus et collectés au cours d'évènements de collectes. Il s'agit d'une plateforme appartenant à l'association [MerTerre](https://mer-terre.org/) et développée par des bénévoles de l'association Data For Good.

## Démo
Une démo de l'applicaiton a été réalisée lors du Demo Day organisée à la fin de la saison 12 par Data For Good.

<a href="[URL](https://www.youtube.com/live/7Zvy2PS7Vjg?si=Z3Gduxff0EunXsF7&t=6210)">
<img src="https://i.ytimg.com/vi/7Zvy2PS7Vjg/maxresdefault.jpg?sqp=-oaymwEmCIAKENAF8quKqQMa8AEB-AH-CYAC0AWKAgwIABABGFUgTyhlMA8=&rs=AOn4CLC3vkFGSd9jcNDb0HxMvbdN8kxQyA" alt="video youtube du demo day" width="50%">
</a>

## Remerciement
Merci à l'équipe de développement :
* [Floriane](https://github.com/florianeduccini)
* [Hadrien](https://github.com/DridrM)
* [Mehdi](https://github.com/Mendi33)
* [Vincent](https://github.com/Vincentdata)
* [Thibault](https://github.com/tgazagnes)
* [Linh](https://github.com/linh-dinh-1012)
* [Joaquim](https://github.com/JoaquimDiaz)
* [Valérie](https://github.com/ValerieNevo)
* [Kyllian](https://github.com/KyllianBeguin)

## Licence
Ce projet est sous licence MIT. Plus d'information sur le fichier [LICENCE](https://github.com/dataforgoodfr/12_zero_dechet_sauvage/blob/staging/LICENSE).
3 changes: 3 additions & 0 deletions dashboards/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ RUN apt-get update
RUN mkdir zds
WORKDIR zds

RUN apt-get install -y locales
RUN echo "fr_FR.UTF-8 UTF-8" | tee -a /etc/locale.gen && locale-gen fr_FR.UTF-8

COPY app/ ./
RUN pip install -r requirements.txt

Expand Down
3 changes: 3 additions & 0 deletions dashboards/Dockerfile-dev
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ RUN apt-get update
RUN mkdir zds
WORKDIR zds

RUN apt-get install -y locales
RUN echo "fr_FR.UTF-8 UTF-8" | tee -a /etc/locale.gen && locale-gen fr_FR.UTF-8

COPY app/requirements.txt .
RUN pip install -r requirements.txt

Expand Down
14 changes: 14 additions & 0 deletions dashboards/app/.credentials-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
cookie:
expiry_days: 30
key: some_signature_key
name: some_cookie_name
credentials:
usernames:
test:
email: [email protected]
logged_in: false
name: test
password: $2b$12$fR4sp7tIG.dbeusbr695MOw/xvN1sf.21rML7t7j9pCdIVREIocUO
pre-authorized:
emails:
- [email protected]
2 changes: 2 additions & 0 deletions dashboards/app/.streamlit/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[theme]
base = "light"
Loading
Loading