Skip to content

Commit e0a19c3

Browse files
authored
Merge pull request #116 from blocksebastian/master
daterangepicker - use provided firstDay variable to set correct start of week #87
2 parents f393dac + 136766c commit e0a19c3

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

js/src/dashboard.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ Chart.plugins.register({
6969
'Last 5 years': [moment().startOf('day').subtract(5, 'year'), moment().endOf('day')],
7070
},
7171
locale: {
72-
format: 'DD/MM/YY'
72+
format: 'DD/MM/YY',
73+
firstDay: firstDay
7374
}
7475
},cb);
7576
$("#report-range").on('apply.daterangepicker', function(ev, picker) {

js/src/reports.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ require('../../css/style.css');
5353

5454
},
5555
locale: {
56-
format: 'DD/MM/YY'
56+
format: 'DD/MM/YY',
57+
firstDay: firstDay
5758
}
5859
},cb);
5960
$("#report-range").on('apply.daterangepicker', function(ev, picker) {

js/src/timelines.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ require('../../css/style.css');
6868

6969
},
7070
locale: {
71-
format: 'DD/MM/YY'
71+
format: 'DD/MM/YY',
72+
firstDay: firstDay
7273
}
7374
},cb);
7475
$("#report-range").on('apply.daterangepicker', function(ev, picker) {

js/src/timer.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ function() {
4848
'Last 5 years': [moment().startOf('day').subtract(5, 'year'), moment().endOf('day')],
4949
},
5050
locale: {
51-
format: 'DD/MM/YY'
51+
format: 'DD/MM/YY',
52+
firstDay: firstDay
5253
}
5354
},cb);
5455
$("#report-range").on('apply.daterangepicker', function(ev, picker) {
@@ -101,7 +102,8 @@ function() {
101102
//endDate:tsToDate($(this).data('end-date')),
102103
timePicker24Hour: true,
103104
locale: {
104-
format: 'DD/MM/YY hh:mm:ss'
105+
format: 'DD/MM/YY hh:mm:ss',
106+
firstDay: firstDay
105107
}
106108
});
107109
function validateManualEntryFields(){
@@ -348,7 +350,8 @@ function() {
348350
endDate:tsToDate($(this).data('end-date')),
349351
timePicker24Hour: true,
350352
locale: {
351-
format: 'DD/MM/YY hh:mm:ss'
353+
format: 'DD/MM/YY hh:mm:ss',
354+
firstDay: firstDay
352355
}
353356
});
354357

0 commit comments

Comments
 (0)