Skip to content
Snippets Groups Projects
Commit 3ac20e36 authored by thomaswoehlke's avatar thomaswoehlke
Browse files

### 0.0.13 Release

* Fixed #49 EuropeServiceUpdate.__update_data_short() (wontfix)
* Fixed #52 download vaccination timeline data file
* Fixed #53 import vaccination timeline data file into db
* Fixed #54 /vaccination/imported
* Fixed #57 frontend: use npm for handling 3rdParty css and javascript modules like jQuery, Bootstrap
* Fixed #58 frontend: remove jumbotron from all pageheader, put jumbotron as main content on home page
* Fixed #47 major refactoring: Routes from app.py to org...who,europe,... (Doublette von #65)
* Fixed #48 major refactoring: Tasks from server_mq.py to org...who,europe,... (Doublette von #65)
* Fixed #64 major refactoring: create two packages: for web app and for celery worker
* Issue #65 major refactoring: add flask-blueprints for admin, common, europe, rki, vaccination, who

### 0.0.14 Release
* Issue #66 frontend: migrate to Bootstrap Theme sb-admin-angular
* Issue #67 implement Flask-Login

### 0.0.15 Release
* Issue #5 Visual Graphs for Data per Countries order by Date
* Issue #59 frontend: add correct breadcrumb to every page
* Issue #60 frontend: better design for tables
* Issue #61 frontend: better design for navtabs
* Issue #62 frontend: better design for pages
* Issue #63 frontend: add footer design

### 0.0.16 Release
* Issue #28 /admin/database/import
* Issue #39 SQLalchemy instead of SQL: AllModelClasses.remove_all()
* Issue #40 SQLalchemy instead of SQL: EuropeDataImportTable.get_date_rep()
* Issue #41 SQLalchemy instead of SQL: EuropeDataImportTable.get_countries_of_continent()
* Issue #42 SQLalchemy instead of SQL: WhoGlobalDataImportTable.get_new_dates_as_array()
parent 673f78e9
Branches
Tags
No related merge requests found
......@@ -16,7 +16,7 @@ class EuropeDateReported(db.Model):
day_of_week = db.Column(db.Integer, nullable=False)
week_of_year = db.Column(db.Integer, nullable=False)
def get_name_for_datum(self):
def __str__(self):
result = ""
if self.day_of_month < 10:
result += "0" + str(self.day_of_month)
......@@ -37,6 +37,19 @@ class EuropeDateReported(db.Model):
return {1: "Montag", 2: "Dienstag", 3: "Mittwoch", 4: "Donnerstag", 5: "Freitag", 6: "Samstag",
7: "Sonntag"}
def get_name_for_datum(self):
result = ""
if self.day_of_month < 10:
result += "0" + str(self.day_of_month)
else:
result += "" + str(self.day_of_month)
if self.month < 10:
result += ".0" + str(self.month)
else:
result += "." + str(self.month)
result += "." + str(self.year)
return result
@classmethod
def create_new_object_factory(cls, my_date_rep, my_year_week):
my_date_reported = my_date_rep.split('/')
......
<!--
<table class="table table-hover table-striped table-dark">
<thead class="table-secondary">
<tr>
......@@ -21,4 +22,44 @@
</tr>
{% endfor %}
</tbody>
</table>
-->
<table class="table table-hover table-striped table-dark">
<thead class="table-secondary">
<tr>
<th scope="col" class="text-right">day of week</th>
<th scope="col" class="text-left">date reported</th>
<th scope="col" class="text-right">week of year</th>
<th scope="col" class="text-left">year</th>
</tr>
</thead>
<tbody>
{% for europe_date_reported in page_data.items %}
<tr>
<td class="text-right">
{{ europe_date_reported.get_name_for_weekday() }}
</td>
<td class="text-left">
<a href="/europe/date_reported/{{ europe_date_reported.id }}">
{{ europe_date_reported }}
</a>
</td>
<td class="text-right">
{{ europe_date_reported.week_of_year }}
</td>
<td class="text-left">
{{ europe_date_reported.year }}
</td>
</tr>
{% endfor %}
</tbody>
<tfoot class="table-secondary">
<tr>
<th scope="col" class="text-right">day of week</th>
<th scope="col" class="text-left">date reported</th>
<th scope="col" class="text-right">week of year</th>
<th scope="col" class="text-left">year</th>
</tr>
</tfoot>
</table>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment