Fix

src/app/models/dailyworktask.model.ts

@@ -1,3 +1,5 @@
+import * as internal from "stream";
+
 export class DailyWorkTask{
     SerialNumber: string;
     Folio: string;
@@ -67,11 +69,29 @@ export class fullTask {
     workflowName: string
 }
 
+export const activityInstanceNameArray = [
+    'Concluir Despacho',
+    'Tarefa de Despacho','Reexecutar Despacho','Concluir Parecer',
+    'Concluir Deferimento',
+    'Reapreciar Deferimento',
+    'Tarefa de Deferimento',
+    'Assinar Diploma',
+    'Diploma Assinado',
+    'Retificar Diploma',
+    'Gerar Diploma',
+    'Editar Evento',
+    'Revisar Diploma',
+    'Tarefa de Parecer'
+] as const; // TS3.4 syntax
+
+
+export type activityInstanceName = typeof activityInstanceNameArray[number]; 
+
 export interface fullTaskList {
     serialNumber: string;
     taskStartDate: string;
     workflowDisplayName: string;
-    activityInstanceName: string;
+    activityInstanceName: activityInstanceName;
     totalDocuments: number;
     workflowInstanceDataFields: {
         Subject: string;
@@ -142,6 +162,7 @@ export interface expedienteTask  {
 }
 
 export interface ExpedienteTask {
+    Folio: string
     SerialNumber: string
     Senders  : string
     CreateDate  : any
@@ -151,4 +172,23 @@ export interface ExpedienteTask {
     Status  : string
     taskStartDate: string
     Subject: string
+}
+
+
+export interface PedidoDeDeferimento {
+    serialNumber:               string;
+    taskStartDate:              Date;
+    deadline:                   Date | null;
+    workflowDisplayName:        string;
+    activityInstanceName:       string;
+    totalDocuments:             number;
+    workflowInstanceDataFields: PedidoDeDeferimentoWorkflowInstanceDataFields;
+}
+
+export interface PedidoDeDeferimentoWorkflowInstanceDataFields {
+    Sender:     string;
+    Subject:    string;
+    FolderID:   number;
+    Status:     string;
+    originator: string;
 }

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

@@ -83,9 +83,12 @@ export class DiplomasAssinarPage implements OnInit {
 
       let diplomasAssinar = diplomas.filter(data => data.activityInstanceName == "Assinar Diploma");
       
-  
+      let format  = diplomasAssinar.map(element => {
-      this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar)
+        return this.customTaskPipe.transform(element)
-      this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate')
+      });
+      
+      this.deplomasStore.resetDiplomasParaAssinar(format)
+      this.diplomasList = this.sortService.sortDate(format, 'CreateDate')
     } catch(error) {
 
     }

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

@@ -9,6 +9,7 @@ import { SortService } from 'src/app/services/functions/sort.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { PermissionService } from 'src/app/services/permission.service';
 import { DeplomasStore } from 'src/app/store/deplomas.service';
+import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 
 
 @Component({
@@ -28,6 +29,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
 
   skeletonLoader = true
   deplomasStore = DeplomasStore
+  customTaskPipe = new CustomTaskPipe()
   
   constructor(
     private processes: ProcessesService,
@@ -124,13 +126,10 @@ export class DiplomasPage implements OnInit, OnDestroy {
       this.diplomasList = this.sortService.sortDate(diplomasList, 'CreateDate');
 
       let diplomasAssinados = diplomas.filter(data => data.activityInstanceName == "Diploma Assinado");
-      let diplomasAssinadoList = [];
+      
 
-      diplomasAssinados.forEach(async element => {
+      let diplomasAssinadoList = diplomasAssinados.map( element => {
-
+        return this.pipeTask(element);
-        let task = this.pipeTask(element);
-        diplomasAssinadoList.push(task);
-        // console.log('DIPLOMAS ASSINADOS', task)
       });
 
       this.diplomasAssinadoList = this.sortService.sortDate(diplomasAssinadoList, 'CreateDate')
@@ -138,7 +137,10 @@ export class DiplomasPage implements OnInit, OnDestroy {
 
 
       let diplomasAssinar = diplomas.filter(data => data.activityInstanceName == "Assinar Diploma");
-      this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar)
+      
+      this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar.map(element => {
+        return this.customTaskPipe.transform(element)
+      }))
       
       // console.log('DIPLOMAS ASSINADOS', this.diplomasAssinadoList)
 

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

@@ -394,8 +394,6 @@ export class ExpedienteDetailPage implements OnInit {
         });
       })
 
-      
-      
 
     }, (error) => {
 

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

@@ -705,12 +705,12 @@ export class GabineteDigitalPage implements OnInit {
     this.pendentesstore.reset(pendentes);
     this.updateAllProcess()
 
-    let depachoAPI: any  = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise();
+    let depachoAPI  = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise();
   
 
     if(SessionStore.user.Profile != 'PR') {
       
-      let depacho = depachoAPI.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
+      let depacho: any = depachoAPI.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
       depacho = depacho.filter(data => data.workflowInstanceDataFields.Status == "Active");
 
       depacho = depacho.map((e)=> this.customTaskPipe.transform(e))
@@ -719,7 +719,7 @@ export class GabineteDigitalPage implements OnInit {
       this.updateAllProcess()
     } else if(SessionStore.user.Profile == 'PR') {
       
-      let depacho = depachoAPI.filter(data => data.activityInstanceName == "Concluir Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active")
+      let depacho: any = depachoAPI.filter(data => data.activityInstanceName == "Concluir Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active")
       depacho = depacho.map((e)=> this.customTaskPipe.transform(e))
       this.despachoprstore.reset(depacho)
       this.updateAllProcess()
@@ -771,12 +771,14 @@ export class GabineteDigitalPage implements OnInit {
     }))
 
 
-    let diplomasAssinar = depachoAPI.filter(data => data.activityInstanceName == "Assinar Diploma");
+    let diplomasAssinar: any = depachoAPI.filter(data => data.activityInstanceName == "Assinar Diploma");
-
+    diplomasAssinar = diplomasAssinar.map((element) => this.expedienteTaskPipe.transform(element))
     this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar)
 
-    let diplomasAssinados = depachoAPI.filter(data => data.activityInstanceName == "Diploma Assinado");
+    let diplomasAssinados: any = depachoAPI.filter(data => data.activityInstanceName == "Diploma Assinado");
+    diplomasAssinados = diplomasAssinados.map((element) => this.expedienteTaskPipe.transform(element))
     this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados)
+    
 
     this.updateAllProcess()
     this.loadCount = true

src/app/pipes/expediente-task.pipe.ts

@@ -16,6 +16,7 @@ export class ExpedienteTaskPipe implements PipeTransform {
       "SerialNumber": fullTask.serialNumber,
       "taskStartDate": fullTask.taskStartDate,
       "Subject": fullTask.workflowInstanceDataFields.Subject,
+      "Folio": fullTask.workflowInstanceDataFields.Subject,
       "Senders": fullTask.workflowInstanceDataFields.Sender,
       "CreateDate": date,
       "DocumentsQty": fullTask.totalDocuments,

src/app/services/processes.service.ts

@@ -87,7 +87,7 @@ export class ProcessesService {
     return this.http.get<ExpedienteFullTask[]>(`${geturl}`, options);
   }
 
-  GetTask(serialnumber:string): Observable<any>{
+  GetTask(serialnumber:string): Observable<any> {
     const geturl = environment.apiURL + 'Tasks/FindTask';
     let params = new HttpParams();
 

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

@@ -2,11 +2,11 @@
   <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
   <div class="title">
     <div class="thetitle"><ion-label >Diplomas para assinar</ion-label></div>
-    <!-- <div class="theicon">
+    <div class="theicon">
       <button title="Atualizar" class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
       </button>
-    </div> -->
+    </div>
   </div>
 </ion-header>
 <ion-content>
@@ -38,7 +38,7 @@
           <div class="item width-100">
             <div class="exp-top-detail">
               <div class="subject">
-                <ion-label>{{ task.Folio }}</ion-label>
+                <ion-label>{{ task.Folio || task.workflowInstanceDataFields.Subject }}</ion-label>
               </div>
               <div class="exp-icon">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>

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

@@ -71,9 +71,8 @@ export class DiplomasAssinarPage implements OnInit {
 
     let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma");
 
-    diplomasAssinar.forEach(element => {
+    this.diplomasList = diplomasAssinar.map(element => {
-      let task: customTask = this.customTaskPipe.transform(element)
+      return this.customTaskPipe.transform(element)
-      this.diplomasList.push(task);
     });
 
     this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate')

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

@@ -66,29 +66,23 @@ export class DiplomasPage implements OnInit {
     let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
 
     this.diplomasList = [];
-    let diplomasList = [];
 
     // let diplomasReview = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
 
-    diplomas.forEach(element => {
+    let diplomasList = diplomas.map(element => {
-
+      return this.pipeTask(element)
-      let task = this.pipeTask(element)
-      diplomasList.push(task);
     });
 
-    diplomasList = diplomasList.filter(data => data.activityInstanceName != "Tarefa de Despacho");
+    diplomasList = diplomasList.filter(data => data.activityInstanceName == "Revisar Diploma");
 
     this.diplomasList = this.sortService.sortDate(diplomasList, 'CreateDate')
     
     this.deplomasStore.resetDiplomasReview(this.diplomasList)
 
-    let diplomasAssinadoList = []
     let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
 
-    diplomasAssinados.forEach(async element => {
+    let diplomasAssinadoList = diplomasAssinados.map(element => {
-
+      return this.pipeTask(element)
-      let task = this.pipeTask(element)
-      diplomasAssinadoList.push(task);
     });
 
     this.diplomasAssinadoList =  this.sortService.sortDate(diplomasAssinadoList, 'CreateDate')

src/environments/environment.prod.ts

@@ -3,4 +3,4 @@ import { oaprProd } from './suport/oapr'
 import { doneITProd } from './suport/doneIt'
 
 
-export const environment: Environment = oaprProd;
+export const environment: Environment = doneITProd;

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "a263faadb",
+  "shortSHA": "b6c9a3147",
-  "SHA": "a263faadb85a02d4431c33e96585119d549faf74",
+  "SHA": "b6c9a31477f6adea3821ae91f9e936cc56a6c6ec",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Feb 6 18:50:07 2023 +0100'",
+  "lastCommitTime": "'Mon Feb 6 19:04:26 2023 +0100'",
-  "lastCommitMessage": "Fixe",
+  "lastCommitMessage": "fix time",
-  "lastCommitNumber": "4747",
+  "lastCommitNumber": "4748",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified:   src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified:   src/app/pages/publications/new-action/new-action.page.ts\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/shared/publication/new-action/new-action.page.html\n\tmodified:   src/app/shared/publication/new-action/new-action.page.ts\n\tmodified:   src/environments/environment.ts",
+  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/models/dailyworktask.model.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/pipes/expediente-task.pipe.ts\n\tmodified:   src/app/services/processes.service.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified:   src/environments/environment.prod.ts",
   "changeAuthor": "peter.maquiran"
 }