diff options
Diffstat (limited to 'app.py')
-rw-r--r-- | app.py | 39 |
1 files changed, 30 insertions, 9 deletions
@@ -51,20 +51,34 @@ def courbe_image(ext): | |||
51 | texte += donnees_poids_vers_texte(l_jours,l_poids) | 51 | texte += donnees_poids_vers_texte(l_jours,l_poids) |
52 | 52 | ||
53 | # créer la figure | 53 | # créer la figure |
54 | fig = cree_figure(config,l_jours,l_poids,liste_err) | 54 | try: |
55 | output = io.BytesIO() | 55 | fig = cree_figure(config,l_jours,l_poids,liste_err) |
56 | FigureCanvas(fig).print_png(output) | 56 | result = "success" |
57 | plt.close(fig) | 57 | output = io.BytesIO() |
58 | FigureCanvas(fig).print_png(output) | ||
59 | plt.close(fig) | ||
60 | except: | ||
61 | result = "fail" | ||
62 | liste_err[0].append("Impossible de générer la courbe !") | ||
63 | |||
58 | 64 | ||
59 | if ext == "b64": | 65 | if ext == "b64": |
60 | reponse = flask.jsonify({ "result":"success", | 66 | if result == "success": |
61 | "messages": liste_err[1], | 67 | reponse = flask.jsonify({ "result":result, |
62 | "image": base64.b64encode(output.getvalue()).decode("ascii"), | 68 | "messages": liste_err[1], |
63 | "export_txt": texte}) | 69 | "image": base64.b64encode(output.getvalue()).decode("ascii"), |
70 | "export_txt": texte}) | ||
71 | else: | ||
72 | reponse = flask.jsonify({ "result":result, | ||
73 | "messages": liste_err[1]+liste_err[0], | ||
74 | "image": "", | ||
75 | "export_txt": texte}) | ||
64 | return reponse | 76 | return reponse |
65 | #return flask.Response(base64.b64encode(output.getvalue()), mimetype='text/plain') | 77 | #return flask.Response(base64.b64encode(output.getvalue()), mimetype='text/plain') |
66 | elif ext == "png": | 78 | elif ext == "png" and result == "success": |
67 | return flask.Response(output.getvalue(), mimetype='image/png') | 79 | return flask.Response(output.getvalue(), mimetype='image/png') |
80 | elif ext == "png": | ||
81 | return flask.render_template("erreur_fatale.html",erreur="Impossible de générer la courbe") | ||
68 | else: | 82 | else: |
69 | return flask.render_template("erreur_fatale.html",erreur="Le type d'image demandé n'est pas reconnu") | 83 | return flask.render_template("erreur_fatale.html",erreur="Le type d'image demandé n'est pas reconnu") |
70 | 84 | ||
@@ -92,6 +106,13 @@ def faq(): | |||
92 | 106 | ||
93 | return flask.render_template("faq.html",lcateg=l_categ,tableqr=table_qr,err=[]) | 107 | return flask.render_template("faq.html",lcateg=l_categ,tableqr=table_qr,err=[]) |
94 | 108 | ||
109 | @app.route("/changelog") | ||
110 | def changelog(): | ||
111 | |||
112 | table_version = lire_fichier_csv_simple(fichier_changelog) | ||
113 | |||
114 | return flask.render_template("changelog.html",table = table_version,err=[]) | ||
115 | |||
95 | 116 | ||
96 | if __name__ == "__main__": | 117 | if __name__ == "__main__": |
97 | app.run(host='0.0.0.0',debug=True) \ No newline at end of file | 118 | app.run(host='0.0.0.0',debug=True) \ No newline at end of file |