save

src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html

@@ -109,7 +109,7 @@
     </div>
 
     <div *ngIf="task" class="aside-right flex-column height-100">
-      <div class="buttons" *ngIf="task.ctivityInstanceName == 'Tarefa de Despacho'">
+      <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
         <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
         <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
         <button (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel" shape="round" >Gerar Diploma </button>
@@ -120,9 +120,9 @@
         <div class="solid"></div>
         <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
       </div>
-      <div class="buttons" *ngIf="task.ctivityInstanceName == 'Concluir Despacho'">
+      <div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Despacho'">
-        <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar como Concluído</button>
+        <button (click)="openAddNoteModal('Concluido')" class="btn-cancel" shape="round" >Marcar como Concluído</button>
-        <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
+        <button (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
       </div>

src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts

@@ -231,6 +231,47 @@ export class DespachoPrPage implements OnInit {
 
   }
 
+  async concluir(note:string, documents:any){
+    let body = { 
+      "serialNumber": this.serialnumber, 
+      "action": "Executado",
+      "ActionTypeId": 104,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+    try {
+      await this.processes.CompleteTask(body);
+      this.successMessage()
+      this.close();
+    } catch (error) {
+      this.badRequest()
+    }
+
+  }
+
+
+  async reexecutar(note:string, documents:any){
+    let body = { 
+      "serialNumber": this.serialnumber, 
+      "action": "Reexecutar",
+      "ActionTypeId": 100000010,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+    try {
+      await this.processes.CompleteTask(body);
+      this.successMessage()
+      this.close();
+    } catch (error) {
+      this.badRequest()
+    }
+
+  }
+
   sendExpedienteToPending(){
     this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
       console.log(res);
@@ -282,6 +323,12 @@ export class DespachoPrPage implements OnInit {
         else if(actionName == 'Gerar Diploma'){
           this.generateDiploma(res.data.note, docs);
         }
+        else if(actionName == 'Concluido'){
+          this.concluir(res.data.note, docs);
+        }
+        else if(actionName == 'Reexecução'){
+          this.reexecutar(res.data.note, docs);
+        }
       }
     });
   }

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts

@@ -95,7 +95,7 @@ export class ExpedientTaskModalPage implements OnInit {
         Message: '',
         SourceSecFsId: this.task.workflowInstanceDataFields.FsId, //361
         SourceType: 'DOC', //FOLDER
-        SourceId: this.task.workflowInstanceDataFields.DocId, //FolderId
+        SourceId: this.task.workflowInstanceDataFields.DocIdD, //FolderId
         DeadlineType: '',
         SubjectTypes: ['99999844'],
 
@@ -115,6 +115,8 @@ export class ExpedientTaskModalPage implements OnInit {
   }
 
   ngOnInit() {
+    console.log(this.postData);
+    
     this.taskDate = new Date(this.task.taskStartDate);
     if(!this.task.hasOwnProperty('isEvent')) {
       this.getAttachments();
@@ -176,96 +178,100 @@ export class ExpedientTaskModalPage implements OnInit {
     });
     docs.Attachments = DocumentToSave;
     this.dispatchFolder.SubjectTypes = this.selectedTypes;
-    if(this.taskParticipants.length > 0) {
+    
       switch (this.loggeduser.Profile) {
         case 'MDGPR':
-          switch (this.taskType) {
+          if(this.taskParticipants.length > 0) {
-            case '0':
+            switch (this.taskType) {
-              this.postData = {
+              case '0':
-                DistributionType: "Paralelo",
+                this.postData = {
-                CountryCode: 'AO',
+                  DistributionType: "Paralelo",
-                Priority: this.postData.Priority,
+                  CountryCode: 'AO',
-                UserEmail: this.user,
+                  Priority: this.postData.Priority,
-                UsersSelected: attendees,
+                  UserEmail: this.user,
-                DispatchFolder: this.dispatchFolder,
+                  UsersSelected: attendees,
-                AttachmentList: docs,
+                  DispatchFolder: this.dispatchFolder,
-                //SubjectTypes: [],
+                  AttachmentList: docs,
-              }
+                  //SubjectTypes: [],
-              try {
-                this.taskResult = await this.processes.postDespatcho(this.postData).toPromise();
-                await this.successMessage('Processo efetuado')
-              } catch (error) {
-                await this.badRequest('Processo não efetuado')
-              }
-              console.log('this.taskResult', this.taskResult);
-              let action_despacho = {
-                "serialNumber": this.task.serialNumber,
-                "action": "Tratado",
-                "ActionTypeId": 94,
-                "dataFields": {
-                  "Note": "",
                 }
-              }
+                try {
-              this.modalController.dismiss(action_despacho);
+                  this.taskResult = await this.processes.postDespatcho(this.postData).toPromise();
-              break;
+                  await this.successMessage('Processo efetuado')
-    
+                } catch (error) {
-            case '1':
+                  await this.badRequest('Processo não efetuado')
-              this.postData = {
-                DistributionType: "Paralelo",
-                CountryCode: 'AO',
-                Priority: this.postData.Priority,
-                UserEmail: this.user,
-                UsersSelected: attendees,
-                DispatchFolder: this.dispatchFolder,
-                AttachmentList: docs
-              }
-          
-              try {
-                await this.successMessage('Processo efetuado')
-              } catch (error) {
-                await this.badRequest('Processo não efetuado')
-              }
-    
-              let action_parecer = {
-                "serialNumber": this.task.serialNumber,
-                "action": "Tratado",
-                "ActionTypeId": 92,
-                "dataFields": {
-                  "Note": "",
                 }
-              }
+                console.log('this.taskResult', this.taskResult);
-              this.modalController.dismiss(action_parecer);
+                let action_despacho = {
-              break;
+                  "serialNumber": this.task.serialNumber,
-            case '2':
+                  "action": "Tratado",
-              this.postData = {
+                  "ActionTypeId": 94,
-                DistributionType: "Paralelo",
+                  "dataFields": {
-                CountryCode: 'AO',
+                    "Note": "",
-                Priority: this.postData.Priority, 
+                  }
-                UserEmail: this.user,
+                }
-                UsersSelected: attendees,
+                this.modalController.dismiss(action_despacho);
-                DispatchFolder: this.dispatchFolder,
+                break;
-                AttachmentList: docs
+      
-              }
+              case '1':
-              //console.log(this.postData);
+                this.postData = {
-              try {
+                  DistributionType: "Paralelo",
-                this.taskResult = await this.processes.postDeferimento(this.postData).toPromise()
+                  CountryCode: 'AO',
-                await this.successMessage('Processo efetuado')
+                  Priority: this.postData.Priority,
-              } catch (error) {
+                  UserEmail: this.user,
-                await this.badRequest('Processo não efetuado')
+                  UsersSelected: attendees,
-              }
+                  DispatchFolder: this.dispatchFolder,
-              console.log('this.taskResult', this.taskResult);
+                  AttachmentList: docs
-              let action_deferimento = {
+                }
-                "serialNumber": this.task.serialNumber,
+            
-                "action": "Tratado",
+                try {
-                "ActionTypeId": 93,
+                  await this.successMessage('Processo efetuado')
-                "dataFields": {
+                } catch (error) {
-                  "Note": "",
+                  await this.badRequest('Processo não efetuado')
+                }
+      
+                let action_parecer = {
+                  "serialNumber": this.task.serialNumber,
+                  "action": "Tratado",
+                  "ActionTypeId": 92,
+                  "dataFields": {
+                    "Note": "",
+                  }
+                }
+                this.modalController.dismiss(action_parecer);
+                break;
+              case '2':
+                this.postData = {
+                  DistributionType: "Paralelo",
+                  CountryCode: 'AO',
+                  Priority: this.postData.Priority, 
+                  UserEmail: this.user,
+                  UsersSelected: attendees,
+                  DispatchFolder: this.dispatchFolder,
+                  AttachmentList: docs
+                }
+                //console.log(this.postData);
+                try {
+                  this.taskResult = await this.processes.postDeferimento(this.postData).toPromise()
+                  await this.successMessage('Processo efetuado')
+                } catch (error) {
+                  await this.badRequest('Processo não efetuado')
+                }
+                console.log('this.taskResult', this.taskResult);
+                let action_deferimento = {
+                  "serialNumber": this.task.serialNumber,
+                  "action": "Tratado",
+                  "ActionTypeId": 93,
+                  "dataFields": {
+                    "Note": "",
                 }
               }
               this.modalController.dismiss(action_deferimento);
-              break;
+            break;
           }
-          
+        }
+        else {
+          this.alertController.presentAlert("Lista de intervenientes vazia. Por favor, adicione 1 ou mais intervenientes.");
+        }
           break;
         case 'PR':
           switch (this.taskType) {
@@ -280,6 +286,7 @@ export class ExpedientTaskModalPage implements OnInit {
                 AttachmentList: docs,
                 //SubjectTypes: [],
               }
+              console.log(this.postData);
               try {
                 this.taskResult = await this.processes.postDespatchoPr(this.postData).toPromise();
                 await this.successMessage('Processo efetuado')
@@ -328,11 +335,6 @@ export class ExpedientTaskModalPage implements OnInit {
             }
           break;
       }
-    }
-    else {
-      this.alertController.presentAlert("Lista de intervenientes vazia. Por favor, adicione 1 ou mais intervenientes.");
-    }
-    
   }
 
   getAttachments() {