diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
index 0c0d859d8..dc59f8fbf 100644
--- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
+++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
@@ -8,7 +8,7 @@
-
+
Campos marcados com * são obrigatórios
diff --git a/src/app/services/native-notification.service.ts b/src/app/services/native-notification.service.ts
index 9bc3686b3..484592ea1 100644
--- a/src/app/services/native-notification.service.ts
+++ b/src/app/services/native-notification.service.ts
@@ -95,7 +95,7 @@ export class NativeNotificationService {
.filter(e => new Date().getTime() <= new Date(e.start).getTime())
.filter(e => this.didEventHappenToday(e.start))
- console.log('notify', events)
+ // console.log('notify', events)
await this.cancelAllNotification();
diff --git a/src/app/services/notification/notifications.service.ts b/src/app/services/notification/notifications.service.ts
index 0406afa44..0be6326a3 100644
--- a/src/app/services/notification/notifications.service.ts
+++ b/src/app/services/notification/notifications.service.ts
@@ -1,8 +1,7 @@
import { Injectable, NgZone } from '@angular/core';
-import { AlertController, Platform } from '@ionic/angular';
+import { Platform } from '@ionic/angular';
import { Capacitor } from '@capacitor/core';
import { ActionPerformed, PushNotificationSchema, PushNotifications, Token, } from '@capacitor/push-notifications';
-import { environment } from 'src/environments/environment';
import { NotificationsEndsPointsService } from './notifications-ends-points.service'
import { AngularFireMessaging } from '@angular/fire/messaging';
import { NavigationExtras, Router } from '@angular/router';
diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts
index c19e7d0c5..83db46348 100644
--- a/src/app/services/notifications.service.ts
+++ b/src/app/services/notifications.service.ts
@@ -191,6 +191,7 @@ export class NotificationsService {
tracing.setAttribute('outcome','success')
tracing.finish()
}, (error) => {
+ tracing.setAttribute('postToken','failed')
tracing.setAttribute('outcome','failed')
tracing.finish()
})
diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts
index 4b017a7f1..ca49e3524 100644
--- a/src/app/services/task.service.ts
+++ b/src/app/services/task.service.ts
@@ -47,7 +47,6 @@ export class TaskService {
SessionStore = SessionStore
AllProcess = []
- showLoader: boolean = false
showLoaderNum: number = 0
loadCount = false
loadNum = 0
@@ -202,7 +201,6 @@ export class TaskService {
async LoadTask() {
- this.showLoader = true
try {
await this.loadExpedientes()
@@ -225,7 +223,6 @@ export class TaskService {
await this.loadEventosParaAprovacao()
this.loadCount = true
- this.showLoader = false;
}
async loadDespachos() {
@@ -267,7 +264,6 @@ export class TaskService {
}
async loadPedidos() {
- this.showLoader = true
this.showLoaderNum++
try {
@@ -499,4 +495,29 @@ export class TaskService {
}
}
+
+ taskCleaner(serialNumber: string) {
+ const taskData = {
+ serialNumber: serialNumber,
+ action: "Conhecimento",
+ ActionTypeId: 104,
+ dataFields: {
+ ReviewUserComment: "ii"
+ },
+ AttachmentList: {
+ ProcessInstanceID: "",
+ Attachments: []
+ }
+ };
+
+ this.processesbackend.CompleteTask(taskData).subscribe(
+ response => {
+ console.log('Task completed successfully:', response);
+ },
+ error => {
+ console.error('Error completing task:', error);
+ }
+ );
+ }
+
}
diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.ts b/src/app/shared/event/attendee-modal/attendee-modal.page.ts
index db64e005a..f90160934 100644
--- a/src/app/shared/event/attendee-modal/attendee-modal.page.ts
+++ b/src/app/shared/event/attendee-modal/attendee-modal.page.ts
@@ -243,7 +243,7 @@ export class AttendeePage implements OnInit {
let result
if(this.hideExternalDomain) {
- result = _result.filter( e => e.UserType == 'GD' && e.Name.includes(filter))
+ result = _result.filter( e => e.UserType == 'GD' && e.EmailAddress.toLocaleLowerCase().includes(filter.toLocaleLowerCase()))
} else {
result = _result
}
diff --git a/version/git-version.ts b/version/git-version.ts
index 3bd3fc802..5e48f4d82 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,11 +1,11 @@
export let versionData = {
- "shortSHA": "e952cc227",
- "SHA": "e952cc2278c1dccf0502be8597a40c221034c3b7",
+ "shortSHA": "0c024beb7",
+ "SHA": "0c024beb7779e247322cca3efe0bdb3b2dbe7ccb",
"branch": "feature/agenda-api-peter",
"lastCommitAuthor": "'Peter Maquiran'",
- "lastCommitTime": "'Fri Jul 12 16:55:29 2024 +0100'",
- "lastCommitMessage": "create event from attachment",
- "lastCommitNumber": "5865",
- "changeStatus": "On branch feature/agenda-api-peter\nYour branch is up to date with 'origin/feature/agenda-api-peter'.\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/services/notifications.service.ts",
+ "lastCommitTime": "'Fri Jul 12 17:06:06 2024 +0100'",
+ "lastCommitMessage": "fix notification",
+ "lastCommitNumber": "5866",
+ "changeStatus": "On branch feature/agenda-api-peter\nYour branch is up to date with 'origin/feature/agenda-api-peter'.\n\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.html\n\tmodified: src/app/services/native-notification.service.ts\n\tmodified: src/app/services/notification/notifications.service.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.ts\n\tmodified: version/git-version.ts",
"changeAuthor": "peter.maquiran"
}
\ No newline at end of file