Fix issue for speed calculation in READING_SPEED question type and fi…

…netune display - refs #1896
chamilo · Apr 29, 2017 · 5ffb16c · 5ffb16c
1 parent 34cef4c
commit 5ffb16c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/main/exercise/ReadingSpeed.php b/main/exercise/ReadingSpeed.php
@@ -44,7 +44,7 @@ class ReadingSpeed extends UniqueAnswer
      * Refresh delay in seconds
      * @var int
      */
-    public $refreshTime = 5;
+    public $refreshTime = 3;
 
     /**
      * Constructor
@@ -54,10 +54,6 @@ public function __construct()
         parent::__construct();
         $this->type = READING_SPEED;
         $this->isContent = $this->getIsContent();
-        // Refresh is set to 5s, but speed is in words per minute
-        $wordsPerSecond = $this->speeds[$this->level] / 60;
-        $this->expectedWordsPerRefresh = intval($wordsPerSecond * $this->refreshTime);
-
     }
 
     public function createAnswersForm($form)
@@ -145,9 +141,16 @@ private function displayReading($wordsCount, $turns, $text)
 
     public function processText($text)
     {
-        //recalulate the expected words count
-        $this->expectedCount = $this->speeds[$this->level];
+        // Refresh is set to 5s, but speed is in words per minute
+        error_log($this->getLevel().' '.$this->speeds[$this->level]);
+        $wordsPerSecond = $this->speeds[$this->level] / 60;
+        $this->expectedWordsPerRefresh = intval($wordsPerSecond * $this->refreshTime);
 
+        if (empty($text)) {
+            // We have an issue here... how do we treat this case?
+            // For now, let's define a default case
+            $text = get_lang('NoExercise');
+        }
         $words = str_word_count($text, 2, '0..9');
         $indexes = array_keys($words);
 

diff --git a/main/template/default/exercise/reading_speed.tpl b/main/template/default/exercise/reading_speed.tpl
@@ -13,7 +13,7 @@
         color: rgba(0, 0, 0, 1);
     }
     .text-highlight.border {
-        color: #888;
+        color: #bbb;
     }
 </style>