diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index 65578e163..ed64311d0 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -130,8 +130,8 @@ -
- +
+
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 5a7c2a1eb..a06ecb331 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -480,17 +480,17 @@ export class PedidoPage implements OnInit { modal.onDidDismiss(); } - openNewGroupPage(task?:any){ - this.router.navigate(['/home/chat']); - this.dataService.set("newGroup", true); - - if( window.innerWidth < 801){ + openNewGroupPage() { + if (window.innerWidth < 801) { + this.router.navigate(['/home/chat']); this.newGroup(); } - else{ + else { this.dataService.set("newGroup", true); this.dataService.set("task", this.task); this.dataService.set("newGroupName", this.task.Folio); + this.dataService.set("documents", this.fulltask.Documents); + this.router.navigate(['/home/chat']); } } diff --git a/src/app/shared/popover/request-options/request-options.page.html b/src/app/shared/popover/request-options/request-options.page.html index 7105f2577..d76118df8 100644 --- a/src/app/shared/popover/request-options/request-options.page.html +++ b/src/app/shared/popover/request-options/request-options.page.html @@ -42,6 +42,7 @@ +
@@ -54,8 +55,8 @@
-
- -
+ diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts index b8616959b..f59911563 100644 --- a/src/app/shared/popover/request-options/request-options.page.ts +++ b/src/app/shared/popover/request-options/request-options.page.ts @@ -112,18 +112,20 @@ export class RequestOptionsPage implements OnInit { modal.onDidDismiss(); } - openNewGroupPage(){ - this.router.navigate(['/home/chat']); - this.dataService.set("newGroup", true); - - if( window.innerWidth < 801){ - this.newGroup(); - } - else{ - this.dataService.set("newGroup", true); - /* this.closeAllDesktopComponents(); - this.showNewGroup=true; */ - } + async openNewGroupPage(){ + const modal = await this.modalController.create({ + component: NewGroupPage, + cssClass: 'modal modal-desktop', + componentProps: { + name: this.task.Folio, + task: this.task, + documents: this.fulltask.Documents, + }, + }); + await modal.present(); + modal.onDidDismiss().then( () => { + this.popoverController.dismiss('close'); + }); } async newGroup(){