rmanach/covid-plotter
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

add logging + add metadata in html template

Browse Source
This commit is contained in:
rmanach 2021-12-29 15:00:24 +01:00
parent 4c41b44d77
commit 37712f892d
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drees.py
View File

@ -402,7 +402,11 @@ def plot_cumulative_field(
plt.xlabel("date") plt.xlabel("date")
plt.ylabel("nombre") plt.ylabel("nombre")
save_and_close_fig( save_and_close_fig(
fig, os.path.join(OUTPUT_REPOSITORY, f"cumulative_{age_group.name.lower()}_{field.name.lower()}") fig,
os.path.join(
OUTPUT_REPOSITORY,
f"cumulative_{age_group.name.lower()}_{field.name.lower()}",
),
) )
@ -511,10 +515,12 @@ def move_tmp_plots() -> None:
""" """
move .tmp.png plots into .png after generation move .tmp.png plots into .png after generation
""" """
logging.info(f"moving '{OUTPUT_SUFFIX}' file in {FORMAT_SUFFIX}...")
for filename in os.listdir(OUTPUT_REPOSITORY): for filename in os.listdir(OUTPUT_REPOSITORY):
file_path = os.path.join(OUTPUT_REPOSITORY, filename) file_path = os.path.join(OUTPUT_REPOSITORY, filename)
if re.match(TMP_FILE_REGEX, filename): if re.match(TMP_FILE_REGEX, filename):
os.rename(file_path, file_path.replace(OUTPUT_SUFFIX, FORMAT_SUFFIX)) os.rename(file_path, file_path.replace(OUTPUT_SUFFIX, FORMAT_SUFFIX))
logging.info("files moved")
def generate_html_page(np_date: np.ndarray) -> None: def generate_html_page(np_date: np.ndarray) -> None:
@ -533,7 +539,7 @@ def generate_html_page(np_date: np.ndarray) -> None:
"status": VacStatus, "status": VacStatus,
"static": os.path.join(MAIN_URL, STATIC_REPOSITORY), "static": os.path.join(MAIN_URL, STATIC_REPOSITORY),
"src": DATA_URL, "src": DATA_URL,
"period": f"{date_start} -> {date_end}", "period": f"{date_start} - {date_end}",
} }
) )
with open(os.path.join(BUILD_REPOSITORY, "index.html"), "w") as f: with open(os.path.join(BUILD_REPOSITORY, "index.html"), "w") as f:

7
templates/index.template.html
View File

@ -11,13 +11,14 @@
<div class="main-container"> <div class="main-container">
<h1>Thegux covid-19</h1> <h1>Thegux covid-19</h1>
<div>source : <a href="{{ src }}">Data DRESS</a></div> <div>source : <a href="{{ src }}">Data DRESS</a></div>
<div>période temporelle : {{ period }}</div> <div>période temporelle : <b>{{ period }}</b></div>
<h3>Hospitalisations/Soins critiques/Décés par status vaccinal groupés par tranches d'âges</h3> <div>pas de temps : <b>journalier</b></div>
<h3>Hospitalisations/Soins critiques/Décés par status vaccinal groupés et tranches d'âges</h3>
{% for field in fields %} {% for field in fields %}
<img src="{{ static }}/plots/age_percent_vac_{{ field.name.lower() }}.png"/> <img src="{{ static }}/plots/age_percent_vac_{{ field.name.lower() }}.png"/>
<img src="{{ static }}/plots/age_percent_unvac_{{ field.name.lower() }}.png"/> <img src="{{ static }}/plots/age_percent_unvac_{{ field.name.lower() }}.png"/>
{% endfor %} {% endfor %}
<h3>Hospitalisations/Soins critiques/Décés par tranches d'âges groupés par status vaccinal</h3> <h3>Hospitalisations/Soins critiques/Décés par tranches d'âges groupés et status vaccinal</h3>
{% for age in ages %} {% for age in ages %}
{% for field in fields %} {% for field in fields %}
<img src="{{ static }}/plots/vac_percent_{{ age.name.lower() }}_{{ field.name.lower() }}.png"/> <img src="{{ static }}/plots/vac_percent_{{ age.name.lower() }}_{{ field.name.lower() }}.png"/>