mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
add event driven
This commit is contained in:
+2
-1
@@ -14,7 +14,8 @@
|
|||||||
"dev:share": "lite-server --baseDir=share",
|
"dev:share": "lite-server --baseDir=share",
|
||||||
"install:chromium": "node node_modules/puppeteer/install.js",
|
"install:chromium": "node node_modules/puppeteer/install.js",
|
||||||
"build:version": "node ./version/git-version.js",
|
"build:version": "node ./version/git-version.js",
|
||||||
"ionic-build": "ionic cap run android --prod"
|
"ionic-build": "ionic cap run android --prod",
|
||||||
|
"prepare": "husky install"
|
||||||
},
|
},
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ const object = [
|
|||||||
'diplomas',
|
'diplomas',
|
||||||
'expedientes-pr',
|
'expedientes-pr',
|
||||||
'despachos',
|
'despachos',
|
||||||
|
'*',
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
export type IdObject = typeof object[number];
|
export type notificationObject = typeof object[number];
|
||||||
@@ -15,7 +15,7 @@ import { v4 as uuidv4 } from 'uuid';
|
|||||||
import { EventTrigger } from '../services/eventTrigger.service';
|
import { EventTrigger } from '../services/eventTrigger.service';
|
||||||
import { SessionStore } from '../store/session.service';
|
import { SessionStore } from '../store/session.service';
|
||||||
import { ActionPerformed, PushNotificationSchema, PushNotifications, Token, } from '@capacitor/push-notifications';
|
import { ActionPerformed, PushNotificationSchema, PushNotifications, Token, } from '@capacitor/push-notifications';
|
||||||
import { IdObject } from '../models/notifications';
|
import { notificationObject } from '../models/notifications';
|
||||||
/* import { Events } from 'ionic-angular' */
|
/* import { Events } from 'ionic-angular' */
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
@@ -28,7 +28,7 @@ export class NotificationsService {
|
|||||||
DataArray = new Array();
|
DataArray = new Array();
|
||||||
|
|
||||||
callbacks: {
|
callbacks: {
|
||||||
type: string,
|
type: notificationObject,
|
||||||
funx: Function
|
funx: Function
|
||||||
id: string
|
id: string
|
||||||
}[] = []
|
}[] = []
|
||||||
@@ -52,7 +52,7 @@ export class NotificationsService {
|
|||||||
/* private fcm: FCM */) {
|
/* private fcm: FCM */) {
|
||||||
|
|
||||||
}
|
}
|
||||||
registerCallback(type: IdObject, funx: Function, object: any = {}) {
|
registerCallback(type: notificationObject, funx: Function, object: any = {}) {
|
||||||
|
|
||||||
const id = uuidv4()
|
const id = uuidv4()
|
||||||
this.callbacks.push({ type, funx, id })
|
this.callbacks.push({ type, funx, id })
|
||||||
@@ -63,6 +63,27 @@ export class NotificationsService {
|
|||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// registerCallback({type, funx, id = uuidv4()}:{
|
||||||
|
// type: notificationObject,
|
||||||
|
// funx: Function
|
||||||
|
// id?: string
|
||||||
|
// }) {
|
||||||
|
|
||||||
|
// this.callbacks.push({ type, funx, id })
|
||||||
|
|
||||||
|
// return id;
|
||||||
|
// }
|
||||||
|
|
||||||
|
private runNotificationCallback(notification) {
|
||||||
|
this.callbacks.forEach((data) => {
|
||||||
|
if(data.type == notification.data.IdObject) {
|
||||||
|
data.funx({notification})
|
||||||
|
} else if (data.type == '*') {
|
||||||
|
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
deleteCallback(id) {
|
deleteCallback(id) {
|
||||||
this.callbacks.forEach((e, index) => {
|
this.callbacks.forEach((e, index) => {
|
||||||
if (e.id == id) {
|
if (e.id == id) {
|
||||||
@@ -155,6 +176,7 @@ export class NotificationsService {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
this.runNotificationCallback(notification)
|
||||||
/* this.eventTriger.publish('notificatioRecive') */
|
/* this.eventTriger.publish('notificatioRecive') */
|
||||||
this.eventtrigger.publishSomeData({
|
this.eventtrigger.publishSomeData({
|
||||||
notification: "recive"
|
notification: "recive"
|
||||||
@@ -174,6 +196,7 @@ export class NotificationsService {
|
|||||||
notification: "recive"
|
notification: "recive"
|
||||||
}) */
|
}) */
|
||||||
this.notificatinsRoutes(notification)
|
this.notificatinsRoutes(notification)
|
||||||
|
this.runNotificationCallback(notification)
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
export let versionData = {
|
export let versionData = {
|
||||||
"shortSHA": "7fbe4abdd",
|
"shortSHA": "e24f4010e",
|
||||||
"SHA": "7fbe4abddf5aadf72d781e9c140f6364b5f164e3",
|
"SHA": "e24f4010e0b8d94a232bf8d2f5ba88c6fe8d6256",
|
||||||
"branch": "feature/ios-ui-fix",
|
"branch": "feature/ios-ui-fix",
|
||||||
"lastCommitAuthor": "'Peter Maquiran'",
|
"lastCommitAuthor": "'Peter Maquiran'",
|
||||||
"lastCommitTime": "'Mon Jan 16 09:06:12 2023 +0100'",
|
"lastCommitTime": "'Mon Jan 16 12:08:38 2023 +0100'",
|
||||||
"lastCommitMessage": "save",
|
"lastCommitMessage": "fix notification",
|
||||||
"lastCommitNumber": "4626",
|
"lastCommitNumber": "4627",
|
||||||
"change": "",
|
"change": "",
|
||||||
"changeStatus": "On branch feature/ios-ui-fix\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: .gitignore\n\tnew file: android/app/google-services.json",
|
"changeStatus": "On branch feature/ios-ui-fix\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: package.json\n\tmodified: src/app/models/notifications.ts\n\tmodified: src/app/services/notifications.service.ts",
|
||||||
"changeAuthor": "peter.maquiran"
|
"changeAuthor": "peter.maquiran"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user