diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html index faecbdd20..9db791e50 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html @@ -91,45 +91,18 @@
Documentos Anexados
- + -

{{ task.Folio }}

-

{{task.Remetente}}{{ task.CreateDate | date: 'dd/MM/yy' }}

+ (click)="viewDocument(attachment.DocId)"> +

{{ attachment.Assunto }}

+

{{ attachment.DocNumber }}

+

{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}

- -
-

Eventos Associados

- -
- - - -
-
-

{{event.StartDate | date: 'hh:mm'}}

-

{{event.EndDate | date: 'hh:mm'}}

-
-
-

{{event.StartDate | date: 'd/M/yy' }} - {{ event.EndDate | date: 'dd/mm/yy'}} | {{event.Location}}

-

{{event.StartDate | date: 'd/M/yy' }} | {{event.Location}}

-

{{event.Subject}}

-
-
-
-
-
-
-
- +
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index b06385163..a36b502ea 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -27,6 +27,7 @@ export class DespachoPage implements OnInit { customDate:any; task: any; + attachments:any; fulltask: any; eventsList: Event[]; serialnumber: string; @@ -37,7 +38,7 @@ export class DespachoPage implements OnInit { constructor(private activateRoute: ActivatedRoute, private processes: ProcessesService, private iab: InAppBrowser, - private attachments: AttachmentsService, + private attachmentsService: AttachmentsService, private events: EventsService, private menu: MenuController, private router: Router, @@ -101,14 +102,23 @@ export class DespachoPage implements OnInit { }); console.log(users); - }) + }); + this.getDocumentDetails(this.task.FolderId, '361'); }); } + getDocumentDetails(forlderId:string, applicationId:string){ + this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{ + this.attachments = res.Documents; + console.log(res['Documents']); + console.log(this.attachments); + }) + } + async LoadRelatedEvents(serial: string) { if (this.eventsList == null) { - this.attachments.getAttachmentsBySerial(serial).subscribe(res => { + this.attachmentsService.getAttachmentsBySerial(serial).subscribe(res => { console.log(res); res.forEach(att => { if (this.eventsList == null) { @@ -123,8 +133,8 @@ export class DespachoPage implements OnInit { } } - viewDocument(){ - this.processes.GetDocumentUrl(this.task.DocId, this.task.FsId).subscribe(res=>{ + viewDocument(docId:string){ + this.processes.GetDocumentUrl(docId, '361').subscribe(res=>{ console.log(res); const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); const browser = this.iab.create(url,"_blank"); diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index 94299b82b..010d31514 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -53,9 +53,11 @@ export class AuthService { if (result) { this.ValidatedUser = user; + console.log(user); + //if(!environment.production){ - localStorage.setItem('user', JSON.stringify(Object.assign(user, response) ) ); + localStorage.setItem('user', JSON.stringify(Object.assign(user, response))); //} this.storageService.store(AuthConnstants.USER, response); diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html index 002ec1b37..3b30bb1f6 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.html +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html @@ -44,7 +44,7 @@
- +
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts index 52e035bc3..3da586e0b 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts @@ -10,6 +10,7 @@ import { ModalController, NavParams } from '@ionic/angular'; import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'; import { AlertService } from 'src/app/services/alert.service'; import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page'; +import { AuthService } from 'src/app/services/auth.service'; @Component({ selector: 'app-despachos', @@ -36,6 +37,7 @@ export class DespachosPage implements OnInit { private processes:ProcessesService, private modalController: ModalController, private alertService: AlertService, + private authService: AuthService, ) { this.profile = 'mdgpr'; } @@ -44,6 +46,9 @@ export class DespachosPage implements OnInit { //Inicializar segment this.segment = "despachos"; this.LoadList(); + this.authService.userData$.subscribe((res:any)=>{ + console.log(res); + }); } segmentChanged(ev: any) { this.LoadList(); @@ -65,12 +70,11 @@ export class DespachosPage implements OnInit { this.despachoList = new Array(); let res = result.reverse(); res.forEach(element => { - console.log(element.workflowInstanceDataFields.SourceSecFsID); - console.log(element.workflowInstanceDataFields.FolderID); let aplicationId = element.workflowInstanceDataFields.SourceSecFsID; let DocId = element.workflowInstanceDataFields.FolderID; - this.processes.GetDocumentDetails(DocId, aplicationId).subscribe(res=>{ + this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{ + this.totalDocs = res.DocumentsTotal; console.log(res.DocumentsTotal); console.log(element); @@ -85,6 +89,19 @@ export class DespachosPage implements OnInit { "DocumentsQty": this.totalDocs, } this.despachoList.push(task); + }, + (error)=>{ + let task: DailyWorkTask = { + "SerialNumber": element.serialNumber, + "Folio": element.workflowInstanceDataFields.Subject, + "Senders": element.workflowInstanceDataFields.Sender, + "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'), + "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, + "Remetente": element.workflowInstanceDataFields.Remetente, + "DocumentsQty": 0, + } + this.despachoList.push(task); + }); });