From db5a679154c3471504976d8cee331a71b15db975 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 27 Jan 2022 14:58:57 +0100 Subject: [PATCH 1/5] save --- src/app/shared/chat/group-messages/group-messages.page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fd98e664c..7d705a10d 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -248,7 +248,7 @@ - + From e1b6cb8c6bcf96faec4eb0e5273e2293f60f9ef3 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 27 Jan 2022 16:12:51 +0100 Subject: [PATCH 2/5] save --- .../pages/chat/messages/messages.page.html | 56 +++++-------------- 1 file changed, 15 insertions(+), 41 deletions(-) diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index d9027acc9..e232a3660 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -58,37 +58,6 @@
{{msg.msg}} -
-
-
- - image -
-
-
-
- -
- - - - - - - {{file.title}} -
-
-
- - {{file.description}} - - {{msg.file.type.replace('application/','').toUpperCase()}} - -
-
-
-
-
{{last ? scrollToBottom() : ''}}
@@ -104,7 +73,9 @@ --> -
+ +
+
{{msg.u.name}} {{showDateDuration(msg._updatedAt)}} @@ -112,15 +83,11 @@
-
- - File +
image
-
-
+
-
@@ -138,15 +105,22 @@ {{msg.file.type.replace('application/','').toUpperCase()}}
-
{{last ? scrollToBottom() : ''}}
+
+ {{msg.u.name}} criou esta reunião
+
+ De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}
+ {{msg.file.venue}}
+
-
+
+ +
From 9c4ebaaa694b4486a727e7f2525224aab9b2b905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Thu, 27 Jan 2022 16:42:27 +0100 Subject: [PATCH 3/5] change value on sahre chat message page from msg.url to msg.file.url --- src/app/shared/chat/messages/messages.page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index c8c6f57c6..831d0060c 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -74,7 +74,7 @@
- image + image
From 7c208d6c1919403479f311851d5fc46ee1bac3a9 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 27 Jan 2022 17:01:23 +0100 Subject: [PATCH 4/5] save --- src/app/pages/chat/messages/messages.page.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index e232a3660..afaa84300 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -85,6 +85,8 @@
image + +
From 87564626659efadddc7f6c49ea13e7b64f7ebdf1 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 27 Jan 2022 18:29:09 +0100 Subject: [PATCH 5/5] save --- .../group-messages/group-messages.page.html | 60 ++++++------------- .../pages/chat/messages/messages.page.html | 6 +- .../group-messages/group-messages.page.html | 34 +---------- .../shared/chat/messages/messages.page.html | 1 + .../chat-options-popover.page.html | 4 +- 5 files changed, 24 insertions(+), 81 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 8f9430043..38b6ad5b5 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -57,48 +57,19 @@ A conversa original mantêm-se como chat individual
-
+
{{msg.u.name ?? ""}} {{showDateDuration(msg._updatedAt)}}
{{msg.msg}} -
-
-
- image -
-
-
-
- -
- - - - - - - {{file.title}} -
-
-
- - {{file.description}} - - {{msg.file.type.replace('application/','').toUpperCase()}} - -
-
-
-
-
{{last ? scrollToBottom() : ''}}
-
+ + File image
@@ -120,22 +90,22 @@ {{last ? scrollToBottom() : ''}}
-
+
--> -
+
+
{{msg.u.name ?? ""}} {{showDateDuration(msg._updatedAt)}}
- {{msg.msg}}
-
+
image +
-
-
+
@@ -154,13 +124,19 @@ {{msg.file.type.replace('application/','').toUpperCase()}}
-
{{last ? scrollToBottom() : ''}}
+
+ {{msg.u.name ?? ""}} criou esta reunião
+
+ De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}
+ {{msg.file.venue}}
+
+
@@ -191,7 +167,7 @@
{{last ? scrollToBottom() : ''}}
-
+
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index afaa84300..6630716f5 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -49,9 +49,8 @@ -->
-
-
+
+
{{msg.u.name}} {{showDateDuration(msg._updatedAt)}} @@ -85,7 +84,6 @@
image -
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 7d705a10d..1cde6d2f8 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -58,36 +58,6 @@
{{msg.msg}} -
-
-
- image -
-
-
-
- -
- - - - - - - {{file.title}} -
-
-
- - {{file.description}} - - {{msg.file.type.replace('application/','').toUpperCase()}} - -
-
-
-
-
{{last ? scrollToBottom() : ''}}
@@ -95,7 +65,6 @@
- AQUI
@@ -103,7 +72,6 @@
- {{msg.u.name}} {{showDateDuration(msg._updatedAt)}}
@@ -111,10 +79,10 @@
image +
-
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index 831d0060c..81790e731 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -75,6 +75,7 @@
image +
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 eca090810..fb5cc2d04 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 @@ -7,8 +7,8 @@
- - + +