mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 21:35:50 +00:00
fix input filter
This commit is contained in:
@@ -8,7 +8,7 @@
|
|||||||
<!-- *ngIf="p.userRole('PR')" -->
|
<!-- *ngIf="p.userRole('PR')" -->
|
||||||
<!-- *ngIf="p.role(['PR','MD']).permissionAnyOf(['view','edit'])" -->
|
<!-- *ngIf="p.role(['PR','MD']).permissionAnyOf(['view','edit'])" -->
|
||||||
|
|
||||||
<label >Convocar Reunião ..</label><br>
|
<label >Convocar Reunião</label><br>
|
||||||
<i style="margin-top: -3px; font-size: 15px;" > Campos marcados com * são obrigatórios</i>
|
<i style="margin-top: -3px; font-size: 15px;" > Campos marcados com * são obrigatórios</i>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ export class NativeNotificationService {
|
|||||||
.filter(e => new Date().getTime() <= new Date(e.start).getTime())
|
.filter(e => new Date().getTime() <= new Date(e.start).getTime())
|
||||||
.filter(e => this.didEventHappenToday(e.start))
|
.filter(e => this.didEventHappenToday(e.start))
|
||||||
|
|
||||||
console.log('notify', events)
|
// console.log('notify', events)
|
||||||
|
|
||||||
|
|
||||||
await this.cancelAllNotification();
|
await this.cancelAllNotification();
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
import { Injectable, NgZone } from '@angular/core';
|
import { Injectable, NgZone } from '@angular/core';
|
||||||
import { AlertController, Platform } from '@ionic/angular';
|
import { Platform } from '@ionic/angular';
|
||||||
import { Capacitor } from '@capacitor/core';
|
import { Capacitor } from '@capacitor/core';
|
||||||
import { ActionPerformed, PushNotificationSchema, PushNotifications, Token, } from '@capacitor/push-notifications';
|
import { ActionPerformed, PushNotificationSchema, PushNotifications, Token, } from '@capacitor/push-notifications';
|
||||||
import { environment } from 'src/environments/environment';
|
|
||||||
import { NotificationsEndsPointsService } from './notifications-ends-points.service'
|
import { NotificationsEndsPointsService } from './notifications-ends-points.service'
|
||||||
import { AngularFireMessaging } from '@angular/fire/messaging';
|
import { AngularFireMessaging } from '@angular/fire/messaging';
|
||||||
import { NavigationExtras, Router } from '@angular/router';
|
import { NavigationExtras, Router } from '@angular/router';
|
||||||
|
|||||||
@@ -191,6 +191,7 @@ export class NotificationsService {
|
|||||||
tracing.setAttribute('outcome','success')
|
tracing.setAttribute('outcome','success')
|
||||||
tracing.finish()
|
tracing.finish()
|
||||||
}, (error) => {
|
}, (error) => {
|
||||||
|
tracing.setAttribute('postToken','failed')
|
||||||
tracing.setAttribute('outcome','failed')
|
tracing.setAttribute('outcome','failed')
|
||||||
tracing.finish()
|
tracing.finish()
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -47,7 +47,6 @@ export class TaskService {
|
|||||||
SessionStore = SessionStore
|
SessionStore = SessionStore
|
||||||
|
|
||||||
AllProcess = []
|
AllProcess = []
|
||||||
showLoader: boolean = false
|
|
||||||
showLoaderNum: number = 0
|
showLoaderNum: number = 0
|
||||||
loadCount = false
|
loadCount = false
|
||||||
loadNum = 0
|
loadNum = 0
|
||||||
@@ -202,7 +201,6 @@ export class TaskService {
|
|||||||
|
|
||||||
async LoadTask() {
|
async LoadTask() {
|
||||||
|
|
||||||
this.showLoader = true
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await this.loadExpedientes()
|
await this.loadExpedientes()
|
||||||
@@ -225,7 +223,6 @@ export class TaskService {
|
|||||||
|
|
||||||
await this.loadEventosParaAprovacao()
|
await this.loadEventosParaAprovacao()
|
||||||
this.loadCount = true
|
this.loadCount = true
|
||||||
this.showLoader = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async loadDespachos() {
|
async loadDespachos() {
|
||||||
@@ -267,7 +264,6 @@ export class TaskService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async loadPedidos() {
|
async loadPedidos() {
|
||||||
this.showLoader = true
|
|
||||||
this.showLoaderNum++
|
this.showLoaderNum++
|
||||||
|
|
||||||
try {
|
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);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -243,7 +243,7 @@ export class AttendeePage implements OnInit {
|
|||||||
|
|
||||||
let result
|
let result
|
||||||
if(this.hideExternalDomain) {
|
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 {
|
} else {
|
||||||
result = _result
|
result = _result
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
export let versionData = {
|
export let versionData = {
|
||||||
"shortSHA": "e952cc227",
|
"shortSHA": "0c024beb7",
|
||||||
"SHA": "e952cc2278c1dccf0502be8597a40c221034c3b7",
|
"SHA": "0c024beb7779e247322cca3efe0bdb3b2dbe7ccb",
|
||||||
"branch": "feature/agenda-api-peter",
|
"branch": "feature/agenda-api-peter",
|
||||||
"lastCommitAuthor": "'Peter Maquiran'",
|
"lastCommitAuthor": "'Peter Maquiran'",
|
||||||
"lastCommitTime": "'Fri Jul 12 16:55:29 2024 +0100'",
|
"lastCommitTime": "'Fri Jul 12 17:06:06 2024 +0100'",
|
||||||
"lastCommitMessage": "create event from attachment",
|
"lastCommitMessage": "fix notification",
|
||||||
"lastCommitNumber": "5865",
|
"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 <file>...\" to unstage)\n\tmodified: src/app/services/notifications.service.ts",
|
"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 <file>...\" 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"
|
"changeAuthor": "peter.maquiran"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user