blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-08 15:49:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

possible fix for kw 1 issue

Browse Source
This commit is contained in:
Harald Bamberger
2025-01-07 17:09:07 +01:00
parent 46914e8a65
commit e432501a1f
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/components/Calendar/Day.js
+1 -1
View File
@@ -13,7 +13,7 @@ export default {
},
computed: {
title() {
return this.focusDate.format({ year: 'numeric' }) + ' KW ' + this.focusDate.w;
return this.focusDate.wYear + ' KW ' + this.focusDate.w;
}
},
methods: {
public/js/components/Calendar/Week.js
+1 -1
View File
@@ -12,7 +12,7 @@ export default {
},
computed: {
title() {
return this.focusDate.format({year: 'numeric'}) + ' KW ' + this.focusDate.w;
return this.focusDate.wYear + ' KW ' + this.focusDate.w;
}
},
methods: {
public/js/composables/CalendarDate.js
+6
View File
@@ -49,6 +49,12 @@ class CalendarDate {
}
}
}
get wYear() {
if( this.w === 1 ) {
return this.cdLastDayOfWeek.format({ year: 'numeric' });
}
return this.cdFirstDayOfWeek.format({ year: 'numeric' });
}
get wd() {
if (this._wd === null) {
this._wd = ((new Date(this.y, this.m, this.d)).getDay()+7-this.weekStart)%7;