diff --git a/src/app/modals/view-document/view-document.page.ts b/src/app/modals/view-document/view-document.page.ts index 0e66d2ced..f59b7b3c9 100644 --- a/src/app/modals/view-document/view-document.page.ts +++ b/src/app/modals/view-document/view-document.page.ts @@ -33,6 +33,7 @@ export class ViewDocumentPage implements OnInit { private alertController: AlertController, ) { this.file = this.navParams.get('file'); + console.log(this.file ) this.applicationId = this.navParams.get('applicationId'); this.docId = this.navParams.get('docId'); this.Document = this.navParams.get('Document') diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index a5ecf9510..104fcbefa 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -44,8 +44,7 @@ - -
Contactos selecção:
- +

{{user.name}}

@@ -43,7 +43,7 @@ Apagar -
+
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss index c0a1068d7..be6c59607 100644 --- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss +++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss @@ -136,7 +136,7 @@ .item-checkbox p, .members-checkbox p{ display: block; margin: 0 !important; - width: 330px; + padding-left: 10px; font-size: rem(15); color: var(--title-text-color); @@ -165,4 +165,9 @@ } } - \ No newline at end of file + .inactive { + opacity: 0.7; + ion-item-options { + display: none !important; + } + } \ No newline at end of file diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index 8bf7aa9ab..f8199b81f 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -894,7 +894,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { componentProps: { isCreated: this.isGroupCreated, room: this.room, - members: this.members, + members: this.ChatSystemService.getGroupRoom(this.roomId).members, name: this.room.name, }, cssClass: 'contacts', diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index b01407dc5..98f2af49a 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -453,6 +453,7 @@ ion-toolbar{ color: black; min-height: 19px; width: 100%; + } .description{ @@ -460,6 +461,7 @@ ion-toolbar{ font-family: Roboto; font-size: rem(13); font-weight: bold; + //color: #0d89d1; color: var(--title-text-color) } diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index 47000994b..a241a4a00 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -254,7 +254,7 @@ export class ApproveEventPage implements OnInit { componentProps: { trustedUrl: '', file: { - title: Document.Assunto, + title: Document.Description, url: '', title_link: '', }, @@ -382,6 +382,7 @@ export class ApproveEventPage implements OnInit { try { this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.loadedEvent.workflowInstanceDataFields.InstanceId).toPromise(); + console.log(this.loadedAttachments) } catch (error) { console.error('getAttchaments',error) } diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html index 75c8082ff..b0dc8b76f 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.html +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html @@ -114,10 +114,11 @@

{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}

{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}

-
+
+

{{event.workflowInstanceDataFields.Subject}}

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}

-

{{event.workflowInstanceDataFields.Subject}}

+
{{ event.activityInstanceName }}
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..94359aed8 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,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { AnimationController, ModalController } from '@ionic/angular'; +import { ActivatedRoute } from '@angular/router'; +import { ModalController } from '@ionic/angular'; import { Publication } from 'src/app/models/publication'; import { PublicationsService } from 'src/app/services/publications.service'; import { ToastService } from 'src/app/services/toast.service'; @@ -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/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts index 347c322d6..aa69e0fb3 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -144,7 +144,7 @@ export class ApproveEventPage implements OnInit { componentProps: { trustedUrl: '', file: { - title: Document.Assunto, + title: Document.Description, url: '', title_link: '', }, diff --git a/src/app/shared/agenda/event-list/event-list.page.html b/src/app/shared/agenda/event-list/event-list.page.html index 2909f57de..cabad5bec 100644 --- a/src/app/shared/agenda/event-list/event-list.page.html +++ b/src/app/shared/agenda/event-list/event-list.page.html @@ -63,9 +63,10 @@

{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}

+

{{event.workflowInstanceDataFields.Subject}}

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}

-

{{event.workflowInstanceDataFields.Subject}}

+
{{ event.activityInstanceName }}
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html index 97e77ffd0..e4fefa8e3 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html @@ -38,9 +38,9 @@
Contactos selecção: -
+
-

{{user.name}}

+

{{user.name }}

-
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss index b46583944..79ec7b8fc 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss @@ -176,4 +176,9 @@ } } - \ No newline at end of file +.inactive { + opacity: 0.7; + button { + display: none !important; + } +} \ No newline at end of file diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts index 2934ebd5f..c6e20fd9b 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts @@ -39,7 +39,7 @@ export class GroupContactsPage implements OnInit { objectUserSingleStone = [] userContainer = {} - + constructor( private modalController: ModalController, private chatService: ChatService, diff --git a/src/app/shared/chat/new-group/group-contacts/group-contacts-routing.module.ts b/src/app/shared/chat/new-group/group-contacts/group-contacts-routing.module.ts deleted file mode 100644 index c998741ed..000000000 --- a/src/app/shared/chat/new-group/group-contacts/group-contacts-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { GroupContactsPage } from './group-contacts.page'; - -const routes: Routes = [ - { - path: '', - component: GroupContactsPage - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class GroupContactsPageRoutingModule {} diff --git a/src/app/shared/chat/new-group/group-contacts/group-contacts.module.ts b/src/app/shared/chat/new-group/group-contacts/group-contacts.module.ts deleted file mode 100644 index 2946bd28c..000000000 --- a/src/app/shared/chat/new-group/group-contacts/group-contacts.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { IonicModule } from '@ionic/angular'; - -import { GroupContactsPageRoutingModule } from './group-contacts-routing.module'; - -import { GroupContactsPage } from './group-contacts.page'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - GroupContactsPageRoutingModule - ], - declarations: [GroupContactsPage] -}) -export class GroupContactsPageModule {} diff --git a/src/app/shared/chat/new-group/group-contacts/group-contacts.page.html b/src/app/shared/chat/new-group/group-contacts/group-contacts.page.html deleted file mode 100644 index 7cca9b8cf..000000000 --- a/src/app/shared/chat/new-group/group-contacts/group-contacts.page.html +++ /dev/null @@ -1,9 +0,0 @@ - - - group-contacts - - - - - - diff --git a/src/app/shared/chat/new-group/group-contacts/group-contacts.page.scss b/src/app/shared/chat/new-group/group-contacts/group-contacts.page.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/app/shared/chat/new-group/group-contacts/group-contacts.page.spec.ts b/src/app/shared/chat/new-group/group-contacts/group-contacts.page.spec.ts deleted file mode 100644 index 5d3e2033f..000000000 --- a/src/app/shared/chat/new-group/group-contacts/group-contacts.page.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { GroupContactsPage } from './group-contacts.page'; - -describe('GroupContactsPage', () => { - let component: GroupContactsPage; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ GroupContactsPage ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(GroupContactsPage); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/shared/chat/new-group/group-contacts/group-contacts.page.ts b/src/app/shared/chat/new-group/group-contacts/group-contacts.page.ts deleted file mode 100644 index 7cb431b9a..000000000 --- a/src/app/shared/chat/new-group/group-contacts/group-contacts.page.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-group-contacts', - templateUrl: './group-contacts.page.html', - styleUrls: ['./group-contacts.page.scss'], -}) -export class GroupContactsPage implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} diff --git a/src/app/shared/chat/new-group/new-group-routing.module.ts b/src/app/shared/chat/new-group/new-group-routing.module.ts index 1ea3fb565..7800e505c 100644 --- a/src/app/shared/chat/new-group/new-group-routing.module.ts +++ b/src/app/shared/chat/new-group/new-group-routing.module.ts @@ -11,12 +11,7 @@ const routes: Routes = [ { path: 'contacts', loadChildren: () => import('./contacts/contacts.module').then( m => m.ContactsPageModule) - }, - { - path: 'group-contacts', - loadChildren: () => import('./group-contacts/group-contacts.module').then( m => m.GroupContactsPageModule) } - ]; @NgModule({ diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html index 3af8955dd..da030c116 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html @@ -112,9 +112,9 @@

{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}

+
{{event.workflowInstanceDataFields.Subject}}
{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}
{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}
-
{{event.workflowInstanceDataFields.Subject}}
Para hoje diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.html b/src/app/shared/popover/chat-popover/chat-popover.page.html index b47f7dcf8..340f70792 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.html +++ b/src/app/shared/popover/chat-popover/chat-popover.page.html @@ -10,7 +10,7 @@
-
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/shared/publication/view-publications/publication-detail/publication-detail.page.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts index 14a2b5491..415f070f4 100644 --- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts +++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts @@ -134,6 +134,7 @@ export class PublicationDetailPage implements OnInit { if(error.status == 404) { this.publicationFolderService.deletePost(this.folderId, this.publicationId) + this.goBackToViewPublications.emit(); } this.httpErrorHandle.httpStatusHandle(error) 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 587c79187..d8e7b9199 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "188e1033b", - "SHA": "188e1033b8d59e6029218c54edfc506d78e1a960", + "shortSHA": "10ca45b8a", + "SHA": "10ca45b8a0ad7ad7f9167faa7963905a99c98bc0", "branch": "developer-prod", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Tue Aug 22 17:51:32 2023 +0100'", - "lastCommitMessage": "bug fixed", - "lastCommitNumber": "5208", + "lastCommitTime": "'Wed Aug 23 13:34:03 2023 +0100'", + "lastCommitMessage": "buttons: save is first, cancel is second", + "lastCommitNumber": "5210", "change": "", - "changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 5 and 3 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/dar-parecer/dar-parecer.page.html\n\tmodified: src/app/modals/delegar/delegar.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/forward/forward.page.html\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/modals/profile/profile.page.scss\n\tmodified: src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts", + "changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 6 and 3 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/view-document/view-document.page.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\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/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.html\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts-routing.module.ts\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts.module.ts\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts.page.html\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts.page.scss\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts.page.spec.ts\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts.page.ts\n\tmodified: src/app/shared/chat/new-group/new-group-routing.module.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/popover/chat-popover/chat-popover.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.ts\n\tmodified: src/app/store/publication-folder.service.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file