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

android/app/src/main/assets/capacitor.config.json

@@ -16,8 +16,5 @@
 				"sound"
 			]
 		}
-	},
-	"server": {
-		"url": "http://192.168.0.64:8101"
 	}
 }

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

@@ -44,6 +44,7 @@ export class NewGroupPage implements OnInit {
   }
 
   ngOnInit() {
+    console.log(this.documents)
     
   }
 
@@ -86,6 +87,7 @@ export class NewGroupPage implements OnInit {
     this.addContacts(res.result);
 
     this.wsChatMethodsService.subscribeToRoomUpdate(res.result.rid, res.result);
+    console.log(res.result.rid)
 
   }
 

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

@@ -692,6 +692,8 @@ export class ExpedienteDetailPage implements OnInit {
       this.newGroup();
     }
     else {
+      console.log(this.task)
+      console.log(this.fulltask)
       this.dataService.set("newGroup", true);
       this.dataService.set("task", this.task);
       this.dataService.set("newGroupName", this.task.Folio);

src/app/pages/gabinete-digital/expediente/expediente.page.html

@@ -35,7 +35,7 @@
       <ion-list>
         <div
           class="expediente ion-no-padding ion-no-margin cursor-pointer"
-          *ngFor = "let task of expedientegbstore.list"
+          *ngFor = "let task of listToPresent"
           (click)="goToExpediente(task.SerialNumber)"
         >
         <div class="item width-100">
@@ -67,13 +67,13 @@
       </ion-list>
 
       <div
-      *ngIf="!skeletonLoader && expedientegbstore.list.length == 0 && expedientegbstore.list.length == 0"
+      *ngIf="!skeletonLoader && listToPresent.length == 0 && listToPresent.length == 0"
         class="empty-list d-flex height-100 align-center justify-content-center"
       >
         <span>Lista vazia</span>
       </div>
 
-      <div *ngIf="skeletonLoader && expedientegbstore.list.length == 0">
+      <div *ngIf="skeletonLoader && listToPresent.length == 0">
 
         <ion-list>
           <ion-item>

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

@@ -81,6 +81,9 @@ export class ExpedientePage implements OnInit {
         this.taskslist.push(task);
         this.addProcessTODb(task);
       });
+      this.taskslist = this.taskslist.filter(function(item) {
+        return item.activityInstanceName != 'Retificar Expediente'
+    })
       this.listToPresent = this.sortService.sortDate(this.taskslist, 'taskStartDate') 
       
 
@@ -152,6 +155,9 @@ export class ExpedientePage implements OnInit {
   
         });
   
+        this.taskslist = this.taskslist.filter(function(item) {
+          return item.activityInstanceName != 'Retificar Expediente'
+      })
         this.listToPresent = this.taskslist
   
       })

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();