All days results should be on same line

johnwalley · Nov 12, 2016 · c0b20ec · c0b20ec
1 parent ba3ecec
commit c0b20ec
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/src/util.js b/src/util.js
@@ -872,21 +872,29 @@ export function read_tg(input) {
 
       for (let j = 1; j < m.length; j++) {
         if (m[j].indexOf('#') !== 0) {
-          event.results.push(m[j]);
+          Array.prototype.push.apply(event.results, m[j].split(' '));
         }
       }
     } else {
       for (let j = 0; j < m.length; j++) {
         if (inresults === 1 && m[j].indexOf('#') !== 0) {
-          event.results.push(m[j]);
+          Array.prototype.push.apply(event.results, m[j].split(' '));
         } else if (indivision === 1) {
           addcrew(curdiv, m[j]);
         }
       }
     }
   }
 
-  event.results = event.results.filter(r => r !== '').map(r => r.trim()).join('\n');
+  const results = [];
+
+  for (let i = 0; i < event.days; i++) {
+    results.push([]);
+  }
+
+  event.results.filter(r => r !== '').map((r, i) => results[Math.floor(i / event.divisions.length)].push(r.trim()));
+
+  event.results = results.map(r => r.join(' ')).join('\n');
 
   if (curdiv.length > 0) {
     event.divisions.push(curdiv);

diff --git a/test/bumps-test.js b/test/bumps-test.js
@@ -58,9 +58,15 @@ Division,Cantabs 2,City 2\n\
 Division,Champs 1\n\
 \n\
 Results\n\
- r ur rrrrr\n\
- r ur ro3u\n\
- r ru urrr\n';
+ r\n\
+ ur\n\
+ rrrrr\n\
+ r\n\
+ ur\n\
+ ro3u\n\
+ r\n\
+ ru\n\
+ urrr\n';
 
   var expected = {
     completed: [[true, true, true], [true, true, true], [true, true, true]],