From 971a1f50d11965db76191caff0f565e27d27dfc9 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 17 May 2024 15:27:52 +0100
Subject: [PATCH] add paticipant on chat

---
 .../pages/chat/group-messages/group-messages.page.ts  |  2 +-
 .../shared/chat/group-messages/group-messages.page.ts | 11 +++++++++++
 .../shared/popover/chat-popover/chat-popover.page.ts  |  3 +++
 .../publication/upload/publication-from-mv.service.ts |  7 +++++++
 src/environments/environment.prod.ts                  |  2 +-
 src/environments/environment.ts                       |  2 +-
 workspace.code-workspace                              |  3 ---
 7 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index 76ef54e0a..d2ebd9d38 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -1323,7 +1323,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
         reject(error);
       };
     });
-    
+
   }
 
   removeTextBeforeSlash(inputString, controlString) {
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 edfb6d7c2..64864d56f 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -109,6 +109,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     this.loggedUserChat = SessionStore.user.ChatData['data'];
     this.isGroupCreated = true;
 
+
   }
   ngOnChanges(changes: SimpleChanges): void {
 
@@ -127,6 +128,13 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
 
     this.deleteRecording();
 
+
+    if (SessionStore.user.ChatData.data.userId == this.ChatSystemService.getGroupRoom(this.roomId).u._id) {
+      this.isAdmin = true
+    } else {
+      this.isAdmin = false
+    }
+
   }
 
   ngOnInit() {
@@ -524,6 +532,9 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
 
 
   async openOptions(ev: any) {
+
+    console.trace(this.room)
+
     const popover = await this.popoverController.create({
       component: ChatPopoverPage,
       cssClass: 'chat-popover modal-desktop',
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts
index 72362b081..29640a531 100644
--- a/src/app/shared/popover/chat-popover/chat-popover.page.ts
+++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts
@@ -34,6 +34,9 @@ export class ChatPopoverPage implements OnInit {
     this.roomId = this.navParams.get('roomId');
     this.members = this.navParams.get('members');
     this.isAdmin = this.navParams.get('isAdmin');
+
+    console.log(this.navParams.data)
+
   }
 
   ngOnInit() {
diff --git a/src/app/shared/publication/upload/publication-from-mv.service.ts b/src/app/shared/publication/upload/publication-from-mv.service.ts
index 05803d36a..b71c2b000 100644
--- a/src/app/shared/publication/upload/publication-from-mv.service.ts
+++ b/src/app/shared/publication/upload/publication-from-mv.service.ts
@@ -97,6 +97,13 @@ export class PublicationFromMvService {
             if(e.FileType == 'video' && e.toUpload) {
               e.OriginalFileName = e?.chucksManager?.path?.replace(".mp4", "") || e.OriginalFileName
               e.FileExtension =   e.FileExtension || "mp4"
+              e.Base64 = ''
+
+
+              if(e.FileType == 'video'  && !e.toUpload) {
+                e.Base64 = e.url
+              }
+
             }
             return e
           })
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 43c1647f5..0bd217c5f 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -4,4 +4,4 @@ import { environment as oaprProd } from './suport/oapr'
 import { DevDev } from './suport/dev'
 
 
-export const environment: Environment = DevDev;
+export const environment: Environment = oaprProd;
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 8982b9007..983359e87 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -1,6 +1,6 @@
 import { Environment } from './../app/models/envarioment'
 import { environment as oaprDev } from './suport/oapr'
-// import { doneITDev } from './suport/doneIt'
+import { doneITDev } from './suport/doneIt'
 import { DevDev } from './suport/dev'
 
 
diff --git a/workspace.code-workspace b/workspace.code-workspace
index b1838162c..bf4bc2067 100644
--- a/workspace.code-workspace
+++ b/workspace.code-workspace
@@ -2,9 +2,6 @@
     "folders": [
 		{
 			"path": "."
-		},
-		{
-			"path": "../sih/ORM"
 		}
 	],
     "settings": {