| commit | 8c518c645860906f590d02a524e3911cd93c2885 | [log] [tgz] |
|---|---|---|
| author | Matteo Scandolo <matteo.scandolo@gmail.com> | Wed Aug 03 13:31:13 2016 -0700 |
| committer | Matteo Scandolo <teo@onlab.us> | Wed Aug 03 13:49:00 2016 -0700 |
| tree | 59bb198ef6791b1efbc8a43982ea38e9b63f1c1d | |
| parent | 7f1f660623ad2fff6d7f372ebcb6201ae21abd46 [diff] |
Fixed bug in truckroll view and added icons Change-Id: Id65c225eab2ed7dd03ad61f8c4f8137b51b9df67 (cherry picked from commit f1046ab447effd6ca03e5e89a566e479bd6d0943)
diff --git a/views/ngXosViews/truckroll/gulp/server.js b/views/ngXosViews/truckroll/gulp/server.js index 36fdded..3b1ee04 100644 --- a/views/ngXosViews/truckroll/gulp/server.js +++ b/views/ngXosViews/truckroll/gulp/server.js
@@ -55,6 +55,7 @@ '/xos/core/static': options.static + '../../static/' }, middleware: function(req, res, next){ + if( req.url.indexOf('/api/') !== -1 ){
diff --git a/views/ngXosViews/truckroll/src/icons/truckroll-icon-active.png b/views/ngXosViews/truckroll/src/icons/truckroll-icon-active.png new file mode 100644 index 0000000..71b2a55 --- /dev/null +++ b/views/ngXosViews/truckroll/src/icons/truckroll-icon-active.png Binary files differ
diff --git a/views/ngXosViews/truckroll/src/icons/truckroll-icon.png b/views/ngXosViews/truckroll/src/icons/truckroll-icon.png new file mode 100644 index 0000000..fb7c7dc --- /dev/null +++ b/views/ngXosViews/truckroll/src/icons/truckroll-icon.png Binary files differ
diff --git a/views/ngXosViews/truckroll/src/js/main.js b/views/ngXosViews/truckroll/src/js/main.js index 1004cb1..6aee06d 100644 --- a/views/ngXosViews/truckroll/src/js/main.js +++ b/views/ngXosViews/truckroll/src/js/main.js
@@ -34,6 +34,7 @@ this.runTest = () => { // clean previous tests + delete this.truckroll.id; delete this.truckroll.result; delete this.truckroll.is_synced; delete this.truckroll.result_code; @@ -48,6 +49,7 @@ }; this.waitForTest = (id) => { + Truckroll.get({id: id}).$promise .then((testResult) => { // if error
