X-Git-Url: https://git.immae.eu/?p=perso%2FDenise%2Foms.git;a=blobdiff_plain;f=app.py;h=4f330d9204c715f64c2fea39ce1b3705112be69e;hp=7348472c247a130aec058d6a77d6c0c88f6518f4;hb=66a3e38cc085dc000776d3e2ad3acd7ef57068a3;hpb=9cb3c31c54b868e0c3a335ef3a4b4cdc81e479fb

diff --git a/app.py b/app.py
index 7348472..4f330d9 100644
--- a/app.py
+++ b/app.py
@@ -8,6 +8,8 @@ from gestion_erreurs import *
 from gestion_donnees import *
 from gestion_unites import *
 from trace_courbe import *
+from faq import *
+
 import matplotlib.pyplot as plt
 
 import base64
@@ -40,17 +42,27 @@ def courbe_image(ext):
     liste_err = initialise_erreurs()
     data = flask.request.form
     
-    config = gere_configuration(data,liste_err)
-    
+    # Régler la configuration et les données    
+    config = gere_configuration(data,liste_err)    
     l_jours,l_poids = gere_donneespoids(data,config["naissance"],liste_err)
+
+    # préparer l'export
+    texte = configuration_vers_texte(config)
+    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)
+    
     if ext == "b64":
-        return flask.Response(base64.b64encode(output.getvalue()), mimetype='text/plain')
+        reponse = flask.jsonify({ "result":"success", 
+            "messages": liste_err[1], 
+            "image": base64.b64encode(output.getvalue()).decode("ascii"),
+            "export_txt": texte})
+        return reponse
+        #return flask.Response(base64.b64encode(output.getvalue()), mimetype='text/plain')
     elif ext == "png":
         return flask.Response(output.getvalue(), mimetype='image/png')
     else:
@@ -72,5 +84,14 @@ def export_donnees():
     
     return flask.Response(texte,mimetype="text/plain")
 
+@app.route("/faq")
+def faq():
+    
+    table_faq = lire_fichier_csv_simple(fichier_FAQ)
+    l_categ,table_qr = extraire_tables_par_cat(table_faq)
+
+    return flask.render_template("faq.html",lcateg=l_categ,tableqr=table_qr,err=[])
+
+
 if __name__ == "__main__":
     app.run(host='0.0.0.0',debug=True)
\ No newline at end of file