+ (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/publication-detail/publication-detail.module.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.module.ts index 116453af2..7cf296ada 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.module.ts +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.module.ts @@ -7,13 +7,15 @@ import { IonicModule } from '@ionic/angular'; import { PublicationDetailPageRoutingModule } from './publication-detail-routing.module'; import { PublicationDetailPage } from './publication-detail.page'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - PublicationDetailPageRoutingModule + PublicationDetailPageRoutingModule, + HeaderPageModule, ], declarations: [PublicationDetailPage] }) diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html index 8852a366e..e8f116a3b 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html @@ -1,9 +1,12 @@ + + +
-
+
diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts index 423a66043..982916e93 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts @@ -1,10 +1,9 @@ import { Component, OnInit } from '@angular/core'; -import { AnimationController, ModalController, NavParams } from '@ionic/angular'; +import { ActivatedRoute, Router } from '@angular/router'; +import { AnimationController, ModalController } from '@ionic/angular'; import { Publication } from 'src/app/models/publication'; import { PublicationsService } from 'src/app/services/publications.service'; import { ToastService } from 'src/app/services/toast.service'; -import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page'; -import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page'; import { ImageModalPage } from '../../gallery/image-modal/image-modal.page'; import { NewPublicationPage } from '../../new-publication/new-publication.page'; @@ -21,13 +20,21 @@ export class PublicationDetailPage implements OnInit { constructor( private modalController: ModalController, - private navParams:NavParams, private publications:PublicationsService, private animationController: AnimationController, private toastService: ToastService, + private activatedRoute: ActivatedRoute, + private router: Router, ) { - this.publicationId = this.navParams.get('publicationId'); - this.folderId = this.navParams.get('folderId'); + this.activatedRoute.paramMap.subscribe(params => { + console.log(params); + if(params["params"]) { + this.folderId = params["params"].folderId; + this.publicationId = params["params"].publicationId; + console.log(params["params"]); + } + }); + this.publication = { DateIndex: null, DocumentId: '', @@ -80,6 +87,10 @@ export class PublicationDetailPage implements OnInit { this.modalController.dismiss(); } + goBack(){ + this.router.navigate(['/home/publications', this.folderId]); + } + async deletePost(){ 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..b5905e29b 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 @@
- + @@ -32,7 +35,7 @@
+ (click)="goToPublicationDetail(publication.DocumentId)">
image
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..ca3ec6aee 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,20 @@ export class ViewPublicationsPage implements OnInit { private loadingController: LoadingService, private modalController: ModalController, private publications: PublicationsService, - private navParams: NavParams, - ) { + private activatedRoute: ActivatedRoute, + private router: Router, + ) + { this.item = new PublicationFolder(); - 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 +58,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); @@ -102,6 +115,10 @@ export class ViewPublicationsPage implements OnInit { }); } + goToPublicationDetail(publicationId:string){ + this.router.navigate(['/home/publications/view-publications', this.folderId, publicationId]); + } + async viewPublicationDetail(publicationId:string) { const modal = await this.modalController.create({ component: PublicationDetailPage, diff --git a/src/app/shared/publication/view-publications/view-publications.page.scss b/src/app/shared/publication/view-publications/view-publications.page.scss index ae1a88f76..87435bd78 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.scss +++ b/src/app/shared/publication/view-publications/view-publications.page.scss @@ -1,4 +1,11 @@ + :host{ + + ::-webkit-scrollbar { + width: 7px; + height: 7px; + } + background: transparent; padding: 0!important; } @@ -56,15 +63,12 @@ color:#000; } - .main-content{ - width: 100%; /* 400px */ - height: 100%; - font-family: Roboto; - margin: 0 auto; - background-color: #fff; - overflow:auto; - padding: 15px 20px 0 20px; + .main-container{ + width: 100%; + height: 100% !important; + overflow-y: auto; } + .content-top{ background: #f3f2f2; height: 20px; @@ -73,17 +77,6 @@ border-top-right-radius: 25px; transform: translate3d(0, 1px, 0); } - .content-container{ - width: 100%; - margin:0 auto; - border-top-left-radius: 25px; - border-top-right-radius: 25px; - background: #ffffff; - height: 100%; - box-shadow: 0px 0px 18px rgba(0, 0, 0, 0.6); - padding: 25px 0px 0 0px; - overflow: auto; - } .title-content{ margin: 0px auto; overflow: auto; diff --git a/src/global.scss b/src/global.scss index c51e437f0..8f33c6d9e 100644 --- a/src/global.scss +++ b/src/global.scss @@ -862,4 +862,8 @@ background: rgb(92, 92, 92); tr:nth-child(n+6) { display: none; } -} \ No newline at end of file +} + +.modal { + display: flex !important; + } \ No newline at end of file