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

[PYBD] Pierre DE LA RUFFIE & Mathieu GUÉRIN – Rapport mondial du bonheur #50

Open
wants to merge 46 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
82f0049
feat: added data-2021 and data-main files in the data folder
Rokkano Mar 14, 2022
4b73449
feat: added bonheur directory, copied from energies
Rokkano Mar 15, 2022
730dd4b
feat: modified delta.py to include the new bonheur directory and exec…
Rokkano Mar 15, 2022
3ea594f
feat: added jupyter notebook for reference
Rokkano Mar 15, 2022
0864df4
feat: added countries continent csv
Rokkano Mar 15, 2022
f4d2ba2
feat: added a bunch of things, sorry for detail, see github
Rokkano Mar 17, 2022
b762d50
feat: added abstract detailling every column metadatas in the dataset
Rokkano Mar 18, 2022
8bf75c3
fix: added colors for abstract and fixed encoding error for read_csv …
Rokkano Mar 18, 2022
11dd57b
feat: added some descriptions and colormap test for Europe happiness
Rokkano Mar 18, 2022
3ca1618
feat: added some lines to abstract
Rokkano Mar 18, 2022
7b94b8a
fix: fixed indent issues (will see how it turns out
Rokkano Mar 18, 2022
00e8bec
fix: fixed some typos
Rokkano Mar 18, 2022
46bda8d
fix: removed report 2021 and fixed hapiness to Happiness (hello i'm d…
Rokkano Mar 18, 2022
5804504
feat: added another example for interpolate() and fixed plot names fo…
Rokkano Mar 19, 2022
481b284
feat: added another example for interpolate() and fixed plot names fo…
Rokkano Mar 19, 2022
7e5a8de
fix: renamed file according to the requirements, added get_data file …
Rokkano Mar 24, 2022
207cc10
feat: added utils file with (for now) Union and Intersection mathemat…
Rokkano Mar 24, 2022
c5673a0
feat: added interpolate possible for get_data
Rokkano Mar 24, 2022
5a83eaf
fix: renamed pdlr_mg_sujet to remove useless minus symbol
Rokkano Mar 24, 2022
e51749d
fix: fixed import crashing because of rename
Rokkano Mar 24, 2022
292563a
fix: removed doubled main.ipynb
Rokkano Mar 24, 2022
f1994df
fix: fixed git problems
Rokkano Mar 24, 2022
c3995b6
fix: fixed import issues
Rokkano Mar 24, 2022
e20108a
feat: added a bunch of things
Rokkano Mar 24, 2022
89627ed
feat: added a bunch of things
Rokkano Mar 24, 2022
1063834
feat: added a bunch of things
Rokkano Mar 24, 2022
40fba0f
feat: added a bunch of things
Rokkano Mar 24, 2022
6b20a75
feat: added a bunch of things
Rokkano Mar 26, 2022
5d17d34
feat:
Rokkano Apr 6, 2022
4b84ddf
feat: added next step
Rokkano Apr 21, 2022
dfd9bad
Merge branch 'oricou:main' into main
matiboux Apr 25, 2022
433bb87
Refactor files
matiboux May 2, 2022
3acb42a
Rename import in delta.py
matiboux May 2, 2022
c313b78
WIP'
Rokkano May 4, 2022
44f2c66
Merge branch 'main' of github.com:matiboux/epita-scia-pybd-delta
Rokkano May 6, 2022
f163d13
WIP
Rokkano May 6, 2022
157ad47
fix : suppression du ipynb, ajout d'un texte descriptif pour l'usage …
Rokkano May 6, 2022
b31c6a1
fix: fixed style css in asset folder in case the bonheur.py script is…
Rokkano May 6, 2022
dabe478
fix: fixed imports, ids, comments
Rokkano May 6, 2022
94ee53c
Merge branch 'oricou:main' into main
matiboux May 8, 2022
d0949f0
Revert changes to energies/Prix énergie.ipynb
matiboux May 8, 2022
56784a7
Remove data-2021.csv and data-main.csv
matiboux May 8, 2022
344299d
Merge branch 'main' into fix
matiboux Jun 2, 2022
f3fa4e8
Fix href conflit
matiboux Jun 2, 2022
da4d67a
Rename pdlr_mg_sujet/ to pdlr_mg_bonheur/
matiboux Jun 2, 2022
b0134ca
Merge branch 'oricou:main' into fix
matiboux Jun 5, 2022
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
7 changes: 6 additions & 1 deletion delta.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
from APAAL_criminalite_education import criminalite_education
from ADHD_Movies import movies
from ab_wg_apb_parcoursup import apb_parcoursup
from pdlr_mg_bonheur import bonheur as pdlr_mg_bonheur

#@profile
def init():
Expand Down Expand Up @@ -121,6 +122,7 @@ def init():
crim_edu = criminalite_education.Criminalite_Education(app)
mvs = movies.MoviesStats(app)
apb = apb_parcoursup.APB_PARCOURSUP(app)
bnh = pdlr_mg_bonheur.Bonheur(app)

# external_stylesheets = ['https://codepen.io/chriddyp/pen/bWLwgP.css']

Expand Down Expand Up @@ -188,6 +190,7 @@ def init():
dcc.Link(html.Button("Criminalité et Education", style={"width": "100%"}), href="/criminalite-education"),
dcc.Link(html.Button('Rentabilité des films', style={'width':"100%"}), href='/ADHD_Movies'),
dcc.Link( html.Button("APB / Parcoursup", style={"width": "100%"}), href="/ab-wg_apb-parcoursup",),
dcc.Link(html.Button('Bonheur', style={'width':"100%"}), href="/pdlr_mg_bonheur"),
html.Br(),
html.Br(),
html.Br(),
Expand Down Expand Up @@ -254,7 +257,7 @@ def display_page(pathname):
return inc.main_layout
elif pathname == '/pollution':
return pol.main_layout
return dec.main_layout
return dec.main_layout
elif pathname == '/cancer':
return cncr.main_layout
elif pathname == '/music':
Expand Down Expand Up @@ -335,6 +338,8 @@ def display_page(pathname):
return mvs.main_layout
elif pathname == "/ab-wg_apb-parcoursup":
return apb.main_layout
elif pathname == '/pdlr_mg_bonheur':
return bnh.main_layout
else:
return home_page
return app
Expand Down
Loading