Theaninova/openstapps
1
0
Fork 0
mirror of https://gitlab.com/openstapps/openstapps.git synced 2026-01-22 01:22:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: links of timetable tabs

Browse Source 
Closes #144
This commit is contained in:
Jovan Krunić
2021-11-08 21:05:34 +01:00
committed by Rainer Killinger
parent 1c56c891e1
commit 837c69bb21
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/modules/map/page/map-page.component.ts
View File

@@ -438,7 +438,7 @@ export class MapPageComponent {
this.distance = this.positionService.getDistance(this.items[0].geo.point); this.distance = this.positionService.getDistance(this.items[0].geo.point);
this.addToMap(this.items, true); this.addToMap(this.items, true);
this.ref.detectChanges(); this.ref.detectChanges();
const url = this.router.createUrlTree(['/map/', uid]).toString(); const url = this.router.createUrlTree([[], uid]).toString();
this.location.go(url); this.location.go(url);
// center the selected place // center the selected place
this.focus(geoJSON(this.items[0].geo.point).getBounds().getCenter()); this.focus(geoJSON(this.items[0].geo.point).getBounds().getCenter());

17
src/app/modules/schedule/page/schedule-page.component.ts
View File

@@ -19,9 +19,9 @@ import {
OnInit, OnInit,
ViewChild, ViewChild,
} from '@angular/core'; } from '@angular/core';
import {ActivatedRoute} from '@angular/router'; import {Location} from '@angular/common';
import {ActivatedRoute, Router} from '@angular/router';
import {AnimationController, ModalController} from '@ionic/angular'; import {AnimationController, ModalController} from '@ionic/angular';
import {last} from 'lodash-es';
import {SharedAxisChoreographer} from '../../../animation/animation-choreographer'; import {SharedAxisChoreographer} from '../../../animation/animation-choreographer';
import {materialSharedAxisX} from '../../../animation/material-motion'; import {materialSharedAxisX} from '../../../animation/material-motion';
import {ModalEventCreatorComponent} from './modal/modal-event-creator.component'; import {ModalEventCreatorComponent} from './modal/modal-event-creator.component';
@@ -136,6 +136,8 @@ export class SchedulePageComponent implements OnInit, AfterViewInit {
private readonly modalController: ModalController, private readonly modalController: ModalController,
private readonly activatedRoute: ActivatedRoute, private readonly activatedRoute: ActivatedRoute,
private readonly animationController: AnimationController, private readonly animationController: AnimationController,
private router: Router,
private location: Location,
) {} ) {}
ngOnInit() { ngOnInit() {
@@ -172,13 +174,10 @@ export class SchedulePageComponent implements OnInit, AfterViewInit {
* When the segment changes * When the segment changes
*/ */
onSegmentChange() { onSegmentChange() {
window.history.replaceState( const url = this.router
{}, .createUrlTree([[], this.segmentView.value])
'', .toString();
`/#/schedule/${this.segmentView.value}/${last( this.location.go(url);
window.location.href.split('/'),
)}`,
);
this.tabChoreographer.changeViewForState(this.segmentView.value); this.tabChoreographer.changeViewForState(this.segmentView.value);
} }