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

src/app/pages/chat/chat.page.html

@@ -63,7 +63,7 @@
                           </span>
                           </ion-label>
                         </div>
-                        <div class="item-date" [class.item-date-active]="dm._id == idSelected">{{dm._updatedAt | date: 'HH:mm'}}</div>
+                        <div class="item-date" [class.item-date-active]="dm._id == idSelected">{{showDateDuration(dm._updatedAt)}}</div>
                       </div>
                       <div class="item-description" [class.item-description-active]="dm._id == idSelected">
                         <ion-label *ngIf="dm.lastMessage">{{dm.lastMessage.msg}}</ion-label>

src/app/pages/chat/chat.page.ts

@@ -138,6 +138,10 @@ export class ChatPage implements OnInit {
   /* Fim websocket functions */
   this.hideRefreshButton();
   this.getChatMembers();
+
+  //Teste
+  let t = this.showDateDuration(new Date());
+  console.log(t);
 }
 
 hideRefreshButton(){
@@ -368,6 +372,43 @@ hideRefreshButton(){
     });
   }
 
+  showDateDuration(start:any){
+    let end;
+    end = new Date();
+    start = new Date(start);
+    let customizedDate;
+
+    const totalSeconds     = Math.floor((end - (start))/1000);;
+    const totalMinutes     = Math.floor(totalSeconds/60);
+    const totalHours       = Math.floor(totalMinutes/60);
+    const totalDays        = Math.floor(totalHours/24);
+
+    const hours   = totalHours - ( totalDays * 24 );
+    const minutes = totalMinutes - ( totalDays * 24 * 60 ) - ( hours * 60 );
+    const seconds = totalSeconds - ( totalDays * 24 * 60 * 60 ) - ( hours * 60 * 60 ) - ( minutes * 60 );
+
+    if(totalDays == 0){
+      if(start.getDate() == new Date().getDate()){
+        let time = start.getHours() + ":" + this.addZero(start.getUTCMinutes());
+        return time;
+      }
+      else{
+        return 'Ontem';
+      }
+    }
+    else{
+      let date = start.getDate() + "/" + (start.getMonth()+1) + "/" + start.getFullYear();
+      return date;
+    }
+  }
+
+  addZero(i) {
+    if (i < 10) {
+      i = "0" + i;
+    }
+    return i;
+  }
+
   async getChatMembers(){
     //return await this.chatService.getMembers(roomId).toPromise();
     this.chatService.getAllUsers().subscribe(res=> {

src/app/pages/chat/group-messages/group-messages.page.html

@@ -43,7 +43,7 @@
       <div *ngIf="msg.t != 'r'" class='incoming-{{msg.u.username!=loggedUser.me.username}}'>
         <div class="title">
           <ion-label>{{msg.u.name}}</ion-label>
-          <span class="time">{{msg._updatedAt | date: 'HH:mm' }}</span>
+          <span class="time">{{showDateDuration(msg._updatedAt)}}</span>
         </div>
         <div>
           <ion-label>{{msg.msg}}</ion-label>

src/app/pages/chat/group-messages/group-messages.page.ts

@@ -133,6 +133,47 @@ export class GroupMessagesPage implements OnInit, AfterViewChecked {
       });
     } */
   }
+
+  showDateDuration(start:any){
+    let end;
+    end = new Date();
+    start = new Date(start);
+    let customizedDate;
+
+    const totalSeconds     = Math.floor((end - (start))/1000);;
+    const totalMinutes     = Math.floor(totalSeconds/60);
+    const totalHours       = Math.floor(totalMinutes/60);
+    const totalDays        = Math.floor(totalHours/24);
+
+    const hours   = totalHours - ( totalDays * 24 );
+    const minutes = totalMinutes - ( totalDays * 24 * 60 ) - ( hours * 60 );
+    const seconds = totalSeconds - ( totalDays * 24 * 60 * 60 ) - ( hours * 60 * 60 ) - ( minutes * 60 );
+
+    if(totalDays == 0){
+      if(start.getDate() == new Date().getDate()){
+        let time = start.getHours() + ":" + this.addZero(start.getUTCMinutes());
+        return time;
+      }
+      else{
+        return 'Ontem';
+      }
+    }
+    else{
+      let date = start.getDate() + "/" + (start.getMonth()+1) + "/" + start.getFullYear();
+      return date;
+    }
+  }
+
+  addZero(i) {
+    if (i < 10) {
+      i = "0" + i;
+    }
+    return i;
+  }
+
+
+
+
   sendMessage(){
     let body = {
       "message": { "rid": this.roomId, "msg": this.message }

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

@@ -39,7 +39,7 @@
     <div *ngFor="let msg of messages" class='incoming-{{msg.u.username!=loggedUser.me.username}}'>
       <div class="title">
         <ion-label>{{msg.u.name}}</ion-label>
-        <span class="time">{{msg._updatedAt | date: 'HH:mm' }}</span>
+        <span class="time">{{showDateDuration(msg._updatedAt)}}</span>
       </div>
       <div>
         <ion-label>{{msg.msg}}</ion-label>

src/app/pages/chat/messages/messages.page.ts

@@ -126,6 +126,43 @@ export class MessagesPage implements OnInit, AfterViewChecked {
     });
   }
 
+  showDateDuration(start:any){
+    let end;
+    end = new Date();
+    start = new Date(start);
+    let customizedDate;
+
+    const totalSeconds     = Math.floor((end - (start))/1000);;
+    const totalMinutes     = Math.floor(totalSeconds/60);
+    const totalHours       = Math.floor(totalMinutes/60);
+    const totalDays        = Math.floor(totalHours/24);
+
+    const hours   = totalHours - ( totalDays * 24 );
+    const minutes = totalMinutes - ( totalDays * 24 * 60 ) - ( hours * 60 );
+    const seconds = totalSeconds - ( totalDays * 24 * 60 * 60 ) - ( hours * 60 * 60 ) - ( minutes * 60 );
+
+    if(totalDays == 0){
+      if(start.getDate() == new Date().getDate()){
+        let time = start.getHours() + ":" + this.addZero(start.getUTCMinutes());
+        return time;
+      }
+      else{
+        return 'Ontem';
+      }
+    }
+    else{
+      let date = start.getDate() + "/" + (start.getMonth()+1) + "/" + start.getFullYear();
+      return date;
+    }
+  }
+
+  addZero(i) {
+    if (i < 10) {
+      i = "0" + i;
+    }
+    return i;
+  }
+
   async openMessagesOptions(ev?: any) {
     const popover = await this.popoverController.create({
       component: MessagesOptionsPage,

src/app/pages/gabinete-digital/gabinete-digital.page.ts

@@ -154,7 +154,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck  {
     }
 
     const pathname = window.location.pathname
-    
+
 
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == pathname) {
@@ -266,7 +266,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck  {
   }
 
   getCustomDate(thedate: Date){
-    return (thedate.getDay()+1) + "/" +
+    return thedate.getDate() + "/" +
     (thedate.getMonth()+1) + "/" +
     thedate.getFullYear();
   }