From d8e8066eaef190243233370651928d9571bcb07d Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 19 Jan 2023 11:48:43 +0100 Subject: [PATCH] event permission on chat --- src/app/services/chat/chat-system.service.ts | 2 +- .../chat/group-messages/group-messages.page.html | 2 +- .../chat/group-messages/group-messages.page.ts | 2 ++ src/app/shared/chat/messages/messages.page.html | 2 +- src/app/shared/chat/messages/messages.page.ts | 2 ++ .../chat-options-popover.page.html | 2 +- .../chat-options-popover.page.ts | 4 +++- src/app/store/localstore.service.ts | 2 ++ version/git-version.ts | 12 ++++++------ 9 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/app/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts index 5fdb97dc1..2b6483d54 100644 --- a/src/app/services/chat/chat-system.service.ts +++ b/src/app/services/chat/chat-system.service.ts @@ -96,7 +96,7 @@ export class ChatSystemService { } loadChat() { - if(SessionStore.user.ChatData) { + if(SessionStore.user?.ChatData?.data) { this.ReLoadChat() } } diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html index d7dea0438..218883245 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -272,7 +272,7 @@ - + diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index 7384b96a6..804a7e9fc 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -28,6 +28,7 @@ import { File } from '@awesome-cordova-plugins/file/ngx'; import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx'; import { SessionStore } from 'src/app/store/session.service'; import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page'; +import { PermissionService } from 'src/app/services/permission.service'; @Component({ selector: 'app-group-messages', @@ -103,6 +104,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe private file: File, private platform: Platform, private fileOpener: FileOpener, + public p: PermissionService, ) { this.loggedUserChat = SessionStore.user.ChatData['data']; diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index 6579f65b8..0705ef5cf 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -254,7 +254,7 @@ - + diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index f74cb4955..ef48d0263 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -34,6 +34,7 @@ import { SessionStore } from 'src/app/store/session.service'; import { Howl } from 'howler'; import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page'; import { ChatMessageDebuggingPage } from 'src/app/shared/popover/chat-message-debugging/chat-message-debugging.page'; +import { PermissionService } from 'src/app/services/permission.service'; const IMAGE_DIR = 'stored-images'; @@ -121,6 +122,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy private file: File, private platform: Platform, private fileOpener: FileOpener, + public p: PermissionService, ) { // update this.checkAudioPermission() diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html index 780f01377..95f5df98b 100644 --- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html +++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html @@ -11,7 +11,7 @@
- + diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts index cd4eee539..18c19e4ee 100644 --- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts +++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts @@ -6,6 +6,7 @@ import { NewEventPage } from 'src/app/pages/agenda/new-event/new-event.page'; import { SearchPage } from 'src/app/pages/search/search.page'; import { environment } from 'src/environments/environment'; import { ThemeService } from 'src/app/services/theme.service' +import { PermissionService } from 'src/app/services/permission.service'; @Component({ selector: 'app-chat-options-popover', @@ -22,7 +23,8 @@ export class ChatOptionsPopoverPage implements OnInit { private popoverController: PopoverController, private modalController: ModalController, private navParams: NavParams, - public ThemeService: ThemeService + public ThemeService: ThemeService, + public p: PermissionService, ) { this.members = this.navParams.get('members'); diff --git a/src/app/store/localstore.service.ts b/src/app/store/localstore.service.ts index cb2432701..d103f5dcf 100644 --- a/src/app/store/localstore.service.ts +++ b/src/app/store/localstore.service.ts @@ -88,6 +88,8 @@ export class LocalstoreService { } + listener() {} + } export const localstoreService = new LocalstoreService() \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index e9f3fee74..91199948e 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "7851c5a78", - "SHA": "7851c5a78e9305f7f2608c10ea6b30de652607c3", + "shortSHA": "4e8a31b6b", + "SHA": "4e8a31b6b9e66f24197bc66335796300f396f6cb", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Jan 19 10:24:19 2023 +0100'", - "lastCommitMessage": "fixe routes", - "lastCommitNumber": "4658", + "lastCommitTime": "'Thu Jan 19 11:30:12 2023 +0100'", + "lastCommitMessage": "ordenation", + "lastCommitNumber": "4659", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/pages/events/attendees/attendees.page.ts\n\tmodified: src/app/services/first-enter.service.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.ts\n\tmodified: src/app/store/localstore.service.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.html\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/chat/messages/messages.page.html\n\tmodified: src/app/shared/chat/messages/messages.page.ts\n\tmodified: src/app/shared/popover/chat-options-popover/chat-options-popover.page.html\n\tmodified: src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts\n\tmodified: src/app/store/localstore.service.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file