Merge branch 'release-8.5.8'

oat-sa · Nov 8, 2024 · 5ebb7c4 · 5ebb7c4
2 parents 7860034 + 9723a5c
commit 5ebb7c4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/views/js/loader/diagnostic.min.js b/views/js/loader/diagnostic.min.js
diff --git a/views/js/loader/diagnostic.min.js.map b/views/js/loader/diagnostic.min.js.map
diff --git a/views/js/loader/taoClientDiagnostic.min.js b/views/js/loader/taoClientDiagnostic.min.js
diff --git a/views/js/loader/taoClientDiagnostic.min.js.map b/views/js/loader/taoClientDiagnostic.min.js.map
diff --git a/views/js/tools/diagnostic/diagnostic.js b/views/js/tools/diagnostic/diagnostic.js
@@ -13,7 +13,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2016-2021 (original work) Open Assessment Technologies SA ;
+ * Copyright (c) 2016-2024 (original work) Open Assessment Technologies SA ;
  */
 define([
     'jquery',
@@ -40,7 +40,7 @@ define([
     'tpl!taoClientDiagnostic/tools/diagnostic/tpl/feedback',
     'tpl!taoClientDiagnostic/tools/diagnostic/tpl/quality-bar',
     'css!taoClientDiagnosticCss/diagnostics'
-], function(
+], function (
     $,
     _,
     __,
@@ -418,7 +418,7 @@ define([
                     // launch each testers in series, then display the results
                     async.series(testers, () => {
                         // pick the lowest percentage as the main score
-                        const total = _.minBy(scores, 'globalPercentage');
+                        const total = _.minBy(Object.values(scores), 'globalPercentage');
 
                         // get a status according to the main score
                         const status = getStatus(total.globalPercentage, _thresholds);
@@ -631,7 +631,7 @@ define([
                      * @private
                      */
                     function toggleFields(state) {
-                        _.forEach(fields, function(fieldName) {
+                        _.forEach(fields, function (fieldName) {
                             toggleControl(fieldName, state);
                         });
                     }
@@ -696,9 +696,7 @@ define([
                             {}
                         );
 
-                        this.changeStatus(__('Getting school name...'))
-                            .cleanUp()
-                            .disable();
+                        this.changeStatus(__('Getting school name...')).cleanUp().disable();
 
                         if (_.isFunction(validate)) {
                             validate(values)