{{task.taskStartDate | date: 'dd-MM-yy'}}
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 9f3eb8c31..625cb4e50 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -320,6 +320,15 @@ export class EventsPage implements OnInit {
});
}
+ goToExpediente(serialNumber:any){
+ let navigationExtras: NavigationExtras = {
+ queryParams: {
+ "serialNumber": serialNumber,
+ }
+ };
+ this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
+ }
+
async viewExpedientDetail(serialNumber:any) {
let classs;
if( window.innerWidth <= 800){
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html
index 27b5ec6b8..67ea75a48 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html
@@ -1,18 +1,12 @@
- Correspondência
+ Expediente
+
-
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
- {{ task.CreateDate | date: 'dd-MM-yy' }}
-
-
- {{task.Remetente}}
-
-
-
- {{ task.Folio }}
-
-
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index c5c5ce9e0..0e8ca8081 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -1,5 +1,5 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
-import { Router } from '@angular/router';
+import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
+import { NavigationExtras, Router } from '@angular/router';
import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask } from '../../../models/dailyworktask.model';
@@ -7,7 +7,8 @@ import { ProcessesService } from 'src/app/services/processes.service';
import { formatDate } from '@angular/common';
import { LoadingService } from 'src/app/services/loading.service';
import { ModalController, NavParams } from '@ionic/angular';
-import { ExpedienteDetailPage } from './expediente-detail/expediente-detail.page';
+import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
+import { AlertService } from 'src/app/services/alert.service';
@Component({
selector: 'app-expediente',
@@ -17,19 +18,23 @@ import { ExpedienteDetailPage } from './expediente-detail/expediente-detail.page
export class ExpedientePage implements OnInit {
segment:string;
- profile:string;
+ //profile:string;
@ViewChild(CalendarComponent) myCal: CalendarComponent;
taskslist:DailyWorkTask[];
serialNumber:string;
+ @Input() profile:string;
+ @Output() openExpedientDetail:EventEmitter = new EventEmitter();
+
constructor(
private processes:ProcessesService,
private modalController: ModalController,
- private navParams: NavParams,
+ private alertService: AlertService,
+ private router: Router,
) {
- this.profile = this.navParams.get('profile');
+ this.profile = 'mdgpr';
}
ngOnInit() {
@@ -40,56 +45,40 @@ export class ExpedientePage implements OnInit {
segmentChanged(){
console.log(this.segment);
+
this.LoadList();
}
+ notImplemented(){
+ this.alertService.presentAlert('Funcionalidade em desenvolvimento');
+ }
+
+ openExpedientDetailPage(data){
+ console.log(data);
+ this.openExpedientDetail.emit(data);
+ }
+
LoadList(){
- switch(this.segment){
- case "expedientes":
- this.processes.GetTasksList("Expediente", false).subscribe(result => {
- console.log(result);
- this.taskslist = new Array();
- let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
- res.forEach(element => {
- let task: DailyWorkTask = {
- "SerialNumber": element.serialNumber,
- "Folio": element.workflowInstanceDataFields.Subject,
- "Senders": element.originator.email,
- "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
- "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
- "Remetente": element.workflowInstanceDataFields.Remetente,
- "DocumentsQty": 0,
- "WorkflowName": element.workflowDisplayName,
- "activityInstanceName": element.activityInstanceName,
- }
- this.taskslist.push(task);
- });
- console.log(this.taskslist);
- });
- break;
- case "pendentes":
- this.processes.GetTasksList("Expediente", false).subscribe(result => {
- console.log(result);
- this.taskslist = new Array();
- let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending");
- res.forEach(element => {
- let task: DailyWorkTask = {
- "SerialNumber": element.serialNumber,
- "Folio": element.workflowInstanceDataFields.Subject,
- "Senders": element.originator.email,
- "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
- "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
- "Remetente": element.workflowInstanceDataFields.Remetente,
- "DocumentsQty": 0,
- "WorkflowName": element.workflowDisplayName,
- "activityInstanceName": element.activityInstanceName,
- }
- this.taskslist.push(task);
- });
- console.log(this.taskslist);
- });
- break;
- }
+ this.processes.GetTasksList("Expediente", false).subscribe(result => {
+ console.log(result);
+ this.taskslist = new Array();
+ let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
+ res.forEach(element => {
+ let task: DailyWorkTask = {
+ "SerialNumber": element.serialNumber,
+ "Folio": element.workflowInstanceDataFields.Subject,
+ "Senders": element.originator.email,
+ "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+ "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+ "Remetente": element.workflowInstanceDataFields.Remetente,
+ "DocumentsQty": 0,
+ "WorkflowName": element.workflowDisplayName,
+ "activityInstanceName": element.activityInstanceName,
+ }
+ this.taskslist.push(task);
+ });
+ console.log(this.taskslist);
+ });
}
doRefresh(event) {
@@ -100,17 +89,25 @@ export class ExpedientePage implements OnInit {
}, 2000);
}
+ goToExpediente(serialNumber:any){
+ let navigationExtras: NavigationExtras = {
+ queryParams: {
+ "serialNumber": serialNumber,
+ }
+ };
+ this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
+ }
+
async viewExpedientDetail(serialNumber:any) {
-
-
+ console.log(this.profile);
const modal = await this.modalController.create({
component: ExpedienteDetailPage,
componentProps:{
+ enterAnimation: "",
serialNumber: serialNumber,
profile: this.profile,
},
cssClass: 'modal modal-desktop',
- backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then((res)=>{