From f50171ad9aed21448f96087ad325359ace78901b Mon Sep 17 00:00:00 2001 From: chfhtw Date: Mon, 18 Aug 2025 15:38:35 +0200 Subject: [PATCH 1/2] Calender: track locale change for day & list mode --- public/js/components/Calendar/Mode/Day.js | 13 +++++++++---- public/js/components/Calendar/Mode/List.js | 11 ++++++++--- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/public/js/components/Calendar/Mode/Day.js b/public/js/components/Calendar/Mode/Day.js index 68ca1fa89..e9764b495 100644 --- a/public/js/components/Calendar/Mode/Day.js +++ b/public/js/components/Calendar/Mode/Day.js @@ -44,11 +44,16 @@ export default { }, watch: { currentDate() { - this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days; - if (this.rangeOffset) { - this.$refs.view.$refs.grid.disableAutoScroll(); + if (this.currentDate.locale != this.focusDate.locale) { + this.focusDate = this.currentDate; this.$emit('update:range', this.range); - this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage); + } else { + this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days; + if (this.rangeOffset) { + this.$refs.view.$refs.grid.disableAutoScroll(); + this.$emit('update:range', this.range); + this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage); + } } } }, diff --git a/public/js/components/Calendar/Mode/List.js b/public/js/components/Calendar/Mode/List.js index 97990a5a3..76acfc610 100644 --- a/public/js/components/Calendar/Mode/List.js +++ b/public/js/components/Calendar/Mode/List.js @@ -47,10 +47,15 @@ export default { }, watch: { currentDate() { - this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days; - if (this.rangeOffset) { + if (this.currentDate.locale != this.focusDate.locale) { + this.focusDate = this.currentDate; this.$emit('update:range', this.range); - this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage); + } else { + this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days; + if (this.rangeOffset) { + this.$emit('update:range', this.range); + this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage); + } } } }, From ef80a19a2478ae840166c0f7d3ca3d186f6cb3a6 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Tue, 19 Aug 2025 13:22:59 +0200 Subject: [PATCH 2/2] allow negative studiengang_kz in prestudent and orgform urls --- application/config/routes.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/application/config/routes.php b/application/config/routes.php index da3a45f03..f6eafbcd2 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -75,16 +75,16 @@ $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/outgoing'] = 'api/ $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/gemeinsamestudien'] = 'api/frontend/v1/stv/Students/getGemeinsamestudien'; // (studiengang_kz)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]] -$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudents/$1'; -$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2'; -$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$3'; -$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$4'; +$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudents/$1'; +$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2'; +$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$3'; +$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$4'; // (studiengang_kz)/(orgform)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]] -$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2'; -$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3'; -$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$4'; -$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$5'; +$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2'; +$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3'; +$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$4'; +$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$5'; // (studiensemester_kurzbz)/(studiengang_kz)/(semester)/grp/(gruppe) $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsSpezialgruppe/$1/$2/$3/$4';