fixed some more todo items

Author: Hila Manalai

config/config.yaml

@@ -33,7 +33,7 @@ roles:
 
 sys:
   debug: True
-  host: "0.0.0.0" #TODO: change this to the user's IP.
+  host: 0.0.0.0 #TODO: change this to the user's IP.
   port: 8080
 
 # Color Codes
@@ -129,8 +129,8 @@ export:
   path: "application/reports/"
 
 DEBUG:
-  #user: "ballz" #admin
+  user: "heggens" # default user - admin
+  # user: "ballz" #admin
   # user: "hooverk" #systemAdmin
   # user: "thakurr" #superUser
   # user: "williamsk" #systemUser
-  user: "heggens" #unnapproved systemUser #TODO: This should be the default user

reset-db.py

@@ -4,6 +4,7 @@
 from application.models import classes
 from application.config import *
 from application.models import *
+from application.models.usersModel import Users
 import datetime
 
 def init_db ():
@@ -24,5 +25,18 @@ def init_db ():
   for c in classes:
     c.create_table(True)
 
+  # Create a Users entry in the database for Scott Heggen as the admin
+  # The database written to is inventory.sqlite
+  (Users.create(username="heggens",
+    first_name="Scott",
+    last_name="Heggen",
+    auth_level="admin",
+    emailadd="[email protected]",
+    approve=True,
+    created_date=2022-01-31,
+    end_date=2025-01-30,
+    reportto="Idk",
+    created_by="heggens"))
+
 if __name__ == "__main__":
   init_db()

setup.sh

@@ -4,6 +4,7 @@
 # exporting these variables into the shell environment before
 # sourcing this script. If these variables exist before this
 # script is sourced, then the pre-existing values will be used.
+WERKZEUG_VERSION="${WERKZEUG_VERSION:-0.16.0}"
 FLASK_VERSION="${FLASK_VERSION:-0.12.1}"
 WTFORMS_VERSION="${WTFORMS_VERSION:-2.1}"
 FLASK_SESSION_VERSION="${FLASK_SESSION_VERSION:-0.2.3}"
@@ -39,10 +40,10 @@ fi
 # Check for correct python version
 VERSION=`python2 --version | awk '{print $2}'`
 if [ "${VERSION:0:1}" -ne "2" ] || [ "${VERSION:2:1}" -ne "7" ] ; then
-	     echo " You must use Python 2.7. You are using $VERSION "
+	     echo "You must use Python 2.7. You are using $VERSION"
 	     return 1
 else
-	echo -e " You are using Python $VERSION "
+	echo -e "You are using Python $VERSION"
 fi
 
 # Create and activate a clean virtual environment.
@@ -59,6 +60,7 @@ pip install --upgrade pip
 
 # Install specific versions of libraries to avoid
 # different behaviors of applications over time.
+pip install "werkzeug==$WERKZEUG_VERSION"
 
 pip install "flask==$FLASK_VERSION" #0.12.1
 # http://flask.pocoo.org/
@@ -89,13 +91,3 @@ pip install "openpyxl==$OPENPYXL_VERSION" #2.4.5
 
 pip install "unidecode==$UNIDECODE_VERSION" #0.4.20
 # https://pypi.python.org/pypi/Unidecode
-
-#TODO: A better approach to dealing with this would be to figure out what causes the
-# werkzeug version to be 1.x.x
-# I believe it is python version because I get this while uninstalling
-
-# /home/manalaih_ssdt/chemical-inventory/venv/lib/python2.7/site-packages/Werkzeug-1.0.1.dist-info/*
-# /home/manalaih_ssdt/chemical-inventory/venv/lib/python2.7/site-packages/werkzeug/*
-
-pip uninstall "werkzeug"
-pip install "werkzeug==0.16.0"