Merge branch 'release-7.3.1'

oat-sa · Nov 22, 2019 · 3e9d7d1 · 3e9d7d1
2 parents 716a671 + dad010c
commit 3e9d7d1
Show file tree

Hide file tree

Showing 10 changed files with 142 additions and 228 deletions.
diff --git a/manifest.php b/manifest.php
@@ -30,7 +30,7 @@
     'label'       => 'Browser and OS diagnostic tool',
     'description' => 'Check compatibility of the os and browser of a client',
     'license'     => 'GPL-2.0',
-    'version'     => '7.2.3',
+    'version'     => '7.3.1',
     'author'      => 'Open Assessment Technologies SA',
     'requires'    => array(
         'generis'    => '>=12.5.0',

diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
@@ -779,7 +779,7 @@ public function update($initialVersion)
 
             $this->setVersion('6.0.1');
         }
-        
+
         $this->skip('6.0.1', '7.1.0');
 
         if ($this->isVersion('7.1.0')) {
@@ -815,6 +815,6 @@ public function update($initialVersion)
             $this->setVersion('7.2.0');
         }
 
-        $this->skip('7.2.0', '7.2.3');
+        $this->skip('7.2.0', '7.3.1');
     }
 }
diff --git a/views/build/grunt/bundle.js b/views/build/grunt/bundle.js
@@ -33,11 +33,13 @@ module.exports = function(grunt) {
                     bundles : [{
                         name : 'taoClientDiagnostic',
                         default : true,
-                        bootstrap: true
+                        bootstrap: true,
+                        babel: true
                     }, {
                         name : 'diagnostic',
                         entryPoint: 'taoClientDiagnostic/tools/diagnostic/diagnostic',
-                        bootstrap : true
+                        bootstrap : true,
+                        babel: true
                     }]
                 }
             }

diff --git a/views/css/diagnostics.css.map b/views/css/diagnostics.css.map
diff --git a/views/js/controller/Diagnostic/index.js b/views/js/controller/Diagnostic/index.js
@@ -33,9 +33,10 @@ define([
     'taoClientDiagnostic/tools/fingerprint/tester',
     'tpl!taoClientDiagnostic/tools/diagnostic/tpl/fingerprint',
     'tpl!taoClientDiagnostic/tools/diagnostic/tpl/details',
+    'taoClientDiagnostic/tools/csvExporter',
     'ui/datatable',
     'lib/moment-timezone.min'
-], function ($, _, __, helpers, moment, loadingBar, encode, feedback, dialog, getStatus, performancesTesterFactory, fingerprintTesterFactory, fingerprintTpl, detailsTpl) {
+], function ($, _, __, helpers, moment, loadingBar, encode, feedback, dialog, getStatus, performancesTesterFactory, fingerprintTesterFactory, fingerprintTpl, detailsTpl, csvExporter) {
     'use strict';
 
     /**
@@ -189,6 +190,19 @@ define([
                 }
             });
 
+            if (config.export) {
+                // tool: export csv
+                tools.push({
+                    id: 'csvExport',
+                    icon: 'export',
+                    title: __('Export CSV'),
+                    label: __('Export CSV'),
+                    action: function () {
+                        csvExporter.exportCsv(model);
+                    }
+                });
+            }
+
             if(installedExtension){
                 // tool: compatibilty via lti
                 tools.push({