Minor code optimalisations

Author: FlyingBird95

dashboard/forms.py

@@ -10,7 +10,7 @@ class MonitorDashboard(FlaskForm):
 
 
 class Login(FlaskForm):
-    """ Used for serving a login form on /{{ link }}/login. """
+    """ Used for serving a login form. """
     name = StringField('Username', [validators.required()])
     password = PasswordField('Password', [validators.required()])
     submit = SubmitField('Login')

dashboard/routings/result.py

@@ -130,7 +130,7 @@ def get_dot_charts(end, versions):
 
 def get_boxplots(end, versions):
     """
-        Function that builds two dot charts:
+        Function that builds two boxplots:
         1. Execution time per version
         2. Execution time per user
         :param end: the endpoint

dashboard/routings/setup.py

@@ -19,20 +19,16 @@
 @blueprint.route('/settings', methods=['GET', 'POST'])
 @secure
 def settings():
-    form = ChangeSetting()
+    password = 'x' * len(config.password)
+    return render_template('settings.html', link=config.link, session=session, config=config, pw=password)
 
-    if request.method == 'POST' and form.validate():
-        config.username = form.username.data
-        if form.password.data:
-            config.password = form.password.data
-
-    form.username.data = config.username
-    old_password = config.password
-    old_password = 'x' * len(old_password)
 
-    return render_template('settings.html', link=config.link, session=session, version=config.version,
-                           database_name=config.database_name, group=config.get_group_by(), form=form,
-                           testDir=config.test_dir, user=config.username, pw=config.password)
+def formatter(x):
+    sec = x // 1000
+    ms = round(x % 1000, 2)
+    if sec == 0:
+        return '{0}ms'.format(ms)
+    return '{0}s and {1}ms'.format(sec, ms)
 
 
 @blueprint.route('/rules', methods=['GET', 'POST'])
@@ -119,15 +115,11 @@ def testmonitor():
             list_avg.append(d.avg)
             list_max.append(d.max)
             list_count.append(d.count)
-        times_chart.add('Minimum', list_min, formatter=lambda x: '{0}s and {1}ms'.format(math.floor(x / 1000),
-                                                                                         round(x % 1000, 2)))
-        times_chart.add('Average', list_avg, formatter=lambda x: '{0}s and {1}ms'.format(math.floor(x / 1000),
-                                                                                         round(x % 1000, 2)))
-        times_chart.add('Maximum', list_max, formatter=lambda x: '{0}s and {1}ms'.format(math.floor(x / 1000),
-                                                                                         round(x % 1000, 2)))
+        times_chart.add('Minimum', list_min, formatter=formatter)
+        times_chart.add('Average', list_avg, formatter=formatter)
+        times_chart.add('Maximum', list_max, formatter=formatter)
         times_data = times_chart.render_data_uri()
 
     return render_template('testmonitor.html', link=config.link, session=session, curr=3, form=form,
-                           tests=get_tests(),
-                           results=get_results(), res_current_version=get_res_current(config.version),
-                           times_data=times_data)
+                           tests=get_tests(), results=get_results(),
+                           res_current_version=get_res_current(config.version), times_data=times_data)

dashboard/static/assets/css/bootstrap.css

@@ -17,23 +17,23 @@
                         </tr>
                         <tr>
                             <td><b>Version of monitored app</b></td>
-                            <td>{{ version }}</td>
+                            <td>{{ config.version }}</td>
                         </tr>
                         <tr>
                             <td><b>Group by variable</b></td>
-                            <td>{{ group if group != None else "Unspecified" }}</td>
+                            <td>{{ config.get_group_by() if config.get_group_by() != None else "Unspecified" }}</td>
                         </tr>
                         <tr>
                             <td><b>Measurements database</b></td>
-                            <td>{{ database_name }}</td>
+                            <td>{{ config.database_name }}</td>
                         </tr>
                         <tr>
                             <td><b>Location of tests of monitored app</b></td>
-                            <td>{{ testDir if testDir != None else "Unspecified" }}</td>
+                            <td>{{ config.test_dir if config.test_dir != None else "Unspecified" }}</td>
                         </tr>
                         <tr>
                             <td><b>Username</b></td>
-                            <td>{{ user }}</td>
+                            <td>{{ config.username }}</td>
                         </tr>
                         <tr>
                             <td><b>Password</b></td>