Quelques infos, release

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

diff --git a/app.py b/app.py
index d6f8507022a861e653ba1e151920fae9a2550af5..5e62e10cc65f0b68886487de79270adda87fecd5 100644 (file)
--- a/app.py
+++ b/app.py
@@ -7,7 +7,7 @@ import matplotlib.pyplot as plt
 import base64
 from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
 
 import base64
 from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
 

-from configuration import *
+from configuration import config_init

 from gestion_erreurs import *
 from gestion_donnees import *
 from gestion_unites import *
 from gestion_erreurs import *
 from gestion_donnees import *
 from gestion_unites import *


@@ -15,8 +15,6 @@ from trace_courbe import *
 from faq import *
 
 
 from faq import *
 
 

-
-

 app = flask.Flask(__name__)
 
 @app.route('/',methods=['POST','GET'])
 app = flask.Flask(__name__)
 
 @app.route('/',methods=['POST','GET'])


@@ -27,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']
         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)
             val_form.update(val_form2)
             #return str(val_form['nb_data'])
     return flask.render_template("index.html",err=liste_err[1],valform=val_form)


@@ -110,6 +110,6 @@ def changelog():
     
     return flask.render_template("changelog.html",table = table_version,err=[])
 
     
     return flask.render_template("changelog.html",table = table_version,err=[])
 

-

 if __name__ == "__main__":
 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
     app.run(host='0.0.0.0',debug=True)
\ No newline at end of file