Breaking/tao 4814 atomic bundles

manifest.php

@@ -1,38 +1,38 @@
 <?php
-/**  
+/**
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; under version 2
  * of the License (non-upgradable).
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * 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 (original work) Open Assessment Technologies SA;
- *               
- * 
- */               
+ *
+ *
+ */
 
 return array(
     'name' => 'taoMonitoring',
 	'label' => 'Statistics and aggregated data',
 	'description' => 'Extension for monitoring of the tao events. Fast access to statistics data',
     'license' => 'GPL-2.0',
-    'version' => '1.1.4',
+    'version' => '2.0.0',
 	'author' => 'Open Assessment Technologies SA',
 	'requires' => array(
-        'generis' => '>=2.15.0',
-		'tao' => '>=14.3.1',
-        'taoDelivery' => '>=7.0.0',
-        'taoDeliveryRdf' => '>=1.1.0',
-        'taoOutcomeUi' => '>=2.7.2',
-        'taoQtiTest' => '>=2.16.2',
+        'generis'        => '>=2.15.0',
+		'tao'            => '>=21.0.0',
+        'taoDelivery'    => '>=11.0.0',
+        'taoDeliveryRdf' => '>=6.0.0',
+        'taoOutcomeUi'   => '>=7.0.0',
+        'taoQtiTest'     => '>=29.0.0',
     ),
 	'managementRole' => 'http://www.tao.lu/Ontologies/generis.rdf#taoMonitoringManager',
     'acl' => array(
@@ -47,11 +47,11 @@
 	'update' => 'oat\\taoMonitoring\\scripts\\update\\Updater',
 	'routes' => array(
         'taoMonitoring' => 'oat\\taoMonitoring\\controller'
-    ),    
+    ),
 	'constants' => array(
 	    # views directory
 	    "DIR_VIEWS" => dirname(__FILE__).DIRECTORY_SEPARATOR."views".DIRECTORY_SEPARATOR,
-	    
+
 		#BASE URL (usually the domain root)
 		'BASE_URL' => ROOT_URL.'taoMonitoring/'
 	),

scripts/update/Updater.php

@@ -15,7 +15,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * Copyright (c) 2016  (original work) Open Assessment Technologies SA;
- * 
+ *
  * @author Alexander Zagovorichev <zagovorichev@1pt.com>
  */
 
@@ -38,7 +38,7 @@ class Updater extends common_ext_ExtensionUpdater {
      */
     public function update($initialVersion)
     {
-        
+
         if ($this->isVersion('0.0.1')) {
 
             if (!$this->getServiceManager()->has(TestTakerDeliveryActivityLogService::SERVICE_ID)) {
@@ -90,6 +90,6 @@ public function update($initialVersion)
             $this->setVersion('0.1.0');
         }
 
-        $this->skip('0.1.0', '1.1.4');
+        $this->skip('0.1.0', '2.0.0');
     }
 }

views/build/grunt/bundle.js

@@ -1,57 +1,43 @@
+/**
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; under version 2
+ * of the License (non-upgradable).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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) 2014-2018 (original work) Open Assessment Technologies SA;
+ */
+
+/**
+ * configure the extension bundles
+ * @author Bertrand Chevrier <bertrand@taotesting.com>
+ */
 module.exports = function(grunt) {
     'use strict';
 
-    var requirejs   = grunt.config('requirejs') || {};
-    var clean       = grunt.config('clean') || {};
-    var copy        = grunt.config('copy') || {};
-
-    var root        = grunt.option('root');
-    var libs        = grunt.option('mainlibs');
-    var ext         = require(root + '/tao/views/build/tasks/helpers/extensions')(grunt, root);
-    var out         = 'output';
-
-    var paths = {
-        'tao' : root + '/tao/views/js',
-        'taoMonitoring' : root + '/taoMonitoring/views/js',
-        'taoMonitoringCss' : root + '/taoMonitoring/views/css'
-    };
-
-    /**
-     * Remove bundled and bundling files
-     */
-    clean.taomonitoringbundle = [out];
-
-    /**
-     * Compile tao files into a bundle
-     */
-    requirejs.taomonitoringbundle = {
-        options: {
-            baseUrl : '../js',
-            dir : out,
-            mainConfigFile : './config/requirejs.build.js',
-            paths : paths,
-            modules : [{
-                name: 'taoMonitoring/controller/routes',
-                include : ext.getExtensionsControllers(['taoMonitoring']),
-                exclude : ['mathJax'].concat(libs)
-            }]
+    grunt.config.merge({
+        bundle : {
+            taomonitoring : {
+                options : {
+                    extension : 'taoMonitoring',
+                    outputDir : 'loader',
+                    bundles : [{
+                        name : 'taoMonitoring',
+                        default : true,
+                    }]
+                }
+            }
         }
-    };
-
-    /**
-     * copy the bundles to the right place
-     */
-    copy.taomonitoringbundle = {
-        files: [
-            { src: [ out + '/taoMonitoring/controller/routes.js'],  dest: root + '/taoMonitoring/views/js/controllers.min.js' },
-            { src: [ out + '/taoMonitoring/controller/routes.js.map'],  dest: root + '/taoMonitoring/views/js/controllers.min.js.map' }
-        ]
-    };
-
-    grunt.config('clean', clean);
-    grunt.config('copy', copy);
-    grunt.config('requirejs', requirejs);
+    });
 
     // bundle task
-    grunt.registerTask('taomonitoringbundle', ['clean:taomonitoringbundle', 'requirejs:taomonitoringbundle', 'copy:taomonitoringbundle']);
+    grunt.registerTask('taomonitoringbundle', ['bundle:taomonitoring']);
 };