Merge pull request #35 from atangent/fix-date-input

Change expiry date inputs to text inputs

qa327/frontend.py

@@ -271,17 +271,20 @@ def does_user_have_sufficient_balance(user_balance, ticket_price):
 
 @app.route('/update', methods=['POST'])
 def updateticket():
+    message = ""
+
     ticket_id = request.form['ticket_id']
     ticket_name = request.form['name']
     ticket_quantity = int(request.form['quantity'])
     ticket_price = float(request.form['price'])
     ticket_date = request.form['date']
-    ticket_date = datetime.datetime.strptime(ticket_date, '%Y-%m-%d')
+    try:
+        ticket_date = datetime.datetime.strptime(ticket_date, '%Y%m%d')
+    except ValueError:
+        message = "Invalid date format. Please use the format YYYMMDD, i.e. 20200421."
     user_email = request.form['user']
     user = bn.get_user(user_email)
 
-    message = ""
-
     # check ticket exists
     if not does_ticket_exist(ticket_id):
         message = "Ticket not found."
@@ -328,16 +331,19 @@ def buyticket():
 
 @app.route('/sell', methods=['POST'])
 def sellticket():
+    message = ""
+
     ticket_name = request.form['name']
     ticket_quantity = int(request.form['quantity'])
     ticket_price = float(request.form['price'])
     ticket_date = request.form['date']
-    ticket_date = datetime.datetime.strptime(ticket_date, '%Y-%m-%d')
+    try:
+        ticket_date = datetime.datetime.strptime(ticket_date, '%Y%m%d')
+    except ValueError:
+        message = "Invalid date format. Please use the format YYYMMDD, i.e. 20200421."
     user_email = request.form['user']
     user = bn.get_user(user_email)
 
-    message = ""
-
     # check name
     if not is_ticket_name_valid(ticket_name):
         message = "Ticket name is invalid."

qa327/templates/index.html

@@ -62,7 +62,7 @@ <h2>Add new ticket to sell</h2>
     Name: <input id="sell_name" type="text" name="name"/><br/>
     Quantity: <input id="sell_quantity" type="number" name="quantity"/><br/>
     Price: <input id="sell_price" type="number" name="price"/><br/>
-    Expiration Date: <input id="sell_exp_date" type="date" name="date"/><br/>
+    Expiration Date (YYYMMDD): <input id="sell_exp_date" type="text" name="date"/><br/>
     <input type="hidden" value="{{ user.email }}" name="user"/>
     <input id="sell_submit" type="submit"/>
 </form>
@@ -73,7 +73,7 @@ <h2>Buy tickets</h2>
     Name: <input disabled id="buy_name" type="text" name="name"/><br/>
     Quantity: <input disabled id="buy_quantity" type="number" name="quantity"/><br/>
     Price: <input disabled id="buy_price" type="number" name="price"/><br/>
-    Expiration Date: <input disabled id="buy_exp_date" type="date" name="date"/><br/>
+    Expiration Date (YYYMMDD): <input disabled id="buy_exp_date" type="text" name="date"/><br/>
     <input type="hidden" value="{{ user.email }}" name="user"/>
     <input id="buy_submit" type="submit" value="Buy"/>
 </form>
@@ -84,7 +84,7 @@ <h2>Edit ticket</h2>
     Name: <input id="update_name" type="text" name="name"/><br/>
     Quantity: <input id="update_quantity" type="number" name="quantity"/><br/>
     Price: <input id="update_price" type="number" name="price"/><br/>
-    Expiration Date: <input id="update_exp_date" type="date" name="date"/><br/>
+    Expiration Date (YYYMMDD): <input id="update_exp_date" type="text" name="date"/><br/>
     <input type="hidden" value="{{ user.email }}" name="user"/>
     <input type="submit" value="Save"/>
 </form>

qa327_test/integration/buy/test_buy_user_walk_through.py

@@ -32,7 +32,7 @@ def sell_ticket(self):
         self.type("#sell_name", "Avengers")
         self.type("#sell_quantity", "3")
         self.type("#sell_price", "35")
-        self.type("#sell_exp_date", "2022\t12-20")
+        self.type("#sell_exp_date", "20221220")
         self.click("#sell_submit")
 
     def logout(self):

qa327_test/integration/sell/test_sell_user_walk_through.py

@@ -32,7 +32,7 @@ def sell_ticket(self):
         self.type("#sell_name", "Avengers")
         self.type("#sell_quantity", "3")
         self.type("#sell_price", "35")
-        self.type("#sell_exp_date", "2022\t12-20")
+        self.type("#sell_exp_date", "20221220")
         self.click("#sell_submit")
 
     def test_sell_ticket(self):