From e4def047886628a12d2da730c99b471d05940e34 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Thu, 29 Apr 2021 20:27:52 +0200
Subject: [PATCH] working on: 0.0.32 Release
---
.../blueprints/intensivregister/divi_model.py | 40 ++---
.../intensivregister/divi_model_import.py | 14 +-
.../intensivregister/divi_service_import.py | 2 +-
.../intensivregister/divi_service_update.py | 38 ++---
.../blueprints/intensivregister/divi_views.py | 152 +++++++++---------
.../divi_date_reported_all_table.html | 2 +-
.../divi_date_reported_one_table.html | 2 +-
.../templates/divi/divi_info.html | 8 +-
.../templates/divi/divi_tasks.html | 14 +-
.../fragment_divi_imported_table.html | 2 +-
.../fragment_divi_table_global_data.html | 8 +-
.../divi/navigation/divi_navtabs.html | 2 +-
.../divi/region/divi_region_all_table.html | 2 +-
.../divi_test_service.py | 10 +-
.../intensivregister_test/divi_test_views.py | 18 +--
.../{who_test => divi_test}/divi_tests.html | 22 +--
16 files changed, 168 insertions(+), 168 deletions(-)
rename src/covid19/blueprints/intensivregister_test/templates/{who_test => divi_test}/divi_tests.html (74%)
diff --git a/src/covid19/blueprints/intensivregister/divi_model.py b/src/covid19/blueprints/intensivregister/divi_model.py
index 9f3952e6..6738dc4a 100644
--- a/src/covid19/blueprints/intensivregister/divi_model.py
+++ b/src/covid19/blueprints/intensivregister/divi_model.py
@@ -120,7 +120,7 @@ class DiviCountry(db.Model):
.one_or_none()
@classmethod
- def find_by_country_code_and_country_and_who_region_id(cls, i_country_code, i_country, my_region):
+ def find_by_country_code_and_country_and_divi_region_id(cls, i_country_code, i_country, my_region):
return db.session.query(cls).filter(
and_(
cls.country_code == i_country_code,
@@ -154,7 +154,7 @@ class DiviCountry(db.Model):
).one()
@classmethod
- def get_who_countries_for_region(cls, region, page):
+ def get_divi_countries_for_region(cls, region, page):
return db.session.query(cls).filter(
cls.region == region
).order_by(cls.country).paginate(page, per_page=ITEMS_PER_PAGE)
@@ -212,9 +212,9 @@ class DiviData(db.Model):
).one_or_none()
@classmethod
- def get_data_for_country(cls, who_country, page):
+ def get_data_for_country(cls, divi_country, page):
return db.session.query(cls).filter(
- cls.country_id == who_country.id
+ cls.country_id == divi_country.id
).populate_existing().options(
joinedload(cls.country).joinedload(DiviCountry.region),
joinedload(cls.date_reported)
@@ -250,8 +250,8 @@ class DiviData(db.Model):
@classmethod
def delete_data_for_one_day(cls, date_reported):
- for one_who_date in cls.get_data_for_one_day(date_reported):
- db.session.delete(one_who_date)
+ for one_divi_date in cls.get_data_for_one_day(date_reported):
+ db.session.delete(one_divi_date)
db.session.commit()
return None
@@ -300,9 +300,9 @@ class DiviData(db.Model):
).paginate(page, per_page=ITEMS_PER_PAGE)
@classmethod
- def get_data_for_country_order_by_cases_new(cls, who_country, page):
+ def get_data_for_country_order_by_cases_new(cls, divi_country, page):
return db.session.query(cls).filter(
- cls.country_id == who_country.id
+ cls.country_id == divi_country.id
).populate_existing().options(
joinedload(cls.country).joinedload(DiviCountry.region),
joinedload(cls.date_reported)
@@ -311,9 +311,9 @@ class DiviData(db.Model):
).paginate(page, per_page=ITEMS_PER_PAGE)
@classmethod
- def get_data_for_country_order_by_cases_cumulative(cls, who_country, page):
+ def get_data_for_country_order_by_cases_cumulative(cls, divi_country, page):
return db.session.query(cls).filter(
- cls.country_id == who_country.id
+ cls.country_id == divi_country.id
).populate_existing().options(
joinedload(cls.country).joinedload(DiviCountry.region),
joinedload(cls.date_reported)
@@ -322,9 +322,9 @@ class DiviData(db.Model):
).paginate(page, per_page=ITEMS_PER_PAGE)
@classmethod
- def get_data_for_country_order_by_deaths_new(cls, who_country, page):
+ def get_data_for_country_order_by_deaths_new(cls, divi_country, page):
return db.session.query(cls).filter(
- cls.country_id == who_country.id
+ cls.country_id == divi_country.id
).populate_existing().options(
joinedload(cls.country).joinedload(DiviCountry.region),
joinedload(cls.date_reported)
@@ -333,9 +333,9 @@ class DiviData(db.Model):
).paginate(page, per_page=ITEMS_PER_PAGE)
@classmethod
- def get_data_for_country_order_by_deaths_cumulative(cls, who_country, page):
+ def get_data_for_country_order_by_deaths_cumulative(cls, divi_country, page):
return db.session.query(cls).filter(
- cls.country_id == who_country.id
+ cls.country_id == divi_country.id
).populate_existing().options(
joinedload(cls.country).joinedload(DiviCountry.region),
joinedload(cls.date_reported)
@@ -345,14 +345,14 @@ class DiviData(db.Model):
@classmethod
def get_datum_of_all_data(cls):
- datum_of_all_who_data = []
+ datum_of_all_divi_data = []
for data in db.session.query(cls).options(subqueryload("date_reported").load_only("date_reported_import_str")):
datum = data.date_reported.date_reported_import_str
- if not datum in datum_of_all_who_data:
- datum_of_all_who_data.append(datum)
- datum_of_all_who_data.sort()
- return datum_of_all_who_data
+ if not datum in datum_of_all_divi_data:
+ datum_of_all_divi_data.append(datum)
+ datum_of_all_divi_data.sort()
+ return datum_of_all_divi_data
@classmethod
def get_joungest_datum(cls):
- return cls.get_datum_of_all_who_data().pop()
+ return cls.get_datum_of_all_divi_data().pop()
diff --git a/src/covid19/blueprints/intensivregister/divi_model_import.py b/src/covid19/blueprints/intensivregister/divi_model_import.py
index fcbdda1a..6140a66e 100644
--- a/src/covid19/blueprints/intensivregister/divi_model_import.py
+++ b/src/covid19/blueprints/intensivregister/divi_model_import.py
@@ -9,7 +9,7 @@ class DiviImport(db.Model):
date_reported = db.Column(db.String(255), nullable=False)
country_code = db.Column(db.String(255), nullable=False)
country = db.Column(db.String(255), nullable=False)
- who_region = db.Column(db.String(255), nullable=False)
+ divi_region = db.Column(db.String(255), nullable=False)
new_cases = db.Column(db.String(255), nullable=False)
cumulative_cases = db.Column(db.String(255), nullable=False)
new_deaths = db.Column(db.String(255), nullable=False)
@@ -44,8 +44,8 @@ class DiviImport(db.Model):
@classmethod
def get_regions(cls):
- return db.session.query(cls.who_region)\
- .order_by(cls.who_region)\
+ return db.session.query(cls.divi_region)\
+ .order_by(cls.divi_region)\
.distinct().all()
@classmethod
@@ -74,7 +74,7 @@ class DiviImport(db.Model):
@classmethod
def __get_new_dates_as_array_sql(cls):
- # TODO: #83 WhoImport.get_new_dates_as_array() SQLalchemy instead of SQL
+ # TODO: #83 diviImport.get_new_dates_as_array() SQLalchemy instead of SQL
sql_query = """
select
distinct
@@ -110,7 +110,7 @@ class DiviImport(db.Model):
@classmethod
def __get_new_dates_as_array_orm(cls):
- # TODO: #83 WhoImport.get_new_dates_as_array() SQLalchemy instead of SQL
+ # TODO: #83 diviImport.get_new_dates_as_array() SQLalchemy instead of SQL
sql_query = """
select
distinct
@@ -151,11 +151,11 @@ class DiviImport(db.Model):
@classmethod
def countries(cls):
- bu = Bundle('countries', cls.country_code, cls.country, cls.who_region)
+ bu = Bundle('countries', cls.country_code, cls.country, cls.divi_region)
return db.session.query(bu).distinct()
@classmethod
- def get_datum_of_all_who_import(cls):
+ def get_datum_of_all_divi_import(cls):
dates_reported = []
bu = Bundle('dates_reported', cls.date_reported)
for date_reported in db.session.query(bu).distinct().order_by(cls.date_reported):
diff --git a/src/covid19/blueprints/intensivregister/divi_service_import.py b/src/covid19/blueprints/intensivregister/divi_service_import.py
index bf78b119..40fd7cbb 100644
--- a/src/covid19/blueprints/intensivregister/divi_service_import.py
+++ b/src/covid19/blueprints/intensivregister/divi_service_import.py
@@ -36,7 +36,7 @@ class DiviServiceImport:
date_reported=row[keyDate_reported],
country_code=row['Country_code'],
country=row['Country'],
- who_region=row['WHO_region'],
+ divi_region=row['divi_region'],
new_cases=row['New_cases'],
cumulative_cases=row['Cumulative_cases'],
new_deaths=row['New_deaths'],
diff --git a/src/covid19/blueprints/intensivregister/divi_service_update.py b/src/covid19/blueprints/intensivregister/divi_service_update.py
index 0e167c26..15346707 100644
--- a/src/covid19/blueprints/intensivregister/divi_service_update.py
+++ b/src/covid19/blueprints/intensivregister/divi_service_update.py
@@ -36,15 +36,15 @@ class DiviServiceUpdate:
return self
def __update_region(self):
- app.logger.info(" DiviServiceUpdate.__update_who_region [begin]")
+ app.logger.info(" DiviServiceUpdate.__update_divi_region [begin]")
app.logger.info("------------------------------------------------------------")
i = 0
- for i_who_region, in DiviImport.get_regions():
+ for i_divi_region, in DiviImport.get_regions():
i += 1
- output = " [ " + str(i) + " ] " + i_who_region
- c = DiviRegion.find_by_region(i_who_region)
+ output = " [ " + str(i) + " ] " + i_divi_region
+ c = DiviRegion.find_by_region(i_divi_region)
if c is None:
- o = DiviRegion(region=i_who_region)
+ o = DiviRegion(region=i_divi_region)
db.session.add(o)
db.session.commit()
output += " added"
@@ -52,12 +52,12 @@ class DiviServiceUpdate:
output += " NOT added ( " + str(c.id) + " ) "
app.logger.info(output)
app.logger.info("")
- app.logger.info(" DiviServiceUpdate.__update_who_region [done]")
+ app.logger.info(" DiviServiceUpdate.__update_divi_region [done]")
app.logger.info("------------------------------------------------------------")
return self
def __update_country(self):
- app.logger.info(" DiviServiceUpdate.__update_who_country [begin]")
+ app.logger.info(" DiviServiceUpdate.__update_divi_country [begin]")
app.logger.info("------------------------------------------------------------")
result = DiviImport.countries()
i = 0
@@ -65,10 +65,10 @@ class DiviServiceUpdate:
i += 1
i_country_code = result_item.countries.country_code
i_country = result_item.countries.country
- i_who_region = result_item.countries.who_region
- output = " [ " + str(i) + " ] " + i_country_code + " | " + i_country + " | " + i_who_region + " | "
- my_region = DiviRegion.find_by_region(i_who_region)
- my_country = DiviCountry.find_by_country_code_and_country_and_who_region_id(
+ i_divi_region = result_item.countries.divi_region
+ output = " [ " + str(i) + " ] " + i_country_code + " | " + i_country + " | " + i_divi_region + " | "
+ my_region = DiviRegion.find_by_region(i_divi_region)
+ my_country = DiviCountry.find_by_country_code_and_country_and_divi_region_id(
i_country_code, i_country, my_region
)
if my_country is None:
@@ -85,22 +85,22 @@ class DiviServiceUpdate:
app.logger.info(output)
db.session.commit()
app.logger.info("")
- app.logger.info(" DiviServiceUpdate.__update_who_country [done]")
+ app.logger.info(" DiviServiceUpdate.__update_divi_country [done]")
app.logger.info("------------------------------------------------------------")
return self
- def who_import_get_new_dates_as_array(self):
+ def divi_import_get_new_dates_as_array(self):
new_dates_reported_from_import = []
- list_datum_of_all_who_data = DiviData.get_datum_of_all_who_data()
- for item in DiviImport.get_datum_of_all_who_import():
- if not item in list_datum_of_all_who_data:
+ list_datum_of_all_divi_data = DiviData.get_datum_of_all_divi_data()
+ for item in DiviImport.get_datum_of_all_divi_import():
+ if not item in list_datum_of_all_divi_data:
new_dates_reported_from_import.append(item)
return new_dates_reported_from_import
def __update_data_incremental(self):
app.logger.info(" DiviServiceUpdate.__update_fact_tables_incremental [begin]")
app.logger.info("------------------------------------------------------------")
- new_dates_reported_from_import = self.who_import_get_new_dates_as_array()
+ new_dates_reported_from_import = self.divi_import_get_new_dates_as_array()
i = 0
for my_date_reported in new_dates_reported_from_import:
app.logger.info(my_date_reported)
@@ -163,10 +163,10 @@ class DiviServiceUpdate:
db.session.add(result_item)
i += 1
if i % 2000 == 0:
- app.logger.info(" update WHO initial ... "+str(i)+" rows")
+ app.logger.info(" update divi initial ... "+str(i)+" rows")
db.session.commit()
db.session.commit()
- app.logger.info(" update WHO initial : "+str(i)+" total rows")
+ app.logger.info(" update divi initial : "+str(i)+" total rows")
app.logger.info(" DiviServiceUpdate.__update_fact_table_initial [done]")
app.logger.info("------------------------------------------------------------")
return self
diff --git a/src/covid19/blueprints/intensivregister/divi_views.py b/src/covid19/blueprints/intensivregister/divi_views.py
index d23cd990..c39e2489 100644
--- a/src/covid19/blueprints/intensivregister/divi_views.py
+++ b/src/covid19/blueprints/intensivregister/divi_views.py
@@ -30,7 +30,7 @@ admin.add_view(ModelView(DiviData, db.session, category="DIVI"))
@app_divi.route('/info')
def url_divi_info():
- page_info = ApplicationPage('WHO', "Info")
+ page_info = ApplicationPage('divi', "Info")
return render_template(
'divi/divi_info.html',
page_info=page_info)
@@ -39,7 +39,7 @@ def url_divi_info():
@app_divi.route('/tasks')
@login_required
def url_divi_tasks():
- page_info = ApplicationPage('WHO', "Tasks")
+ page_info = ApplicationPage('divi', "Tasks")
return render_template(
'divi/divi_tasks.html',
page_info=page_info)
@@ -49,7 +49,7 @@ def url_divi_tasks():
@app_divi.route('/imported')
@login_required
def url_divi_imported(page=1):
- page_info = ApplicationPage('WHO', "Last Import")
+ page_info = ApplicationPage('divi', "Last Import")
try:
page_data = DiviImport.get_all_as_page(page)
except OperationalError:
@@ -64,7 +64,7 @@ def url_divi_imported(page=1):
@app_divi.route('/date_reported/all/page/<int:page>')
@app_divi.route('/date_reported/all')
def url_divi_date_reported_all(page: int = 1):
- page_info = ApplicationPage('WHO', "Date Reported", "All")
+ page_info = ApplicationPage('divi', "Date Reported", "All")
try:
page_data = DiviDateReported.get_all_as_page(page)
except OperationalError:
@@ -82,8 +82,8 @@ def url_divi_date_reported(date_reported_id: int, page: int = 1):
date_reported = DiviDateReported.get_by_id(date_reported_id)
page_info = ApplicationPage(
"Date Reported: " + date_reported.date_reported,
- 'WHO',
- "data of all reported countries for WHO date reported " + date_reported.date_reported + " "
+ 'divi',
+ "data of all reported countries for divi date reported " + date_reported.date_reported + " "
)
try:
page_data = DiviData.get_data_for_day(date_reported, page)
@@ -92,7 +92,7 @@ def url_divi_date_reported(date_reported_id: int, page: int = 1):
page_data = None
return render_template(
'divi/date_reported/divi_date_reported_one.html',
- who_date_reported=date_reported,
+ divi_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
@@ -103,8 +103,8 @@ def url_divi_date_reported_cases_new(date_reported_id: int, page: int = 1):
date_reported = DiviDateReported.get_by_id(date_reported_id)
page_info = ApplicationPage(
"Date Reported: " + date_reported.date_reported,
- 'WHO',
- "data of all reported countries for WHO date reported " + date_reported.date_reported + " "
+ 'divi',
+ "data of all reported countries for divi date reported " + date_reported.date_reported + " "
)
try:
page_data = DiviData.get_data_for_day_order_by_cases_new(date_reported, page)
@@ -113,7 +113,7 @@ def url_divi_date_reported_cases_new(date_reported_id: int, page: int = 1):
page_data = None
return render_template(
'divi/date_reported/divi_date_reported_one_cases_new.html',
- who_date_reported=date_reported,
+ divi_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
@@ -124,8 +124,8 @@ def url_divi_date_reported_cases_cumulative(date_reported_id: int, page: int = 1
date_reported = DiviDateReported.get_by_id(date_reported_id)
page_info = ApplicationPage(
"Date Reported: " + date_reported.date_reported,
- 'WHO',
- "data of all reported countries for WHO date reported " + date_reported.date_reported + " "
+ 'divi',
+ "data of all reported countries for divi date reported " + date_reported.date_reported + " "
)
try:
page_data = DiviData.get_data_for_day_order_by_cases_cumulative(date_reported, page)
@@ -134,7 +134,7 @@ def url_divi_date_reported_cases_cumulative(date_reported_id: int, page: int = 1
page_data = None
return render_template(
'divi/date_reported/divi_date_reported_one_cases_cumulative.html',
- who_date_reported=date_reported,
+ divi_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
@@ -145,8 +145,8 @@ def url_divi_date_reported_deaths_new(date_reported_id: int, page: int = 1):
date_reported = DiviDateReported.get_by_id(date_reported_id)
page_info = ApplicationPage(
"Date Reported: " + date_reported.date_reported,
- 'WHO',
- "data of all reported countries for WHO date reported " + date_reported.date_reported + " "
+ 'divi',
+ "data of all reported countries for divi date reported " + date_reported.date_reported + " "
)
try:
page_data = DiviData.get_data_for_day_order_by_deaths_new(date_reported, page)
@@ -155,7 +155,7 @@ def url_divi_date_reported_deaths_new(date_reported_id: int, page: int = 1):
page_data = None
return render_template(
'divi/date_reported/divi_date_reported_one_deaths_new.html',
- who_date_reported=date_reported,
+ divi_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
@@ -166,8 +166,8 @@ def url_divi_date_reported_deaths_cumulative(date_reported_id: int, page: int =
date_reported = DiviDateReported.get_by_id(date_reported_id)
page_info = ApplicationPage(
"Date Reported: " + date_reported.date_reported,
- 'WHO',
- "data of all reported countries for WHO date reported " + date_reported.date_reported + " "
+ 'divi',
+ "data of all reported countries for divi date reported " + date_reported.date_reported + " "
)
try:
page_data = DiviData.get_data_for_day_order_by_deaths_cumulative(date_reported, page)
@@ -176,7 +176,7 @@ def url_divi_date_reported_deaths_cumulative(date_reported_id: int, page: int =
page_data = None
return render_template(
'divi/date_reported/divi_date_reported_one_deaths_cumulative.html',
- who_date_reported=date_reported,
+ divi_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
@@ -184,7 +184,7 @@ def url_divi_date_reported_deaths_cumulative(date_reported_id: int, page: int =
@app_divi.route('/region/all/page/<int:page>')
@app_divi.route('/region/all')
def url_divi_region_all(page: int = 1):
- page_info = ApplicationPage('WHO', "Region", "All")
+ page_info = ApplicationPage('divi', "Region", "All")
try:
page_data = DiviRegion.get_all_as_page(page)
except OperationalError:
@@ -199,20 +199,20 @@ def url_divi_region_all(page: int = 1):
@app_divi.route('/region/<int:region_id>/page/<int:page>')
@app_divi.route('/region/<int:region_id>')
def url_divi_region(region_id: int, page: int = 1):
- who_region = None
- page_info = ApplicationPage("Countries", "WHO Region")
+ divi_region = None
+ page_info = ApplicationPage("Countries", "divi Region")
try:
- who_region = DiviRegion.get_by_id(region_id)
- page_data = DiviCountry.get_who_countries_for_region(who_region, page)
- page_info.title = who_region.region
- page_info.subtitle = "WHO Region"
- page_info.subtitle_info = "Countries of WHO Region " + who_region.region
+ divi_region = DiviRegion.get_by_id(region_id)
+ page_data = DiviCountry.get_divi_countries_for_region(divi_region, page)
+ page_info.title = divi_region.region
+ page_info.subtitle = "divi Region"
+ page_info.subtitle_info = "Countries of divi Region " + divi_region.region
except OperationalError:
flash("No countries of that region in the database.")
page_data = None
return render_template(
'divi/region/divi_region_one.html',
- who_region=who_region,
+ divi_region=divi_region,
page_data=page_data,
page_info=page_info)
@@ -220,7 +220,7 @@ def url_divi_region(region_id: int, page: int = 1):
@app_divi.route('/country/all/page/<int:page>')
@app_divi.route('/country/all')
def url_divi_country_all(page: int = 1):
- page_info = ApplicationPage('WHO', "Countries", "All")
+ page_info = ApplicationPage('divi', "Countries", "All")
try:
page_data = DiviCountry.get_all_as_page(page)
except OperationalError:
@@ -235,14 +235,14 @@ def url_divi_country_all(page: int = 1):
@app_divi.route('/country/<int:country_id>/page/<int:page>')
@app_divi.route('/country/<int:country_id>')
def url_divi_country(country_id: int, page: int = 1):
- who_country = DiviCountry.get_by_id(country_id)
- page_data = DiviData.get_data_for_country(who_country, page)
- page_info = ApplicationPage(who_country.country,
- "Country "+who_country.country_code,
- "Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region)
+ divi_country = DiviCountry.get_by_id(country_id)
+ page_data = DiviData.get_data_for_country(divi_country, page)
+ page_info = ApplicationPage(divi_country.country,
+ "Country "+divi_country.country_code,
+ "Data per Day in Country "+divi_country.country+" of divi Region "+divi_country.region.region)
return render_template(
'divi/country/divi_country_one.html',
- who_country=who_country,
+ divi_country=divi_country,
page_data=page_data,
page_info=page_info)
@@ -250,14 +250,14 @@ def url_divi_country(country_id: int, page: int = 1):
@app_divi.route('/country/<int:country_id>/cases_new/page/<int:page>')
@app_divi.route('/country/<int:country_id>/cases_new')
def url_divi_country_cases_new(country_id: int, page: int = 1):
- who_country = DiviCountry.get_by_id(country_id)
- page_data = DiviData.get_data_for_country_order_by_cases_new(who_country, page)
- page_info = ApplicationPage(who_country.country,
- "Country "+who_country.country_code,
- "Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region)
+ divi_country = DiviCountry.get_by_id(country_id)
+ page_data = DiviData.get_data_for_country_order_by_cases_new(divi_country, page)
+ page_info = ApplicationPage(divi_country.country,
+ "Country "+divi_country.country_code,
+ "Data per Day in Country "+divi_country.country+" of divi Region "+divi_country.region.region)
return render_template(
'divi/country/divi_country_one_cases_new.html',
- who_country=who_country,
+ divi_country=divi_country,
page_data=page_data,
page_info=page_info)
@@ -265,14 +265,14 @@ def url_divi_country_cases_new(country_id: int, page: int = 1):
@app_divi.route('/country/<int:country_id>/cases_cumulative/page/<int:page>')
@app_divi.route('/country/<int:country_id>/cases_cumulative')
def url_divi_country_cases_cumulative(country_id: int, page: int = 1):
- who_country = DiviCountry.get_by_id(country_id)
- page_data = DiviData.get_data_for_country_order_by_cases_cumulative(who_country, page)
- page_info = ApplicationPage(who_country.country,
- "Country "+who_country.country_code,
- "Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region)
+ divi_country = DiviCountry.get_by_id(country_id)
+ page_data = DiviData.get_data_for_country_order_by_cases_cumulative(divi_country, page)
+ page_info = ApplicationPage(divi_country.country,
+ "Country "+divi_country.country_code,
+ "Data per Day in Country "+divi_country.country+" of divi Region "+divi_country.region.region)
return render_template(
'divi/country/divi_country_one_cases_cumulative.html',
- who_country=who_country,
+ divi_country=divi_country,
page_data=page_data,
page_info=page_info)
@@ -280,14 +280,14 @@ def url_divi_country_cases_cumulative(country_id: int, page: int = 1):
@app_divi.route('/country/<int:country_id>/deaths_new/page/<int:page>')
@app_divi.route('/country/<int:country_id>/deaths_new')
def url_divi_country_deaths_new(country_id: int, page: int = 1):
- who_country = DiviCountry.get_by_id(country_id)
- page_data = DiviData.get_data_for_country_order_by_deaths_new(who_country, page)
- page_info = ApplicationPage(who_country.country,
- "Country "+who_country.country_code,
- "Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region)
+ divi_country = DiviCountry.get_by_id(country_id)
+ page_data = DiviData.get_data_for_country_order_by_deaths_new(divi_country, page)
+ page_info = ApplicationPage(divi_country.country,
+ "Country "+divi_country.country_code,
+ "Data per Day in Country "+divi_country.country+" of divi Region "+divi_country.region.region)
return render_template(
'divi/country/divi_country_one_deaths_new.html',
- who_country=who_country,
+ divi_country=divi_country,
page_data=page_data,
page_info=page_info)
@@ -295,14 +295,14 @@ def url_divi_country_deaths_new(country_id: int, page: int = 1):
@app_divi.route('/country/<int:country_id>/deaths_cumulative/page/<int:page>')
@app_divi.route('/country/<int:country_id>/deaths_cumulative')
def url_divi_country_deaths_cumulative(country_id: int, page: int = 1):
- who_country = DiviCountry.get_by_id(country_id)
- page_data = DiviData.get_data_for_country_order_by_deaths_cumulative(who_country, page)
- page_info = ApplicationPage(who_country.country,
- "Country "+who_country.country_code,
- "Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region)
+ divi_country = DiviCountry.get_by_id(country_id)
+ page_data = DiviData.get_data_for_country_order_by_deaths_cumulative(divi_country, page)
+ page_info = ApplicationPage(divi_country.country,
+ "Country "+divi_country.country_code,
+ "Data per Day in Country "+divi_country.country+" of divi Region "+divi_country.region.region)
return render_template(
'divi/country/divi_country_one_deaths_cumulative.html',
- who_country=who_country,
+ divi_country=divi_country,
page_data=page_data,
page_info=page_info)
@@ -310,15 +310,15 @@ def url_divi_country_deaths_cumulative(country_id: int, page: int = 1):
@app_divi.route('/germany/page/<int:page>')
@app_divi.route('/germany')
def url_divi_germany(page: int = 1):
- page_info = ApplicationPage('WHO', "Germany")
- who_country_germany = DiviCountry.get_germany()
- if who_country_germany is None:
+ page_info = ApplicationPage('divi', "Germany")
+ divi_country_germany = DiviCountry.get_germany()
+ if divi_country_germany is None:
flash('country: Germany not found in Database', category='error')
- return redirect(url_for('who.url_divi_tasks'))
- page_data = DiviData.get_data_for_country(who_country_germany, page)
+ return redirect(url_for('divi.url_divi_tasks'))
+ page_data = DiviData.get_data_for_country(divi_country_germany, page)
return render_template(
'divi/country/divi_country_germany.html',
- who_country=who_country_germany,
+ divi_country=divi_country_germany,
page_data=page_data,
page_info=page_info)
@@ -330,7 +330,7 @@ def url_divi_mytest():
i = 0
for c in DiviImport.countries():
i += 1
- line = " | " + str(i) + " | " + c.countries.country_code + " | " + c.countries.country + " | " + c.countries.who_region + " | "
+ line = " | " + str(i) + " | " + c.countries.country_code + " | " + c.countries.country + " | " + c.countries.divi_region + " | "
app.logger.info(line)
flash("url_divi_mytest - DONE: DiviImport.countries()")
app.logger.info("url_divi_mytest - DONE: DiviImport.countries()")
@@ -344,13 +344,13 @@ def url_divi_mytest():
joungest_datum = DiviDateReported.get_joungest_datum()
app.logger.info(joungest_datum)
i = 0
- for who_data in DiviData.get_data_for_one_day(joungest_datum):
+ for divi_data in DiviData.get_data_for_one_day(joungest_datum):
i += 1
- line = " | " + str(i) + " | " + str(who_data.date_reported) + " | " + who_data.country.country + " | "
+ line = " | " + str(i) + " | " + str(divi_data.date_reported) + " | " + divi_data.country.country + " | "
app.logger.info(line)
flash("url_divi_mytest - DONE: DiviImport.get_new_dates_as_array()")
app.logger.info("url_divi_mytest - DONE: DiviImport.get_new_dates_as_array()")
- return redirect(url_for('who.url_divi_tasks'))
+ return redirect(url_for('divi.url_divi_tasks'))
# ----------------------------------------------------------------------------------------------------------------
# Celery TASKS
@@ -459,7 +459,7 @@ def url_task_divi_download_only():
divi_service.run_download_only()
flash("divi_service.run_download_only ok")
app.logger.info("url_divi_task_download_only [done]")
- return redirect(url_for('who.url_divi_tasks'))
+ return redirect(url_for('divi.url_divi_tasks'))
@app_divi.route('/task/import/only')
@@ -470,7 +470,7 @@ def url_task_divi_import_only():
flash("divi_service.run_update started")
flash(message="long running background task started", category="warning")
app.logger.info("url_divi_update_run [done]")
- return redirect(url_for('who.url_divi_tasks'))
+ return redirect(url_for('divi.url_divi_tasks'))
@app_divi.route('/task/update/dimension-tables/only')
@@ -481,7 +481,7 @@ def url_task_divi_update_dimension_tables_only():
flash("task_divi_update_dimension_tables_only started")
flash(message="long running background task started", category="warning")
app.logger.info("url_task_divi_update_dimension_tables_only [done]")
- return redirect(url_for('who.url_divi_tasks'))
+ return redirect(url_for('divi.url_divi_tasks'))
@app_divi.route('/task/update/fact-table/incremental/only')
@@ -492,7 +492,7 @@ def url_task_divi_update_fact_table_incremental_only():
flash("task_divi_update_fact_table_incremental_only started")
flash(message="long running background task started", category="warning")
app.logger.info("url_task_divi_update_fact_table_incremental_only [done]")
- return redirect(url_for('who.url_divi_tasks'))
+ return redirect(url_for('divi.url_divi_tasks'))
@app_divi.route('/task/update/fact-table/initial/only')
@@ -503,7 +503,7 @@ def url_task_divi_update_fact_table_initial_only():
flash("task_divi_update_fact_table_initial_only started")
flash(message="long running background task started", category="warning")
app.logger.info("url_divi_task_update_full [done]")
- return redirect(url_for('who.url_divi_tasks'))
+ return redirect(url_for('divi.url_divi_tasks'))
@app_divi.route('/task/update/star_schema/initial')
@@ -516,7 +516,7 @@ def url_task_divi_update_star_schema_initial():
flash("task_divi_update_star_schema_initial started")
flash(message="long running background task started", category="warning")
app.logger.info("url_divi_task_update_full [done]")
- return redirect(url_for('who.url_divi_tasks'))
+ return redirect(url_for('divi.url_divi_tasks'))
@app_divi.route('/task/update/star_schema/incremental')
@@ -529,4 +529,4 @@ def url_task_divi_update_star_schema_incremental():
flash("task_divi_run_update_full started")
flash(message="long running background task started", category="warning")
app.logger.info("url_task_divi_update_star_schema_incremental [done]")
- return redirect(url_for('who.url_divi_tasks'))
+ return redirect(url_for('divi.url_divi_tasks'))
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_table.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_table.html
index 71fc780b..3fa292b0 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_table.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_table.html
@@ -14,7 +14,7 @@
{{ divi_date_reported.get_name_for_weekday() }}
</td>
<td class="text-left">
- <a href="/who/date_reported/{{ divi_date_reported.id }}">
+ <a href="/divi/date_reported/{{ divi_date_reported.id }}">
{{ divi_date_reported }}
</a>
</td>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_table.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_table.html
index ee420aa6..12716b3d 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_table.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_table.html
@@ -6,7 +6,7 @@
date reported
</a>
</th>
- <th scope="col"> who.
+ <th scope="col"> divi.
<a href="{{ url_for('divi.url_divi_date_reported_deaths_new', date_reported_id=divi_date_reported.id) }}">
deaths new
</a>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/divi_info.html b/src/covid19/blueprints/intensivregister/templates/divi/divi_info.html
index 9aea2eeb..a4dc0e5c 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/divi_info.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/divi_info.html
@@ -13,10 +13,10 @@
Dashboard
</div>
<div class="card-text">
- WHO Coronavirus Disease (COVID-19)
+ divi Coronavirus Disease (COVID-19)
</div>
<div class="card-text">
- <a class="btn btn-primary" href="https://covid19.who.int/">https://covid19.who.int</a>
+ <a class="btn btn-primary" href="https://covid19.divi.int/">https://covid19.divi.int</a>
</div>
</div>
</div>
@@ -28,10 +28,10 @@
Pandemic
</div>
<div class="card-text">
- WHO Coronavirus Disease (COVID-19)
+ divi Coronavirus Disease (COVID-19)
</div>
<div class="card-text">
- <a class="btn btn-primary" href="https://www.who.int/emergencies/diseases/novel-coronavirus-2019">
+ <a class="btn btn-primary" href="https://www.divi.int/emergencies/diseases/novel-coronavirus-2019">
novel-coronavirus-2019
</a>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html b/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html
index 27c195b2..de4351b7 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html
@@ -10,29 +10,29 @@
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-primary btn-lg btn-block text-left"
href="{{ url_for('divi.url_task_divi_update_star_schema_initial') }}"
- role="button">WHO :: Task :: update :: star_schema :: initial</a>
+ role="button">divi :: Task :: update :: star_schema :: initial</a>
<a class="btn btn-primary btn-lg btn-block text-left"
href="{{ url_for('divi.url_task_divi_update_star_schema_incremental') }}"
- role="button">WHO :: Task :: update :: star_schema :: incremental</a>
+ role="button">divi :: Task :: update :: star_schema :: incremental</a>
</div>
</div>
<div class="col">
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-success btn-lg btn-block text-left"
href="{{ url_for('divi.url_task_divi_download_only') }}"
- role="button">WHO :: Task :: download :: only</a>
+ role="button">divi :: Task :: download :: only</a>
<a class="btn btn-info btn-lg btn-block text-left"
href="{{ url_for('divi.url_task_divi_import_only') }}"
- role="button">WHO :: Task :: import :: only</a>
+ role="button">divi :: Task :: import :: only</a>
<a class="btn btn-warning btn-lg btn-block text-left"
href="{{ url_for('divi.url_task_divi_update_dimension_tables_only') }}"
- role="button">WHO :: Task :: update :: dimension-tables : only</a>
+ role="button">divi :: Task :: update :: dimension-tables : only</a>
<a class="btn btn-danger btn-lg btn-block text-left"
href="{{ url_for('divi.url_task_divi_update_fact_table_incremental_only') }}"
- role="button">WHO :: Task :: update :: fact-table :: only :: incremental</a>
+ role="button">divi :: Task :: update :: fact-table :: only :: incremental</a>
<a class="btn btn-secondary btn-lg btn-block text-left"
href="{{ url_for('divi.url_task_divi_update_fact_table_initial_only') }}"
- role="button">WHO :: Task :: update :: fact-table :: only :: initial</a>
+ role="button">divi :: Task :: update :: fact-table :: only :: initial</a>
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_table.html b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_table.html
index 55571bff..6446c4fe 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_table.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_table.html
@@ -4,7 +4,7 @@
<th scope="col">date reported</th>
<th scope="col">country</th>
<th scope="col">country code</th>
- <th scope="col">who region</th>
+ <th scope="col">divi region</th>
<th scope="col">new cases</th>
<th scope="col">cumulative cases</th>
<th scope="col">new deaths</th>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_table_global_data.html b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_table_global_data.html
index 27ad588f..69193e2a 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_table_global_data.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_table_global_data.html
@@ -39,7 +39,7 @@
{% for divi_global_data in page_data.items %}
<tr>
<th>
- <a href="/who/date_reported/{{ divi_global_data.date_reported.id }}">
+ <a href="/divi/date_reported/{{ divi_global_data.date_reported.id }}">
{{ divi_global_data.date_reported }}
</a>
</th>
@@ -48,17 +48,17 @@
<td>{{ divi_global_data.deaths_cumulative }}</td>
<td>{{ divi_global_data.cases_cumulative }}</td>
<td>
- <a href="/who/country/{{ divi_global_data.country.id }}">
+ <a href="/divi/country/{{ divi_global_data.country.id }}">
{{ divi_global_data.country.country_code }}
</a>
</td>
<td>
- <a href="/who/country/{{ divi_global_data.country.id }}">
+ <a href="/divi/country/{{ divi_global_data.country.id }}">
{{ divi_global_data.country.country }}
</a>
</td>
<th>
- <a href="/who/region/{{ divi_global_data.country.region.id }}">
+ <a href="/divi/region/{{ divi_global_data.country.region.id }}">
{{ divi_global_data.country.region.region }}
</a>
</th>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navtabs.html b/src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navtabs.html
index 71862974..b3571c7f 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navtabs.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navtabs.html
@@ -17,7 +17,7 @@
{% if current_user.is_authenticated %}
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'divi.url_divi_test_tests') }}">DIVI Tests</a>
+ href="{{ url_for( 'divi_test.url_divi_test_tests') }}">DIVI Tests</a>
</li>
{% endif %}
<li class="nav-item">
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_table.html b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_table.html
index 496da52c..e6154479 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_table.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_table.html
@@ -9,7 +9,7 @@
{% for divi_region in page_data.items %}
<tr>
<td>
- <a href="/who/region/{{ divi_region.id }}">
+ <a href="/divi/region/{{ divi_region.id }}">
{{ divi_region.region }}
</a>
</td>
diff --git a/src/covid19/blueprints/intensivregister_test/divi_test_service.py b/src/covid19/blueprints/intensivregister_test/divi_test_service.py
index 8f147bf7..ec3297ec 100644
--- a/src/covid19/blueprints/intensivregister_test/divi_test_service.py
+++ b/src/covid19/blueprints/intensivregister_test/divi_test_service.py
@@ -4,13 +4,13 @@ from covid19.blueprints.intensivregister.divi_model import DiviDateReported, Div
class DiviTestService:
- def __init__(self, database, who_service):
+ def __init__(self, database, divi_service):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" DIVI Test Service [init]")
app.logger.debug("------------------------------------------------------------")
self.__database = database
- self.__service = who_service
- self.cfg = ApplicationServiceConfig.create_config_for_who()
+ self.__service = divi_service
+ self.cfg = ApplicationServiceConfig.create_config_for_intensivregister()
app.logger.debug("------------------------------------------------------------")
app.logger.info(" DIVI Test Service [ready]")
@@ -22,13 +22,13 @@ class DiviTestService:
joungest_datum = DiviDateReported.find_by_date_reported(joungest_datum_str)
app.logger.info("joungest_datum:")
app.logger.info(joungest_datum)
- app.logger.info("WhoData.get_data_for_one_day(joungest_datum):")
+ app.logger.info("DiviData.get_data_for_one_day(joungest_datum):")
i = 0
for data in DiviData.get_data_for_one_day(joungest_datum):
i += 1
line = " | " + str(i) + " | " + str(data.date_reported) + " | " + data.country.country + " | to be deleted"
app.logger.info(line)
- app.logger.info("WhoData.delete_data_for_one_day(joungest_datum)")
+ app.logger.info("DiviData.delete_data_for_one_day(joungest_datum)")
DiviData.delete_data_for_one_day(joungest_datum)
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" DiviTestService.delete_last_day() [DONE]")
diff --git a/src/covid19/blueprints/intensivregister_test/divi_test_views.py b/src/covid19/blueprints/intensivregister_test/divi_test_views.py
index 2f13f31b..ee72ad80 100644
--- a/src/covid19/blueprints/intensivregister_test/divi_test_views.py
+++ b/src/covid19/blueprints/intensivregister_test/divi_test_views.py
@@ -25,7 +25,7 @@ app_divi_test = Blueprint('divi_test', __name__, template_folder='templates', ur
@app_divi_test.route('/tests')
@login_required
def url_divi_test_tests():
- page_info = ApplicationPage('WHO', "Tests")
+ page_info = ApplicationPage('DIVI', "Tests")
return render_template(
'divi_test/divi_tests.html',
page_info=page_info)
@@ -86,22 +86,22 @@ def url_divi_test_divi_data_get_datum_of_all_divi_import():
@app_divi_test.route('/divi_service/service_update/divi_import_get_new_dates_as_array')
@login_required
def url_divi_test_divi_service_divi_import_get_new_dates_as_array():
- app.logger.info("url_divi_test_divi_import_get_new_dates_as_array - START: WhoService.divi_import_get_new_dates_as_array()")
- flash("url_divi_test_divi_import_get_new_dates_as_array - START: WhoService.divi_import_get_new_dates_as_array()")
+ app.logger.info("url_divi_test_divi_import_get_new_dates_as_array - START: DiviService.divi_import_get_new_dates_as_array()")
+ flash("url_divi_test_divi_import_get_new_dates_as_array - START: DiviService.divi_import_get_new_dates_as_array()")
for datum in divi_service.service_update.divi_import_get_new_dates_as_array():
app.logger.info(str(datum))
- flash("url_divi_test_divi_import_get_new_dates_as_array - DONE: WhoService.divi_import_get_new_dates_as_array()")
- app.logger.info("url_divi_test_divi_import_get_new_dates_as_array - DONE: WhoService.divi_import_get_new_dates_as_array()")
+ flash("url_divi_test_divi_import_get_new_dates_as_array - DONE: DiviService.divi_import_get_new_dates_as_array()")
+ app.logger.info("url_divi_test_divi_import_get_new_dates_as_array - DONE: DiviService.divi_import_get_new_dates_as_array()")
return redirect(url_for('divi_test.url_divi_test_tests'))
@app_divi_test.route('/divi_test_service/delete_last_day')
@login_required
def url_divi_test_divi_test_service_delete_last_days_data():
- app.logger.info("url_divi_test_divi_test_service_delete_last_days_data - START: WhoService.divi_import_get_new_dates_as_array()")
- flash("url_divi_test_divi_test_service_delete_last_days_data - START: WhoService.divi_import_get_new_dates_as_array()")
+ app.logger.info("url_divi_test_divi_test_service_delete_last_days_data - START: DiviService.divi_import_get_new_dates_as_array()")
+ flash("url_divi_test_divi_test_service_delete_last_days_data - START: DiviService.divi_import_get_new_dates_as_array()")
divi_test_service.delete_last_day()
- flash("url_divi_test_divi_test_service_delete_last_days_data - DONE: WhoService.divi_import_get_new_dates_as_array()")
- app.logger.info("url_divi_test_divi_test_service_delete_last_days_data - DONE: WhoService.divi_import_get_new_dates_as_array()")
+ flash("url_divi_test_divi_test_service_delete_last_days_data - DONE: DiviService.divi_import_get_new_dates_as_array()")
+ app.logger.info("url_divi_test_divi_test_service_delete_last_days_data - DONE: DiviService.divi_import_get_new_dates_as_array()")
return redirect(url_for('divi_test.url_divi_test_tests'))
diff --git a/src/covid19/blueprints/intensivregister_test/templates/who_test/divi_tests.html b/src/covid19/blueprints/intensivregister_test/templates/divi_test/divi_tests.html
similarity index 74%
rename from src/covid19/blueprints/intensivregister_test/templates/who_test/divi_tests.html
rename to src/covid19/blueprints/intensivregister_test/templates/divi_test/divi_tests.html
index a47341ba..cdbd748e 100644
--- a/src/covid19/blueprints/intensivregister_test/templates/who_test/divi_tests.html
+++ b/src/covid19/blueprints/intensivregister_test/templates/divi_test/divi_tests.html
@@ -10,7 +10,7 @@
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-primary btn-lg btn-block text-left"
href="{{ url_for( 'divi.url_divi_tasks') }}"
- role="button">WHO :: Tasks</a>
+ role="button">DIVI :: Tasks</a>
</div>
</div>
</div>
@@ -19,20 +19,20 @@
<div class="col">
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-danger btn-lg btn-block text-left"
- href="{{ url_for( 'divi_test.url_divi_test_who_import_countries') }}"
- role="button">url_divi_test_who_import_countries</a>
+ href="{{ url_for( 'divi_test.url_divi_test_divi_import_countries') }}"
+ role="button">url_divi_test_divi_import_countries</a>
<a class="btn btn-primary btn-lg btn-block text-left"
- href="{{ url_for( 'divi_test.url_divi_test_who_import_get_new_dates_as_array') }}"
- role="button">url_divi_test_who_import_get_new_dates_as_array</a>
+ href="{{ url_for( 'divi_test.url_divi_test_divi_import_get_new_dates_as_array') }}"
+ role="button">url_divi_test_divi_import_get_new_dates_as_array</a>
<a class="btn btn-danger btn-lg btn-block text-left"
- href="{{ url_for( 'divi_test.url_divi_test_who_data_get_datum_of_all_who_data') }}"
- role="button">url_divi_test_who_data_get_datum_of_all_who_data</a>
+ href="{{ url_for( 'divi_test.url_divi_test_divi_data_get_datum_of_all_divi_data') }}"
+ role="button">url_divi_test_divi_data_get_datum_of_all_divi_data</a>
<a class="btn btn-primary btn-lg btn-block text-left"
- href="{{ url_for( 'divi_test.url_divi_test_who_data_get_datum_of_all_who_import') }}"
- role="button">url_divi_test_who_data_get_datum_of_all_who_import</a>
+ href="{{ url_for( 'divi_test.url_divi_test_divi_data_get_datum_of_all_divi_import') }}"
+ role="button">url_divi_test_divi_data_get_datum_of_all_divi_import</a>
<a class="btn btn-danger btn-lg btn-block text-left"
- href="{{ url_for( 'divi_test.url_divi_test_who_service_who_import_get_new_dates_as_array') }}"
- role="button">url_divi_test_who_service_who_import_get_new_dates_as_array</a>
+ href="{{ url_for( 'divi_test.url_divi_test_divi_service_divi_import_get_new_dates_as_array') }}"
+ role="button">url_divi_test_divi_service_divi_import_get_new_dates_as_array</a>
<a class="btn btn-primary btn-lg btn-block text-left"
href="{{ url_for( 'divi_test.url_divi_test_divi_test_service_delete_last_days_data') }}"
role="button">url_divi_test_divi_test_service_delete_last_days_data</a>
--
GitLab