diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 9056c7ef8..b6b265601 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -153,14 +153,14 @@ export class ChatPage implements OnInit { console.log(t); this.setStatus('away'); - if(this.dataService.get("newGroup")){ + /* if(this.dataService.get("newGroup")){ this.openNewGroupPage(); - } + } */ this.router.events.forEach((event) => { if (event instanceof NavigationStart && event.url.startsWith('/home/chat')) { if (window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/chat')) { - alert('OIII') + //alert('OIII') } else { if(this.dataService.get("newGroup")){ this.openNewGroupPage(); diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index 7d14e8fcd..aac84926d 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -583,4 +583,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { }); } + openPreview(){ + + } + } diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index 5e500863d..25b9444c2 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -118,7 +118,7 @@ - + diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 4adf39246..1307cae28 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -615,7 +615,7 @@ export class ExpedienteDetailPage implements OnInit { return await popover.present(); } - openNewGroupPage(){ + openNewGroupPage(task?:any){ this.router.navigate(['/home/chat']); this.dataService.set("newGroup", true); @@ -624,8 +624,8 @@ export class ExpedienteDetailPage implements OnInit { } else{ this.dataService.set("newGroup", true); - /* this.closeAllDesktopComponents(); - this.showNewGroup=true; */ + this.dataService.set("task", this.task); + this.dataService.set("newGroupName", this.task.Folio); } } @@ -635,6 +635,7 @@ export class ExpedienteDetailPage implements OnInit { cssClass: 'modal modal-desktop', componentProps: { name: this.task.Folio, + task: this.task }, }); await modal.present(); 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 286865bd8..65578e163 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -131,7 +131,7 @@
- +
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 0bc8b92a9..e931d8802 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -480,7 +480,7 @@ export class PedidoPage implements OnInit { modal.onDidDismiss(); } - openNewGroupPage(){ + openNewGroupPage(task?:any){ this.router.navigate(['/home/chat']); this.dataService.set("newGroup", true); @@ -489,8 +489,8 @@ export class PedidoPage implements OnInit { } else{ this.dataService.set("newGroup", true); - /* this.closeAllDesktopComponents(); - this.showNewGroup=true; */ + this.dataService.set("task", this.task); + this.dataService.set("newGroupName", this.task.Folio); } } @@ -500,6 +500,7 @@ export class PedidoPage implements OnInit { cssClass: 'modal modal-desktop', componentProps: { name: this.task.Folio, + task: this.task }, }); await modal.present(); diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index 9e57e30e8..9c9d56edb 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -553,7 +553,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe let url = await this.processesService.GetDocumentUrl(res.data.selected.Id, res.data.selected.ApplicationType).toPromise(); let url_no_options: string = url.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); console.log(url_no_options); - console.log('Oie'); + //console.log('Oie'); let body = { "message": diff --git a/src/app/shared/chat/new-group/new-group.page.ts b/src/app/shared/chat/new-group/new-group.page.ts index 1c183a0cd..afcdba940 100644 --- a/src/app/shared/chat/new-group/new-group.page.ts +++ b/src/app/shared/chat/new-group/new-group.page.ts @@ -1,7 +1,8 @@ import { analyzeAndValidateNgModules } from '@angular/compiler'; -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; import { ModalController, NavParams, PickerController, PopoverController } from '@ionic/angular'; import { ChatService } from 'src/app/services/chat.service'; +import { DataService } from 'src/app/services/data.service'; import { GroupDurationPage } from 'src/app/shared/popover/group-duration/group-duration.page'; import { GroupContactsPage } from '../group-messages/group-contacts/group-contacts.page'; @@ -10,7 +11,7 @@ import { GroupContactsPage } from '../group-messages/group-contacts/group-contac templateUrl: './new-group.page.html', styleUrls: ['./new-group.page.scss'], }) -export class NewGroupPage implements OnInit { +export class NewGroupPage implements OnInit{ isGroupCreated:boolean; showLoader: boolean; displayDuration: any; @@ -20,6 +21,7 @@ export class NewGroupPage implements OnInit { selectedDuration = ['','','']; countDownTime:any; //groupName:string; + task:any; @Input() groupName:string; @Output() addGroupMessage:EventEmitter = new EventEmitter(); @@ -29,16 +31,28 @@ export class NewGroupPage implements OnInit { private popoverController: PopoverController, private modalController: ModalController, private chatService: ChatService, - //private navParams: NavParams, + private dataService:DataService, ) { this.isGroupCreated = false; //this.groupName = this.navParams.get('name'); + } ngOnInit() { + if(this.dataService.get("newGroup")){ + this.task = this.dataService.get("task"); + this.groupName = this.task.Folio; + } + console.log(this.task); } + /* ngOnDestroy(){ + alert('Destroy') + this.dataService.set("newGroup", false); + this.dataService.set("task", null); + this.dataService.set("newGroupName", ''); + } */ _ionChange(event){ console.log(event); console.log(event.detail.checked);