From a678ce3b84e96733a8da1546f76a473011f1f58e Mon Sep 17 00:00:00 2001
From: Samia-A-Mohamed <samiaamoham@gmail.com>
Date: Tue, 6 Feb 2024 20:00:07 +0000
Subject: [PATCH 1/2] addition of delivery column

---
 app.py                | 3 +++
 templates/orders.html | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/app.py b/app.py
index 50f4e29d..9134c260 100644
--- a/app.py
+++ b/app.py
@@ -46,6 +46,7 @@ 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)
 
 # define routes
 # route to display orders
@@ -85,6 +86,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'] 
     
     # Create a session to interact with the database
     session = Session()
@@ -99,6 +101,7 @@ def add_order():
         product_quantity=product_quantity,
         order_date=order_date,
         shipping_date=shipping_date
+        delivery_date=delivery_date
     )
 
     # Add the new order to the session and commit to the database
diff --git a/templates/orders.html b/templates/orders.html
index 9372e2d0..79e5a68c 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"></label>
+                <input type="date" id="delivery_date" name="delivery_date"><br><br>
                 <input type="submit" value="Add Order">
             </form>
         </div>

From 64f7cb0c65bc1ac04f8ac11e65c7495fbf1db2c1 Mon Sep 17 00:00:00 2001
From: Samia-A-Mohamed <samiaamoham@gmail.com>
Date: Tue, 6 Feb 2024 20:09:28 +0000
Subject: [PATCH 2/2] Revert "addition of delivery column"

This reverts commit a678ce3b84e96733a8da1546f76a473011f1f58e.

-m "revert the changes of addition of delivery date"
---
 app.py                | 3 ---
 templates/orders.html | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/app.py b/app.py
index 9134c260..50f4e29d 100644
--- a/app.py
+++ b/app.py
@@ -46,7 +46,6 @@ 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)
 
 # define routes
 # route to display orders
@@ -86,7 +85,6 @@ 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'] 
     
     # Create a session to interact with the database
     session = Session()
@@ -101,7 +99,6 @@ def add_order():
         product_quantity=product_quantity,
         order_date=order_date,
         shipping_date=shipping_date
-        delivery_date=delivery_date
     )
 
     # Add the new order to the session and commit to the database
diff --git a/templates/orders.html b/templates/orders.html
index 79e5a68c..9372e2d0 100644
--- a/templates/orders.html
+++ b/templates/orders.html
@@ -27,7 +27,6 @@ <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>
@@ -41,7 +40,6 @@ <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>
@@ -75,8 +73,6 @@ <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"></label>
-                <input type="date" id="delivery_date" name="delivery_date"><br><br>
                 <input type="submit" value="Add Order">
             </form>
         </div>