diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index b01407dc5..b3a747135 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -453,13 +453,14 @@ ion-toolbar{ color: black; min-height: 19px; width: 100%; + font-weight: bold; } .description{ width: 100%; font-family: Roboto; font-size: rem(13); - font-weight: bold; + //color: #0d89d1; color: var(--title-text-color) } diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index e0ffe37a5..b880e0c40 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -210,6 +210,7 @@ export class NewPublicationPage implements OnInit { if (this.publicationType == '3') { + const loader = this.toastService.loading() // has captured image if (this.capturedImage != '') { @@ -225,20 +226,7 @@ export class NewPublicationPage implements OnInit { FileExtension: 'jpeg', } - const loader = this.toastService.loading() - try { - - const response = await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise() - this.httpErrorHandle.httpsSucessMessagge('Publicação Editada') - console.log({response}) - - this.close() - } catch (error) { - this.httpErrorHandle.httpStatusHandle(error) - } finally { - loader.remove() - } } // no file names @@ -255,19 +243,6 @@ export class NewPublicationPage implements OnInit { FileExtension: "", } - const loader = this.toastService.loading() - - try { - const response = await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise() - this.httpErrorHandle.httpsSucessMessagge('Criar publicação') - console.log({response}) - - this.close() - } catch (error) { - this.httpErrorHandle.httpStatusHandle(error) - } finally { - loader.remove() - } } else { this.publication = { @@ -281,23 +256,30 @@ export class NewPublicationPage implements OnInit { FileBase64: this.publication.FileBase64, FileExtension: 'jpeg', } - - const loader = this.toastService.loading() - - try { - const response = await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise() - this.httpErrorHandle.httpsSucessMessagge('Publicação Editada') - console.log({response}) - this.close() - } catch (error) { - this.httpErrorHandle.httpStatusHandle(error) - } finally { - loader.remove() - } } + try { + + const response = await this.publications.CreatePublication(this.publication.ProcessId, this.publication).toPromise() + try { + await this.publications.DeletePublication(this.folderId, this.publication.DocumentId).toPromise(); + } catch(error) {} + + this.httpErrorHandle.httpsSucessMessagge('Editar publicação') + console.log({response}) + + + this.close(); + } catch (error) { + this.httpErrorHandle.httpStatusHandle(error) + } finally { + loader.remove() + } + this.PublicationFolderService.deletePost(this.publication.DocumentId, this.publication.ProcessId) + this.PublicationFolderService.deletePost(this.folderId, this.publication.ProcessId) + this.PublicationFolderService.deletePost(this.publication.ProcessId, this.publication.DocumentId) } else { @@ -336,11 +318,13 @@ export class NewPublicationPage implements OnInit { } } + + this.PublicationFolderService.getPublicationsIds(this.folderId) } close() { - this.modalController.dismiss().then(() => { + this.modalController.dismiss(this.publication).then(() => { this.showLoader = true; }); } 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 e02b7030d..7e411f677 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 @@ -134,6 +134,9 @@ 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(); } @@ -156,6 +159,7 @@ export class PublicationDetailPage implements OnInit { } catch (error) { if(error.status == 404) { this.publicationFolderService.deletePost(this.folderId, this.publicationId) + this.goBack(); } this.httpErrorHandle.httpStatusHandle(error) } finally { @@ -178,10 +182,13 @@ export class PublicationDetailPage implements OnInit { backdropDismiss: false }); - modal.onDidDismiss().then(()=>{ - setTimeout(() => { - this.getPublicationDetail(); - }, 5000); + 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(); 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 16ace1644..1c4f0e856 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -167,6 +167,7 @@ export class NewPublicationPage implements OnInit { } if(this.publicationType == '3') { + const loader = this.toastService.loading() if(this.capturedImage != '') { @@ -181,23 +182,6 @@ export class NewPublicationPage implements OnInit { FileBase64: this.capturedImage, FileExtension: 'jpeg', } - - - - const loader = this.toastService.loading() - - try { - const response = await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise() - this.httpErroHandle.httpsSucessMessagge('Criar publicação') - console.log({response}) - - this.goBack(); - } catch (error) { - this.httpErroHandle.httpStatusHandle(error) - } finally { - loader.remove() - } - } else if (!this.PublicationFolderService.PublicationHasImage(this.publication)) { // @@ -212,21 +196,6 @@ export class NewPublicationPage implements OnInit { FileBase64: "", FileExtension: this.publication.FileExtension, } - const loader = this.toastService.loading() - - try { - - const response = await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise() - - this.httpErroHandle.httpsSucessMessagge('Criar publicação') - console.log({response}) - - this.goBack(); - } catch (error) { - this.httpErroHandle.httpStatusHandle(error) - } finally { - loader.remove() - } } else { this.publication = { @@ -241,28 +210,29 @@ export class NewPublicationPage implements OnInit { FileExtension: 'jpeg', } - - - const loader = this.toastService.loading() - - try { - const response =await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise() - this.httpErroHandle.httpsSucessMessagge('Criar publicação') - - console.log({response}) - this.goBack(); - } catch (error) { - this.httpErroHandle.httpStatusHandle(error) - } finally { - loader.remove() - } - } + try { + const response = await this.publications.CreatePublication(this.publication.ProcessId, this.publication).toPromise() + try { + await this.publications.DeletePublication(this.folderId, this.publication.DocumentId).toPromise(); + } catch(error) {} + + this.httpErroHandle.httpsSucessMessagge('Editar publicação') + console.log({response}) + + + this.goBack(); + } catch (error) { + this.httpErroHandle.httpStatusHandle(error) + } finally { + loader.remove() + } + + this.PublicationFolderService.deletePost(this.publication.ProcessId, this.publication.DocumentId) this.PublicationFolderService.deletePost(this.publication.DocumentId, this.publication.ProcessId) - - + } else { diff --git a/src/app/store/publication-folder.service.ts b/src/app/store/publication-folder.service.ts index 9cbdac7f3..da941d2fe 100644 --- a/src/app/store/publication-folder.service.ts +++ b/src/app/store/publication-folder.service.ts @@ -155,6 +155,14 @@ export class PublicationFolderService { } + + async CreatePublication(folderId, publication: Publication) { + const response = await this.publications.CreatePublication(folderId, publication).toPromise() + let publicationDetails: Publication = this.publicationPipe.itemList(response) + this.publicationList[folderId].push(publicationDetails) + return publicationDetails + } + async setPublication(publicationId, folderId, publicationDetails: Publication) { diff --git a/version/git-version.ts b/version/git-version.ts index 704da0d94..cd4d9ff6a 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "977aed886", - "SHA": "977aed8862882fbc93ba9376e49974fdcca9be55", + "shortSHA": "a06bc4a40", + "SHA": "a06bc4a409dab223870433cd26d557b78ea5a8d3", "branch": "developer-prod", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Aug 22 15:43:20 2023 +0100'", - "lastCommitMessage": "fix pages", - "lastCommitNumber": "5203", + "lastCommitTime": "'Tue Aug 22 17:50:18 2023 +0100'", + "lastCommitMessage": "s", + "lastCommitNumber": "5204", "change": "", - "changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts", + "changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified: src/app/store/publication-folder.service.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file