diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts index 2aec463e7..dfb585392 100644 --- a/src/app/modals/profile/profile.page.ts +++ b/src/app/modals/profile/profile.page.ts @@ -43,7 +43,7 @@ export class ProfilePage implements OnInit { private storageservice: StorageService, private zone: NgZone, private platform: Platform, - private eventtrigger: EventTrigger, + private eventTriger: EventTrigger, public ThemeService: ThemeService, ) { @@ -53,6 +53,13 @@ export class ProfilePage implements OnInit { this.logoutOut = true }); + this.eventTriger.getObservable().subscribe((event) => { + if(event.notification == "recive") { + this.getNotificationData(); + } + console.log(event) + }); + setTimeout(() => { this.hideImage = true }, 2000) @@ -193,7 +200,7 @@ export class ProfilePage implements OnInit { // this.notificationservice.tempClearArray(); this.deleteNotification(index); - this.eventtrigger.publishSomeData({ + this.eventTriger.publishSomeData({ notification: "deleted" }) diff --git a/src/app/models/envarioment.ts b/src/app/models/envarioment.ts index f4b4b609f..e9ec2da8e 100644 --- a/src/app/models/envarioment.ts +++ b/src/app/models/envarioment.ts @@ -13,6 +13,7 @@ export interface Environment { version: version; sentryUrl: string; despachoLabel: string + despachoLabel2: string, } diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index f4db62035..f1e92ced9 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -3,12 +3,12 @@ - - - - - + + + + +
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts index c281841b2..2659ba89b 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -20,6 +20,7 @@ import { SortService } from 'src/app/services/functions/sort.service'; import { ThemeService } from 'src/app/services/theme.service' import { SessionStore } from 'src/app/store/session.service'; import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; +import { environment } from 'src/environments/environment'; @Component({ selector: 'app-despachos-pr', diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts index ef938f3a9..0d3509a4c 100644 --- a/src/app/services/chat/message.service.ts +++ b/src/app/services/chat/message.service.ts @@ -369,7 +369,8 @@ export class MessageService { if(!roomObject.isGroup) { var memeberTosend = this.ChatSystemService.getRoomById(this.rid).membersExcludeMe - this.notificationService.ChatSendMessageNotification(memeberTosend[0].username,ChatMessage.u.username,ChatMessage.msg,this.rid) + console.log(ChatMessage) + this.notificationService.ChatSendMessageNotification(memeberTosend[0].username,ChatMessage.u.name,ChatMessage.msg,this.rid) } diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts index ec8b4c390..820e63d57 100644 --- a/src/app/services/notifications.service.ts +++ b/src/app/services/notifications.service.ts @@ -40,45 +40,44 @@ export class NotificationsService { private platform: Platform, private router: Router, private zone: NgZone, - private eventtrigger: EventTrigger,) {} - - - registerCallback({type, funx, id = uuidv4()} : { - type: notificationObject, - funx: Function - id?: string - }) { - this.callbacks[id] = { funx, id, type} - return id; - } - - deleteCallback(id) { - delete this.callbacks[id] - } - - private async runNotificationCallback(notification) { - - for (const [key, value] of Object.entries(this.callbacks)) { - if(value.type == notification.data.Object) { - - const dontRepeat = await value.funx(notification) - - if(dontRepeat) { - delete this.callbacks[key] - } - - } else if (value.type == '*') { - const dontRepeat = await value.funx(notification) - - if(dontRepeat) { - delete this.callbacks[key] - } - } - - } + private eventtrigger: EventTrigger,) { } + + // registerCallback({type, funx, id = uuidv4()} : { + // type: notificationObject, + // funx: Function + // id?: string + // }) { + // this.callbacks[id] = { funx, id, type} + // return id; + // } + + + // private async runNotificationCallback(notification) { + + // for (const [key, value] of Object.entries(this.callbacks)) { + // if(value.type == notification.data.Object) { + + // const dontRepeat = await value.funx(notification) + + // if(dontRepeat) { + // delete this.callbacks[key] + // } + + // } else if (value.type == '*') { + // const dontRepeat = await value.funx(notification) + + // if(dontRepeat) { + // delete this.callbacks[key] + // } + // } + + // } + + // } + getTokenByUserIdAndId(user, userID) { // const geturl = environment.apiURL + 'notifications/user/' + userID; @@ -194,7 +193,7 @@ export class NotificationsService { } ChatSendMessageNotification(userID,title,bodymsg,roomId) { - const geturl = environment.apiURL + `notifications/send`; + const geturl = environment.apiURL + `notifications/sendbyUsername`; const headers = { 'Authorization': SessionStore.user.BasicAuthKey }; const message = { @@ -203,6 +202,23 @@ export class NotificationsService { } let id = 437 console.log(userID,title,bodymsg,roomId) + this.http.post(geturl+`?username=${userID}&title=${title}&body=${bodymsg}`, message, { headers }).subscribe(data => { + this.active = true + console.log(data) + }, (error) => { + console.log(error) + }) + } + + ChatSendMessageNotificationGrup(userID,title,bodymsg,roomId) { + const geturl = environment.apiURL + `notifications/send`; + + const headers = { 'Authorization': SessionStore.user.BasicAuthKey }; + const message = { + "Service": "chat", + "IdObject": roomId + } + console.log(userID,title,bodymsg,roomId) this.http.post(geturl+`?userId=${userID}&title=${title}&body=${bodymsg}`, message, { headers }).subscribe(data => { this.active = true console.log(data) diff --git a/src/environments/suport/doneIt.ts b/src/environments/suport/doneIt.ts index c072682d7..5de27d6d3 100644 --- a/src/environments/suport/doneIt.ts +++ b/src/environments/suport/doneIt.ts @@ -16,6 +16,7 @@ export const doneITProd: Environment = { sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712', logoLabel: 'doneIT', despachoLabel: 'Titular', + despachoLabel2: 'Despachos do Titular', }; export const doneITDev: Environment = { @@ -33,4 +34,5 @@ export const doneITDev: Environment = { sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712', logoLabel: 'doneIT', despachoLabel: 'Titular', + despachoLabel2: 'Despachos do Titular', }; \ No newline at end of file diff --git a/src/environments/suport/oapr.ts b/src/environments/suport/oapr.ts index 9e95e4e7e..5b2631af1 100644 --- a/src/environments/suport/oapr.ts +++ b/src/environments/suport/oapr.ts @@ -9,6 +9,7 @@ export const oaprProd: Environment = { apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket', logoLabel: 'Presidente da República', despachoLabel: 'Presidente da República', + despachoLabel2: 'Despachos Presidenciais', production: false, domain: 'oapr.gov.ao', defaultuser: '', @@ -26,6 +27,7 @@ export const oaprDev: Environment = { apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket', logoLabel: 'Presidente da República', despachoLabel: 'Presidente da República', + despachoLabel2: 'Despachos Presidenciais', production: false, domain: 'oapr.gov.ao', defaultuser: 'gmanuel@oapr.gov.ao', diff --git a/version/git-version.ts b/version/git-version.ts index a9853b5e8..bb1104273 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "065fc517a", - "SHA": "065fc517aedb4f1a87f84ccf0a87b4331f373f67", + "shortSHA": "6ff883c98", + "SHA": "6ff883c9823b89c727d25fcccf2df8c647b5c0ae", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Feb 3 14:37:29 2023 +0100'", - "lastCommitMessage": "improve", - "lastCommitNumber": "4719", + "lastCommitTime": "'Fri Feb 3 19:37:47 2023 +0100'", + "lastCommitMessage": "message", + "lastCommitNumber": "4720", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: .gitignore\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/background.service.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/store/eventoaprovacao-store.service.ts\n\tmodified: src/app/store/session.service.ts\n\tmodified: src/assets/firebase-messaging-sw.js\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/index.html", + "changeStatus": "On branch no_bug_movemente\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/models/envarioment.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/environments/suport/doneIt.ts\n\tmodified: src/environments/suport/oapr.ts\n\tmodified: version/git-version.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file