Fixed DatePicker issue #129. Issue was in sortPost.py, any input date was being reset as the current date.

Author: ZachBall

.gitignore

@@ -8,3 +8,4 @@ data/inventory.sqlite
 .~c9*
 *.sqlite-shm
 *.sqlite-wal
+.cache/

application/controllers/allCont/ContainerInfoController.py

@@ -42,7 +42,10 @@ def maContainerInfo(chemId, barcodeId):
       data = request.form
       cont = getContainer(barcodeId)
       updateHistory(cont, "Checked Out", data['storageId'], user)
-      changeLocation(cont, True, data) #This line is causing issues because the container info page checkout is different from the snip
+      status = False
+      if data['formName'] == 'checkOutForm':
+        status = True
+      changeLocation(cont, status, data, user.username) #This line is causing issues because the container info page checkout is different from the snip
       # add form data to container as checked out
       return redirect('/ViewChemical/%s/' %(chemId))
       # Find a way to combine these

application/logic/sortPost.py

@@ -34,8 +34,7 @@ def sortPost( data, model):
       field_type = getattr(instance, "db_field")
       if field_type == "datetime":
         fixed_date = convert_to_datetime(data[key])
-        fixed_date_string = datetime.date.today()
-        model_data[key] = fixed_date_string
+        model_data[key] = fixed_date
       elif field_type == bool:
         model_data[key] = bool(data[key])
       else:
@@ -46,4 +45,4 @@ def sortPost( data, model):
   return ( model_data, extra_data )
 
 def convert_to_datetime(dateString):
-  datetime_object = datetime.datetime.strptime(dateString, '%Y-%m-%d')
+  return datetime.datetime.strptime(dateString, '%Y-%m-%d').date()

application/models/containersModel.py

@@ -32,7 +32,7 @@ def getContainer(barcode):
   """Returns a Containers object with the given barcode"""
   return Containers.get(Containers.barcodeId == barcode)
 
-def changeLocation(cont, status, data):
+def changeLocation(cont, status, data, user):
   """Used to check containers in and out
   
   Args:
@@ -45,9 +45,9 @@ def changeLocation(cont, status, data):
   if status: # True if checking out
     cont.storageId = data['storageId']
     cont.checkedOut = status
-    cont.checkOutReason = data['forClass']
+    cont.checkOutReason = data['class']
     cont.forProf = data['forProf']
-    cont.checkedOutBy = data['user']
+    cont.checkedOutBy = user
     cont.save()
   else: # Checking in
     cont.storageId = data['storageId']

application/models/usersModel.py

@@ -1,5 +1,6 @@
 from application.models.util import *
 from application.logic.sortPost import *
+import pytest
 
 class Users (Model):
     userId       = PrimaryKeyField()
@@ -15,6 +16,18 @@ class Users (Model):
     class Meta:
         database = getDB("inventory", "dynamic")
 
+def getUsers(username = None):
+    if username != None:
+        return Users.get(Users.username == username)
+    else:
+        return Users.select()
+        
+@pytest.fixture
+def getUsersTest():
+    assert type(getUsers('ballz')) is Users
+    from peewee import SelectQuery
+    assert type(getUsers()) is SelectQuery
+
 def createUser(data, createdBy, approval, authLevel = "systemUser"):
     """Used to check containers in and out
   
@@ -35,7 +48,7 @@ def createUser(data, createdBy, approval, authLevel = "systemUser"):
     if 'auth_level' not in modelData:
         modelData['auth_level'] = authLevel
     # Peewee has a get_or_create function. Would that be more useful than putting this in a try/except?
-    if modelData['end_date'] >= datetime.date.today():
+    if modelData['end_date'] <= datetime.date.today():
         return("Error: User could not be added. End Date must be later than today.", 'list-group-item list-group-item-danger')
     try:
         Users.create(**modelData)

application/test/test_queries.py

@@ -0,0 +1,2 @@
+def test_fixture(): #Need a new 'def test_*():' for every test you wish to run
+    pytest.mark.usefixtures(getUsersTest())

setup.sh

@@ -12,6 +12,7 @@ PEEWEE_VERSION="${PEEWEE_VERSION:-2.8.1}"
 WTF_PEEWEE_VERSION="${WTF_PEEWEE_VERSION:-0.2.6}"
 PYYAML_VERSION="${PYYAML_VERSION:-3.11}"
 CONFIGURE_VERSION="${CONFIGURE_VERSION:-0.5}"
+PYTEST_VERSION="${PYTEST_VERSION:-3.0.5}"
 
 # Check for virtualenv
 command -v virtualenv >/dev/null 2>&1 || { 
@@ -68,3 +69,6 @@ pip install -U "wtf-peewee==$WTF_PEEWEE_VERSION"
 
 pip install -U "configure==$CONFIGURE_VERSION"
 # http://configure.readthedocs.io/en/latest/#
+
+pip install -U "pytest==$PYTEST_VERSION"
+# http://docs.pytest.org/en/latest/

test.py

@@ -0,0 +1,10 @@
+def gcd(m, n, count=1):
+    if m%n == 0:
+        return(count)
+    else:
+        return gcd(n, m%n, count+1)
+
+for i in range(1, 10):
+    for r in range(1, 10):
+        print i, r
+        print gcd(i, r)