comparison test_create/test_core.js @ 3099:fc9718756d55

#200 Auto-pair fragments for AB and ABX in test create.

                     var reader = new FileReader();
                     reader.readAsArrayBuffer(f);
 
                     reader.onload = (function (theFile) {
                         return function (e) {
-                            scope.addAudioElementFromFile(theFile.name);
+                            scope.ondrop(theFile.name);
                             scope.$apply();
                         };
                     })(f);
                 }
             });

 }]);
 
 AngularInterface.controller("introduction", ['$scope', '$element', '$window', function ($s, $e, $w) {
     $s.state = 0;
     $s.selected = undefined;
+    $s.close = function () {
+        $($e[0]).modal('hide');
+    }
     $s.next = function () {
+        if (($s.state === 0 && $s.file) || $s.state === 1) {
+            $s.initialise($s.selected);
+            if ($s.selected != "AB" && $s.selected != "ABX") {
+                $s.close();
+            }
+        } else if ($s.state === 2 && $s.audioFragments.length > 0) {
+            // Populate the audio pages by creating a pairwise set of pairs
+            $s.populatePages((function (a) {
+                var b = [];
+                a.forEach(function (e1, i1, a) {
+                    a.forEach(function (e2, i2) {
+                        var entry = [e1, e2];
+                        if (i1 > i2) {
+                            b.push(entry);
+                        }
+                    });
+                });
+                return b;
+            })($s.audioFragments));
+            $s.close();
+        } else if ($s.state > 2) {
+            $s.close();
+        }
         $s.state++;
-        if ($s.state > 1 || $s.file) {
-            $($e[0]).modal('hide')
-            $s.initialise($s.selected);
-        }
-    };
+        console.log("Modal state " + $s.state);
+    };
+    $s.skip = function () {
+        $s.close();
+    }
     $s.back = function () {
         $s.state--;
     };
     $s.mouseover = function (name) {
         var obj = $s.testSpecifications.interfaces.find(function (i) {

         } else {
             $s.setTestPrototype(obj);
         }
     };
     $s.select = function (name) {
-            $s.selected = name;
-        }
-        // Get the test interface specifications
+        $s.selected = name;
+    };
+    // Get the test interface specifications
     $s.file = undefined;
     $s.description = "";
 
     $s.parseFile = function (f) {
         var p = new DOMParser();

         r.onload = function () {
             $s.parseFile(r.result);
         };
         r.readAsText($s.file);
     };
+
+    $s.audioFragments = [];
+    $s.ondrop = function (filename) {
+        $s.audioFragments.push({
+            fname: filename,
+            name: "fragment-" + String($s.audioFragments.length)
+        });
+    };
+
+    $s.populatePages = function (structures) {
+        structures.forEach(function (p, i) {
+            var page = $w.specification.createNewPage();
+            page.id = "page-" + String(i);
+            p.forEach(function (a) {
+                var fragment = page.addAudioElement();
+                fragment.name = a.name;
+                fragment.id = a.name + "-p" + String(i);
+                fragment.url = a.fname;
+            });
+            page.addInterface();
+        });
+    }
 }]);
 
 AngularInterface.controller("setup", ['$scope', '$element', '$window', function ($s, $e, $w) {
     function initialise() {
         if ($s.globalSchema) {

         $s.page.commentQuestions.splice(index, 1);
     };
     $s.addAudioElement = function () {
         $s.page.addAudioElement();
     };
-    $s.addAudioElementFromFile = function (filename) {
+    $s.ondrop = function (filename) {
         var fragment = $s.page.addAudioElement();
         fragment.url = filename;
     };
     $s.removeAudioElement = function (element) {
         var index = $s.page.audioElements.findIndex(function (a) {