+
{{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 @@