From e5c6977183c3bf0b813e61aa29b827ee4701d080 Mon Sep 17 00:00:00 2001
From: kawther-adam <91793772+kawther-adam@users.noreply.github.com>
Date: Sat, 20 Jan 2024 12:09:47 +0000
Subject: [PATCH 1/3] Code change on ADD DELIVERY DATE

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

diff --git a/app.py b/app.py
index 50f4e29d..940114c1 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,7 +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()
 
@@ -98,7 +99,8 @@ def add_order():
         product_code=product_code,
         product_quantity=product_quantity,
         order_date=order_date,
-        shipping_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..05b435d6 100644
--- a/templates/orders.html
+++ b/templates/orders.html
@@ -40,6 +40,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 +74,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>

From 7545838e775f9586d0eac2e0c122fd00d2a07227 Mon Sep 17 00:00:00 2001
From: kawther-adam <91793772+kawther-adam@users.noreply.github.com>
Date: Sat, 20 Jan 2024 14:23:49 +0000
Subject: [PATCH 2/3] Revert changes

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

diff --git a/app.py b/app.py
index 940114c1..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,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,8 +98,7 @@ def add_order():
         product_code=product_code,
         product_quantity=product_quantity,
         order_date=order_date,
-        shipping_date=
-        delivery_date=delivery_date
+        shipping_date=shipping_date
     )
 
     # Add the new order to the session and commit to the database
diff --git a/templates/orders.html b/templates/orders.html
index 05b435d6..9372e2d0 100644
--- a/templates/orders.html
+++ b/templates/orders.html
@@ -40,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>
@@ -74,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">Delivery Date:</label>
-                <input type="date" id="delivery_date" name="delivery_date"><br><br> 
                 <input type="submit" value="Add Order">
             </form>
         </div>

From b4ee80b885cd64f9efde156226974905677b671a Mon Sep 17 00:00:00 2001
From: kawther-adam <91793772+kawther-adam@users.noreply.github.com>
Date: Sat, 20 Jan 2024 14:26:41 +0000
Subject: [PATCH 3/3] revert changes

---
 templates/orders.html | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/templates/orders.html b/templates/orders.html
index 9372e2d0..11aef8ac 100644
--- a/templates/orders.html
+++ b/templates/orders.html
@@ -21,14 +21,6 @@ <h2 class="tab-title">Order List</h2>
                     <tr>
                         <th>Date UUID</th>
                         <th>User ID</th>
-                        <th>Card Number</th>
-                        <th>Store Code</th>
-                        <th>Product Code</th>
-                        <th>Product Quantity</th>
-                        <th>Order Date</th>
-                        <th>Shipping Date</th>
-                    </tr>
-                </thead>
                 <tbody>
                     {% for order in orders %}
                         <tr>