-
-
-
-
-
-
-
+
-
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 38a1e8532..e32bb5795 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
@@ -17,6 +17,7 @@ import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-m
import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.page';
+import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
@Component({
selector: 'app-pedido',
@@ -60,7 +61,6 @@ export class PedidoPage implements OnInit {
console.log(this.serialnumber);
this.LoadTaskDetail(this.serialnumber);
- this.LoadRelatedEvents(this.serialnumber);
}
goBack(){
@@ -98,6 +98,7 @@ export class PedidoPage implements OnInit {
"WorkflowName": res.workflowDisplayName,
"DeadlineType": res.workflowInstanceDataFields.DeadlineType,
"ProcessInstanceID": res.workflowInstanceDataFields.InstanceID,
+ "activityInstanceName": res.activityInstanceName,
}
}
else if(res.workflowDisplayName == 'Pedido de Deferimento'){
@@ -115,6 +116,7 @@ export class PedidoPage implements OnInit {
"WorkflowName": res.workflowDisplayName,
"DeadlineType": res.workflowInstanceDataFields.DeadlineType,
"ProcessInstanceID": res.workflowInstanceDataFields.InstanceID,
+ "activityInstanceName": res.activityInstanceName,
}
}
@@ -150,23 +152,6 @@ export class PedidoPage implements OnInit {
})
}
- async LoadRelatedEvents(serial: string) {
- if (this.eventsList == null) {
- this.attachmentsService.getAttachmentsBySerial(serial).subscribe(res => {
- console.log(res);
- res.forEach(att => {
- if (this.eventsList == null) {
- this.eventsList = new Array();
- }
- this.events.getEvent(att.ParentId).subscribe(event => {
- this.eventsList.push(event);
- console.log(this.eventsList);
- });
- });
- });
- }
- }
-
viewDocument(docId:string){
this.processes.GetDocumentUrl(docId, '361').subscribe(res=>{
console.log(res);
@@ -180,17 +165,31 @@ export class PedidoPage implements OnInit {
this.menu.open();
this.modalController.dismiss();
}
- arquivar(){
+ repreciar(note:string, documents:any){
+ let body = {
+ "serialNumber": this.serialnumber,
+ "action": "Reapreciação",
+ "ActionTypeId": 100000009,
+ "dataFields": {
+ "ReviewUserComent": note,
+ },
+ "AttachmentList" :documents,
+ }
+ this.processes.CompleteTask(body);
+ this.close();
+ }
+ arquivar(note:string, documents:any){
let body = {
"serialNumber": this.serialnumber,
"action": "Arquivo",
"ActionTypeId": 95,
"dataFields": {
- "ReviewerUseComment": '',
+ "ReviewUserComent": note,
},
- "AttachmentList" :null,
+ "AttachmentList" :documents,
}
this.processes.CompleteTask(body);
+ this.close();
}
sendExpedienteToPending(){
@@ -350,5 +349,34 @@ export class PedidoPage implements OnInit {
await modal.present();
modal.onDidDismiss();
}
+ async openAddNoteModal(actionName:string) {
+ let classs;
+ if( window.innerWidth <= 800){
+ classs = 'modal modal-desktop'
+ } else {
+ classs = 'modal modal-desktop'
+ }
+ const modal = await this.modalController.create({
+ component: AddNotePage,
+ componentProps:{
+ },
+ cssClass: classs,
+ backdropDismiss: true
+ });
+
+ await modal.present();
+
+ modal.onDidDismiss().then(res => {
+ console.log(res);
+ if(res.data){
+ if(actionName == 'Solicitar Reapreciação'){
+ this.repreciar(res.data.note,res.data.documents);
+ }
+ else if(actionName == 'Arquivar'){
+ this.arquivar(res.data.note,res.data.documents);
+ }
+ }
+ });
+ }
}
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
index d1035f67d..1c3978ee1 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
@@ -3,7 +3,7 @@
Pedidos
-
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
index 16cb21734..68dc620cc 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
@@ -46,9 +46,10 @@ export class PedidosPage implements OnInit {
}
ngOnInit() {
- this.segment = 'parecer';
//Inicializar segment
- this.segment = 'parecer';
+ //this.segment = 'parecer';
+ console.log(this.serialNumber);
+
this.LoadList();
}
segmentChanged(ev: any) {
@@ -93,6 +94,7 @@ export class PedidosPage implements OnInit {
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
+ "activityInstanceName": element.activityInstanceName,
}
this.parecerList.push(task);
});
@@ -131,10 +133,9 @@ export class PedidosPage implements OnInit {
console.log(this.taskType);
}
- doRefresh(event) {
+ doRefresh() {
this.LoadList();
setTimeout(() => {
- event.target.complete();
}, 2000);
}