autos working!

app/models/auto.py

@@ -1,12 +1,22 @@
 from sqlalchemy import (Column, Integer,
         DECIMAL, TEXT,
-        VARCHAR, TIMESTAMP, DATE, INTEGER)
+        VARCHAR, DATE, INTEGER)
 from datetime import datetime
 from database import  Base
 
 
 
 
+class Auto_Update(Base):
+    __tablename__ = 'auto_update'
+
+    id = Column(Integer,
+                   primary_key=True,
+                   autoincrement=True,
+                   unique=False)
+
+    last_updated = Column(DATE())
+
 
 class Auto_Temp(Base):
     __tablename__ = 'auto_temp'
@@ -16,7 +26,7 @@ class Auto_Temp(Base):
                    autoincrement=True,
                    unique=False)
 
-    todays_date = Column(TIMESTAMP(), default=datetime.utcnow())
+    todays_date = Column(DATE)
     temp = Column(DECIMAL(5, 2))
     temp_max = Column(DECIMAL(5, 2))
     temp_min = Column(DECIMAL(5, 2))
@@ -40,11 +50,37 @@ class Auto_Delivery(Base):
     customer_address = Column(VARCHAR(1000))
     customer_zip = Column(VARCHAR(25))
     customer_full_name = Column(VARCHAR(250))
-    last_fill = Column(TIMESTAMP())
-    last_updated = Column(TIMESTAMP())
-    estimated_gallons_left = Column(INTEGER())
-    estimated_gallons_left_prev_day = Column(INTEGER())
+    last_fill = Column(DATE())
+    days_since_last_fill =  Column(INTEGER())
+    last_updated = Column(DATE())
+    estimated_gallons_left = Column(DECIMAL(6, 2))
+    estimated_gallons_left_prev_day = Column(DECIMAL(6, 2))
     tank_height = Column(VARCHAR(25))
     tank_size = Column(VARCHAR(25))
     house_factor = Column(DECIMAL(5, 2))
-    auto_status =  Column(INTEGER())
+    auto_status =  Column(INTEGER())
+
+
+class Tickets_Auto_Delivery(Base):
+    __tablename__ = 'auto_tickets'
+    
+    id = Column(Integer,
+                   primary_key=True,
+                   autoincrement=True,
+                   unique=False)
+    customer_id =  Column(INTEGER())
+    account_number = Column(VARCHAR(25))
+
+    customer_town = Column(VARCHAR(140))
+    customer_state = Column(Integer)
+    customer_address = Column(VARCHAR(1000))
+    customer_zip = Column(VARCHAR(25))
+    customer_full_name = Column(VARCHAR(250))
+    customer_zip = Column(VARCHAR(25))
+
+    oil_prices_id = Column(INTEGER())
+
+    gallons_delivered = Column(DECIMAL(6, 2))
+    price_per_gallon = Column(DECIMAL(6, 2))
+
+    total_amount_customer = Column(DECIMAL(6, 2))

app/models/cards.py

@@ -1,8 +1,8 @@
 
 from sqlalchemy import (Column, Integer,
-        DECIMAL, Text, BOOLEAN,
-        VARCHAR, TIMESTAMP,
-        Date, INTEGER)
+        DECIMAL, BOOLEAN, DATE,
+        VARCHAR, 
+         INTEGER)
 from datetime import datetime, timezone
 from database import  Base
 
@@ -16,7 +16,7 @@ class Card_Card(Base):
                    primary_key=True,
                    autoincrement=True,
                    unique=False)
-    date_added = Column(TIMESTAMP(), default=datetime.utcnow())
+    date_added = Column(DATE())
     user_id = Column(INTEGER())
     card_number = Column(VARCHAR(50))
     last_four_digits = Column(INTEGER())

app/models/customer.py

@@ -1,7 +1,7 @@
 from sqlalchemy import (Column, Integer,
-        DECIMAL, Text,
-        VARCHAR, TIMESTAMP,
-        Date, INTEGER)
+        DECIMAL, 
+        VARCHAR,
+        DATE, INTEGER)
 from datetime import datetime, timezone
 from database import  Base
 
@@ -20,7 +20,7 @@ class Customer_Customer(Base):
     customer_town = Column(VARCHAR(140))
     customer_state = Column(INTEGER)
     customer_zip = Column(VARCHAR(25))
-    customer_first_call = Column(TIMESTAMP())
+    customer_first_call = Column(DATE())
     customer_email = Column(VARCHAR(500))
     customer_automatic = Column(INTEGER)
     customer_phone_number = Column(VARCHAR(25))

app/models/delivery.py

@@ -26,8 +26,8 @@ class Delivery(Base):
     customer_filled = Column(INTEGER)
   
     delivery_status = Column(INTEGER)
-    when_ordered = Column(TIMESTAMP(), default=datetime.datetime.utcnow())
-    when_delivered = Column(TIMESTAMP(), default=None)
+    when_ordered = Column(DATE(), )
+    when_delivered = Column(DATE())
     expected_delivery_date = Column(DATE(), default=None)
     automatic = Column(INTEGER)
     automatic_id = Column(INTEGER)