Skip to content

Commit

Permalink
Swap position for overall and month balance on day view (#331)
Browse files Browse the repository at this point in the history
* Swap position for overall and month balance on day view
Closes #328

* Adding changelog entry
  • Loading branch information
thamara committed Jul 31, 2020
1 parent b23ae0e commit f522da1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
1.5.6 (in development)
------------------------------------------------------------------------
- Fix: Fixed behavior of calendar when moving to next/previous month when current day is in the range of 29-31.
- Enhancement: [#328] Swap position for overall and month balance on day view

Who built 1.5.6:
- thamara
Expand Down
12 changes: 6 additions & 6 deletions js/classes/Calendar.js
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

0 comments on commit f522da1

Please sign in to comment.