diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html
index efb0cdbe5..a6b2c38c0 100644
--- a/src/app/pages/agenda/new-event/new-event.page.html
+++ b/src/app/pages/agenda/new-event/new-event.page.html
@@ -32,7 +32,7 @@
Calendário do Presidente da República
- Meu calendário
+ Calendário do MDGPR
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html
index 5d2d63013..2cad919fc 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.html
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html
@@ -16,7 +16,7 @@
- Meu calendário
+ Calendário do MDGPR
Presidente da República
diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html
index ed7fccafb..dd6e0bbb6 100644
--- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html
+++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html
@@ -1,5 +1,4 @@
-
diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss
index 2f9854000..1802e0968 100644
--- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss
+++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss
@@ -1,9 +1,8 @@
:host{
-
+
}
ion-content{
--background: transparent;
- transform: translate3d(0, 5px, 0);
--border-radius: 30px;
}
ion-footer{
@@ -89,4 +88,4 @@
.post-description{
margin: 0 auto;
margin-bottom: 35px;
-}
\ No newline at end of file
+}
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index fb89ea961..42f80a4a2 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -84,20 +84,21 @@ export class RoomService {
ChatMessage = this.fix_updatedAt(ChatMessage)
console.log('recivemessage', ChatMessage)
-
const message = this.prepareMessage(ChatMessage)
+ if(message._updatedAt == undefined){
+ message._updatedAt = new Date().getTime();
+ }
+
this.lastMessage = message
if (message.t == 'r') { this.name = message.msg }
- this.calDateDuration(ChatMessage._updatedAt)
+ this.calDateDuration(message._updatedAt)
this.messages.push(message)
setTimeout(() => {
this.scrollDown()
}, 100)
- //this.sortService.sortDate(this.messages, '')
-
if(SessionStore.user.RochetChatUser != ChatMessage.u.username) {
this.NativeNotificationService.sendNotificationChat({
message: message.msg,
@@ -182,7 +183,7 @@ export class RoomService {
if(message._id == id) {
messages.splice(index, 1)
}
-
+
})
this.storage.set('chatmsg' + this.id, messages).then((value) => {
@@ -250,12 +251,12 @@ export class RoomService {
open() {
// this.typing(this.message)
}
-
+
leave(rid?) {
this.WsChatService.leaveRoom(this.id)
}
-
+
isJson(str) {
try {
JSON.parse(str);
@@ -341,10 +342,10 @@ export class RoomService {
private fix_updatedAt(message) {
if (message.result) {
- console.log('FIX UPDATE ', message.result)
+ //console.log('FIX UPDATE ', message.result)
message.result._updatedAt = message.result._updatedAt['$date']
} else {
- // console.log('FIX UPDATE 11', message)
+ //console.log('FIX UPDATE 11', message)
message._updatedAt = message._updatedAt['$date']
}
return message
diff --git a/src/app/services/functions/file.service.ts b/src/app/services/functions/file.service.ts
index 2f3313ab2..f864b398f 100644
--- a/src/app/services/functions/file.service.ts
+++ b/src/app/services/functions/file.service.ts
@@ -299,10 +299,10 @@ export class FileService {
loader.remove();
this.toastService.badRequest("Não foi possível adicionar a fotografia!");
});
-
+
});
}
-
+
});
}
@@ -386,12 +386,6 @@ export class FileService {
accept: ['image/apng', 'image/jpeg', 'image/png']
})
-
- setInterval(() => {
- console.log(input.value)
- }, 550)
-
-
input.onchange = async () => {
//alert('Onchange AQUI')
diff --git a/src/app/shared/agenda/event-list/event-list.page.html b/src/app/shared/agenda/event-list/event-list.page.html
index 62932ed7d..fb67da1f3 100644
--- a/src/app/shared/agenda/event-list/event-list.page.html
+++ b/src/app/shared/agenda/event-list/event-list.page.html
@@ -11,7 +11,7 @@
- Meu calendário
+ Calendário do MDGPR
Presidente da República
diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html
index ba4135ca2..f5c683c3e 100644
--- a/src/app/shared/agenda/new-event/new-event.page.html
+++ b/src/app/shared/agenda/new-event/new-event.page.html
@@ -43,7 +43,7 @@
Calendário do Presidente da República
- Meu calendário
+ Calendário do MDGPR
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 10a3032be..37c723586 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -68,7 +68,7 @@