Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

src/app/pages/agenda/agenda.page.html

@@ -228,7 +228,7 @@
 
           <div class="calendar-title-container px-20 d-none d-md-flex" *ngIf="loggeduser.Profile == 'MDGPR'">
             <div class="calendar-title-description flex-grow-1 text-grey d-flex justify-center align-center">
-              <div>Meu Calendário</div>
+              <div>Calendário do MDGPR</div>
             </div>
             <div class="calendar-title-description text-black align-center">
               <div class="flex-grow-1 text-grey d-flex justify-center align-center">

src/app/pages/agenda/new-event/new-event.page.html

@@ -32,7 +32,7 @@
                 Calendário do Presidente da República
               </mat-option>
               <mat-option value="MDGPR">
-                Meu calendário
+                Calendário do MDGPR
               </mat-option>
 
             </mat-select>

src/app/pages/gabinete-digital/event-list/event-list.page.html

@@ -16,7 +16,7 @@
   <ion-toolbar>
     <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
       <ion-segment-button value="MDGPR">
-        Meu calendário
+        Calendário do MDGPR
       </ion-segment-button>
       <ion-segment-button value="PR">
         Presidente da República

src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html

@@ -1,5 +1,4 @@
 <ion-header class="ion-no-border">
-  <app-header></app-header>
 </ion-header>
 
 <ion-content>

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;
-}
+}

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

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')

src/app/shared/agenda/event-list/event-list.page.html

@@ -11,7 +11,7 @@
   <ion-toolbar>
     <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
       <ion-segment-button value="MDGPR">
-        Meu calendário
+        Calendário do MDGPR
       </ion-segment-button>
       <ion-segment-button value="PR">
         Presidente da República

src/app/shared/agenda/new-event/new-event.page.html

@@ -43,7 +43,7 @@
                 Calendário do Presidente da República
               </mat-option>
               <mat-option value="MDGPR">
-                Meu calendário
+                Calendário do MDGPR
               </mat-option>
 
             </mat-select>

src/app/shared/chat/messages/messages.page.html

@@ -68,7 +68,7 @@
           </div>
           <div class="title">
             <ion-label>{{msg.u.name}}</ion-label>
-            <span class="time">{{showDateDuration(msg._updatedAt)}}</span>
+            <span class="time">{{showDateDuration(msg.duration)}}</span>
           </div>
           <div>
             <div *ngIf="msg.attachments" class="message-attachments">

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html

@@ -10,7 +10,7 @@
     <ion-toolbar>
       <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
         <ion-segment-button value="MDGPR">
-          Meu calendário
+          Calendário do MDGPR
         </ion-segment-button>
         <ion-segment-button value="PR">
           Presidente da República

src/app/shared/popover/chat-popover/chat-popover.page.ts

@@ -66,7 +66,9 @@ export class ChatPopoverPage implements OnInit {
     });
     await modal.present();
       modal.onDidDismiss().then((res)=>{
-      this.leaveGroup();
+        if(res.data == 'success'){
+          this.leaveGroup();
+        }
     });
    }