diff --git a/app.js b/app.js index 557e7ea..bd880e4 100644 --- a/app.js +++ b/app.js @@ -55,6 +55,7 @@ function initApp (config, callback) { require('./route/new')(app); require('./route/task/index')(app); require('./route/task/delete')(app); + require('./route/result/index')(app); // Error handling app.express.get('*', function (req, res) { diff --git a/package.json b/package.json index 84d416b..b59581c 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "express": "~3.4", "express-hbs": "~0.2", "moment": "~2.2", - "pa11y-webservice-client-node": "git+ssh://git@github.com:nature/pa11y-webservice-client-node.git#1.0.0-beta.2", + "pa11y-webservice-client-node": "git+ssh://git@github.com:nature/pa11y-webservice-client-node.git#1.0.0-beta.3", "underscore": "~1.5" }, "devDependencies": { diff --git a/route/result/index.js b/route/result/index.js new file mode 100644 index 0000000..74d12b6 --- /dev/null +++ b/route/result/index.js @@ -0,0 +1,31 @@ +'use strict'; + +var presentTask = require('../../view/presenter/task'); +var presentResult = require('../../view/presenter/result'); + +module.exports = route; + +// Route definition +function route (app) { + + app.express.get('/:id/:rid', function (req, res, next) { + app.webservice.task(req.params.id).get({}, function (err, task) { + if (err) { + return next(); + } + app.webservice + .task(req.params.id) + .result(req.params.rid) + .get({full: true}, function (err, result) { + if (err) { + return next(); + } + res.render('result', { + task: presentTask(task), + mainResult: presentResult(result) + }); + }); + }); + }); + +} diff --git a/route/task/index.js b/route/task/index.js index 98607ba..3c8af2f 100644 --- a/route/task/index.js +++ b/route/task/index.js @@ -20,7 +20,7 @@ function route (app) { res.render('task', { task: presentTask(task), results: results.map(presentResult), - lastResult: task.lastResult || null, + mainResult: task.lastResult || null, added: (typeof req.query.added !== 'undefined') }); }); diff --git a/view/result/index.html b/view/result/index.html new file mode 100644 index 0000000..b27f6c2 --- /dev/null +++ b/view/result/index.html @@ -0,0 +1,6 @@ + +{{#content "title"}} + {{task.url}} ({{task.standard}}) {{date-format mainResult.date format="DD MMM YYYY"}} +{{/content}} + +

{{task.url}} ({{task.standard}}) {{date-format mainResult.date format="DD MMM YYYY"}}

diff --git a/view/task/index.html b/view/task/index.html index 9b01876..a08cf8c 100644 --- a/view/task/index.html +++ b/view/task/index.html @@ -23,9 +23,9 @@
- {{#if lastResult}} + {{#if task.lastResult}} -
Last run : {{date-format lastResult.date format="DD MMM YYYY"}}
+
Last run : {{date-format task.lastResult.date format="DD MMM YYYY"}}
{{else}}
Not yet run
{{/if}} @@ -54,22 +54,21 @@
@@ -104,20 +103,20 @@
{{#if results}} - {{#if lastResult.count.error}} + {{#if mainResult.count.error}}
- - Errors ( {{lastResult.count.error}} ) + Errors ( {{mainResult.count.error}} )
Back to top
@@ -125,19 +124,19 @@

Well done! You have 0 errors.

{{/if}} - {{#if lastResult.count.warning}} + {{#if mainResult.count.warning}}
+ - Warnings ( {{lastResult.count.warning}} ) + Warnings ( {{mainResult.count.warning}} )
Back to top
@@ -146,19 +145,19 @@

Well done! You have 0 warnings.

{{/if}} - {{#if lastResult.count.notice}} + {{#if mainResult.count.notice}}
+ - Notices ( {{lastResult.count.notice}} ) + Notices ( {{mainResult.count.notice}} )
Back to top