Merge branch 'hotfix/v0.4.1' into develop

Fix a bug where dashboard did not render if there were no sessions.
indentlabs · Feb 24, 2015 · f53450c · f53450c
2 parents 812710d + b6612a8
commit f53450c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Writer's Trail change log
 
+
+## v0.4.1
+
+* Fix a bug where dashboard did not render if there were no sessions.
+
 ## v0.4.0
 
 * Mandatory password for those who login with social network.

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # [Writer's Trail](http://writerstrail.georgemarques.com.br)
 
-v0.4.0
+v0.4.1
 
 [![Join the chat at https://gitter.im/flikore/writerstrail](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/flikore/writerstrail?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "Writerstrail",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "authors": [
     "George Marques <[email protected]>"
   ],

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "WritersTrail",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "private": true,
   "scripts": {
     "start": "node server.js"

diff --git a/routes/users.js b/routes/users.js
@@ -137,15 +137,16 @@ router.get('/dashboard', isactivated, sendflash, function (req, res, next) {
       if (!todaySessions || todaySessions.length === 0) {
         res.locals.errorMessage.push('You didn\'t write anything today. <a href="/timer" class="alert-link">Fix this and write now</a>.');
       }
+      console.log('---daily', dailyAverage.length > 0 && dailyAverage[0].dailyAverage ? dailyAverage[0].dailyAverage : 0);
       res.render('user/dashboard', {
         title: 'Dashboard',
         section: 'dashboard',
         projects: projects,
         target: target,
         stats: {
           totalWordcount: totalWordcount,
-          dailyAverage: dailyAverage.length > 0 ? dailyAverage[0].dailyAverage : 0,
-          wpm: wpm.length > 0 ? wpm[0].wpm : 0,
+          dailyAverage: dailyAverage.length > 0 && dailyAverage[0].dailyAverage ? dailyAverage[0].dailyAverage : 0,
+          wpm: wpm.length > 0 && wpm[0].wpm ? wpm[0].wpm : 0,
           period: perfPeriod.length > 0 ? perfPeriod[0] : null,
           session: perfSession.length > 0 ? perfSession[0] : null,
           largestProject: largestProject