From 8c86d05184134fc9e2fe5a70f4ad17d0f5836338 Mon Sep 17 00:00:00 2001
From: philipptrenz <mail@philipptrenz.de>
Date: Thu, 8 Nov 2018 16:46:37 +0100
Subject: [PATCH] Fixed mixed intends

---
 sunportal.py     |  7 +++----
 util/database.py | 14 ++++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/sunportal.py b/sunportal.py
index 43efeab..ef131bb 100755
--- a/sunportal.py
+++ b/sunportal.py
@@ -1,13 +1,12 @@
 #!/usr/bin/python3
 """
 """
-import flask, json
-from flask import Flask, render_template, request, json, jsonify
+import flask
+from flask import Flask, render_template, request, jsonify
 
 from util.config import Config
-from util.mail import Mail
 from util.database import Database
-
+from util.mail import Mail
 
 config = Config()
 db = Database(config=config)
diff --git a/util/database.py b/util/database.py
index 47a9054..03e7092 100644
--- a/util/database.py
+++ b/util/database.py
@@ -1,8 +1,10 @@
 #!/usr/bin/python3
 """
 """
-import sqlite3, json, pytz
-from datetime import datetime, timedelta, timezone
+import pytz
+import sqlite3
+from datetime import datetime, timedelta
+
 
 class Database():
 
@@ -84,9 +86,9 @@ def get_requested_day(self, date):
 
         query = '''
             SELECT TimeStamp, SUM(Power) AS Power 
-			FROM DayData 
-			WHERE TimeStamp BETWEEN %s AND %s 
-			GROUP BY TimeStamp;
+            FROM DayData 
+            WHERE TimeStamp BETWEEN %s AND %s 
+            GROUP BY TimeStamp;
         '''
 
         data['data'] = list()
@@ -114,7 +116,7 @@ def get_requested_day(self, date):
 
         query = '''
             SELECT MIN(TimeStamp) as Min, MAX(TimeStamp) as Max 
-			FROM ( SELECT TimeStamp FROM DayData GROUP BY TimeStamp );
+            FROM ( SELECT TimeStamp FROM DayData GROUP BY TimeStamp );
             '''
 
         self.c.execute(query)