diff --git a/config.xml b/config.xml
index 17e317687..d592cd3bc 100644
--- a/config.xml
+++ b/config.xml
@@ -20,6 +20,7 @@
+
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 106979ccf..171a9db0d 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -1136,7 +1136,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
modal.present();
} else {
this.downloadFileFromBrowser("file", str)
- this.downloadFileFromBrowser(msg.attachments[0].name, str)
+ this.downloadFileFromBrowser(msg.attachments[0].title, str)
}
} else {
@@ -1153,7 +1153,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
});
modal.present();
} else {
- this.openFile(str, msg.attachments[0].name, msg.file.type);
+ this.openFile(str, msg.attachments[0].title, msg.file.type);
}
}
}
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.ts b/src/app/pages/chat/messages/contacts/contacts.page.ts
index 55f7b5b16..3b3a3d47c 100644
--- a/src/app/pages/chat/messages/contacts/contacts.page.ts
+++ b/src/app/pages/chat/messages/contacts/contacts.page.ts
@@ -42,32 +42,13 @@ export class ContactsPage implements OnInit {
ngOnInit() {
// this.chatService.refreshtoken();
- this.loadUsers();
+ // this.loadUsers();
}
onChange(event){
this.textSearch = event.detail.value;
}
- loadUsers(){
-
- this.chatService.getAllUsers().subscribe((res:any) => {
-
- this.contacts = res.users.filter(data => data.username != this.sessionStore.user.UserName);
- this.users = this.contacts.sort((a,b) => {
- if(a.name < b.name){
- return -1;
- }
- if(a.name > b.name){
- return 1;
- }
- return 0;
- });
- this.showLoader = false;
- }, (error) =>{
- // this.chatService.refreshtoken();
- });
- }
separateLetter(record, recordIndex, records){
if(recordIndex == 0){
@@ -92,14 +73,13 @@ export class ContactsPage implements OnInit {
clicked() {}
- createRoom(username:string){
+ createRoom(username:string) {
let body = {
username: username,
}
this.chatService.createRoom(body).subscribe(async(res) => {
this.room = res['room'];
-
await this.ChatSystemService.getAllRooms();
this.getDirectMessage(this.room._id);
});
@@ -107,15 +87,8 @@ export class ContactsPage implements OnInit {
getDirectMessage(roomId:any) {
+ this.openModal(roomId);
- this.chatService.getAllDirectMessages().subscribe(res=>{
- let result = res['ims'].filter(data => data._id == roomId);
-
-
- this.dm = result[0];
-
- this.openModal(this.dm._id);
- });
}
async openModal(roomId:any){
@@ -133,11 +106,4 @@ export class ContactsPage implements OnInit {
modal.onDidDismiss();
}
- async openMessages(username:string){
-
- let dm:any;
- this.createRoom(username);
-
- }
-
}
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index f04104503..592381c34 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -1067,9 +1067,9 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
} else {
this.downloadFileFromBrowser("file", str)
- this.downloadFileFromBrowser(msg.attachments[0].name, str)
+ this.downloadFileFromBrowser(msg.attachments[0].title, str)
- this.downloadFileFromBrowser(msg.attachments[0].name, str)
+ this.downloadFileFromBrowser(msg.attachments[0].title, str)
}
@@ -1087,7 +1087,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
});
modal.present();
} else {
- this.openFile(str, msg.attachments[0].name, msg.file.type);
+ this.openFile(str, msg.attachments[0].title, msg.file.type);
}
}
diff --git a/src/app/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts
index cbe4a74cc..0bcc5fa80 100644
--- a/src/app/services/chat/chat-system.service.ts
+++ b/src/app/services/chat/chat-system.service.ts
@@ -654,6 +654,8 @@ export class ChatSystemService {
let users: chatUser[] = _res['users'].filter(data => data.username != SessionStore.user.UserName);
+ users = users.filter((data) => !(data.name == 'Rocket.Cat' || data.name == 'Administrator'))
+
const userIds = this.users.map((user) => user._id)
for(let UserUpdate of users) {
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index a0c279faf..141ba951d 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -290,7 +290,7 @@ export class MessageService {
clearTimeout(this.functionTimer);
this.redefinedMessage(ChatMessage)
- console.log()
+ // console.log()
}
).catch((error) => {
clearTimeout(this.functionTimer);
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 249aa5739..a2aa7f835 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -1112,7 +1112,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
this.downloadFileFromBrowser("file", str)
}
} else {
- this.openFile(str, msg.attachments[0].name, msg.file.type);
+ this.openFile(str, msg.attachments[0].title, msg.file.type);
}
}
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 089665e26..496a57568 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -1057,11 +1057,14 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.downloadFileMsg(msg)
} else {
- var str = msg.attachments[0].image_url;
+
+ var str = msg.attachments[0].image_url
str = str.substring(1, ((str.length) - 1));
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+ console.log('hello')
+
console.log(msg)
if (msg.file.type == "application/img") {
const modal = await this.modalController.create({
@@ -1081,11 +1084,10 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
} else {
- this.openFile(str, msg.attachments[0].name, msg.file.type);
+ this.openFile(str, msg.attachments[0].title, msg.file.type);
+ // this.downloadFileFromBrowser("file", str)
}
-
-
}
}
diff --git a/version/git-version.ts b/version/git-version.ts
index b9cf40d18..3b7138b75 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "b3356a197",
- "SHA": "b3356a197cab868df99b19ca9432e03edbce62a1",
+ "shortSHA": "2b8357cec",
+ "SHA": "2b8357ceced749dc0b2fc3b1465029773b7ffc16",
"branch": "feature/agenda-layout",
"lastCommitAuthor": "'Peter Maquiran'",
- "lastCommitTime": "'Fri Mar 31 13:51:17 2023 +0100'",
- "lastCommitMessage": "add drop down",
- "lastCommitNumber": "4888",
+ "lastCommitTime": "'Wed Apr 5 15:15:42 2023 +0100'",
+ "lastCommitMessage": "agenda",
+ "lastCommitNumber": "4889",
"change": "",
- "changeStatus": "On branch feature/agenda-layout\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.scss\n\tmodified: src/app/services/agenda/list-box.service.ts\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.html",
+ "changeStatus": "On branch feature/agenda-layout\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: config.xml\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/chat/messages/contacts/contacts.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/chat/messages/messages.page.ts\n\tmodified: version/git-version.ts",
"changeAuthor": "peter.maquiran"
}
\ No newline at end of file