From 4ac8da1e8f41f3219c545aef08e098c6eedf2052 Mon Sep 17 00:00:00 2001 From: Son Date: Tue, 4 Jan 2022 16:24:50 +0100 Subject: [PATCH] poll messages on the phone reservation page --- app/phone/views/phone_reservation.py | 8 +-- templates/phone/phone_reservation.html | 79 ++++++++++++++++++++------ 2 files changed, 62 insertions(+), 25 deletions(-) diff --git a/app/phone/views/phone_reservation.py b/app/phone/views/phone_reservation.py index 21a9a7db..949bcb97 100644 --- a/app/phone/views/phone_reservation.py +++ b/app/phone/views/phone_reservation.py @@ -3,7 +3,7 @@ from flask import render_template, flash, redirect, url_for, request from flask_login import login_required, current_user from app.db import Session -from app.models import PhoneReservation, PhoneMessage, User +from app.models import PhoneReservation, User from app.phone.base import phone_bp current_user: User @@ -18,11 +18,6 @@ def reservation_route(reservation_id: int): return redirect(url_for("phone.index")) phone_number = reservation.number - messages = PhoneMessage.filter( - PhoneMessage.number_id == phone_number.id, - PhoneMessage.created_at > reservation.start, - PhoneMessage.created_at < reservation.end, - ).all() if request.method == "POST": if request.form.get("form-name") == "release": @@ -43,6 +38,5 @@ def reservation_route(reservation_id: int): "phone/phone_reservation.html", phone_number=phone_number, reservation=reservation, - messages=messages, now=arrow.now(), ) diff --git a/templates/phone/phone_reservation.html b/templates/phone/phone_reservation.html index ebf4c8e3..cbdb4c36 100644 --- a/templates/phone/phone_reservation.html +++ b/templates/phone/phone_reservation.html @@ -32,29 +32,34 @@
-
+

Received Messages

-
Please refresh the page to have the latest messages
- - - - - - - - - - {% for message in messages %} +
+ Loading ... +
+
+
FromTimeMessage
+ - - - + + + - {% endfor %} - -
{{ message.from_number }}{{ message.created_at.humanize() }}{{ message.body }}FromTimeMessage
+ + + + + + [[ message.from_number ]] + [[ message.created_at ]] + [[ message.body ]] + + + + +
@@ -72,9 +77,47 @@ {% endif %} +{% endblock %} +{% block script %} + {% endblock %}