Changeset 715671f in OpenWorkouts-current for ow/templates/bulk_files.pt

Timestamp:

Oct 13, 2019, 4:40:50 PM (5 years ago)

Author:

Borja Lopez <borja@…>

Branches:

current

Children:

93b23a6

Parents:

fcf0ef3

Message:

(#77) Bulk workouts upload:

• Added methods to extract files from compressed bulk files, then load workouts from those files.
• Added a task to process/load workouts from "not loaded" bulk files
• Added full tests coverage

File:

• ow/templates/bulk_files.pt (modified) (3 diffs)

ow/templates/bulk_files.pt

@@ -20 +20 @@
     <div class="bulk-files ow-forms">
       <a href="" class="back"
-         tal:attributes="href request.resource_url(context)"
+         tal:attributes="href request.resource_url(context, 'add-bulk-file')"
          i18n:translate="">Back</a>
       <h2 i18n:translate="">Multiple file uploads</h2>
@@ -36 +36 @@
           <p>
             <tal:loaded tal:condition="bulk_file.loaded">
-              <span i18n:translate="">File loaded on></span>
+              <span i18n:translate="">File loaded on</span>
               <span tal:content="bulk_file.loaded_in_timezone(context.timezone)"></span>
+              <ul>
+                <tal:loaded_files tal:repeat="file_name bulk_file.loaded_info.keys()">
+                  <li tal:define="file_info bulk_file.loaded_info[file_name]">
+                    <span tal:content="file_name"></span>
+                    <tal:file_loaded tal:condition="file_info['loaded']">
+                      <span i18n:translate="">Loaded correctly</span>
+                      <a href="" tal:attributes="href request.resource_url(context, file_info['workout'])"
+                         i18n:translate="">See workout</a>
+                    </tal:file_loaded>
+                    <tal:file_not_loaded tal:condition="not file_info['loaded']">
+                      <span i18n:translate="">Couldn't be loaded:</span>
+                      <span tal:content="file_info['error']"></span>
+                    </tal:file_not_loaded>
+                  </li>
+                </tal:loaded_files>
+              </ul>
             </tal:loaded>
             <tal:not_loaded tal:condition="not bulk_file.loaded">
@@ -44 +60 @@
           </p>
 
-          <tal:workouts tal:condition="bulk_file.loaded and bulk_file.workout_ids">
-            <ul class="bulk-loaded-workouts">
-              <tal:workout tal:repeat="workout bulk_file.workouts">
-                <li>
-                  <span tal:content="workout.start_in_timezone(context.timezone)"></span>,
-                  <span tal:content="workout.sport"></span>,
-                  <span tal:content="workout.title"></span>
-                </li>
-              </tal:workout>
-            </ul>
-          </tal:workouts>
-
+          <!--!
+               <tal:workouts tal:condition="bulk_file.loaded and bulk_file.workout_ids">
+               <ul class="bulk-loaded-workouts">
+               <tal:workout tal:repeat="workout bulk_file.workouts">
+               <li>
+               <span tal:content="workout.start_in_timezone(context.timezone)"></span>,
+               <span tal:content="workout.sport"></span>,
+               <span tal:content="workout.title"></span>
+               </li>
+               </tal:workout>
+               </ul>
+               </tal:workouts>
+          -->
           <tal:no_workouts tal:condition="bulk_file.loaded and not bulk_file.workout_ids">
             <p><span i18n:translate>No workouts have been loaded from this file</span></p>