working on: 0.0.32 Release

src/covid19/blueprints/owid/owid_views.py

@@ -477,15 +477,28 @@ def task_owid_import_only(self):
 
 
 @celery.task(bind=True)
-def task_owid_update_dimension_tables_only(self):
+def task_owid_update_dimension_tables_initial_only(self):
     logger = get_task_logger(__name__)
     self.update_state(state=states.STARTED)
     logger.info("------------------------------------------------------------")
-    logger.info(" Received: task_owid_update_dimension_tables_only [OK] ")
+    logger.info(" Received: task_owid_update_dimension_tables_initial_only [OK] ")
     logger.info("------------------------------------------------------------")
     owid_service.run_update_dimension_tables_only()
     self.update_state(state=states.SUCCESS)
-    result = "OK (task_owid_update_dimension_tables_only)"
+    result = "OK (task_owid_update_dimension_tables_initial_only)"
+    return result
+
+
+@celery.task(bind=True)
+def task_owid_update_dimension_tables_incremental_only(self):
+    logger = get_task_logger(__name__)
+    self.update_state(state=states.STARTED)
+    logger.info("------------------------------------------------------------")
+    logger.info(" Received: task_owid_update_dimension_tables_incremental_only [OK] ")
+    logger.info("------------------------------------------------------------")
+    owid_service.run_update_dimension_tables_only()
+    self.update_state(state=states.SUCCESS)
+    result = "OK (task_owid_update_dimension_tables_incremental_only)"
     return result
 
 
@@ -498,7 +511,7 @@ def task_owid_update_fact_table_incremental_only(self):
     logger.info("------------------------------------------------------------")
     owid_service.run_update_fact_table_incremental_only()
     self.update_state(state=states.SUCCESS)
-    result = "OK (task_owid_update_dimension_tables_only)"
+    result = "OK (task_owid_update_fact_table_incremental_only)"
     return result
 
 
@@ -537,7 +550,7 @@ def task_owid_update_star_schema_initial(self):
     logger.info("------------------------------------------------------------")
     owid_service.run_update_star_schema_initial()
     self.update_state(state=states.SUCCESS)
-    result = "OK (task_owid_update_star_schema_incremental)"
+    result = "OK (task_owid_update_star_schema_initial)"
     return result
 
 
@@ -565,13 +578,23 @@ def url_task_owid_import_only():
     return redirect(url_for('owid.url_owid_tasks'))
 
 
-@app_owid.route('/task/update/dimension-tables/only')
-def url_task_owid_update_dimension_tables_only():
-    app.logger.info("url_task_owid_update_dimension_tables_only [start]")
+@app_owid.route('/task/update/dimension-tables/incremental/only')
+def url_task_owid_update_dimension_tables_incremental_only():
+    app.logger.info("url_task_owid_update_dimension_tables_incremental_only [start]")
+    task_owid_update_dimension_tables_only.apply_async()
+    flash("task_owid_update_dimension_tables_only started")
+    flash(message="long running background task started", category="warning")
+    app.logger.info("url_task_owid_update_dimension_tables_incremental_only [done]")
+    return redirect(url_for('owid.url_owid_tasks'))
+
+
+@app_owid.route('/task/update/dimension-tables/initial/only')
+def url_task_owid_update_dimension_tables_initial_only():
+    app.logger.info("url_task_owid_update_dimension_tables_initial_only [start]")
     task_owid_update_dimension_tables_only.apply_async()
     flash("task_owid_update_dimension_tables_only started")
     flash(message="long running background task started", category="warning")
-    app.logger.info("url_task_owid_update_dimension_tables_only [done]")
+    app.logger.info("url_task_owid_update_dimension_tables_initial_only [done]")
     return redirect(url_for('owid.url_owid_tasks'))
 
 

src/covid19/blueprints/owid/templates/owid/owid_tasks.html

@@ -2,37 +2,60 @@
 
 {% block content %}
     {{super()}}
-     {% include 'owid/navigation/owid_navtabs.html' %}
+    {% include 'owid/navigation/owid_navtabs.html' %}
 
     <div class="container">
         <div class="row">
             <div class="col">
+                <h4>Full Update</h4>
                 <div class="btn-group-vertical" role="group" aria-label="Views">
                     <a class="btn btn-primary btn-lg btn-block text-left"
                        href="{{ url_for( 'owid.url_task_owid_update_star_schema_initial') }}"
-                       role="button">OWID :: Task :: update :: star_schema :: initial</a>
+                       role="button">OWID :: Task :: update :: star_schema :: full</a>
+                </div>
+            </div>
+            <div class="col">
+                <h4>Update</h4>
+                <div class="btn-group-vertical" role="group" aria-label="Views">
                     <a class="btn btn-primary btn-lg btn-block text-left"
                        href="{{ url_for( 'owid.url_task_owid_update_star_schema_incremental') }}"
-                       role="button">OWID :: Task :: update :: star_schema :: incremental</a>
+                       role="button">OWID :: Task :: update :: star_schema</a>
                 </div>
             </div>
+        </div>
+        <div class="row">
             <div class="col">
+                <h4>Full Update</h4>
                 <div class="btn-group-vertical" role="group" aria-label="Views">
                     <a class="btn btn-success btn-lg btn-block text-left"
                        href="{{ url_for( 'owid.url_task_owid_download_only') }}"
-                       role="button">OWID :: Task :: download :: only</a>
+                       role="button">OWID :: Task :: download</a>
                     <a class="btn btn-info btn-lg btn-block text-left"
                        href="{{ url_for( 'owid.url_task_owid_import_only') }}"
-                       role="button">OWID :: Task :: import :: only</a>
+                       role="button">OWID :: Task :: import</a>
                     <a class="btn btn-warning btn-lg btn-block text-left"
-                       href="{{ url_for( 'owid.url_task_owid_update_dimension_tables_only') }}"
-                       role="button">OWID :: Task :: update :: dimension-tables : only</a>
+                       href="{{ url_for( 'owid.url_task_owid_update_dimension_tables_initial_only') }}"
+                       role="button">OWID :: Task :: update :: dimension-tables :: full</a>
                     <a class="btn btn-danger btn-lg btn-block text-left"
-                       href="{{ url_for( 'owid.url_task_owid_update_fact_table_incremental_only') }}"
-                       role="button">OWID :: Task :: update :: fact-table :: only :: incremental</a>
-                    <a class="btn btn-secondary btn-lg btn-block text-left"
                        href="{{ url_for( 'owid.url_task_owid_update_fact_table_initial_only') }}"
-                       role="button">OWID :: Task :: update :: fact-table :: only :: initial</a>
+                       role="button">OWID :: Task :: update :: fact-table :: full</a>
+                </div>
+            </div>
+            <div class="col">
+                <h4>Update</h4>
+                <div class="btn-group-vertical" role="group" aria-label="Views">
+                    <a class="btn btn-success btn-lg btn-block text-left"
+                       href="{{ url_for( 'owid.url_task_owid_download_only') }}"
+                       role="button">OWID :: Task :: download</a>
+                    <a class="btn btn-info btn-lg btn-block text-left"
+                       href="{{ url_for( 'owid.url_task_owid_import_only') }}"
+                       role="button">OWID :: Task :: import</a>
+                    <a class="btn btn-warning btn-lg btn-block text-left"
+                       href="{{ url_for( 'owid.url_task_owid_update_dimension_tables_incremental_only') }}"
+                       role="button">OWID :: Task :: update :: dimension-tables</a>
+                    <a class="btn btn-danger btn-lg btn-block text-left"
+                       href="{{ url_for( 'owid.url_task_owid_update_fact_table_incremental_only') }}"
+                       role="button">OWID :: Task :: update :: fact-table</a>
                 </div>
             </div>
          </div>