diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index b0d2fdb74..e68af0924 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -38,7 +38,7 @@
-
-
-
-
-
-
-
-
- {{ task.CreateDate | date: 'dd-MM-yy' }}
-
-
- {{task.Senders}}
-
-
-
-
-
-
+
+
+
+ {{ task.CreateDate | date: 'dd-MM-yy' }}
+
+
+ {{task.Senders}}
+
+
+ {{task.activityInstanceName}}
+
+
- -->
+
+
+
+
+
+
+ {{ task.Folio }}
-
- {{ task.Folio }}
-
-
-
-
-
+
+
+
+
-
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
index a4d063809..6c6c2f667 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -15,6 +15,7 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar
import { AuthService } from 'src/app/services/auth.service';
import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
import { User } from 'src/app/models/user.model';
+import { NavigationExtras, Router } from '@angular/router';
@Component({
selector: 'app-despachos-pr',
@@ -53,6 +54,7 @@ export class DespachosPrPage implements OnInit {
private alertService: AlertService,
private authService: AuthService,
private navParams: NavParams,
+ private router: Router,
) {
this.loggeduser = authService.ValidatedUser;
@@ -71,7 +73,16 @@ export class DespachosPrPage implements OnInit {
}
segmentChanged(ev: any) {
- // this.LoadList();
+ this.LoadList();
+ }
+
+ goToDespachoPr(serialNumber:any){
+ let navigationExtras: NavigationExtras = {
+ queryParams: {
+ "serialNumber": serialNumber,
+ }
+ };
+ this.router.navigate(['/home/gabinete-digital/despachos-pr/despacho-pr'], navigationExtras);
}
notImplemented(){
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 6e4ba732e..6c41242d2 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -53,12 +53,14 @@ export class DespachoPage implements OnInit {
private activatedRoute: ActivatedRoute,
private router: Router,
) {
+
this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) {
this.serialnumber = params["serialNumber"];
console.log(params["serialNumber"]);
}
});
+
}
ngOnInit() {
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
index 89cd047a1..48bdb4792 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
@@ -14,6 +14,7 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar
import { AuthService } from 'src/app/services/auth.service';
import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
+import { NavigationExtras, Router } from '@angular/router';
@Component({
selector: 'app-despachos',
@@ -49,6 +50,7 @@ export class DespachosPage implements OnInit {
private modalController: ModalController,
private alertService: AlertService,
private authService: AuthService,
+ private router: Router,
) {
this.profile = 'mdgpr';
// alert('nice!')
@@ -132,134 +134,17 @@ export class DespachosPage implements OnInit {
}
async viewExpedientDetail(serialNumber:any) {
- console.log(this.profile);
-
- const modal = await this.modalController.create({
- component: DespachoPage,
- componentProps:{
- enterAnimation: "",
- serialNumber: serialNumber,
- profile: this.profile,
- },
- cssClass: 'modal modal-desktop',
- });
- await modal.present();
- modal.onDidDismiss().then((res)=>{
- console.log('refresh list');
- this.LoadList();
- });
- }
-
- // old
- async openExpedientActionsModal(taskAction: any, task: any) {
- //this.modalController.dismiss();
- let classs;
- if( window.innerWidth <= 800){
- classs = 'modal modal-desktop'
- } else {
- classs = 'modal modal-desktop showAsideOptions'
- }
-
- const doc = this.loadedAttachments[ this.dicIndex];
-
- task = {
- serialNumber: doc.SourceId,
- taskStartDate: doc.CreateDate,
- isEvent: true,
- workflowInstanceDataFields: {
- FsId: doc.ApplicationId,
- FolderID: null,
- DocId: doc.SourceId,
- Subject: doc.SourceName
- },
- }
-
- const modal = await this.modalController.create({
- component: ExpedientTaskModalPage,
- componentProps: {
- taskAction: taskAction,
- task: task,
- profile: this.profile,
- },
- cssClass: classs,
- });
- await modal.present();
- modal.onDidDismiss().then(res=>{
- console.log(res['data']);
- if(res['data']=='openDiscart'){
- console.log('open discart');
-
- // this.distartExpedientModal();
+ let navigationExtras: NavigationExtras = {
+ queryParams: {
+ "serialNumber": serialNumber,
}
+ };
+
+ this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras);
- });
}
- async openBookMeetingModal(task: any) {
-
- const doc = this.loadedAttachments[ this.dicIndex];
-
- task = {
- serialNumber: doc.SourceId,
- taskStartDate: doc.CreateDate,
- isEvent: true,
- workflowInstanceDataFields: {
- FsId: doc.ApplicationId,
- FolderID: null,
- DocId: doc.SourceId,
- Subject: doc.SourceName
- },
- }
-
- let classs;
- if( window.innerWidth <= 800){
- classs = 'book-meeting-modal modal modal-desktop'
- } else {
- classs = 'modal modal-desktop showAsideOptions'
- }
- const modal = await this.modalController.create({
- component: BookMeetingModalPage,
- componentProps: {
- task: task,
- },
- cssClass: classs,
- backdropDismiss: false
- });
- await modal.present();
- modal.onDidDismiss();
- }
-
-
- async distartExpedientModal() {
-
- const doc = this.taskList[ this.dicIndex];
-
- console.log(doc, this.dicIndex, this.taskList)
-
- const modal = await this.modalController.create({
- component: DiscartExpedientModalPage,
- componentProps: {
- serialNumber: doc.serialNumber,
- folderId: doc.workflowInstanceDataFields.FolderID,
- action: 'complete',
- },
- cssClass: 'discart-expedient-modal',
- backdropDismiss: false
- });
-
- await modal.present();
- modal.onDidDismiss().then(res=>{
- if(res['data']=='close'){
- // this.close();
- /* console.log('2Expedient Discard closed2');
- this.close();
- this.openMenu(); */
- }
-
- });
- }
-
docIndex(index: number) {
this.dicIndex = index;
}
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
index f4e59f719..82902770c 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
@@ -311,6 +311,7 @@ export class ExpedientTaskModalPage implements OnInit {
this.loadedAttachments = res;
console.log(res);
});
+
}
async addParticipants() {
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index d27ce5dd6..8c778560d 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -266,16 +266,16 @@ export class GabineteDigitalPage implements OnInit {
return false;
}
- openEventsToApprovePage(profile:any){
+ openEventsToApprovePage(profile:any) {
console.log(profile);
this.closeAllDesktopComponents();
let navigationExtras: NavigationExtras = { queryParams: {"eventos": true,}};
- if( window.innerWidth <= 800){
+ if( window.innerWidth <= 800) {
//this.openEventsToApproveList(profile);
this.router.navigate(['/home/gabinete-digital/event-list']);
}
- else{
+ else {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
this.showEventsToApprove = true;
}
@@ -347,7 +347,7 @@ export class GabineteDigitalPage implements OnInit {
openPedidosPage(segment:string){
this.closeAllDesktopComponents();
- if( window.innerWidth <= 800){
+ if( window.innerWidth <= 800) {
this.openPedidoList();
}
else{
@@ -463,7 +463,7 @@ export class GabineteDigitalPage implements OnInit {
//if( window.innerWidth <= 1024){
const modal = await this.modalController.create({
component: ExpedientePage,
- componentProps:{
+ componentProps: {
profile: this.profile,
},
cssClass: 'modal modal-desktop',
@@ -497,6 +497,7 @@ export class GabineteDigitalPage implements OnInit {
component: DespachosPage,
componentProps:{
profile: this.profile,
+ serialNumber: this.serialNumber
},
cssClass: 'modal modal-desktop',
});
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 d5db43e05..2785461d9 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
@@ -16,7 +16,7 @@
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
index 78ca38316..91b522eed 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
@@ -42,19 +42,19 @@ export class PedidosPage implements OnInit {
private modalController: ModalController,
private alertService: AlertService,
) {
- this.profile = 'mdgpr';
- }
+ this.profile = 'mdgpr';
+ }
- ngOnInit() {
- //Inicializar segment
- //this.segment = 'parecer';
- console.log(this.serialNumber);
-
- this.LoadList();
- }
- segmentChanged(ev: any) {
- this.LoadList();
- }
+ ngOnInit() {
+ //Inicializar segment
+ this.segment = 'parecer';
+
+ this.LoadList();
+ }
+
+ segmentChanged(ev: any) {
+ this.LoadList();
+ }
goToPedido(serialNumber:any){
let navigationExtras: NavigationExtras = {
@@ -66,72 +66,72 @@ export class PedidosPage implements OnInit {
}
notImplemented(){
- this.alertService.presentAlert('Funcionalidade em desenvolvimento');
+ this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
- openExpedientDetailPage(data){
- console.log(data);
- this.openExpedientDetail.emit(data);
- }
+ openExpedientDetailPage(data){
+ console.log(data);
+ this.openExpedientDetail.emit(data);
+ }
LoadList(){
- if(this.segment == 'parecer'){
- this.taskType = "Pedido de Parecer";
- this.processes.GetTasksList("Pedido de Parecer", false).subscribe(result => {
- this.taskslist = result;
- console.log(result);
-
- this.parecerList = new Array();
- let res = result.reverse();
- res.forEach(element => {
- let task = {
- "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,
- "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
- "WorkflowName": element.workflowDisplayName,
- "activityInstanceName": element.activityInstanceName,
- }
- this.parecerList.push(task);
- });
- console.log(this.parecerList);
-
- });
- }
- else if(this.segment == 'deferimento'){
- this.taskType = "Pedido de Deferimento";
- this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
- this.taskslist = result;
-
- console.log(result);
-
- this.deferimentoList = new Array();
- let res = result.reverse();
- res.forEach(element => {
- let task = {
- "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,
- "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
- "FolderId": element.workflowInstanceDataFields.FolderId,
- "WorkflowName": element.workflowDisplayName,
- }
- this.deferimentoList.push(task);
- });
- console.log(this.deferimentoList);
-
- });
- }
- console.log(this.taskType);
- }
+ if(this.segment == 'parecer'){
+ this.taskType = "Pedido de Parecer";
+ this.processes.GetTasksList("Pedido de Parecer", false).subscribe(result => {
+ this.taskslist = result;
+ console.log(result);
+
+ this.parecerList = new Array();
+ let res = result.reverse();
+ res.forEach(element => {
+ let task = {
+ "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,
+ "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+ "WorkflowName": element.workflowDisplayName,
+ "activityInstanceName": element.activityInstanceName,
+ }
+ this.parecerList.push(task);
+ });
+ console.log(this.parecerList);
+
+ });
+ }
+ else if(this.segment == 'deferimento'){
+ this.taskType = "Pedido de Deferimento";
+ this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
+ this.taskslist = result;
+
+ console.log(result);
+
+ this.deferimentoList = new Array();
+ let res = result.reverse();
+ res.forEach(element => {
+ let task = {
+ "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,
+ "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+ "FolderId": element.workflowInstanceDataFields.FolderId,
+ "WorkflowName": element.workflowDisplayName,
+ }
+ this.deferimentoList.push(task);
+ });
+ console.log(this.deferimentoList);
+
+ });
+ }
+ console.log(this.taskType);
+ }
doRefresh() {
this.LoadList();
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html
index ef6818ff2..04811f220 100644
--- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html
+++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html
@@ -19,40 +19,40 @@
-