Merge branch 'master' into links_to_task_attempts_151

Author: HadronCollider

app/feedback_evaluator.py

@@ -162,13 +162,14 @@ def __init__(self, weights=None):
 
         super().__init__(name=PredefenceEightToTenMinutesNoSlideCheckFeedbackEvaluator.CLASS_NAME, weights=weights)
 
-    def find_strict_speech_duration_criterion(self, criteria_keys, suffix='StrictSpeechDurationCriterion'):
+    def rework_strict_speech_duration_criterion(self, criteria_keys, suffix='StrictSpeechDurationCriterion'):
         for criteria in criteria_keys:
             if criteria.endswith(suffix):
+                self.weights[criteria] = self.weights.pop('StrictSpeechDurationCriterion')
                 return criteria
 
     def evaluate_feedback(self, criteria_results):
-        self.ssd_criterion = self.find_strict_speech_duration_criterion(criteria_results.keys())
+        self.ssd_criterion = self.rework_strict_speech_duration_criterion(criteria_results.keys())
         if not criteria_results.get(self.ssd_criterion) or \
                 criteria_results[self.ssd_criterion].result == 0:
             return Feedback(0)
@@ -178,15 +179,13 @@ def evaluate_feedback(self, criteria_results):
         return super().evaluate_feedback(criteria_results)
 
     def get_result_as_sum_str(self, criteria_results):
-        self.ssd_criterion = self.find_strict_speech_duration_criterion(criteria_results.keys())
-
+        if not self.ssd_criterion:
+            self.ssd_criterion = self.rework_strict_speech_duration_criterion(criteria_results.keys())
         if criteria_results is None or self.weights is None or \
                 criteria_results.get(self.ssd_criterion, {}).get('result', 0) == 0 or \
                 criteria_results.get("DEFAULT_SPEECH_PACE_CRITERION", {}).get('result', 0) == 0:
             return None
 
-        criteria_results["StrictSpeechDurationCriterion"] = criteria_results.pop(self.ssd_criterion)
-
         return super().get_result_as_sum_str(criteria_results)
 
 

app/templates/footer.html

@@ -1,5 +1,5 @@
 {% block footer %}
-<div align="center">&copy; Сopyright OSLL 2020<script language="javascript" type="text/javascript">
+<div align="center">&copy; Сopyright MOEVM 2020<script language="javascript" type="text/javascript">
 var d = new Date();
 if(d.getFullYear()>2020)
     document.write("-"+d.getFullYear());

app_conf/testing.ini

@@ -45,5 +45,5 @@ firefox=87
 language=ru
 
 [bugreport]
-form_link=https://docs.google.com/forms/d/e/1FAIpQLScUudcDPUwtTvmN_sbeljicHYhubK7pPQIM1o8Wh54HstT2BQ/viewform?usp=sf_link
-report_mail=[email protected]
+form_link=https://docs.google.com
+report_mail=[email protected]

tests/test_app.py

@@ -3,17 +3,12 @@
 from app.web_speech_trainer import app
 
 
-def test_home_page():
-    """
-    GIVEN a Flask application configured for testing
-    WHEN the '/' page is requested (GET)
-    THEN check that the response is valid
-    """
+def test_init_page():
     flask_app = app
 
     with flask_app.test_client() as test_client:
-        response = test_client.get('/')
-        assert response.status_code == 404
+        response = test_client.get('/init/')
+        assert response.status_code == 200
 
 
 def test_fillers_ratio_criteria():

tests/test_feedback_evaluator.py

@@ -20,7 +20,7 @@ class TestPredefenceEightToTenMinutesNoSlideCheckFeedbackEvaluator:
                 "PredefenceStrictSpeechDurationCriterion": {'result': 0.5},
                 "DEFAULT_SPEECH_PACE_CRITERION": {'result': 0.7},
                 "DEFAULT_FILLERS_NUMBER_CRITERION": {'result': 0.9},
-            }, '0.600 * 0.50 + 0.200 * 0.70 + 0.200 * 0.90'),
+            }, '0.200 * 0.70 + 0.200 * 0.90 + 0.600 * 0.50'),
         ],
     )
     def test_get_result_as_sum_str(self, criteria_results, expected_string):