diff --git a/libraries/repositories/runs.py b/libraries/repositories/runs.py index 18e0b6c..52a4b35 100644 --- a/libraries/repositories/runs.py +++ b/libraries/repositories/runs.py @@ -1,6 +1,18 @@ # -*- coding: utf-8; -*- import registry as r +import json +import logging + +logger = logging.getLogger('run.data') + +fh = logging.FileHandler('run_logs.log') +fh.setLevel(logging.INFO) + +FORMAT = "%(message)s" +logging.basicConfig(format=FORMAT, level=logging.INFO) + +logger.addHandler(fh) class Runs(object): @staticmethod @@ -137,6 +149,12 @@ def record_run(level, } r.get_registry()['MY_SQL'].insert(query, data) + json_data = {} + + json_data[robot_id] = data + + logger.info(json.dumps(json_data)) + @staticmethod def get_runs_robot_level(robot_id, level): query = """SELECT * FROM runs where (robot_id = %(robot_id)s) AND (level = level);""" diff --git a/scoringsystem/blueprints/main.py b/scoringsystem/blueprints/main.py index a227a66..687c469 100644 --- a/scoringsystem/blueprints/main.py +++ b/scoringsystem/blueprints/main.py @@ -15,11 +15,10 @@ ) main = Blueprint('main', __name__) - -@main.before_request -def require_login(): - if not AuthenticationUtilities.user_is_logged_in(session): - return redirect(url_for('auth.signin')) +#@main.before_request +#def require_login(): +# if not AuthenticationUtilities.user_is_logged_in(session): +# return redirect(url_for('auth.signin')) @main.route('/', methods=['GET', 'POST']) @@ -421,9 +420,10 @@ def validate_actual_time_compare(time_j1, time_j2): time_j1 = time_j1.strip() time_j2 = time_j2.strip() - if time_j1.isdigit() and time_j2.isdigit(): + try: return float(time_j1) == float(time_j2) - return False + except ValueError: + return False # valide actual time def validate_actual_time(time_s, level, failed): @@ -443,7 +443,6 @@ def validate_actual_time(time_s, level, failed): picked_baby_3 = 400 # failed but picked up baby (level 3) # check if input string is a number - # convet to a float try: @@ -483,7 +482,9 @@ def validate_actual_time(time_s, level, failed): # validate number of rooms def validate_num_rooms(num_s, level): - num_s = num_s.strip() + if num_s: + num_s = num_s.strip() + # minimum and maximum allowed values min_123 = 0 max_123 = 4 diff --git a/templates/robot_run_info.html b/templates/robot_run_info.html index 9602d4d..5de4503 100644 --- a/templates/robot_run_info.html +++ b/templates/robot_run_info.html @@ -18,7 +18,7 @@