diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 7851858b0..ab50275a4 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -76,6 +76,7 @@ class="height-100 d-flex flex-column overflow-hidden flex-grow-1" (addNewPublication)="addNewPublication($event)" (openPublicationDetails)="openPublicationDetails($event)" + (goBacktoPublicationDetails)="goBacktoPublicationDetails($event)" (goBackToViewPublications)="goBackToViewPublications($event)" (closeDesktopComponent)="closeDesktopComponent($event)" > diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 18305e427..847c37051 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -179,18 +179,24 @@ export class PublicationsPage implements OnInit { } } - // called from view publications + + // called from publications details + // Emittter goBackToViewPublications(){ this.closeDesktopComponent(); this.desktopComponent.showViewPublication = true; } + // called from publications details + // Emitters goBackToPubications(){ this.closeDesktopComponent(); this.desktopComponent.showViewPublication = true; } + // called from edit publication (Emitters only) + // Emitters async goBacktoPublicationDetails(){ this.closeDesktopComponent(); this.desktopComponent.showPublicationDetail = true; diff --git a/src/app/shared/publication/new-publication/new-publication.page.html b/src/app/shared/publication/new-publication/new-publication.page.html index 64332cdcc..fca85e913 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.html +++ b/src/app/shared/publication/new-publication/new-publication.page.html @@ -1,8 +1,8 @@
-
+
{{publicationTitle}}
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 ed7493069..c547eb9b5 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -39,8 +39,9 @@ export class NewPublicationPage implements OnInit { @Input() publicationType: string; @Input() folderId: string; @Output() closeDesktopComponent = new EventEmitter(); - @Output() goBacktoPublicationDetails = new EventEmitter(); - + @Output() openPublicationDetails = new EventEmitter(); + @Output() goBackToViewPublications = new EventEmitter(); + @Output() goBacktoPublicationDetails = new EventEmitter(); guestPicture:any; @@ -121,7 +122,7 @@ export class NewPublicationPage implements OnInit { console.log('Edit change image'); console.log(this.publication); this.publications.UpdatePublication(this.publication.ProcessId, this.publication); - this.closeDesktopComponent.emit(); + this.goBack(); } else{ this.publication = { @@ -138,7 +139,7 @@ export class NewPublicationPage implements OnInit { console.log('Edit - keep image'); console.log(this.publication); this.publications.UpdatePublication(this.publication.ProcessId, this.publication); - this.closeDesktopComponent.emit(); + this.goBack(); } } else{ @@ -164,7 +165,7 @@ export class NewPublicationPage implements OnInit { close(){ - this.closeDesktopComponent.emit('!???____!!'); + this.goBack(); } clear(){ this.capturedImage = ''; @@ -183,8 +184,13 @@ export class NewPublicationPage implements OnInit { } async goBack(){ - - this.goBacktoPublicationDetails.emit(); + + if(this.publicationType == '2'){ + this.goBackToViewPublications.emit(); + } else { + this.goBacktoPublicationDetails.emit(); + } + } /* async openGallery() { diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.scss b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.scss index 06637624b..e0273da92 100644 --- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.scss +++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.scss @@ -74,7 +74,6 @@ } .post-img{ width: 100%; - height: 400px; margin: 0 auto; border-radius: 0px!important; overflow: hidden; @@ -85,7 +84,6 @@ object-fit: cover; } .post-description{ - width: 360px; margin: 0 auto; margin-bottom: 35px; } \ No newline at end of file diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html index fab92d47f..73200cd06 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.html +++ b/src/app/shared/publication/view-publications/view-publications.page.html @@ -3,9 +3,9 @@
-
+
{{item.Description}}

{{item.Detail}}

diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts index 411457d99..ca483e02d 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.ts +++ b/src/app/shared/publication/view-publications/view-publications.page.ts @@ -149,9 +149,5 @@ export class ViewPublicationsPage implements OnInit { } - async goBack(){ - console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!') - this.goBacktoPublicationDetails.emit(); - } }