diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
index 2fe029dd4..49cc677c1 100644
--- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
+++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
@@ -68,6 +68,7 @@ export class EditEventToApproveComponent implements OnInit {
workflowInstanceDataFields:{
Body: "",
OccurrenceType: '',
+ Category: '',
LastOccurrence: '',
ParticipantsList: [],
Agenda: '',
@@ -132,41 +133,42 @@ export class EditEventToApproveComponent implements OnInit {
async getTask() {
const result = await this.processes.GetTask(this.serialNumber).toPromise();
- console.log(result);
+ console.log(result);
this.eventProcess = result
+ this.eventProcess.workflowInstanceDataFields.Category = result.workflowInstanceDataFields.EventType
- this.startDate = new Date(this.eventProcess.workflowInstanceDataFields.StartDate);
- this.endDate = new Date(this.eventProcess.workflowInstanceDataFields.EndDate);
+ this.startDate = new Date(this.eventProcess.workflowInstanceDataFields.StartDate);
+ this.endDate = new Date(this.eventProcess.workflowInstanceDataFields.EndDate);
- // description
- let body : any =this.eventProcess.workflowInstanceDataFields.Body.replace(/<[^>]+>/g, '')
- this.eventProcess.workflowInstanceDataFields.Body = body
- this.Location = this.eventProcess.workflowInstanceDataFields.Location
+ // description
+ let body : any =this.eventProcess.workflowInstanceDataFields.Body.replace(/<[^>]+>/g, '')
+ this.eventProcess.workflowInstanceDataFields.Body = body
+ this.Location = this.eventProcess.workflowInstanceDataFields.Location
- this.InstanceId = this.eventProcess.workflowInstanceDataFields.InstanceId
- try {
- this.getAttachments()
+ this.InstanceId = this.eventProcess.workflowInstanceDataFields.InstanceId
+ try {
+ this.getAttachments()
- } catch (error) {
+ } catch (error) {
+ }
+
+
+ if(this.eventProcess.workflowInstanceDataFields.IsRecurring == false) {
+ this.isRecurring = "Não se repete";
+ }
+ else {
+ this.isRecurring = "Repete";
+ }
+
+ this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e => {
+ if(e.IsRequired) {
+ this.taskParticipants.push(e);
+ } else {
+ this.taskParticipantsCc.push(e);
}
-
-
- if(this.eventProcess.workflowInstanceDataFields.IsRecurring == false) {
- this.isRecurring = "Não se repete";
- }
- else {
- this.isRecurring = "Repete";
- }
-
- this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e => {
- if(e.IsRequired) {
- this.taskParticipants.push(e);
- } else {
- this.taskParticipantsCc.push(e);
- }
- })
+ })
/* }) */
}
@@ -254,6 +256,7 @@ export class EditEventToApproveComponent implements OnInit {
LastOccurrence: this.eventProcess.workflowInstanceDataFields.LastOccurrence,
},
ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList,
+ Category: this.eventProcess.workflowInstanceDataFields.Category
}
console.log(event);
@@ -307,14 +310,19 @@ export class EditEventToApproveComponent implements OnInit {
modal.onDidDismiss().then((data) => {
- if(data){
+ if(data) {
data = data['data'];
const newAttendees: EventPerson[] = data['taskParticipants'];
const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
- this.setIntervenient(newAttendees);
- this.setIntervenientCC(newAttendeesCC);
+ if(newAttendees.length) {
+ this.setIntervenient(newAttendees);
+ }
+ if(newAttendeesCC) {
+ this.setIntervenientCC(newAttendeesCC);
+ }
+
}
});
} else {
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts
index fdd6ed39f..c7aad3f17 100644
--- a/src/app/shared/header/header.page.ts
+++ b/src/app/shared/header/header.page.ts
@@ -6,6 +6,7 @@ import { LoginUserRespose } from 'src/app/models/user.model';
import { ProfilePage } from 'src/app/modals/profile/profile.page';
import { StorageService } from '../../services/storage.service';
import { SessionStore } from 'src/app/store/session.service';
+import { NotificationsService } from '../../services/notifications.service';
import { environment } from 'src/environments/environment';
@Component({
@@ -32,6 +33,7 @@ export class HeaderPage implements OnInit {
private animationController: AnimationController,
private storageservice: StorageService,
private platform: Platform,
+ private notificationsService: NotificationsService,
) {
this.loggeduser = SessionStore.user;
router.events.subscribe((val) => {
@@ -45,21 +47,28 @@ export class HeaderPage implements OnInit {
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
console.log('Notifications not supported')
} else {
- this.notificationLengthData();
+ this.UpdateNotificationCount();
}
}
- async notificationLengthData() {
+ UpdateNotificationCount() {
+ this.notificationsService.registerCallback(
+ 'any',
+ () => {
+ this.notificationLengthData();
+ }
+ )
+ }
+
+ notificationLengthData() {
this.storageservice.get("Notifications").then((value) => {
console.log("Init get store", value)
- var data = JSON.parse(value);
- this.notificationLength = data.length;
+ /* var data = JSON.parse(value); */
+ this.notificationLength = value.length;
})
- await new Promise(resolve => setTimeout(resolve, 10000))
- await this.notificationLengthData()
console.log('Timer badge count')
}