save

src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html

@@ -73,12 +73,15 @@
     </div>
 
     <div *ngIf="task" class="aside-right flex-column height-100">
-      <div class="buttons">
+      <div class="buttons" *ngIf="task.activityInstanceName == 'Revisar Diploma'">
         <button (click)="openAddNoteModal('Solicitar assinatura')" class="btn-cancel" shape="round" >Solicitar assinatura do Presidente</button>
         <button (click)="openAddNoteModal('Solicitar alteração')" class="btn-cancel" shape="round" >Solicitar alteração</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <div class="solid"></div>
       </div>
+      <div class="buttons" *ngIf="task.activityInstanceName == 'Diploma Assinado'">
+        <button (click)="openAddNoteModal('Concluir diploma')" class="btn-cancel" shape="round" >Concluir</button>
+      </div>
     </div>
 
     <div *ngIf="!task">

src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts

@@ -178,6 +178,26 @@ export class DiplomaPage implements OnInit {
     }
   }
 
+  async finish(note:string, documents:any){
+    let body = { 
+      "serialNumber": this.serialnumber, 
+      "action": "Concluir",
+      "ActionTypeId": 95,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+    try {
+      await this.processes.CompleteTask(body);
+      this.successMessage()
+      this.close();
+    } catch (error) {
+      this.badRequest()
+    }
+
+  }
+
   async openAddNoteModal(actionName:string) {
     let classs;
     if( window.innerWidth <= 800){
@@ -220,6 +240,10 @@ export class DiplomaPage implements OnInit {
           this.askToChange(res.data.note, docs);
           this.goBack();
         }
+        else if(actionName == 'Concluir diploma'){
+          this.finish(res.data.note, docs);
+          this.goBack();
+        }
       }
     });
   }

src/app/pages/gabinete-digital/diplomas/diplomas.page.html

@@ -39,15 +39,11 @@
     <div class="width-100" [ngSwitch]="segment">
       <div *ngIf="diplomasList">
         <ion-list *ngSwitchCase="'validar'">
-          <!-- *ngFor = "let task of parecerList; let i = index"
-          (click)="viewExpedientDetail(task.SerialNumber)" -->
           <ion-item 
               class="expediente ion-no-padding cursor-pointer"  
               *ngFor = "let task of diplomasList"
               (click)="goToDiploma(task.SerialNumber)"
               >
-              <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
-              <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
                 <div class="item width-100">
                   <div class="exp-top-detail">
                     <div class="exp-date">
@@ -72,12 +68,12 @@
         </ion-list>
   
       </div>
-      <div *ngIf="diplomasList">
+      <div *ngIf="diplomasAssinadoList">
         <ion-list *ngSwitchCase="'assinados'">
           <ion-item 
               class="expediente ion-no-padding cursor-pointer"  
               *ngFor = "let task of diplomasList"
-              (click)="viewPedidoDetail(task.SerialNumber)"
+              (click)="goToDiploma(task.SerialNumber)"
               >
                 <div class="item width-100">
                   <div class="exp-top-detail">
@@ -91,9 +87,8 @@
                       <span class="label">{{task.activityInstanceName}}</span>
                     </div>
                     <div class="exp-icon">
-                      <ion-menu-button style="width: 35px; height: 41px;" autoHide="false">
+                      <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                        <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                      <label></label>
-                      </ion-menu-button> 
                     </div>
                   </div>
                   <div class="exp-bottom-detail">

src/app/pages/gabinete-digital/diplomas/diplomas.page.ts

@@ -13,8 +13,8 @@ import { DiplomaPage } from 'src/app/pages/gabinete-digital/diplomas/diploma/dip
   styleUrls: ['./diplomas.page.scss'],
 })
 export class DiplomasPage implements OnInit {
-//profile:string;
 diplomasList:DailyWorkTask[] = [];
+diplomasAssinadoList:DailyWorkTask[] = [];
 showLoader: boolean;
 totalDocs:any;
 serialNumber:string;
@@ -29,13 +29,9 @@ constructor(
   private router: Router,
   private activatedRoute: ActivatedRoute,
   ) {
-    this.profile = 'mdgpr';
-    this.segment = 'validar'
   }
 
   ngOnInit() {
-    //Inicializar segment
-    this.segment = 'validar';
 
     this.activatedRoute.queryParams.subscribe(params => {
 
@@ -83,12 +79,13 @@ constructor(
     
 
     let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
-    this.diplomasList = new Array();
 
     console.log('diplomas', diplomas);
 
     switch (this.segment) {
       case 'validar':
+        console.log(this.segment);
+        this.diplomasList = new Array();
         let diplomasValidar = diplomas.reverse().filter(data => data.activityInstanceName == "Revisar Diploma");
         console.log(diplomasValidar);
         diplomasValidar.forEach(element => {
@@ -140,6 +137,57 @@ constructor(
         this.showLoader = false;
         break;
       case 'assinados':
+        console.log(this.segment);
+        this.diplomasList = new Array();
+        let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
+        console.log(diplomasAssinados);
+        diplomasAssinados.forEach(element => {
+          let DocId = element.workflowInstanceDataFields.FolderID;
+          let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
+          this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
+            this.totalDocs = res.DocumentsTotal;
+            console.log(res.DocumentsTotal);
+
+            let date = new Date(element.taskStartDate);
+            date.setMonth(date.getMonth() + 1);
+            let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+
+            let task = {
+              "SerialNumber": element.serialNumber,
+              "Folio": element.workflowInstanceDataFields.Subject,
+              "Senders": element.workflowInstanceDataFields.Sender,
+              "CreateDate": taskDate,
+              "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+              "Remetente": element.workflowInstanceDataFields.Remetente,
+              "DocumentsQty": 0,
+              "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+              "WorkflowName": element.workflowDisplayName,
+              "activityInstanceName": element.activityInstanceName,
+            }
+            this.diplomasList.push(task);
+          },
+          (error)=> {
+            
+            let date = new Date(element.taskStartDate);
+            date.setMonth(date.getMonth() + 1);
+            let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+
+            let task = {
+              "SerialNumber": element.serialNumber,
+              "Folio": element.workflowInstanceDataFields.Subject,
+              "Senders": element.workflowInstanceDataFields.Sender,
+              "CreateDate": taskDate,
+              "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+              "Remetente": element.workflowInstanceDataFields.Remetente,
+              "DocumentsQty": 0,
+              "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+              "WorkflowName": element.workflowDisplayName,
+              "activityInstanceName": element.activityInstanceName,
+            }
+            this.diplomasList.push(task);
+          });
+        });
+        this.showLoader = false;
         
         break;
     }

src/app/pages/gabinete-digital/gabinete-digital.page.html

@@ -129,7 +129,7 @@
             </div>
             <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'MDGPR' ">Diplomas assinados PR</p>
             <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'PR'" >Diplomas</p>
-            <p class="text-center exp-card-content">{{count_dip_Signed}} <span class="title1">Documentos</span></p>
+            <p class="text-center exp-card-content">{{ count_dip_as_pr }} <span class="title1">Documentos</span></p>
           </div>
 
           <div *ngIf="loggeduser.Profile == 'PR'" (click)="openDiplomasAssinarPage(); selectedElement='DiplomasAssinar'" [class.active]="selectedElement == 'DiplomasAssinar'" class="exp-card d-flex flex-column justify-center">

src/app/pages/gabinete-digital/gabinete-digital.page.ts

@@ -36,7 +36,7 @@ export class GabineteDigitalPage implements OnInit {
   count_exp_pp : string;
   count_exp_pd : string;
   count_dip_apr : string;
-  count_dip_Signed =0
+  count_dip_as_pr =0
   count_dip_pv=0;
   count_dip_as = 0;
   count_de_pr = 0;
@@ -225,10 +225,8 @@ export class GabineteDigitalPage implements OnInit {
     let diplomasAssinar = despachospr.filter(data => data.activityInstanceName == "Assinar Diploma");
     this.count_dip_as = Object.keys(diplomasAssinar).length;
 
-    this.processesbackend.GetTasksList("Expediente", false).subscribe(result => {
+    let diplomasAssinados = despachospr.filter(data => data.activityInstanceName == "Diploma Assinado");
-      let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Signed");
+    this.count_dip_as_pr = Object.keys(diplomasAssinados).length;
-      this.count_dip_Signed = Object.keys(res).length
-    });
 
     this.processesbackend.GetToApprovedEvents('PR','true').subscribe(res=>{
       this.count_ev_pr = res; 

src/app/shared/gabinete-digital/diplomas/diplomas.page.html

@@ -31,15 +31,11 @@
   <div class="width-100" [ngSwitch]="segment">
     <div *ngIf="diplomasList">
       <ion-list *ngSwitchCase="'validar'">
-        <!-- *ngFor = "let task of parecerList; let i = index"
-        (click)="viewExpedientDetail(task.SerialNumber)" -->
         <ion-item 
             class="expediente ion-no-padding cursor-pointer"  
             *ngFor = "let task of diplomasList"
             (click)="goToDiploma(task.SerialNumber)"
             >
-            <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
-            <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
               <div class="item width-100">
                 <div class="exp-top-detail">
                   <div class="exp-date">
@@ -64,12 +60,12 @@
       </ion-list>
 
     </div>
-    <div *ngIf="">
+    <div *ngIf="diplomasList">
       <ion-list *ngSwitchCase="'assinados'">
         <ion-item 
             class="expediente ion-no-padding cursor-pointer"  
             *ngFor = "let task of diplomasList"
-            (click)="viewPedidoDetail(task.SerialNumber)"
+            (click)="goToDiploma(task.SerialNumber)"
             >
               <div class="item width-100">
                 <div class="exp-top-detail">
@@ -83,9 +79,8 @@
                     <span class="label">{{task.activityInstanceName}}</span>
                   </div>
                   <div class="exp-icon">
-                    <ion-menu-button style="width: 35px; height: 41px;" autoHide="false">
+                    <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                      <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                    <label></label>
-                    </ion-menu-button> 
                   </div>
                 </div>
                 <div class="exp-bottom-detail">

src/app/shared/gabinete-digital/diplomas/diplomas.page.ts

@@ -108,6 +108,8 @@ constructor(
         this.showLoader = false;
         break;
       case 'assinados':
+        console.log(this.segment);
+        this.diplomasList = new Array();
         let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
         console.log(diplomasAssinados);
         diplomasAssinados.forEach(element => {
@@ -116,41 +118,43 @@ constructor(
           this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
             this.totalDocs = res.DocumentsTotal;
             console.log(res.DocumentsTotal);
-            let date = new Date(element.taskStartDate);
-        date.setMonth(date.getMonth() + 1);
-        let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
 
-        let task = {
+            let date = new Date(element.taskStartDate);
-            "SerialNumber": element.serialNumber,
+            date.setMonth(date.getMonth() + 1);
-            "Folio": element.workflowInstanceDataFields.Subject,
+            let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
-            "Senders": element.originator.email,
+
-            "CreateDate": taskDate,
+            let task = {
-            "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+              "SerialNumber": element.serialNumber,
-            "Remetente": element.workflowInstanceDataFields.Remetente,
+              "Folio": element.workflowInstanceDataFields.Subject,
-            "DocumentsQty": 0,
+              "Senders": element.workflowInstanceDataFields.Sender,
-            "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+              "CreateDate": taskDate,
-            "WorkflowName": element.workflowDisplayName,
+              "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-            "activityInstanceName": element.activityInstanceName,
+              "Remetente": element.workflowInstanceDataFields.Remetente,
-        }
+              "DocumentsQty": 0,
+              "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+              "WorkflowName": element.workflowDisplayName,
+              "activityInstanceName": element.activityInstanceName,
+            }
             this.diplomasList.push(task);
           },
-          (error)=>{
+          (error)=> {
-            let date = new Date(element.taskStartDate);
-        date.setMonth(date.getMonth() + 1);
-        let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
             
-        let task = {
+            let date = new Date(element.taskStartDate);
-            "SerialNumber": element.serialNumber,
+            date.setMonth(date.getMonth() + 1);
-            "Folio": element.workflowInstanceDataFields.Subject,
+            let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
-            "Senders": element.workflowInstanceDataFields.Sender,
+
-            "CreateDate": taskDate,
+            let task = {
-            "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+              "SerialNumber": element.serialNumber,
-            "Remetente": element.workflowInstanceDataFields.Remetente,
+              "Folio": element.workflowInstanceDataFields.Subject,
-            "DocumentsQty": 0,
+              "Senders": element.workflowInstanceDataFields.Sender,
-            "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+              "CreateDate": taskDate,
-            "WorkflowName": element.workflowDisplayName,
+              "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-            "activityInstanceName": element.activityInstanceName,
+              "Remetente": element.workflowInstanceDataFields.Remetente,
-        }
+              "DocumentsQty": 0,
+              "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+              "WorkflowName": element.workflowDisplayName,
+              "activityInstanceName": element.activityInstanceName,
+            }
             this.diplomasList.push(task);
           });
         });