From 68de93e5dbabe675f6452c90bfe5d14a118f58c8 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 14 Feb 2023 10:17:25 +0100 Subject: [PATCH 1/2] message statude spacing --- .../group-messages/group-messages.page.html | 18 +++++++++--------- src/app/pages/chat/messages/messages.page.html | 18 +++++++++--------- .../group-messages/group-messages.page.html | 18 +++++++++--------- .../shared/chat/messages/messages.page.html | 18 +++++++++--------- version/git-version.ts | 12 ++++++------ 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html index 23a5b78f3..fd8294ba2 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -62,13 +62,13 @@ {{msg.msg}} - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
{{last ? scrollToBottom() : ''}} @@ -103,13 +103,13 @@ image - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
@@ -159,13 +159,13 @@ - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index f626c951b..2a6e6dc2e 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -60,13 +60,13 @@ - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
{{last ? scrollToBottom() : ''}} @@ -99,13 +99,13 @@ image - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
@@ -165,13 +165,13 @@ - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
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 36dbc6172..2c6854b6e 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -59,13 +59,13 @@ - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
{{last ? scrollToBottom() : ''}} @@ -108,13 +108,13 @@ - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
@@ -165,13 +165,13 @@ - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index 0662e54b7..884abe7a0 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -60,13 +60,13 @@ - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
{{last ? scrollToBottom() : ''}} @@ -106,13 +106,13 @@ image - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
@@ -174,13 +174,13 @@ - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
diff --git a/version/git-version.ts b/version/git-version.ts index 0fd6e82ab..5db8b7b08 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "b1160a179", - "SHA": "b1160a179cd14a4f291f872e1144ffad74215b9c", + "shortSHA": "b21a3350e", + "SHA": "b21a3350ec5135e0be63566be04f5599127044fd", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Feb 13 19:34:00 2023 +0100'", - "lastCommitMessage": "plura worlds", - "lastCommitNumber": "4775", + "lastCommitTime": "'Mon Feb 13 19:35:16 2023 +0100'", + "lastCommitMessage": "merge", + "lastCommitNumber": "4778", "change": "", - "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/add-note/add-note.page.html\n\tmodified: src/app/modals/create-process/create-process.page.html\n\tmodified: src/app/modals/dar-parecer/dar-parecer.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: version/git-version.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.html\n\tmodified: src/app/pages/chat/messages/messages.page.html\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.html\n\tmodified: src/app/shared/chat/messages/messages.page.html", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 1e34f3de62905bb24425504f6d4263d71d40559b Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 14 Feb 2023 10:40:05 +0100 Subject: [PATCH 2/2] spelling --- .../group-messages/group-messages.page.ts | 35 ++++++++++--------- .../chat/messages/contacts/contacts.page.html | 2 +- version/git-version.ts | 12 +++---- 3 files changed, 25 insertions(+), 24 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 573cdb045..0af96090a 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -45,7 +45,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { room: any; roomName: any; - members: any; + members: any = [] contacts: string[] = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"]; allUsers: any[] = []; @@ -143,6 +143,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { this.getChatMembers(); this.getRoomMessageDB(this.roomId); + this.getGroupContacts({}); } @@ -615,6 +616,8 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { } async bookMeeting() { + + this.getGroupContacts({}); this.attendees = this.members.map((val) => { return { Name: val.name, @@ -623,23 +626,21 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { } }); - this.popoverController.dismiss(); - if (window.innerWidth <= 1024) { - const modal = await this.modalController.create({ - component: NewEventPage, - componentProps: { - attendees: this.attendees, - }, - cssClass: 'modal modal-desktop', - backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss().then((data) => { - if (data) { + // this.popoverController.dismiss(); + const modal = await this.modalController.create({ + component: NewEventPage, + componentProps: { + attendees: this.attendees, + }, + cssClass: 'modal modal-desktop', + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss().then((data) => { + if (data) { - } - }); - } + } + }); } diff --git a/src/app/shared/chat/messages/contacts/contacts.page.html b/src/app/shared/chat/messages/contacts/contacts.page.html index 11b11f721..839f9ea23 100644 --- a/src/app/shared/chat/messages/contacts/contacts.page.html +++ b/src/app/shared/chat/messages/contacts/contacts.page.html @@ -9,7 +9,7 @@
- Nova Conversas + Nova Conversa
diff --git a/version/git-version.ts b/version/git-version.ts index 5db8b7b08..a7a94745e 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "b21a3350e", - "SHA": "b21a3350ec5135e0be63566be04f5599127044fd", + "shortSHA": "68de93e5d", + "SHA": "68de93e5dbabe675f6452c90bfe5d14a118f58c8", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Feb 13 19:35:16 2023 +0100'", - "lastCommitMessage": "merge", - "lastCommitNumber": "4778", + "lastCommitTime": "'Tue Feb 14 10:17:25 2023 +0100'", + "lastCommitMessage": "message statude spacing", + "lastCommitNumber": "4779", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.html\n\tmodified: src/app/pages/chat/messages/messages.page.html\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.html\n\tmodified: src/app/shared/chat/messages/messages.page.html", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.html", "changeAuthor": "peter.maquiran" } \ No newline at end of file