\n
\n
\n {{publication.Title}} \ndiff --git a/src/app/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts\nindex 3d9bec3ee..c19f5ea02 100644\n--- a/src/app/services/chat/chat-system.service.ts\n+++ b/src/app/services/chat/chat-system.service.ts\n@@ -102,7 +102,7 @@ export class ChatSystemService {\n \n \n document.addEventListener('resume', function () {\n- if(this._dm?.length == 0 || this._group?.length == 0) {\n+ if(this._dm?.length == 0 && this._group?.length == 0) {\n this.getAllRooms();\n }\n });\ndiff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts\nindex 589595ac2..88fdb6bcf 100644\n--- a/src/app/services/events.service.ts\n+++ b/src/app/services/events.service.ts\n@@ -851,12 +851,22 @@ export class EventsService {\n const puturl = environment.apiURL + 'calendar/PutEvent';\n let params = new HttpParams();\n \n+ // event.Organizer = {\n+ // \"Id\": SessionStore.user.UserId,\n+ // \"EmailAddress\": SessionStore.user.Email,\n+ // \"Name\": SessionStore.user.UserName,\n+ // \"IsRequired\": true,\n+ // \"UserType\": \"GD\"\n+ // }\n+ // params = params.set(\"notifyUsers\", true)\n+\n params = params.set(\"conflictResolutionMode\", conflictResolutionMode.toString());\n params = params.set(\"sendInvitationsOrCancellationsMode\", sendInvitationsOrCancellationsMode.toString());\n params.set('CalendarId', event.CalendarId)\n params.set('CalendarName', event.CalendarName)\n this.headers['CalendarId'] = event.CalendarId\n this.headers['CalendarName'] = event.CalendarName\n+ //params = params.set(\"CalendarName\", event.CalendarName);\n \n if (event.CalendarName == 'Oficial') {\n if (SessionStore.user.Profile == 'MDGPR') {\ndiff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts\nindex ec462226f..dec1f2a5a 100644\n--- a/src/app/shared/agenda/approve-event/approve-event.page.ts\n+++ b/src/app/shared/agenda/approve-event/approve-event.page.ts\n@@ -10,7 +10,7 @@ import { ToastService } from 'src/app/services/toast.service';\n import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';\n import { ThemeService } from 'src/app/services/theme.service';\n import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';\n-import { TaskService } from 'src/app/services/task.service';\n+import { TaskService } from 'src/app/services/task.service'\n \n \n @Component({\n@@ -109,6 +109,7 @@ export class ApproveEventPage implements OnInit {\n async rejectTask(serialNumber:string) {\n \n let body = { \"serialNumber\": serialNumber, \"action\": \"Descartar\" }\n+ \n \n const loader = this.toastService.loading()\n \n@@ -132,6 +133,8 @@ export class ApproveEventPage implements OnInit {\n } catch (error) {\n console.error('getAttchaments',error)\n }\n+ \n+\n }\n \n async viewDocument(DocId:string, Document) {\n@@ -193,33 +196,26 @@ export class ApproveEventPage implements OnInit {\n if(res.data.option == 'save') { \n \n \n- if(res.data.note !== '') {\n- let body = { \"serialNumber\": serialNumber,\n- \"action\": \"Emendar\",\n- \"dataFields\": {\n- \"ReviewUserComment\": res.data,\n- }\n- }\n- \n- const loader = this.toastService.loading();\n-\n- try {\n- await this.processes.PostTaskAction(body).toPromise();\n- this.httpErroHandle.httpsSucessMessagge('Rever')\n- this.TaskService.loadEventosParaAprovacao();\n- this.close();\n- } catch (error) {\n- this.httpErroHandle.httpStatusHandle(error)\n- } finally {\n- loader.remove()\n+\n+ let body = { \"serialNumber\": serialNumber,\n+ \"action\": \"Emendar\",\n+ \"dataFields\": {\n+ \"ReviewUserComment\": res.data,\n }\n }\n- else {\n- if(res.data.option == 'save') {\n- this.toastService._badRequest('É necessário adicionar uma nota');\n- }\n+ \n+ const loader = this.toastService.loading();\n+\n+ try {\n+ await this.processes.PostTaskAction(body).toPromise();\n+ this.httpErroHandle.httpsSucessMessagge('Rever')\n+ this.TaskService.loadEventosParaAprovacao();\n+ this.close();\n+ } catch (error) {\n+ this.httpErroHandle.httpStatusHandle(error)\n+ } finally {\n+ loader.remove()\n }\n-\n \n } else {\n \ndiff --git a/src/app/shared/publication/new-publication/new-publication.page.html b/src/app/shared/publication/new-publication/new-publication.page.html\nindex c56c31771..b68341348 100644\n--- a/src/app/shared/publication/new-publication/new-publication.page.html\n+++ b/src/app/shared/publication/new-publication/new-publication.page.html\n@@ -12,6 +12,7 @@\n \n \n
\n+
\n+ \n \n
\n \n \n+ \n+ \n+\n \n \n Fotografia Anexada \ndiff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts\nindex de1dc4cf2..425919d32 100644\n--- a/src/app/shared/publication/new-publication/new-publication.page.ts\n+++ b/src/app/shared/publication/new-publication/new-publication.page.ts\n@@ -32,6 +32,7 @@ export class NewPublicationPage implements OnInit {\n @Input() publication!: Publication;\n @Input() publicationType: string;\n @Input() folderId:string;\n+ @Input() documentId:string;\n \n @Output() closeDesktopComponent = new EventEmitter();\n @Output() openPublicationDetails = new EventEmitter();\n@@ -64,16 +65,45 @@ export class NewPublicationPage implements OnInit {\n \n \n setData() {\n- if(!this.publication) {\n+ if(!this.publicationType) {\n setTimeout(() => {\n this.setData()\n }, 500)\n } else {\n- this.pub = this.publication\n+ // this.pub = this.publication\n+ // this.publication = null\n+ this.getPublicationDetail()\n }\n }\n \n \n+ getPublicationDetail() {\n+\n+ if(this.publicationType != '2') { \n+ this.showLoader = true;\n+ this.publications.GetPublicationById(this.documentId).subscribe( res => {\n+ this.publication = {\n+ DateIndex: res.DateIndex,\n+ DocumentId: res.DocumentId,\n+ ProcessId:res.ProcessId,\n+ Title:res.Title,\n+ Message: res.Message,\n+ DatePublication: res.DatePublication,\n+ FileBase64: \"data:image/jpg;base64,\" + res.FileBase64,\n+ OriginalFileName: res.OriginalFileName,\n+ FileExtension: res.FileExtension,\n+ }\n+ this.pub = this.publication;\n+ this.showLoader = false;\n+ }, () => {\n+ this.showLoader = false;\n+ this.goBack() \n+ });\n+ }\n+\n+\n+ }\n+\n async takePicture() {\n const capturedImage = await Camera.getPhoto({\n quality: 50,\n@@ -130,6 +160,16 @@ export class NewPublicationPage implements OnInit {\n }\n \n if(this.publicationType == '3') {\n+\n+ if(!this.publication?.OriginalFileName || !this.pub.OriginalFileName) {\n+ \n+ if(this.pub?.OriginalFileName) {\n+ console.log('this.pub',this.pub)\n+ }\n+ throw('no this.publication.OriginalFileName')\n+ \n+ }\n+ \n const loader = this.toastService.loading()\n \n if(this.capturedImage != '') {\ndiff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html\nindex c2bfb2b33..9242bb39d 100644\n--- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html\n+++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html\n@@ -10,6 +10,7 @@\n
\n {{publication.DatePublication | date: 'dd-MM-yyyy | h:mm'}}
\n\n
\n
\n ![]()
\n
\n- \n+
\n
\n
\n {{publication.Title}} ",
"changeStatus": "On branch developer-prod-2\nYour branch is ahead of 'origin/developer-prod-2' by 2 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: .gitignore\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: src/app/modals/add-note/add-note.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts\n\tmodified: src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts\n\tmodified: src/app/pages/events/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/publications/publications.page.html\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.html\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.html",
"changeAuthor": "peter.maquiran"
}