X-Git-Url: https://git.immae.eu/?p=perso%2FDenise%2Foms.git;a=blobdiff_plain;f=app.py;h=5e62e10cc65f0b68886487de79270adda87fecd5;hp=93c5b309ead261fa4ca6694cb6d6c6de842af264;hb=9297f44a695bd97cd058d79b9a3564fab414dce5;hpb=915e90bbf0bee1d69c51a749a4f2be85b9fda091

diff --git a/app.py b/app.py
index 93c5b30..5e62e10 100644
--- a/app.py
+++ b/app.py
@@ -3,18 +3,17 @@
 
 import flask
 import io
-from configuration import *
+import matplotlib.pyplot as plt
+import base64
+from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
+
+from configuration import config_init
 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
-
-from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
 
 app = flask.Flask(__name__)
 
@@ -26,8 +25,10 @@ def index():
         if 'fichier_donnees' in flask.request.files:
             ## charger les donneés dans le formulaire
             fichier = flask.request.files['fichier_donnees']
-        
-            val_form2 = fichier_json_vers_configdonnees(fichier,liste_err)
+            chaine = fichier.read()
+            val_form2 = fichier_json_vers_configdonnees(chaine,liste_err)
+            if val_form2 == {}:
+                return flask.render_template("index.html",err=liste_err[2]+liste_err[1]+liste_err[0],valform=val_form)
             val_form.update(val_form2)
             #return str(val_form['nb_data'])
     return flask.render_template("index.html",err=liste_err[1],valform=val_form)
@@ -54,15 +55,13 @@ def courbe_image(ext):
     # noter le nom de l'enfant pour l'export
     nomenfant = simplifie_nom(config['nom'])
 
-    #warning(str(config),liste_err)
-
     # créer la figure
     try:
         fig = cree_figure(config,l_jours,l_poids,liste_err)
         result = "success"
         output = io.BytesIO()
-        #warning("Là ça va",liste_err)
         FigureCanvas(fig).print_png(output)
+ 
         plt.close(fig)
     except:
         result = "fail"
@@ -78,12 +77,12 @@ def courbe_image(ext):
                 "nomenfant": nomenfant})
         else:
             reponse = flask.jsonify({ "result":result, 
-                "messages": liste_err[1]+liste_err[0], 
+                "messages": liste_err[2]+liste_err[1]+liste_err[0], 
                 "image": "",
                 "export_txt": texte,
                 "nomenfant": nomenfant})
         return reponse
-        #return flask.Response(base64.b64encode(output.getvalue()), mimetype='text/plain')
+    
     elif ext == "png" and result == "success":
         return flask.Response(output.getvalue(), mimetype='image/png')
     elif ext == "png":
@@ -111,6 +110,6 @@ def changelog():
     
     return flask.render_template("changelog.html",table = table_version,err=[])
 
-
 if __name__ == "__main__":
+    print("Mode debug maison : "+str(niveau_debug))
     app.run(host='0.0.0.0',debug=True)
\ No newline at end of file