improve go back

This commit is contained in:
Peter Maquiran
2022-01-06 14:47:22 +01:00
parent be06d3b3d1
commit 73354e00af
28 changed files with 153 additions and 58 deletions
@@ -12,6 +12,7 @@ import { SearchedDocumentOptionsPage } from 'src/app/shared/popover/searched-doc
import { Location } from '@angular/common';
import { ViewDocumentPage } from '../view-document/view-document.page';
import { ThemeService } from 'src/app/services/theme.service'
import { RouteService } from 'src/app/services/route.service';
@Component({
@@ -225,7 +226,7 @@ export class DocumentDetailPage implements OnInit {
});
await modal.present();
modal.onDidDismiss().then(res=>{
//this.location.back();
//this.RouteService.goBack();
});
}
@@ -248,7 +249,7 @@ export class DocumentDetailPage implements OnInit {
});
await modal.present();
modal.onDidDismiss().then(res=>{
this.location.back();
this.RouteService.goBack();
});
} */
@@ -6,7 +6,9 @@ import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expedient
import { ProcessesService } from 'src/app/services/processes.service';
import { EventDetailsDocumentsOptionsPage } from 'src/app/shared/popover/event-details-documents-options/event-details-documents-options.page';
import { DocumentSetUpMeetingPage } from '../document-set-up-meeting/document-set-up-meeting.page';
8
import { RouteService } from 'src/app/services/route.service';
@Component({
selector: 'app-view-document',
templateUrl: './view-document.page.html',
@@ -103,7 +105,7 @@ export class ViewDocumentPage implements OnInit {
});
await modal.present();
modal.onDidDismiss().then(res=>{
//this.location.back();
//this.RouteService.goBack();
});
}
+4 -3
View File
@@ -20,6 +20,7 @@ import { ThemeService } from 'src/app/services/theme.service'
import { Event } from '../../models/event.model';
import { EditEventPage } from 'src/app/pages/agenda/edit-event/edit-event.page';
import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
import { RouteService } from 'src/app/services/route.service';
@Component({
@@ -65,7 +66,7 @@ export class ViewEventPage implements OnInit {
private activatedRoute: ActivatedRoute,
private router: Router,
private toastService: ToastService,
private location: Location,
private RouteService: RouteService,
public platform: Platform,
private sqliteservice: SqliteService,
private backgroundservice: BackgroundService,
@@ -145,7 +146,7 @@ export class ViewEventPage implements OnInit {
this.toastService.badRequest('Este evento já não existe na sua agenda')
loader.remove()
this.modalController.dismiss('Eevent not Foud');
this.location.back();
this.RouteService.goBack();
}
loader.remove()
});
@@ -327,7 +328,7 @@ export class ViewEventPage implements OnInit {
});
await modal.present();
modal.onDidDismiss().then(res => {
//this.location.back();
//this.RouteService.goBack();
});
}