From 1b9baec1284e96e63d635d3e690eba47554afb57 Mon Sep 17 00:00:00 2001 From: nberting Date: Wed, 13 Jun 2018 23:09:43 +0200 Subject: [PATCH] changed datetime.utcnow() to datetime.now() to give local time --- app/models.py | 8 ++++---- app/templates/show_book_detail.html | 2 +- app/views.py | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/models.py b/app/models.py index 8c9e45c..076ca22 100755 --- a/app/models.py +++ b/app/models.py @@ -111,11 +111,11 @@ class Chat(db.Model): id = db.Column(db.Integer(), primary_key=True) message = db.Column(db.String(1000)) - time = Column(DateTime, default=datetime.datetime.utcnow) + time = Column(DateTime, default=datetime.datetime.now) def __init__(self, message): self.message = message - self.time = datetime.datetime.utcnow() + self.time = datetime.datetime.now() class Stack(db.Model): __tablename__ = 'stacks' @@ -138,11 +138,11 @@ class Potential(db.Model): __tablename__ = 'potential' id = db.Column(db.Integer, primary_key = True) ptitle = db.Column(db.String(50)) - time = db.Column(DateTime, default=datetime.datetime.utcnow()) + time = db.Column(DateTime, default=datetime.datetime.now()) def __init__(self, ptitle): self.ptitle = ptitle - self.time = datetime.datetime.utcnow() + self.time = datetime.datetime.now() class AuthorSchema(Schema): diff --git a/app/templates/show_book_detail.html b/app/templates/show_book_detail.html index 8014e15..8a273a7 100755 --- a/app/templates/show_book_detail.html +++ b/app/templates/show_book_detail.html @@ -128,7 +128,7 @@ {% endif %} {% endfor %} -{%else%}
No annotations yet for this book
+{%else%}
No annotations yet for this book
{%endif%}
diff --git a/app/views.py b/app/views.py index 0ddb453..4848d3b 100755 --- a/app/views.py +++ b/app/views.py @@ -572,7 +572,7 @@ def show_books(): socketio.emit('channel-' + str(1), { 'username': 'Search form', 'text': search.search.data, - 'time': str(datetime.datetime.utcnow().strftime("%d.%m.%Y %H:%M"))}, broadcast=True) + 'time': str(datetime.datetime.now().strftime("%d.%m.%Y %H:%M"))}, broadcast=True) # Save message my_new_chat = Chat(message=newmsg) db.session.add(my_new_chat) @@ -638,7 +638,7 @@ def search_results(searchtype, query, viewby): socketio.emit('channel-' + str(1), { 'username': 'Search form', 'text': search.search.data, - 'time': str(datetime.datetime.utcnow().strftime("%d.%m.%Y %H:%M"))}, broadcast=True) + 'time': str(datetime.datetime.now().strftime("%d.%m.%Y %H:%M"))}, broadcast=True) # Save message my_new_chat = Chat(message=newmsg) db.session.add(my_new_chat) @@ -885,7 +885,7 @@ def new_message(message): emit('channel-' + str(message['channel']), { 'username': message['username'], 'text': message['text'], - 'time': str(datetime.datetime.utcnow().strftime("%d.%m.%Y %H:%M")) + 'time': str(datetime.datetime.now().strftime("%d.%m.%Y %H:%M")) }, broadcast=True )