From da84f0ddb8aa69119fc0c1543ab7e3272a7d51e2 Mon Sep 17 00:00:00 2001
From: David Ansell <davidmdansell@hotmail.com>
Date: Sun, 28 Jan 2024 20:46:41 +0000
Subject: [PATCH] changes required to add delivery-date column

---
 .DS_Store             | Bin 0 -> 6148 bytes
 app.py                |   4 ++++
 templates/orders.html |   4 ++++
 3 files changed, 8 insertions(+)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..a119e2353a6d273e99193da8c1d47be4c22a3f1c
GIT binary patch
literal 6148
zcmeHKJFWsT4748<Jkd~6<_g>(LT~~uz`p{41oT^RE{?|dQ-BsaXwX=4CUHE8GR1l=
zB09dTM<N3e>A?-<YD3#>-@Iji8Brh{XY6DlXW7VUyKZH_4jA{}IeR%i@=vSf;jpu9
z8Wo@dRDcRl0V?o81+uvI`X4-#M^OPP@EZ!)_o2WIYhn}VpAHP(0sy-RyJ7CV1h7~D
zSQDE-L|__JU{Ez%3=KNsCG%=x6Bu;SY(6w^*6dK!Z^!w?(?x3_M=C%Co)zfCa$xm;
z3V+l8Ka;qk0#x9q6wvNuHW}kdSzB9=vszo=bGYT);AWUR1%sDkpqFDTtQ-$LDe{WV
Xv0oFLK&K<_bRd5QOcxpz__hLfWAhc3

literal 0
HcmV?d00001

diff --git a/app.py b/app.py
index 50f4e29d..bfc738a9 100644
--- a/app.py
+++ b/app.py
@@ -46,6 +46,8 @@ class Order(Base):
     product_quantity = Column('Product Quantity', Integer)
     order_date = Column('Order Date', DateTime)
     shipping_date = Column('Shipping Date', DateTime)
+    delivery_date = Column('Delivery Date', DateTime) #adds new column 'delivery date'
+    
 
 # define routes
 # route to display orders
@@ -85,6 +87,7 @@ def add_order():
     product_quantity = request.form.get('product_quantity')
     order_date = request.form.get('order_date')
     shipping_date = request.form.get('shipping_date')
+    delivery_date = request.form['delivery_date'] # includes delivery date in the form
     
     # Create a session to interact with the database
     session = Session()
@@ -99,6 +102,7 @@ def add_order():
         product_quantity=product_quantity,
         order_date=order_date,
         shipping_date=shipping_date
+        delivery_date=delivery_date #adds delivery date to the new order
     )
 
     # Add the new order to the session and commit to the database
diff --git a/templates/orders.html b/templates/orders.html
index 9372e2d0..b2103f74 100644
--- a/templates/orders.html
+++ b/templates/orders.html
@@ -27,6 +27,7 @@ <h2 class="tab-title">Order List</h2>
                         <th>Product Quantity</th>
                         <th>Order Date</th>
                         <th>Shipping Date</th>
+                        <th>Delivery Date</th> 
                     </tr>
                 </thead>
                 <tbody>
@@ -40,6 +41,7 @@ <h2 class="tab-title">Order List</h2>
                             <td>{{ order.product_quantity }}</td>
                             <td>{{ order.order_date }}</td>
                             <td>{{ order.shipping_date }}</td>
+                            <td>{{ order.delivery_date }}</td> 
                         </tr>
                     {% endfor %}
                 </tbody>
@@ -73,6 +75,8 @@ <h2 class="tab-title">Add New Order</h2>
                 <input type="text" id="order_date" name="order_date" required><br>
                 <label for="shipping_date">Shipping Date:</label>
                 <input type="text" id="shipping_date" name="shipping_date" required><br>
+                <label for="delivery_date">Delivery Date:</label> 
+                <input type="date" id="delivery_date" name="delivery_date"><br><br> 
                 <input type="submit" value="Add Order">
             </form>
         </div>