digital-telepresence
/
dtp-base
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

bunch of little fixes

develop
Rob Colbert 12 months ago
parent
98969a8afd
commit
efa8437b48
5 changed files with 63 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      app/views/client/editor.pug
  2. 2
      app/views/client/view.pug
  3. 33
      app/views/report/components/weekly-summary.pug
  4. 51
      app/views/report/dashboard.pug
  5. 9
      client/js/time-tracker-client.js

12
app/views/client/editor.pug
View File

@ -42,5 +42,13 @@ block view-content
).uk-input
.uk-text-small.uk-text-muted Use zero or 168 (7 x 24) for unlimited hours per week.
.uk-card-footer.uk-flex.uk-flex-right
button(type="submit").uk-button.uk-button-default.uk-border-rounded #[span= !!client ? "Update" : "Create"] Client
.uk-card-footer
div(uk-grid).uk-grid-small.uk-flex-right
.uk-width-auto
a(href=`/client/${client._id}`).uk-button.uk-button-default.uk-border-rounded
i.fa-solid.fa-chevron-left
span.uk-margin-small-left Back
.uk-width-auto
button(type="submit").uk-button.uk-button-default.uk-border-rounded
i.fa-solid.fa-save
span.uk-margin-small-left #{!!client ? "Update" : "Create"} Client

2
app/views/client/view.pug
View File

@ -13,7 +13,7 @@ block view-content
.uk-width-auto
a(href=`/client/${client._id}/edit`).uk-button.uk-button-default.uk-button-small
i.fa-solid.fa-cog
span.uk-margin-small-left Edit Client
span.uk-margin-small-left Settings
.uk-width-auto
a(href=`/client/${client._id}/project/create`).uk-button.uk-button-default.uk-button-small
i.fa-solid.fa-plus

33
app/views/report/components/weekly-summary.pug
View File

@ -1,17 +1,20 @@
mixin renderWeeklySummaryReport (data)
table.uk-table.uk-table-small.uk-table-responsive.no-select
thead
tr
th Project
th Client
th Sessions
th Time Worked
th Billable
tbody
each row in data
.uk-overflow-auto
table.uk-table.uk-table-small.no-select
thead
tr
td.uk-table-expand=row.project.name
td= row.project.client.name
td= formatCount(row.sessionCount)
td= numeral(row.duration).format('0:00:00')
td= numeral(row.billable).format('$0,0.00')
th Project
th Client
th Sessions
th Time Worked
th Billable
tbody
each row in data
tr
td.uk-table-expand
a(href=`/client/${row.project.client._id}/project/${row.project._id}`)=row.project.name
td
a(href=`/client/${row.project.client._id}`)= row.project.client.name
td= formatCount(row.sessionCount)
td= numeral(row.duration).format('0:00:00')
td= numeral(row.billable).format('$0,0.00')

51
app/views/report/dashboard.pug
View File

@ -10,31 +10,32 @@ block view-content
.uk-margin-medium
h2 Daily Hours
table.uk-table.uk-table-small.uk-table-divider
thead
tr
th.uk-table-expand Day of Week
th.uk-text-nowrap.uk-text-right.uk-table-shrink Session Count
th.uk-text-nowrap.uk-text-right.uk-table-shrink Hours Worked
th.uk-text-nowrap.uk-text-right.uk-table-shrink Time Worked
tbody
-
var totalHoursWorked = 0;
var totalSessionCount = 0;
each day in dailyTimeWorked
.uk-overflow-auto
table.uk-table.uk-table-small.uk-table-divider
thead
tr
th.uk-table-expand Day of Week
th.uk-text-nowrap.uk-text-right.uk-table-shrink Session Count
th.uk-text-nowrap.uk-text-right.uk-table-shrink Hours Worked
th.uk-text-nowrap.uk-text-right.uk-table-shrink Time Worked
tbody
-
totalHoursWorked += day.hoursWorked;
totalSessionCount += day.workSessionCount;
var totalHoursWorked = 0;
var totalSessionCount = 0;
each day in dailyTimeWorked
-
totalHoursWorked += day.hoursWorked;
totalSessionCount += day.workSessionCount;
tr
td.uk-table-expand= dayjs(day.date).format('dddd')
td.uk-text-right.uk-text-nowrap.uk-table-shrink= (day.workSessionCount > 0) ? formatCount(day.workSessionCount) : '---'
td.uk-text-right.uk-text-nowrap.uk-table-shrink= (day.hoursWorked > 0) ? numeral(day.hoursWorked).format('0.00') : '---'
td.uk-text-right.uk-text-nowrap.uk-table-shrink= (day.hoursWorked > 0) ? numeral(day.hoursWorked * 3600).format('0:00:00') : '---'
tfoot
tr
td.uk-table-expand= dayjs(day.date).format('dddd')
td.uk-text-right.uk-text-nowrap.uk-table-shrink= (day.workSessionCount > 0) ? formatCount(day.workSessionCount) : '---'
td.uk-text-right.uk-text-nowrap.uk-table-shrink= (day.hoursWorked > 0) ? numeral(day.hoursWorked).format('0.00') : '---'
td.uk-text-right.uk-text-nowrap.uk-table-shrink= (day.hoursWorked > 0) ? numeral(day.hoursWorked * 3600).format('0:00:00') : '---'
tfoot
tr
td.uk-table-expand TOTALS
td.uk-text-right.uk-text-nowrap.uk-table-shrink= formatCount(totalSessionCount)
td.uk-text-right.uk-text-nowrap.uk-table-shrink= numeral(totalHoursWorked).format('0.00')
td.uk-text-right.uk-text-nowrap.uk-table-shrink= numeral(totalHoursWorked * 3600).format('0:00:00')
td.uk-table-expand TOTALS
td.uk-text-right.uk-text-nowrap.uk-table-shrink= formatCount(totalSessionCount)
td.uk-text-right.uk-text-nowrap.uk-table-shrink= numeral(totalHoursWorked).format('0.00')
td.uk-text-right.uk-text-nowrap.uk-table-shrink= numeral(totalHoursWorked * 3600).format('0:00:00')

9
client/js/time-tracker-client.js
View File

@ -47,6 +47,7 @@ export class TimeTrackerApp extends DtpApp {
/*
* Page Visibility API hooks
*/
window.addEventListener('pageshow', this.onWindowPageShow.bind(this));
window.addEventListener('pagehide', this.onWindowPageHide.bind(this));
window.addEventListener('freeze', this.onWindowFreeze.bind(this));
window.addEventListener('resume', this.onWindowResume.bind(this));
@ -74,9 +75,15 @@ export class TimeTrackerApp extends DtpApp {
this.haveFocus = false;
}
async onWindowPageShow (event) {
this.log.debug('onWindowPageShow', 'the page is being shown', { event });
}
async onWindowPageHide (event) {
this.log.debug('onWindowPageHide', 'the page is being hidden', { event });
await this.socket.disconnect();
if (!event.persisted) {
await this.socket.disconnect();
}
}
async onWindowFreeze (event) {

Write Preview
Loading…
Cancel
Save