Changeset 617 in tmcsimulator for branches/LCSv1/controllers

Timestamp:

07/10/2020 02:16:04 PM (6 years ago)

Author:

jdalbey

Message:

Make branch for LCSv2

Location:

branches/LCSv1/controllers

Files:

• default.py (modified) (1 diff)
• default.py.bak (modified) (3 diffs)

branches/LCSv1/controllers/default.py

@@ -99 +99 @@
         # Each row contains a form with two buttons and columns with fields from database
         multiform.append(TR(TD(
-                    XML("<button class='submit-button' onclick=showPopup(\'"),statusfields,XML("\')>View History</button>"),BR(),
+                    XML("<button class='submit-button' onclick=\"showPopup(\'"),statusfields,XML("\')\">View History</button>"),BR(),
                     FORM(
                           INPUT(_type='submit',_name='btn2',_value='Show Status Form',_class="submit-button" ),

branches/LCSv1/controllers/default.py.bak

@@ -56 +56 @@
 def special_validation(form):
     # Error if a lognum was given and no closure id
-    if (len(form.vars.lognum) > 0 and len(form.vars.closureid = 0)):
+    if (len(form.vars.lognum) > 0 and len(form.vars.closureid) == 0):
        form.errors.lognum = 'Must provide a closureID when specifying a log number'
 # Show the item that was found in the search
@@ -79 +79 @@
         msg += "Start date = " + session.startdate
     if (len(session.enddate) != 0):
-        query = query & (db.closures.startdate <= session.enddate)
+        query = query & (db.closures.enddate <= session.enddate)
         msg += "End date = " + session.enddate
     
@@ -99 +99 @@
         # Each row contains a form with two buttons and columns with fields from database
         multiform.append(TR(TD(
-                    XML("<button class='submit-button' onclick=showPopup(\'"),statusfields,XML("\')>View History</button>"),BR(),
+                    XML("<button class='submit-button' onclick=showPopup(\""),statusfields,XML("\")>View History</button>"),BR(),
                     FORM(
                           INPUT(_type='submit',_name='btn2',_value='Show Status Form',_class="submit-button" ),