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

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

@@ -159,6 +159,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   }
 
   ngOnInit() {
+    console.log(this.roomId)
     this.loggedUser = this.loggedUserChat;
     setTimeout(() => {
       this.getRoomInfo();
@@ -362,7 +363,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     this.chatService.getAllUsers().subscribe(res => {
       //
 
-      this.allUsers = res['users'].filter(data => data.username != this.loggedUserChat.me.username);
+      this.allUsers = res['users'].filter(data => data.username != SessionStore.user.UserName);
       //
     });
   }

src/app/shared/chat/new-group/new-group.page.ts

@@ -107,7 +107,30 @@ export class NewGroupPage implements OnInit{
     }
 
     this.wsChatMethodsService.subscribeToRoomUpdate(res.result.rid, res.result);
+    console.log(res.result.rid)
+    console.log(this.documents)
     this.addGroupMessage.emit(res.result.rid);
+    this.documents.forEach(element => {
+      this.wsChatMethodsService.getGroupRoom(res.result.rid).send({
+        file: {
+          "name": element.Assunto,
+          "type": "application/webtrix",
+          "ApplicationId": element.ApplicationId,
+          "DocId": element.DocId,
+          "Assunto": element.Assunto,
+        },
+        temporaryData: res,
+        attachments: [{
+          "title": element.Assunto,
+          "description": element.Assunto,
+          "title_link_download": true,
+          "type": "webtrix",
+          "text": element.Assunto,
+          "thumb_url": "https://static.ichimura.ed.jp/uploads/2017/10/pdf-icon.png",
+        }],
+      })
+    });
+    
     this.wsChatMethodsService.getAllRooms()
   }
 

src/app/shared/gabinete-digital/expedients/expedients.page.ts

@@ -73,6 +73,9 @@ export class ExpedientsPage implements OnInit {
       });
       this.taskslist = this.sortService.sortDate(this.taskslist, 'CreateDate')
       this.addProcessTODb(this.taskslist);
+      this.taskslist = this.taskslist.filter(function(item) {
+        return item.activityInstanceName != 'Retificar Expediente'
+    })
       this.expedientegbstore.reset(this.taskslist);
     }, (error) => {
       this.getEventsFromLocalDb();