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)">
30" class="post-img">
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;