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
@@ -7,6 +7,7 @@ import { DeplomaService } from 'src/app/Rules/deploma.service';
import { ProcessesService } from 'src/app/services/processes.service';
import { ToastService } from 'src/app/services/toast.service';
import { Location } from '@angular/common';
import { RouteService } from 'src/app/services/route.service';
@Component({
selector: 'app-deploma-options',
@@ -30,7 +31,7 @@ export class DeplomaOptionsPage implements OnInit {
private toastService: ToastService,
private router: Router,
private deplomaService: DeplomaService,
private location: Location) {
private RouteService: RouteService) {
this.serialNumber = this.navParams.get('serialNumber');
this.task = this.navParams.get('task');
this.fulltask = this.navParams.get('fulltask');
@@ -216,7 +217,7 @@ export class DeplomaOptionsPage implements OnInit {
}
goBack() {
this.location.back()
this.RouteService.goBack()
}
@@ -12,6 +12,7 @@ import { customTask, fullTask } from 'src/app/models/dailyworktask.model';
import { PermissionService } from 'src/app/services/worker/permission.service';
import { ThemeService } from 'src/app/services/theme.service'
import { Location } from '@angular/common'
import { RouteService } from 'src/app/services/route.service';
@Component({
selector: 'app-despachos-options',
@@ -33,7 +34,7 @@ export class DespachosOptionsPage implements OnInit {
private toastService: ToastService,
public p: PermissionService,
public ThemeService: ThemeService,
private location: Location,
private RouteService: RouteService,
) {
this.task = this.navParams.get('task')
this.fulltask = this.navParams.get('fulltask')
@@ -316,7 +317,7 @@ export class DespachosOptionsPage implements OnInit {
}
goBack() {
this.location.back();
this.RouteService.goBack();
}
}
@@ -11,7 +11,7 @@ import { ToastService } from 'src/app/services/toast.service';
import { Location } from '@angular/common'
import { PermissionService } from 'src/app/services/worker/permission.service';
import { ThemeService } from 'src/app/services/theme.service'
import { RouteService } from 'src/app/services/route.service';
@Component({
selector: 'app-despachos-pr-options',
@@ -33,7 +33,7 @@ export class DespachosPrOptionsPage implements OnInit {
public popoverController: PopoverController,
private activatedRoute: ActivatedRoute,
private toastService: ToastService,
private location: Location,
private RouteService: RouteService,
public p: PermissionService,
public ThemeService: ThemeService,
@@ -373,7 +373,7 @@ export class DespachosPrOptionsPage implements OnInit {
}
goBack() {
this.location.back();
this.RouteService.goBack();
}
cancle() {
@@ -14,7 +14,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
import { ToastService } from 'src/app/services/toast.service';
import { Location } from '@angular/common'
import { ThemeService } from 'src/app/services/theme.service'
import { RouteService } from 'src/app/services/route.service';
@Component({
selector: 'app-opts-expediente-pr',
@@ -50,7 +50,7 @@ export class OptsExpedientePrPage implements OnInit {
private navParams: NavParams,
private animationController: AnimationController,
private toastService: ToastService,
private location: Location,
private RouteService: RouteService,
public ThemeService: ThemeService
) {
@@ -329,7 +329,7 @@ export class OptsExpedientePrPage implements OnInit {
}
goBack() {
this.location.back()
this.RouteService.goBack()
}
getAttachments(serialNumber){
@@ -18,7 +18,7 @@ import { ExpedienteService } from 'src/app/Rules/expediente.service';
import { PermissionService } from 'src/app/services/worker/permission.service';
import { ThemeService } from 'src/app/services/theme.service'
import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page';
import { RouteService } from 'src/app/services/route.service';
@Component({
selector: 'app-opts-expediente',
@@ -46,7 +46,7 @@ export class OptsExpedientePage implements OnInit {
private activatedRoute: ActivatedRoute,
public p: PermissionService,
private attachmentsService: AttachmentsService,
private location: Location,
private RouteService: RouteService,
private TaskService: TaskService,
private expedienteService: ExpedienteService,
public ThemeService: ThemeService
@@ -107,7 +107,7 @@ export class OptsExpedientePage implements OnInit {
}
}
else {
this.location.back()
this.RouteService.goBack()
/* this.activatedRoute.paramMap.subscribe(params => {