ajout du "changelog", dossiers pour les données, et diverses choses

[perso/Denise/oms.git] / app.py

diff --git a/app.py b/app.py
index 4f330d9204c715f64c2fea39ce1b3705112be69e..7baef86c03fd113bba7850ff607ac854ebe63699 100644 (file)
--- a/app.py
+++ b/app.py
@@ -51,20 +51,34 @@ def courbe_image(ext):
     texte += donnees_poids_vers_texte(l_jours,l_poids)  
 
     # créer la figure
-    fig = cree_figure(config,l_jours,l_poids,liste_err)
-    output = io.BytesIO()
-    FigureCanvas(fig).print_png(output)
-    plt.close(fig)
+    try:
+        fig = cree_figure(config,l_jours,l_poids,liste_err)
+        result = "success"
+        output = io.BytesIO()
+        FigureCanvas(fig).print_png(output)
+        plt.close(fig)
+    except:
+        result = "fail"
+        liste_err[0].append("Impossible de générer la courbe !")
+    
     
     if ext == "b64":
-        reponse = flask.jsonify({ "result":"success", 
-            "messages": liste_err[1], 
-            "image": base64.b64encode(output.getvalue()).decode("ascii"),
-            "export_txt": texte})
+        if result == "success":
+            reponse = flask.jsonify({ "result":result, 
+                "messages": liste_err[1], 
+                "image": base64.b64encode(output.getvalue()).decode("ascii"),
+                "export_txt": texte})
+        else:
+            reponse = flask.jsonify({ "result":result, 
+                "messages": liste_err[1]+liste_err[0], 
+                "image": "",
+                "export_txt": texte})
         return reponse
         #return flask.Response(base64.b64encode(output.getvalue()), mimetype='text/plain')
-    elif ext == "png":
+    elif ext == "png" and result == "success":
         return flask.Response(output.getvalue(), mimetype='image/png')
+    elif ext == "png":
+        return flask.render_template("erreur_fatale.html",erreur="Impossible de générer la courbe")
     else:
         return flask.render_template("erreur_fatale.html",erreur="Le type d'image demandé n'est pas reconnu")
     
@@ -92,6 +106,13 @@ def faq():
 
     return flask.render_template("faq.html",lcateg=l_categ,tableqr=table_qr,err=[])
 
+@app.route("/changelog")
+def changelog():
+    
+    table_version = lire_fichier_csv_simple(fichier_changelog)
+    
+    return flask.render_template("changelog.html",table = table_version,err=[])
+
 
 if __name__ == "__main__":
     app.run(host='0.0.0.0',debug=True)
\ No newline at end of file