Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Swap position for overall and month balance on day view #331

Merged
merged 2 commits into from
Jul 31, 2020
Merged

Swap position for overall and month balance on day view #331

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d46590a
Swap position for overall and month balance on day view
thamara Jul 30, 2020
7919c3c
Adding changelog entry
thamara Jul 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions js/classes/Calendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,15 +1010,15 @@ class DayCalendar extends Calendar {
return '<div class="month-total-row">' +
'<div class="half-width">' +
'<div class="month-total-element">' +
'<div class="month-total-text month-sum" title="Overall balance until end of the month or current day">Overall Balance</div>' +
'<div class="month-total-time month-sum-time" title="Overall balance until end of the month or current day"><span id="overall-balance"></div>' +
'</div>' +
'<div class="month-total-text month-balance" title="Balance up until today for this month. A positive balance means extra hours you don\'t need to work today (or the rest of the month).">Month Balance</div>' +
'<div class="month-total-time month-balance-time" title="Balance up until today for this month. A positive balance means extra hours you don\'t need to work today (or the rest of the month)."><span type="text" id="month-balance"></div>' +
'</div>' +
'</div>' +
'<div class="half-width">' +
'<div class="month-total-element">' +
'<div class="month-total-text month-balance" title="Balance up until today for this month. A positive balance means extra hours you don\'t need to work today (or the rest of the month).">Month Balance</div>' +
'<div class="month-total-time month-balance-time" title="Balance up until today for this month. A positive balance means extra hours you don\'t need to work today (or the rest of the month)."><span type="text" id="month-balance"></div>' +
'</div>' +
'<div class="month-total-text month-sum" title="Overall balance until end of the month or current day">Overall Balance</div>' +
'<div class="month-total-time month-sum-time" title="Overall balance until end of the month or current day"><span id="overall-balance"></div>' +
'</div>' +
'</div>' +
'</div>';
}
Expand Down