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 8abf39b97..05c2cdb45 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,4 +1,4 @@ -import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; +import { Component, ElementRef, OnInit, ViewChild, OnDestroy } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { ModalController } from '@ionic/angular'; import { Publication } from 'src/app/models/publication'; @@ -13,6 +13,7 @@ import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { PublicationFolderService } from 'src/app/store/publication-folder.service'; import { checkFileTypeService } from 'src/app/services/checkFileType.service'; import { StopvideoService } from "src/app/services/stopvideo.service" +import { PublicationHolderService } from 'src/app/services/publication/publication-holder.service' @Component({ @@ -34,6 +35,8 @@ export class PublicationDetailPage implements OnInit { dynamicBullets: true } + isComponentIsAlive = true + constructor( private modalController: ModalController, private publications:PublicationsService, @@ -45,7 +48,8 @@ export class PublicationDetailPage implements OnInit { private httpErrorHandle: HttpErrorHandle, public publicationFolderService: PublicationFolderService, public checkFileType: checkFileTypeService, - public StopvideoService: StopvideoService + public StopvideoService: StopvideoService, + public PublicationHolderService: PublicationHolderService ) { } @@ -77,6 +81,19 @@ export class PublicationDetailPage implements OnInit { OriginalFileName: '', FileExtension: '', }; + + + + window['publicationEdit'] = () => { + if(this.isComponentIsAlive == true) { + this.getPublicationDetail() + } + } + + } + + OnDestroy() { + this.isComponentIsAlive = false } doRefresh(event) { this.getPublicationDetail(); @@ -131,9 +148,6 @@ export class PublicationDetailPage implements OnInit { if(this.isModal) { this.close() } else { - if(window['app-view-publications-page-doRefresh']) { - window['app-view-publications-page-doRefresh']() - } this.RouteService.goBack(); } @@ -167,28 +181,28 @@ export class PublicationDetailPage implements OnInit { } async editPost(publicationType:any) { + if(this.PublicationHolderService.PublicationFormMV.length == 0) { + const modal = await this.modalController.create({ + component: NewPublicationPage, + componentProps:{ + publicationType: publicationType, + publication: this.publication, + folderId: this.folderId + }, + cssClass: 'new-publication modal modal-desktop', + backdropDismiss: false + }); - const modal = await this.modalController.create({ - component: NewPublicationPage, - componentProps:{ - publicationType: publicationType, - publication: this.publication, - folderId: this.folderId - }, - cssClass: 'new-publication modal modal-desktop', - backdropDismiss: false - }); + modal.onDidDismiss().then((data) => { + + }); + + await modal.present(); + } else { + this.toastService._successMessage('já existe uma publicação a ser processado'); + } - modal.onDidDismiss().then((data) => { - if(data.data) { - this.publication = data.data - if(window['app-view-publications-page-doRefresh']) { - window['app-view-publications-page-doRefresh']() - } - } - }); - await modal.present(); } async openPreview(item) { diff --git a/src/app/shared/publication/upload/publication-from-mv.service.ts b/src/app/shared/publication/upload/publication-from-mv.service.ts index 5d271b413..8b8587461 100644 --- a/src/app/shared/publication/upload/publication-from-mv.service.ts +++ b/src/app/shared/publication/upload/publication-from-mv.service.ts @@ -126,6 +126,10 @@ export class PublicationFromMvService { this.httpErroHandle.httpsSucessMessagge('Editar publicação') } + if(window['publicationEdit']) { + window['publicationEdit']() + } + this.publicationFolderService.getPublicationsIds(this.folderId) window['upload-header-set-remove'](this.id); diff --git a/src/app/shared/swiper/swiper.page.html b/src/app/shared/swiper/swiper.page.html index b47d01a5e..d94804cce 100644 --- a/src/app/shared/swiper/swiper.page.html +++ b/src/app/shared/swiper/swiper.page.html @@ -10,28 +10,28 @@
- + - +
- + - +
- diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 0bd217c5f..43c1647f5 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -4,4 +4,4 @@ import { environment as oaprProd } from './suport/oapr' import { DevDev } from './suport/dev' -export const environment: Environment = oaprProd; +export const environment: Environment = DevDev;