From d776fd78ad5464dbcadf1fa654bb621eab1184f7 Mon Sep 17 00:00:00 2001
From: jakobsn <jakob_sn_@hotmail.com>
Date: Thu, 28 Nov 2019 15:42:54 +0100
Subject: [PATCH] Remove phone number field

---
 mysql/sql/init.sql         | 1 -
 src/app/models/register.py | 8 ++++----
 src/app/views/forms.py     | 1 -
 src/app/views/register.py  | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/mysql/sql/init.sql b/mysql/sql/init.sql
index a8a8231..81414cd 100644
--- a/mysql/sql/init.sql
+++ b/mysql/sql/init.sql
@@ -6,7 +6,6 @@ CREATE TABLE users (
   full_name VARCHAR(200) NOT NULL,
   company VARCHAR(50),
   email VARCHAR(50) NOT NULL,
-  phone_number VARCHAR(50),
   street_address VARCHAR(50),
   city VARCHAR(50),
   state VARCHAR(50),
diff --git a/src/app/models/register.py b/src/app/models/register.py
index be0221c..0a00582 100644
--- a/src/app/models/register.py
+++ b/src/app/models/register.py
@@ -8,7 +8,7 @@ def set_user(username, password, full_name, company, email, phone_number,
         :param password: The password
         :param full_name: The users full name
         :param company: The company the user represents
-        :param phone_number: The phone number of the user
+        :param email: The users email address
         :param street_address: The street address of the user
         :param city: The city where the user lives
         :param state: The state where the user lives
@@ -18,7 +18,7 @@ def set_user(username, password, full_name, company, email, phone_number,
         :type password: str
         :type full_name: str
         :type company: str
-        :type phone_number: str
+        :type email: str
         :type street_address: str
         :type city: str
         :type state: str
@@ -28,8 +28,8 @@ def set_user(username, password, full_name, company, email, phone_number,
     cursor = db.cursor()
     query = ("INSERT INTO users VALUES (NULL, \"" + username + "\", \"" + 
         password + "\", \"" + full_name + "\" , \"" + company + "\", \"" + 
-        email + "\", \"" + phone_number + "\", \"" + street_address + "\", \"" + 
-        city + "\", \"" + state  + "\", \"" + postal_code + "\", \"" + country + "\")")
+        email + "\", \"" + street_address + "\", \"" + city + "\", \"" + 
+        state  + "\", \"" + postal_code + "\", \"" + country + "\")")
     cursor.execute(query)
     db.commit()
     cursor.close()
diff --git a/src/app/views/forms.py b/src/app/views/forms.py
index f5d6720..25ae338 100644
--- a/src/app/views/forms.py
+++ b/src/app/views/forms.py
@@ -20,7 +20,6 @@ register_form = form.Form(
     form.Textbox("full_name", description="Full name"),
     form.Textbox("company", description="Company"),
     form.Textbox("email", vemail, description="Email Address"),
-    form.Textbox("phone_number", description="Phone Number"),
     form.Textbox("street_address", description="Street address"),
     form.Textbox("city", description="City"),
     form.Textbox("state", description="State"),
diff --git a/src/app/views/register.py b/src/app/views/register.py
index 287fd38..2d6c807 100644
--- a/src/app/views/register.py
+++ b/src/app/views/register.py
@@ -37,7 +37,7 @@ class Register:
             return render.register(nav, r, "All fields must be valid.")
 
         models.register.set_user(data.username, hashlib.md5(b'TDT4237' + data.password.encode('utf-8')).hexdigest(), 
-        data.full_name, data.email, data.company, data.phone_number, data.street_address, 
+        data.full_name, data.company, data.phone_number, data.street_address, 
         data.city, data.state, data.postal_code, data.country)
         message += "User registered!"