From 0a753bd38c17078d871bc4c4ce42a309e1ae549d Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 8 Apr 2021 11:55:44 +0100 Subject: [PATCH] save --- .../publication-detail.page.ts | 2 ++ .../pages/publications/publications.page.ts | 4 ++- .../new-publication/new-publication.page.ts | 32 ++++++++++++++++++- src/global.scss | 2 +- 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/publication-detail/publication-detail.page.ts index 52aace972..6e564f5d5 100644 --- a/src/app/pages/publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/publication-detail/publication-detail.page.ts @@ -85,6 +85,8 @@ export class PublicationDetailPage implements OnInit { } async editPost(publicationType:any) { + console.log('HERE'); + console.log(this.publication); const modal = await this.modalController.create({ component: NewPublicationPage, diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index c565c6809..bba22464f 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -10,6 +10,7 @@ import { ViewPublicationsPage } from './view-publications/view-publications.page import { Animation, AnimationController } from '@ionic/angular'; import { LoadingController } from '@ionic/angular'; import { LoadingService } from 'src/app/services/loading.service'; +import { Publication } from 'src/app/models/publication'; @Component({ @@ -20,6 +21,7 @@ import { LoadingService } from 'src/app/services/loading.service'; export class PublicationsPage implements OnInit { showLoader: boolean; publicationFolder: PublicationFolder; + publication: Publication; publicationFolderList: PublicationFolder[]; publicationsEventFolderList: PublicationFolder[]; @@ -45,7 +47,7 @@ export class PublicationsPage implements OnInit { publicationId: string; // from publication details - publication: object; + //publication: object; constructor( private router: Router, diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts index 4ff61af78..6aebde7d5 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -39,6 +39,7 @@ export class NewPublicationPage implements OnInit { @Input() publicationType: string; @Input() folderId: string; + @Input() publicationId:string; @Output() closeDesktopComponent = new EventEmitter(); @Output() openPublicationDetails = new EventEmitter(); @Output() goBackToViewPublications = new EventEmitter(); @@ -59,10 +60,38 @@ export class NewPublicationPage implements OnInit { } ngOnInit() { + if(this.publicationType == '3'){ + this.getPublicationDetail(); + } this.setTitle(); this.clear(); this.takePicture(); } + + getPublicationDetail(){ + this.showLoader = true; + console.log(this.publicationId); + /* console.log(this.folderId); */ + this.publications.GetPublicationById(this.publicationId).subscribe(res=>{ + console.log(res); + /* this.publication = res; */ + this.publication = { + DateIndex: res.DateIndex, + DocumentId: res.DocumentId, + ProcessId:res.ProcessId, + Title:res.Title, + Message: res.Message, + DatePublication: res.DatePublication, + FileBase64: "data:image/jpg;base64," + res.FileBase64, + OriginalFileName: res.OriginalFileName, + FileExtension: 'jpeg', + } + this.pub = this.publication; + this.showLoader = false; + }); + } + + takePicture(){ const options: CameraOptions = { quality: 90, @@ -189,7 +218,8 @@ export class NewPublicationPage implements OnInit { if(this.publicationType == '2'){ this.goBackToViewPublications.emit(); } else { - this.goBacktoPublicationDetails.emit(); + this.goBackToViewPublications.emit(); + //this.goBacktoPublicationDetails.emit(); } } diff --git a/src/global.scss b/src/global.scss index cbbd385c4..c0cc6c0bf 100644 --- a/src/global.scss +++ b/src/global.scss @@ -571,6 +571,6 @@ border-top: 1px solid #d8d8d8; } .title-icon{ font-size: 40px !important; - color: #0782c9; + color: #42b9fe; overflow: auto; } \ No newline at end of file