Envoi de l’analyse dans un fichier AJAX plutôt que de l’inscrire directement dans...

diff --git a/femtoblackweb.py b/femtoblackweb.py
index 52223b5..fca80af 100644 (file)
--- a/femtoblackweb.py
+++ b/femtoblackweb.py
@@ -105,16 +105,22 @@ def analyze_file(filename):
     json_file = os.path.join(app.config['UPLOAD_FOLDER'], "{}.json".format(filename))
 
     if os.path.exists(f) and os.path.isfile(json_file):
-        try:
-            with open(json_file) as json_f:
-                json_content = json.load(json_f)
-                return render_template('analyze_file.html', filename=filename, json=json_content)
-        except ValueError as e:
-            abort(503)
+        return render_template('analyze_file.html', filename=filename)
 
     else:
         abort(404)
 
+@app.route('/ajax/analysis/')
+def ajax_get_analysis():
+    filename = request.args.get('filename')
+    try:
+        json_file = os.path.join(app.config['UPLOAD_FOLDER'], "{}.json".format(filename))
+        with open(json_file) as json_f:
+            json_content = json.load(json_f)
+            return jsonify(**json_content)
+
+    except ValueError as e:
+        abort(503)
 
 if __name__ == "__main__":
     app.run(debug=True)

diff --git a/templates/analyze_file.html b/templates/analyze_file.html
index 864678a..fecf314 100644 (file)
--- a/templates/analyze_file.html
+++ b/templates/analyze_file.html
@@ -47,26 +47,25 @@
   <script src="{{ url_for('static', filename='wavesurfer.js/dist/wavesurfer.min.js') }}"></script>
   <script src="{{ url_for('static', filename='wavesurfer.js/dist/plugin/wavesurfer.regions.min.js') }}"></script>
   <script>
-
-var json_file = {{ json | safe }};
+var analysis;
 var wavesurfer = Object.create(WaveSurfer);
 
 function lancementOrdres() {
-    periode = json_file["période"] * 1000;
+    periode = analysis["période"] * 1000;
 
     var ordres = $('<ul></ul>');
     $('#ordres').append(ordres);
 
     var currentItemIndex = 0;
     var interval = setInterval(function() {
-       order = json_file["orders"][currentItemIndex];
+       order = analysis["orders"][currentItemIndex];
        console.log(order);
 
        ordres.append(`<li class="ordre"><span class="index">${currentItemIndex}</span> <span class="type_ordre">${order['action']}</span> <span class="valeur">${order['valeur du CAC']}</span> <span class="order_details">(${order['cote']} × ${order['number']} actions)</span></li>`);
 
        currentItemIndex += 1
 
-       if(currentItemIndex >= json_file["nombre d'ordres"]) {
+       if(currentItemIndex >= analysis["nombre d'ordres"]) {
            clearInterval(interval);
        }
     }, periode);
@@ -177,5 +176,14 @@ document.addEventListener('DOMContentLoaded', function () {
         });
     });
 });
+
+$(document).ready(function() {
+    $.getJSON('{{ url_for('ajax_get_analysis') }}',
+              { filename: '{{ filename }}' },
+              function(data) {
+                  analysis = data;
+              }
+             );
+});
   </script>
 {% endblock %}