Merge remote-tracking branch 'origin/main'

# Conflicts:
#	main.py

src/server/SpritpreisAnalysis.py

@@ -0,0 +1,6 @@
+import psycopg2
+from src.db import *
+
+class SpritpreisAnalysis:
+    def __init__(self):
+        pass

src/webScraper/Spritpreise.py

@@ -185,3 +185,45 @@ class Spritpreise(DbEntity):
         return self
 
 
+    def createDb(self):
+        connection, cursor = self.__getDbConnection()
+        sql = ('CREATE SEQUENCE IF NOT EXISTS spritpreise_header_id_seq;\
+                \
+                -- Table Definition\
+                CREATE TABLE IF NOT EXISTS "public"."spritpreis_header" (\
+                    "id" int4 NOT NULL DEFAULT nextval(\'spritpreise_header_id_seq\'::regclass),\
+                    "name" text NOT NULL,\
+                    "street" text NOT NULL,\
+                    "city" text NOT NULL,\
+                    PRIMARY KEY ("id")\
+                );\
+                -- Indices\
+                CREATE UNIQUE INDEX IF NOT EXISTS spritpreise_header_pkey ON public.spritpreis_header USING btree (id);\
+                CREATE INDEX IF NOT EXISTS idx ON public.spritpreis_header USING btree (city) INCLUDE (city, street) WITH (deduplicate_items=\'false\');\
+               \
+               CREATE SEQUENCE IF NOT EXISTS spritpreis_position_id_seq;\
+                \
+                -- Table Definition\
+                CREATE TABLE IF NOT EXISTS "public"."spritpreis_position" (\
+                    "id" int4 NOT NULL DEFAULT nextval(\'spritpreis_position_id_seq\'::regclass),\
+                    "of_spritpreis_header" int4 NOT NULL,\
+                    "time" timestamptz NOT NULL,\
+                    "diesel_price" float4,\
+                    "e10_price" float4,\
+                    "e5_price" float4,\
+                    "super_plus_price" float4,\
+                    CONSTRAINT "foreign_idx" FOREIGN KEY ("of_spritpreis_header") REFERENCES "public"."spritpreis_header"("id") ON DELETE CASCADE,\
+                    PRIMARY KEY ("id")\
+                );\
+                -- Indices\
+                CREATE INDEX IF NOT EXISTS "fki_F" ON public.spritpreis_position USING btree (of_spritpreis_header);\
+                CREATE INDEX IF NOT EXISTS idx_time ON public.spritpreis_position USING btree ("time") WITH (deduplicate_items=\'true\');\
+                CREATE INDEX IF NOT EXISTS idx_diesel ON public.spritpreis_position USING btree (diesel_price) INCLUDE (diesel_price) WITH (deduplicate_items=\'true\');\
+                CREATE INDEX IF NOT EXISTS idx_e10 ON public.spritpreis_position USING btree (e10_price) WITH (deduplicate_items=\'true\');\
+                CREATE INDEX IF NOT EXISTS idx_e5 ON public.spritpreis_position USING btree (e5_price) WITH (deduplicate_items=\'true\');\
+                CREATE INDEX IF NOT EXISTS idx_super_plus ON public.spritpreis_position USING btree (super_plus_price) WITH (deduplicate_items=\'true\');')
+
+        cursor.execute(sql)
+
+        cursor.close()
+        connection.close()

www/js/main.js

@@ -22,4 +22,5 @@ new Chart("myChart", {
   options: {
     legend: {display: false}
   }
-});
+});
+// test