From 42dbc8e1b47aa8dfbf8034f10cca8352c3cc624c Mon Sep 17 00:00:00 2001 From: Pierrick C Date: Sun, 1 Oct 2017 09:23:50 +0200 Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20jour=20chemin=20vers=20les=20te?= =?UTF-8?q?mplate=20Jinja=20renomm=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- raspberry/python/interface.py | 44 +++++++++---------- .../python/templates/config_page.html.j2 | 6 +-- raspberry/python/templates/data_graph.html.j2 | 6 +-- raspberry/python/templates/data_viz.html.j2 | 6 +-- raspberry/python/templates/index.html.j2 | 4 +- raspberry/python/templates/photos.html.j2 | 4 +- 6 files changed, 35 insertions(+), 35 deletions(-) diff --git a/raspberry/python/interface.py b/raspberry/python/interface.py index 074797f..82010b1 100755 --- a/raspberry/python/interface.py +++ b/raspberry/python/interface.py @@ -29,7 +29,7 @@ bootstrap = Bootstrap(app) nav = Nav() nav.init_app(app) -navbar = Navbar('Camétéo', +navbar = Navbar('Camétéo', View('Accueil', 'index'), View('Toutes les données', 'all_data'), Subgroup('Par données', @@ -39,7 +39,7 @@ navbar = Navbar('Camétéo', View("Pression atmosphérique (mer)", 'by_data_type', dt='MSLP'), View("Altitude", 'by_data_type', dt='ALTI'), ), - Subgroup('Par capteur', + Subgroup('Par capteur', View("Capteur BME280", 'by_sensor', sens = 'AdaBME280_1') ), Subgroup('Photos', @@ -48,7 +48,7 @@ navbar = Navbar('Camétéo', ), View('Configuration', 'config_page') ) - + nav.register_element('top', navbar) js_resources = INLINE.render_js() @@ -56,7 +56,7 @@ css_resources = INLINE.render_css() @app.route('/') def index(): - return render_template('index.tpl') + return render_template('index.html.j2') @app.route('/picture=') def picture(num): @@ -67,23 +67,23 @@ def picture(num): if num > pictures.count()-1: num = pictures.count()-1 pict = pictures[num] - return render_template('photos.tpl', picture_path = os.path.join("static/photos", pict.file_name), numero = num ) + return render_template('photos.html.j2', picture_path = os.path.join("static/photos", pict.file_name), numero = num ) @app.route('/all_data') def all_data(): date_deb = datetime.utcnow()-timedelta(seconds=3600) res = Data.query.filter(Data.dbdate >= date_deb) - return render_template('data_viz.tpl', dat=res.order_by(Data.dbdate.desc()).paginate(per_page=15)) - + return render_template('data_viz.html.j2', dat=res.order_by(Data.dbdate.desc()).paginate(per_page=15)) + @app.route('/type_id=
') def by_data_type(dt): date_deb = datetime.utcnow()-timedelta(seconds=3600) #Récupération des données à afficher res = Data.query.filter(Data.type_id == dt).filter(Data.dbdate >= date_deb).order_by(Data.valdate) - + plot_data = ColumnDataSource(data=dict(x = res.values('valdate'), y = res.values('value'))) - - #Préparation du graphique + + #Préparation du graphique data_plot = figure(tools = TOOLS, title = dt, x_axis_label = 'Date', @@ -93,31 +93,31 @@ def by_data_type(dt): plot_width = 800, ) data_plot.line('x', 'y', source=plot_data, line_width=2) - + script, div = components(data_plot) - - return render_template('data_graph.tpl', dat=res.order_by(Data.dbdate.desc()).paginate(per_page=15), - plot_script=script, + + return render_template('data_graph.html.j2', dat=res.order_by(Data.dbdate.desc()).paginate(per_page=15), + plot_script=script, plot_div=div, js_resources=js_resources, css_resources=css_resources, ) - + @app.route('/sensor_id=') def by_sensor(sens): date_deb = datetime.utcnow()-timedelta(seconds=3600) res = Data.query.filter(Data.sensor_id == sens).filter(Data.dbdate >= date_deb) - return render_template('data_viz.tpl', dat=res.order_by(Data.dbdate.desc()).paginate(per_page=15)) - + return render_template('data_viz.html.j2', dat=res.order_by(Data.dbdate.desc()).paginate(per_page=15)) + @app.route('/configuration', methods=['GET', 'POST']) def config_page(): - + if request.method == 'POST': pass else: pass - - return render_template('config_page.tpl') - + + return render_template('config_page.html.j2') + if __name__=="__main__": - app.run(host="0.0.0.0") \ No newline at end of file + app.run(host="0.0.0.0") diff --git a/raspberry/python/templates/config_page.html.j2 b/raspberry/python/templates/config_page.html.j2 index cb64e99..62c774a 100644 --- a/raspberry/python/templates/config_page.html.j2 +++ b/raspberry/python/templates/config_page.html.j2 @@ -1,9 +1,9 @@ -{% extends "base.tpl" %} +{% extends "base.html.j2" %} {% block title %}Camétéo{% endblock %} {% block content %}
- +
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/raspberry/python/templates/data_graph.html.j2 b/raspberry/python/templates/data_graph.html.j2 index 6a4552a..f1468c1 100644 --- a/raspberry/python/templates/data_graph.html.j2 +++ b/raspberry/python/templates/data_graph.html.j2 @@ -1,4 +1,4 @@ -{% extends "base.tpl" %} +{% extends "base.html.j2" %} {% block title %}Camétéo{% endblock %} {% block styles %} @@ -35,7 +35,7 @@ {{ item.value }} {{ item.unit }} {{ item.sensor_id }} - {%- endfor %} + {%- endfor %} {{ render_pagination(dat) }} @@ -43,4 +43,4 @@ {{ plot_script|safe }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/raspberry/python/templates/data_viz.html.j2 b/raspberry/python/templates/data_viz.html.j2 index dc70781..6619121 100644 --- a/raspberry/python/templates/data_viz.html.j2 +++ b/raspberry/python/templates/data_viz.html.j2 @@ -1,4 +1,4 @@ -{% extends "base.tpl" %} +{% extends "base.html.j2" %} {% block title %}Camétéo{% endblock %} {% block content %} @@ -28,10 +28,10 @@ {{ item.value }} {{ item.unit }} {{ item.sensor_id }} - {%- endfor %} + {%- endfor %} {{ render_pagination(dat) }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/raspberry/python/templates/index.html.j2 b/raspberry/python/templates/index.html.j2 index 55be6dd..d58a951 100644 --- a/raspberry/python/templates/index.html.j2 +++ b/raspberry/python/templates/index.html.j2 @@ -1,4 +1,4 @@ -{% extends "base.tpl" %} +{% extends "base.html.j2" %} {% block title %}Camétéo{% endblock %} {% block content %} @@ -11,4 +11,4 @@

Voir les données...

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/raspberry/python/templates/photos.html.j2 b/raspberry/python/templates/photos.html.j2 index f7fa1cb..cad829c 100644 --- a/raspberry/python/templates/photos.html.j2 +++ b/raspberry/python/templates/photos.html.j2 @@ -1,4 +1,4 @@ -{% extends "base.tpl" %} +{% extends "base.html.j2" %} {% block title %}Camétéo - Photos{% endblock %} {% block content %} @@ -11,4 +11,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %}