diff --git a/src/app/models/attachment.model.ts b/src/app/models/attachment.model.ts index e2a14b1d5..c7d8a04ad 100644 --- a/src/app/models/attachment.model.ts +++ b/src/app/models/attachment.model.ts @@ -11,7 +11,7 @@ export class Attachment { //Data: any; } -enum Sources +export enum Sources { Undefined = 0, webTRIX = 1, 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 72d024021..937803520 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 @@ -27,6 +27,38 @@ Ver documento + + + + +
+
+
+ +
+
+

{{event.Subject}}

+

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

+
+
+
+
+ +
+
+

{{event.Location}}

+
+
+ +
+
+
+
+
+
+
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 fe107dd68..22fb4a551 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 @@ -1,11 +1,12 @@ import { Component, OnInit } from '@angular/core'; import { ProcessesService } from 'src/app/services/processes.service'; +import { AttachmentsService } from 'src/app/services/attachments.service'; +import { EventsService } from 'src/app/services/events.service'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { DailyWorkTask } from '../../../../models/dailyworktask.model'; import { ActivatedRoute } from '@angular/router'; import { formatDate } from '@angular/common'; -import { LoadingService } from 'src/app/services/loading.service'; - +import { Event } from '../../../../models/event.model'; @Component({ selector: 'app-expediente-detail', @@ -16,10 +17,12 @@ export class ExpedienteDetailPage implements OnInit { constructor(private activateRoute: ActivatedRoute, private processes:ProcessesService, - private iab: InAppBrowser) { } + private iab: InAppBrowser, + private attachments: AttachmentsService, + private events: EventsService) { } task: DailyWorkTask; - + eventsList: Event[]; serialnumber:string; ngOnInit() { @@ -29,10 +32,11 @@ export class ExpedienteDetailPage implements OnInit { } this.serialnumber = paramMap.get('SerialNumber'); this.LoadTaskDetail(this.serialnumber); + this.LoadRelatedEvents(this.serialnumber); }); } - LoadTaskDetail(serial:string) + async LoadTaskDetail(serial:string) { this.processes.GetTask(serial).subscribe(result => { this.task = { @@ -45,6 +49,22 @@ export class ExpedienteDetailPage implements OnInit { }); } + async LoadRelatedEvents(serial:string) + { + this.eventsList = null; + this.attachments.getAttachments(2, serial).subscribe(result => { + result.forEach(att =>{ + if (this.eventsList == null) + { + this.eventsList = new Array(); + } + this.events.getEvent(att.ParentId).subscribe(event => { + this.eventsList.push(event); + }); + }); + }); + } + viewDocument() { const url: string = this.task.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); diff --git a/src/app/services/attachments.service.ts b/src/app/services/attachments.service.ts index c15eec509..1c2ab2f90 100644 --- a/src/app/services/attachments.service.ts +++ b/src/app/services/attachments.service.ts @@ -33,4 +33,19 @@ export class AttachmentsService { return this.http.get(`${geturl}`, options); } + + getAttachments(source: number, sourceid: string): Observable{ + let geturl = environment.apiURL + 'attachments/GetAttachments'; + let params = new HttpParams(); + + params = params.set("Source", source.toString()); + params = params.set("SourceId", sourceid); + + let options = { + headers: this.headers, + params: params + }; + + return this.http.get(`${geturl}`, options); + } }