+ (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); From 650ef9c5c1fd0eada2afaa24c0e357ac0f1b603a Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 18 Jun 2021 11:06:38 +0100 Subject: [PATCH 4/6] save --- .../publications/view-publications/view-publications.page.ts | 2 -- 1 file changed, 2 deletions(-) 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 9e98cff9f..a4dfb5231 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/src/app/pages/publications/view-publications/view-publications.page.ts @@ -25,13 +25,11 @@ 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); From 8b108ad8efcc76133593e58b0c0fd3d4d32b5f08 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 18 Jun 2021 11:09:02 +0100 Subject: [PATCH 5/6] save --- .../expedientes-pr/expediente-pr/expediente-pr.page.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html index c03c37315..c52ba9d34 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html @@ -35,14 +35,14 @@
-
Intervenientes
+
Com conhecimento
From ca3830a423b88e77a6e70f164e3d53184de51b5d Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 18 Jun 2021 11:59:06 +0100 Subject: [PATCH 6/6] multiples changes --- src/app/home/home-routing.module.ts | 8 ++--- .../publication-detail.module.ts | 4 ++- .../publication-detail.page.html | 5 ++- .../publication-detail.page.ts | 23 ++++++++++---- .../view-publications.page.html | 2 +- .../view-publications.page.ts | 4 +++ .../view-publications.page.scss | 31 +++++++------------ 7 files changed, 45 insertions(+), 32 deletions(-) diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 66534f60e..9cc716326 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -180,12 +180,12 @@ const routes: Routes = [ path:':folderId', loadChildren: ()=> import('../pages/publications/view-publications/view-publications.module').then(m => m.ViewPublicationsPageModule) }, - /* { + { path:'view-publications', children: [ { - path:':folderId', - loadChildren: ()=> import('../pages/publications/view-publications/view-publications.module').then(m => m.ViewPublicationsPageModule) + path:':folderId/:publicationId', + loadChildren: ()=> import('../pages/publications/view-publications/publication-detail/publication-detail.module').then(m => m.PublicationDetailPageModule) }, { path:'publication-detail', @@ -198,7 +198,7 @@ const routes: Routes = [ }, ] - }, */ + }, { path:'new-publication', loadChildren: ()=> import('../shared/publication/new-publication/new-publication.module').then(m => m.NewPublicationPageModule) 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.page.html b/src/app/pages/publications/view-publications/view-publications.page.html index 87c5af296..b5905e29b 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.html +++ b/src/app/pages/publications/view-publications/view-publications.page.html @@ -35,7 +35,7 @@
+ (click)="goToPublicationDetail(publication.DocumentId)">
image
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 a4dfb5231..ca3ec6aee 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/src/app/pages/publications/view-publications/view-publications.page.ts @@ -115,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;