derogab
/
ITAvsCOVIDbot
mirror of https://github.com/derogab/ITAvsCOVIDbot
1
1
Fork 0
Code Issues Releases Wiki Activity

Minor improvements

This commit is contained in:
Gabriele De Rosa 2021-05-21 15:08:13 +02:00
parent d6a93dfd91
commit 6ea9453626
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/templates/plot.html
View File

@ -48,6 +48,7 @@
<!-- totalVaccinations --> <!-- totalVaccinations -->
</h1> </h1>
Somministrazioni Somministrazioni
<!-- typeVaccinations -->
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">

5
bot.py
View File

@ -101,9 +101,10 @@ def generate(df, target, template):
vaccinesPerDayAverage = sum(lastWeekData[target]) / 7 vaccinesPerDayAverage = sum(lastWeekData[target]) / 7
remainingDays = (HIT - totalVaccines) / vaccinesPerDayAverage remainingDays = (HIT - totalVaccines) / vaccinesPerDayAverage
hitDate = df.index[-1] + td(days=remainingDays) hitDate = df.index[-1] + td(days=remainingDays)
first_or_second = 'Seconda Dose' if target == 'seconda_dose' else 'Prima Dose' if target == 'prima_dose' else 'Totale'
# Generate plot # Generate plot
plt.ylabel('Seconda Dose' if target == 'seconda_dose' else 'Prima Dose' if target == 'prima_dose' else 'Totale') plt.ylabel(first_or_second)
plt.xlabel("Ultima settimana") plt.xlabel("Ultima settimana")
plt.grid(True) plt.grid(True)
plt.gca().xaxis.set_major_formatter(mdates.DateFormatter('%Y-%m-%d')) plt.gca().xaxis.set_major_formatter(mdates.DateFormatter('%Y-%m-%d'))
@ -130,6 +131,8 @@ def generate(df, target, template):
for line in f.read().splitlines(): for line in f.read().splitlines():
if "<!-- totalVaccinations -->" in line: if "<!-- totalVaccinations -->" in line:
line = f"{totalVaccines}" line = f"{totalVaccines}"
elif "<!-- typeVaccinations -->" in line:
line = f"{first_or_second}"
elif "<!-- totalVaccinationsPerc -->" in line: elif "<!-- totalVaccinationsPerc -->" in line:
line = f"{str(round(totalVaccines / ITALIAN_POPULATION * 100, 2)).replace('.', ',')}%" line = f"{str(round(totalVaccines / ITALIAN_POPULATION * 100, 2)).replace('.', ',')}%"
elif "<!-- totalVaccinationsLastWeek -->" in line: elif "<!-- totalVaccinationsLastWeek -->" in line: