+ (click)="goToPublicationsList(viagem.ProcessId)">
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 7951ed6fe..096bb77eb 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -152,6 +152,17 @@ export class PublicationsPage implements OnInit { } + goToPublicationsList(folderId: string){ + if( window.innerWidth <= 800){ + this.router.navigate(['/home/publications',folderId]); + } else { + this.closeDesktopComponent(); + this.folderId = folderId + this.desktopComponent.showViewPublication = true; + } + + } + async viewPublications(folderId: string) { const enterAnimation = (baseEl: any) => { diff --git a/src/app/pages/publications/view-publications/view-publications.module.ts b/src/app/pages/publications/view-publications/view-publications.module.ts index ea016b8ed..795264add 100644 --- a/src/app/pages/publications/view-publications/view-publications.module.ts +++ b/src/app/pages/publications/view-publications/view-publications.module.ts @@ -8,6 +8,7 @@ import { ViewPublicationsPageRoutingModule } from './view-publications-routing.m import { ViewPublicationsPage } from './view-publications.page'; import { ComponentsModule } from 'src/app/components/components.module'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ @@ -15,7 +16,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - ViewPublicationsPageRoutingModule + ViewPublicationsPageRoutingModule, + HeaderPageModule, ], exports: [ViewPublicationsPage], declarations: [ViewPublicationsPage] diff --git a/src/app/pages/publications/view-publications/view-publications.page.html b/src/app/pages/publications/view-publications/view-publications.page.html index 89ac01a00..87c5af296 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.html +++ b/src/app/pages/publications/view-publications/view-publications.page.html @@ -1,10 +1,13 @@ - - + + + + +
-
+
@@ -18,7 +21,7 @@
- + diff --git a/src/app/pages/publications/view-publications/view-publications.page.scss b/src/app/pages/publications/view-publications/view-publications.page.scss index 7ea77b36e..099235685 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.scss +++ b/src/app/pages/publications/view-publications/view-publications.page.scss @@ -4,7 +4,7 @@ } ion-content{ --background: transparent; - transform: translate3d(0, 5px, 0); + //transform: translate3d(0, 5px, 0); --border-radius: 30px; } ion-toolbar{ @@ -52,7 +52,6 @@ overflow:hidden; padding: 25px 20px 0px 20px; color:#000; - } .main-content{ width: 100%; /* 400px */ @@ -60,7 +59,6 @@ font-family: Roboto; margin: 0 auto; background-color: #fff; - padding: 15px 20px 0 20px; } .content-top{ diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts index ea83b9db6..9e98cff9f 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/src/app/pages/publications/view-publications/view-publications.page.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { ModalController, NavParams } from '@ionic/angular'; +import { ActivatedRoute, Router } from '@angular/router'; +import { ModalController } from '@ionic/angular'; import { Publication } from 'src/app/models/publication'; import { PublicationFolder } from 'src/app/models/publicationfolder'; import { LoadingService } from 'src/app/services/loading.service'; @@ -24,11 +25,22 @@ export class ViewPublicationsPage implements OnInit { private loadingController: LoadingService, private modalController: ModalController, private publications: PublicationsService, - private navParams: NavParams, - ) { + /* private navParams: NavParams, */ + private activatedRoute: ActivatedRoute, + private router: Router, + ) + { this.item = new PublicationFolder(); - this.folderId = this.navParams.get('folderId'); - } + /* this.folderId = this.navParams.get('folderId'); */ + this.activatedRoute.paramMap.subscribe(params => { + console.log(params); + + if(params["params"]) { + this.folderId = params["params"].folderId; + console.log(params["params"]); + } + }); + } ngOnInit() { console.log(this.folderId); @@ -48,6 +60,9 @@ export class ViewPublicationsPage implements OnInit { close(){ this.modalController.dismiss(); } + goBack(){ + this.router.navigate(['/home/publications']); + } getPublicationDetail(){ this.publications.GetPublicationFolderById(this.folderId).subscribe(res=>{ console.log(res);