Merge branch 'dev-nico' into 'master'

Dev nico

See merge request !110

atdb/atdb/settings/base.py

@@ -188,8 +188,8 @@ LOGOUT_REDIRECT_URL = '/atdb'
 STATIC_URL = '/atdb/static/'
 STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 
-ALL_STATUSSES = ['defining','defined','staging','staged','processing','processed','validated', 'scrubbing','scrubbed','archiving','archived','finished']
-ACTIVE_STATUSSES = ['staging','staged','processing','processed','validated', 'scrubbing','scrubbed','archiving','archived']
-STATUSSES_WITH_DATA = ['staged','processing','processed','validated', 'scrubbing','scrubbed','archiving','archived']
+ALL_STATUSSES = ['defining','defined','staging','staged','fetching','fetched','processing','processed','storing','stored','validated', 'scrubbing','scrubbed','archiving','archived','finished']
+ACTIVE_STATUSSES = ['staging','staged','fetching','fetched','processing','processed','validated','storing','stored','scrubbing','scrubbed','archiving','archived']
+STATUSSES_WITH_DATA = ['staged','fetching','fetched','processing','processed','validated','storing','stored','scrubbing','scrubbed','archiving','archived']
 
 QUERY_LIMIT_MULTI_CHANGE = 1000
\ No newline at end of file

atdb/atdb/static/taskdatabase/style.css

@@ -3,12 +3,12 @@ TD {
   font-size: 12pt;
 }
 
-.defining,.staging,.processing,.scrub,.scrubbing,.archiving {
+.defining,.staging,.fetching,.processing,.storing,.scrub,.scrubbing,.archiving {
   font-style: italic;
   color: green;
 }
 
-.defined,.staged,.processed,.validated,.scrubbed,.archived,.finished {
+.defined,.staged,.fetched,.processed,.stored,.validated,.scrubbed,.archived,.finished {
   background-color: lemonchiffon;
   color: blue;
 }
@@ -62,10 +62,9 @@ p.title {
 .info {
    background-color: #E0F8F8;
 }
-
 .max {
    font-weight: bold;
-   color: darkgray;
+   color: green;
    background-color: lightgreen;
 }
 

atdb/taskdatabase/static/taskdatabase/style.css

@@ -3,12 +3,12 @@ TD {
   font-size: 12pt;
 }
 
-.defining,.staging,.processing,.scrub,.scrubbing,.archiving {
+.defining,.staging,.fetching,.processing,.storing,.scrub,.scrubbing,.archiving {
   font-style: italic;
   color: green;
 }
 
-.defined,.staged,.processed,.validated,.scrubbed,.archived,.finished {
+.defined,.staged,.fetched,.processed,.stored,.validated,.scrubbed,.archived,.finished {
   background-color: lemonchiffon;
   color: blue;
 }

atdb/taskdatabase/templates/query/status_buttons_per_row.html

@@ -3,7 +3,9 @@
  <a href="{% url 'task-setstatus' record.pk 'defining' '1' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-undo"></i> defining</a>
  <a href="{% url 'task-setstatus' record.pk 'defined' '1' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> defined</a>
  <a href="{% url 'task-setstatus' record.pk 'staged' '1' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> staged</a>&nbsp;
- <a href="{% url 'task-setstatus' record.pk 'processed' '1' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> processed</a>&nbsp;
+ <a href="{% url 'task-setstatus' record.pk 'fetched' '1' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> fetched</a>&nbsp;
+ <a href="{% url 'task-setstatus' record.pk 'processed' '1' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> processed</a>
+ <a href="{% url 'task-setstatus' record.pk 'stored' '1' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> stored</a>&nbsp;&nbsp;
  <a href="{% url 'task-setstatus' record.pk 'validated' '1' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> validated</a>&nbsp;
  <a href="{% url 'task-setstatus' record.pk 'scrubbed' '1' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> scrubbed</a>&nbsp;
  <a href="{% url 'task-setstatus' record.pk 'archived' '1' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> archived</a>

atdb/taskdatabase/templates/taskdatabase/filter/filter_buttons.html

@@ -6,17 +6,22 @@
              <tr><td>Click to Filter</td></tr>
              <tr>
                <td>
-                <a href="{% url 'task-set-filter' 'all' %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-layer-group"></i> All Tasks</a>
-                <a href="{% url 'task-set-active-filter' %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-layer-group"></i> Active Tasks</a>
-                <a href="{% url 'task-set-filter' 'failed' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-layer-group"></i> Failed Tasks</a>
+                <a href="{% url 'task-set-filter' 'all' %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-layer-group"></i> All</a>
+                <a href="{% url 'task-set-active-filter' %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-layer-group"></i> Active</a>
+                <a href="{% url 'task-set-filter' 'failed' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-layer-group"></i> Failed</a>
                  <a href="{% url 'task-set-onhold-filter' True %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-layer-group"></i> On Hold</a>
-               &nbsp;&nbsp;
+             <!--  &nbsp;&nbsp;
                 <a href="{% url 'task-set-filter' 'defining' %}" class="btn btn-secondary btn-sm" role="button">defining</a>
+             -->
                 <a href="{% url 'task-set-filter' 'defined' %}" class="btn btn-primary btn-sm" role="button">defined</a>
                 <a href="{% url 'task-set-filter' 'staging' %}" class="btn btn-secondary btn-sm" role="button">staging</a>
                 <a href="{% url 'task-set-filter' 'staged' %}" class="btn btn-primary btn-sm" role="button">staged</a>
+                <a href="{% url 'task-set-filter' 'fetching' %}" class="btn btn-secondary btn-sm" role="button">fetching</a>
+                <a href="{% url 'task-set-filter' 'fetched' %}" class="btn btn-primary btn-sm" role="button">fetched</a>
                 <a href="{% url 'task-set-filter' 'processing' %}" class="btn btn-secondary btn-sm" role="button">processing</a>
-                <a href="{% url 'task-set-filter' 'processed' %}" class="btn btn-success btn-sm" role="button">processed</a>
+                <a href="{% url 'task-set-filter' 'processed' %}" class="btn btn-primary btn-sm" role="button">processed</a>
+                <a href="{% url 'task-set-filter' 'storing' %}" class="btn btn-secondary btn-sm" role="button">storing</a>
+                <a href="{% url 'task-set-filter' 'stored' %}" class="btn btn-success btn-sm" role="button">stored</a>
                 <a href="{% url 'task-set-filter' 'validated' %}" class="btn btn-primary btn-sm" role="button">validated</a>
                 <a href="{% url 'task-set-filter' 'scrubbing' %}" class="btn btn-secondary btn-sm" role="button">scrubbing</a>
                 <a href="{% url 'task-set-filter' 'scrubbed' %}" class="btn btn-primary btn-sm" role="button">scrubbed</a>

atdb/taskdatabase/templates/taskdatabase/index.html

@@ -80,7 +80,7 @@
         {% include 'taskdatabase/pagination.html' %}
        </div>
     </div>
-    <p class="footer"> Version 1.0.0 (13 apr 2021 - 10:00)
+    <p class="footer"> Version 1.0.0 (13 apr 2021 - 17:30)
 
 </div>
 

atdb/taskdatabase/templates/taskdatabase/tasks.html

@@ -60,7 +60,7 @@
                        <a href="{% url 'task-hold-resume' task.pk 'resume' my_tasks.number %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-play"></i> start</a>
                 {% endif %}
 
-                {% if task.status == "processed" %}
+                {% if task.status == "stored" %}
                     <a href="{% url 'task-setstatus-view' task.pk 'validated' my_tasks.number %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-check"></i> validate</a>
                 {% endif %}
             {% endif %}

atdb/taskdatabase/templates/taskdatabase/tasks/set_status_buttons.html

 <a href="{% url 'task-details-setstatus' task.pk 'defining' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-undo"></i> defining</a>&nbsp;
 <a href="{% url 'task-details-setstatus' task.pk 'defined' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> defined</a>&nbsp;
 <a href="{% url 'task-details-setstatus' task.pk 'staged' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> staged</a>&nbsp;
+<a href="{% url 'task-details-setstatus' task.pk 'fetched' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> fetched</a></td>&nbsp;
 <a href="{% url 'task-details-setstatus' task.pk 'processed' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> processed</a></td>&nbsp;
+<a href="{% url 'task-details-setstatus' task.pk 'stored' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> stored</a></td>&nbsp;
 <a href="{% url 'task-details-setstatus' task.pk 'validated' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> validated</a>&nbsp;
 <a href="{% url 'task-details-setstatus' task.pk 'scrubbed' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> scrubbed</a>&nbsp;
 <a href="{% url 'task-details-setstatus' task.pk 'archived' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> archived</a>&nbsp;