Parcourir la source

End of managing download data

Jérôme BUISINE il y a 4 ans
Parent
commit
40bcf5e133
2 fichiers modifiés avec 17 ajouts et 6 suppressions
  1. 13 4
      expe/templates/expe/expe_results.html
  2. 4 2
      expe/views.py

+ 13 - 4
expe/templates/expe/expe_results.html

@@ -8,13 +8,20 @@
 
 {% block content %}
     
-    <h3>Results files of experiences</h3>
-    <br />
+    {% if not expe %}
+        <h3>Results files of experiences</h3>
+        <br />
+    {% endif %}
 
     <div class="results-expe">
 
         {% if expe %}
-            <h4>{{expe}}</h4>
+            <div class="alert alert-info" role="alert">
+                <h4 class="alert-heading"><strong>Experience:</strong> {{expe}}</h4>
+                <hr>
+                <p><strong>Question:</strong> {{infos.question}} </p>
+                <p class="mb-0"><strong>Indication:</strong> {{infos.indication}} </p>
+            </div>
 
             <br/>
             {% if folders %}
@@ -59,7 +66,9 @@
         {% else %}
              {% for f in folders %}
                 <ul class="list-group">
-                    <li class="list-group-item"><a href="{% url 'expe:results_expe' expe=f %}">{{f}}</a></li>
+                    <a href="{% url 'expe:results_expe' expe=f %}">
+                        <li class="list-group-item">{{f}}</li>
+                    </a>
                 </ul>
             {% endfor %}
         {% endif %}

+ 4 - 2
expe/views.py

@@ -150,6 +150,9 @@ def list_results(request, expe=None):
 
     if expe is None:
         folders = cfg.expe_name_list
+
+        return render(request, 'expe/expe_results.html', {'expe': expe, 'folders': folders})
+
     else:
         if expe in cfg.expe_name_list:
             folder_path = os.path.join(settings.MEDIA_ROOT, cfg.output_expe_folder, expe)
@@ -164,12 +167,11 @@ def list_results(request, expe=None):
                 for day in days:
                     day_path = os.path.join(folder_path, day)
                     filenames = os.listdir(day_path)
-                    print(filenames)
                     folders[day] = filenames
         else:
             raise Http404("Expe does not exists")
 
-    return render(request, 'expe/expe_results.html', {'expe': expe, 'folders': folders})
+    return render(request, 'expe/expe_results.html', {'expe': expe, 'folders': folders, 'infos': cfg.expes_configuration[expe]['text']})
 
 
 @login_required(login_url="login/")