Add result graphing utils to results.

RoboticSwarmControl · Jul 18, 2016 · b0658ee · b0658ee
1 parent b0e0b0e
commit b0658ee
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -87,7 +87,19 @@ gulp.task('build:games-images', function () {
 gulp.task('build:games-scripts', function () {
     return gulp.src('games/**/*.js', { base:'games' })
             .pipe(gulp.dest('dist/games'))
-            .pipe(notify({ message: 'Built client images.' }));
+            .pipe(notify({ message: 'Built game scripts.' }));
+});
+
+gulp.task('build:results-vendor', function() {
+return gulp.src([
+                        'vendor/flotr2/flotr2.min.js',
+                        'vendor/game-framework/utils/resultutils.js',
+                    ])
+                .pipe(concat('main-results-vendor.js'))
+                .pipe(gulp.dest('dist/js'))
+                .pipe(rename({suffix: '.min'}))
+                .pipe(gulp.dest('dist/js'))
+                .pipe(notify({ message: 'Built result page vendor scripts.' }));
 });
 
 gulp.task('build:games-vendor', function() {
@@ -127,6 +139,7 @@ gulp.task('build-no-lint', ['clean'], function() {
                         'build:games-images',
                         'build:games-scripts',
                         'build:games-vendor',
+                        'build:results-vendor',
                         'build:server');
 });
 

diff --git a/server/views/results.html.ejs b/server/views/results.html.ejs
@@ -2,12 +2,13 @@
 <html itemscope itemtype="http://schema.org/CreativeWork">
 	<head>
 		<%- include('partials/app-common-head.html.ejs') %>
-		<%- include('partials/common-scripts.html.ejs') %>
+		<%- include('partials/common-scripts.html.ejs') %>		
 	</head>
 	<body>
-
+	<script src="/assets/js/main-results-vendor.min.js"></script>
 	<%- include('partials/navbar.html.ejs') %>
 
+
  	<div id="fb-root"></div>
 	 <script>(function(d, s, id) {
 	  var js, fjs = d.getElementsByTagName(s)[0];