exporting ECB2

web/templates/pages/admin/ecb/ecb.html

@@ -23,7 +23,10 @@
   {% include "pages/admin/ecb/status.html" %}
 
   <section class="panel">
-    <h2>Import attempts <span class="count">{{ page.batches.len() }}</span></h2>
+    <h2>
+      Import attempts <span class="count">{{ page.batches.len() }}</span>
+      {%- if page.failure_count() > 0 %}<span class="tag tag-bad">{{ page.failure_count() }} failed</span>{% endif -%}
+    </h2>
     {% if page.batches.is_empty() %}
       <p class="hint">
         The importer has not recorded an attempt. It runs on startup and then daily, so
@@ -35,36 +38,45 @@
         <table class="builder-table">
           <thead>
             <tr>
-              <th>Started</th><th>Finished</th><th>Window</th><th>Result</th>
-              <th>Observations</th><th>Verified through</th>
+              <th class="mark">#</th><th>Result</th><th>Started</th><th>Finished</th>
+              <th>Took</th><th>Window</th><th class="numeric">Observations</th>
+              <th>Verified through</th>
             </tr>
           </thead>
           <tbody>
             {% for batch in page.batches %}
-              <tr>
-                <td>{{ batch.started_at }}</td>
-                <td>
-                  {%- if let Some(finished) = batch.completed_at %}{{ finished }}
-                  {%- else %}<span class="hint">still running</span>{% endif -%}
-                </td>
-                <td>
-                  {{ batch.window() }}
-                  <div class="hint"><code>{{ batch.endpoint }}</code></div>
-                </td>
+              <tr{% if batch.failed() %} class="attempt-failed"{% endif %}>
+                <td class="mark">{{ batch.batch_id }}</td>
                 <td>
                   {%- if batch.succeeded() %}<span class="tag tag-ok">succeeded</span>
                   {%- else if batch.running() %}<span class="tag">running</span>
                   {%- else %}<span class="tag tag-bad">failed</span>{% endif -%}
-                  {%- if let Some(message) = batch.error_message %}
-                    <div class="hint">{{ message }}</div>
-                  {% endif -%}
                 </td>
-                <td>{{ batch.observations() }}</td>
+                <td class="moment">{{ batch.started() }}</td>
+                <td class="moment">
+                  {%- if let Some(finished) = batch.finished() %}{{ finished }}
+                  {%- else %}<span class="hint">still running</span>{% endif -%}
+                </td>
+                <td class="numeric">
+                  {%- if let Some(took) = batch.took() %}{{ took }}
+                  {%- else %}<span class="hint">—</span>{% endif -%}
+                </td>
                 <td>
+                  {{ batch.window() }}
+                  <div class="hint endpoint" title="{{ batch.endpoint }}"><code>{{ batch.endpoint }}</code></div>
+                </td>
+                <td class="numeric">{{ batch.observations() }}</td>
+                <td class="moment">
                   {%- if let Some(date) = batch.verified_through_date %}{{ date }}
                   {%- else %}<span class="hint">—</span>{% endif -%}
                 </td>
               </tr>
+              {% if let Some(message) = batch.error_message %}
+                <tr class="attempt-error">
+                  <td class="mark"></td>
+                  <td colspan="7">{{ message }}</td>
+                </tr>
+              {% endif %}
             {% endfor %}
           </tbody>
         </table>