diff --git a/app/views/task/view.pug b/app/views/task/view.pug index 47c2953..fdafa08 100644 --- a/app/views/task/view.pug +++ b/app/views/task/view.pug @@ -51,16 +51,32 @@ block view-content small.uk-text-muted Week of #{dayjs(weekStartDate).format('MMMM DD')} if Array.isArray(sessions) && (sessions.length > 0) - ul.uk-list.uk-list-divider - each session in sessions - li - a(href=`/task/${task._id}/session/${session._id}`, - onclick="return dtp.app.performSessionNavigation(event);", - ).uk-link-reset.uk-display-block - div(uk-grid) - .uk-width-expand= dayjs(session.created).format('dddd [at] h:mm a') - .uk-width-auto= numeral(session.duration).format('HH:MM:SS') - .uk-width-auto= numeral(session.hourlyRate * (session.duration / 60 / 60)).format('$0,00.00') + - + var totalTimeWorked = 0; + var totalBillable = 0; + + table.uk-table.uk-table-small.uk-table-divider + thead + tr.uk-background-secondary + th.uk-table-expand Start Time + th.uk-text-nowrap.uk-table-shrink Tracked Time + th.uk-text-nowrap.uk-table-shrink Billable + tbody + each session in sessions + - + totalTimeWorked += session.duration; + totalBillable += session.hourlyRate * (session.duration / 3600); + tr + td.uk-table-expand + a(href=`/task/${task._id}/session/${session._id}`, + onclick="return dtp.app.performSessionNavigation(event);", + ).uk-link-reset.uk-display-block= dayjs(session.created).format('dddd [at] h:mm a') + td.uk-text-right.uk-text-nowrap.uk-table-shrink= numeral(session.duration).format('HH:MM:SS') + td.uk-text-right.uk-text-nowrap.uk-table-shrink= numeral(session.hourlyRate * (session.duration / 3600)).format('$0,00.00') + tr.uk-background-secondary + td.uk-table-expand TOTALS + td.uk-text-right.uk-text-nowrap.uk-table-shrink= numeral(totalTimeWorked).format('HH:MM:SS') + td.uk-text-right.uk-text-nowrap.uk-table-shrink #{numeral(totalBillable).format('$0,0.00')} else div No work sessions