improve

src/app/Rules/despacho.service.ts

@@ -51,20 +51,6 @@ export class DespachoService {
     return this.processes.CompleteTask(body)
   }
 
-  // reencaminhar(note:string, documents:any, serialnumber) {
-
-  //   let body = {
-  //     "serialNumber": serialnumber,
-  //     "action": "Reencaminhar",
-  //     "ActionTypeId": 98,
-  //     "dataFields": {
-  //       "ReviewUserComment": note,
-  //     },
-  //     "AttachmentList" :documents,
-  //   }
-  //   return this.processes.CompleteTask(body)
-  // }
-
   executado(note:string, documents:any , serialnumber) {
 
     let body = {
@@ -139,7 +125,7 @@ export class DespachoService {
         "dataFields": {
           "ReviewUserComment": note,
         },
-         "AttachmentList" :documents,
+        "AttachmentList" :documents,
       }
     }
     

src/app/Rules/pedido.service.ts

@@ -29,13 +29,13 @@ export class PedidoService {
     return this.processes.postDeferimento(body)
   }
 
-  taskCompleteParecer({serialNumber}) {
+  taskCompleteParecer({serialNumber, note}) {
     const body = {
       "serialNumber": serialNumber,
       "action": "Parecer",
       "ActionTypeId": 92, // Pedido de parece
       "dataFields": {
-        "ReviewUserComment": '',
+        "ReviewUserComment": note,
       },
       "AttachmentList" :null,
     }

src/app/modals/create-process/create-process.page.html

@@ -8,6 +8,8 @@
         <ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Assunto*" [(ngModel)]="postData.DispatchFolder.Subject"></ion-input>
       </div>
 
+      {{ postData.DispatchFolder.Subject }}
+
       <div class="container-div width-100">
         <div class="ion-item-class-2">
           <div class="ion-icon-class">
@@ -19,6 +21,8 @@
         </div>
       </div>
 
+      {{ postData.DispatchFolder.Message }}
+
       <!-- Add scrolls -->
       <div class="d-flex flex-column height-100 overflow-y-auto">
 

src/app/modals/create-process/create-process.page.ts

@@ -257,6 +257,11 @@ export class CreateProcessPage implements OnInit {
     });
 
 
+    let docs = {
+      ProcessInstanceID: "",
+      Attachments: []
+    }
+
     const DocumentToSave = this.documents.map((e) => {
       return {
         ApplicationId: e.ApplicationType,
@@ -264,6 +269,8 @@ export class CreateProcessPage implements OnInit {
       }
     });
 
+    docs.Attachments = DocumentToSave;
+
     this.dispatchFolder.SubjectTypes = this.selectedTypes;
     const loader = this.toastService.loading()
 
@@ -278,6 +285,7 @@ export class CreateProcessPage implements OnInit {
             UserEmail: this.loggeduser.Email,
             UsersSelected: attendees,
             DispatchFolder: this.dispatchFolder,
+            AttachmentList: docs
           }
 
           try {
@@ -302,6 +310,7 @@ export class CreateProcessPage implements OnInit {
             UserEmail: this.loggeduser.Email,
             UsersSelected: attendees,
             DispatchFolder: this.dispatchFolder,
+            AttachmentList: docs
           }
 
           try {
@@ -309,8 +318,9 @@ export class CreateProcessPage implements OnInit {
               await this.despachoService.createParecer(this.postData).toPromise();
               await this.despachoService.solicitarParecer({ serialnumber: this.task.serialNumber, activityInstanceName: this.task.activityInstanceName}).toPromise();
             } else  {
+
               await this.pedidoService.createParecer(this.postData).toPromise();
-              await this.pedidoService.taskCompleteParecer({serialNumber:this.task.serialNumber}).toPromise();
+              await this.pedidoService.taskCompleteParecer({serialNumber:this.task.serialNumber, note: this.postData.DispatchFolder.Subject}).toPromise();
             }
 
             this.modalController.dismiss();
@@ -331,6 +341,7 @@ export class CreateProcessPage implements OnInit {
             UserEmail: this.loggeduser.Email,
             UsersSelected: attendees,
             DispatchFolder: this.dispatchFolder,
+            AttachmentList: docs
           }
 
           try {
@@ -358,6 +369,7 @@ export class CreateProcessPage implements OnInit {
             UserEmail: this.loggeduser.Email,
             UsersSelected: attendees,
             DispatchFolder: this.dispatchFolder,
+            AttachmentList: docs
           }
 
           if(this.postData.DispatchFolder.Message){
@@ -387,6 +399,7 @@ export class CreateProcessPage implements OnInit {
             UserEmail: this.loggeduser.Email,
             UsersSelected: attendees,
             DispatchFolder: this.dispatchFolder,
+            AttachmentList: docs
           }
 
           try {
@@ -396,7 +409,7 @@ export class CreateProcessPage implements OnInit {
               await this.despachoService.solicitarParecer({ serialnumber: this.task.serialNumber, activityInstanceName: this.task.activityInstanceName}).toPromise();
             } else  {
               await this.pedidoService.createParecer(this.postData).toPromise();
-              await this.pedidoService.taskCompleteParecer({serialNumber:this.task.serialNumber}).toPromise();
+              await this.pedidoService.taskCompleteParecer({serialNumber:this.task.serialNumber, note: this.postData.DispatchFolder.Subject}).toPromise();
             }
 
             this.modalController.dismiss();
@@ -417,6 +430,7 @@ export class CreateProcessPage implements OnInit {
               UserEmail: this.loggeduser.Email,
               UsersSelected: attendees,
               DispatchFolder: this.dispatchFolder,
+              AttachmentList: docs
             }
 
             try {
@@ -474,7 +488,7 @@ export class CreateProcessPage implements OnInit {
       }
 
     } else {
-      console.log('unexpected error')
+      // console.log('unexpected error')
     }
 
 

src/app/pages/agenda/agenda.page.html

@@ -447,6 +447,7 @@
         (clearContact)="clearContact()"
         (openAttendeesComponent)="openAttendeesComponent($event)"
         (closeComponent)="approveEventDismissGoBack()"
+        (approveEventDismiss) = "approveEventDismiss($event)"
         (setIntervenient)="setIntervenient($event)"
         (setIntervenientCC)="setIntervenientCC($event)"
 

src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html

@@ -5,11 +5,12 @@
       <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
     </button>
   </div>
+
   <div class="buttons">
-    <button class="btn-cancel" shape="round" (click)="emendarTask()">Rever</button>
+    <button *ngIf="activityInstanceName == 'Aprovar Evento'" class="btn-cancel" shape="round" (click)="emendarTask()">Rever</button>
-    <button class="btn-cancel" shape="round" (click)="approveTask()">Aprovar</button>
+    <button *ngIf="activityInstanceName == 'Aprovar Evento'" class="btn-cancel" shape="round" (click)="approveTask()">Aprovar</button>
     <div class="solid"></div>
-    <button class="btn-cancel" shape="round" (click)="editTask()">Editar</button>
+    <button *ngIf="activityInstanceName != 'Aprovar Evento'" class="btn-cancel" shape="round" (click)="editTask()">Editar</button>
-    <button class="btn-delete" shape="round" (click)="rejeitar()">Rejeitar</button>
+    <button *ngIf="activityInstanceName != 'Aprovar Evento'" class="btn-delete" shape="round" (click)="rejeitar()">Rejeitar</button>
   </div>
 </ion-content>

src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts

@@ -16,6 +16,7 @@ import { RouteService } from 'src/app/services/route.service';
 export class EventActionsPopoverPage implements OnInit {
   serialNumber:string;
   instanceId: string;
+  activityInstanceName: string
 
   constructor(
     private navParams: NavParams,
@@ -27,7 +28,8 @@ export class EventActionsPopoverPage implements OnInit {
     public ThemeService: ThemeService) {
       this.serialNumber = this.navParams.get('serialNumber');
       this.instanceId = this.navParams.get('InstanceId');
-     }
+      this.activityInstanceName = this.navParams.get('InstanceId');
+  }
 
   ngOnInit() {
     window.onresize = (event) => {
@@ -67,6 +69,26 @@ export class EventActionsPopoverPage implements OnInit {
 
   }
 
+  async ReenviarTask() {
+    let body = { "serialNumber": this.serialNumber, "action": "Reenviar" }
+    
+    
+    const loader = this.toastService.loading()
+    try {
+      await this.processes.PostTaskAction(body).toPromise()
+
+      this.toastService.successMessage();
+      this.goBack();
+    } catch (error) {
+
+      this.toastService.badRequest()
+    }
+    finally {
+      loader.remove()
+    }
+
+  }
+
   async emendarTask() {
     this.closePopover();
     
@@ -107,25 +129,24 @@ export class EventActionsPopoverPage implements OnInit {
         }
       }
       else{
-        //this.alertService.presentAlert('Operação cancelada!');
+        
       }
     });
   }
 
-  async rejeitar(){
+  async rejeitar() {
     let body = { "serialNumber": this.serialNumber, "action": "Rejeitar" }
 
-
+    const loader = this.toastService.loading();
-    const loader = this.toastService.loading()
     try {    
       await this.processes.PostTaskAction(body).toPromise();
       await this.toastService.successMessage('Processo rejeitado');
       this.goBack();
     } catch (error) {
-      this.toastService.badRequest()
+      this.toastService.badRequest();
     }
     finally {
-      loader.remove()
+      loader.remove();
     }
 
 

src/app/pages/agenda/new-event/new-event.page.ts

@@ -98,7 +98,6 @@ export class NewEventPage implements OnInit {
     this.postEvent.EventRecurrence = {Type:'-1'};
     this.eventBody = { BodyType : "1", Text : ""};
     this.postEvent.Body = this.eventBody;
-    /* this.profile = this.navParams.get('profile'); */
 
     this.selectedSegment = this.navParams.get('segment');
     this.selectedDate = this.navParams.get('eventSelectedDate');

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

@@ -270,9 +270,6 @@ export class DespachoPage implements OnInit {
 
   async viewDocument(docId: string, Document) {
 
-
-    
-
     const modal = await this.modalController.create({
       component: ViewDocumentPage,
       componentProps: {

src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts

@@ -152,6 +152,9 @@ export class ApproveEventModalPage implements OnInit {
   async openOptions(ev:any) {
     const popover = await this.popoverController.create({
       component: EventActionsPopoverPage,
+      componentProps: {
+        activityInstanceName: this.loadedEvent.activityInstanceName
+      },
       cssClass: 'event-actions-popover',
       event: ev,
       translucent: true

src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html

@@ -101,13 +101,14 @@
       </div>
 
     <div *ngIf="loadedEvent" class="aside-right flex-column height-100">
+      {{ loadedEvent.activityInstanceName }}
       <div class="aside-buttons">
-        <button hidden full class="btn-cancel" shape="round" >Editar evento</button>
+        <button full class="btn-cancel" shape="round" *ngIf="loadedEvent.activityInstanceName == 'Aprovar Evento'">Editar evento</button>
-        <button (click)="approveTask(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" >Aprovar</button>
+        <button (click)="approveTask(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" *ngIf="loadedEvent.activityInstanceName == 'Aprovar Evento'">Aprovar</button>
         <button (click)="emendTask(loadedEvent.serialNumber)" class="btn-cancel" shape="round" >Rever</button>
         <div class="solid"></div>
-        <button full  class="btn-cancel" shape="round" (click)="editar(loadedEvent.serialNumber)" >Editar</button>
+        <button full  class="btn-cancel" shape="round" (click)="editar(loadedEvent.serialNumber)" *ngIf="loadedEvent.activityInstanceName != 'Aprovar Evento'">Editar</button>
-        <button (click)="rejeitar(loadedEvent.serialNumber)" full class="btn-delete" shape="round" >Rejeitar</button>
+        <button (click)="rejeitar(loadedEvent.serialNumber)" full class="btn-delete" shape="round" *ngIf="loadedEvent.activityInstanceName != 'Aprovar Evento'">Rejeitar</button>
       </div>
     </div>
     </div>

src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts

@@ -188,10 +188,8 @@ export class ApproveEventPage implements OnInit {
   
           this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]);
 
-          let instanceId = this.loadedEvent.workflowInstanceDataFields.InstanceId;
           this.loadedAttachments = this.loadedEvent.Documents;
             
-  
         })
       })
     }
@@ -205,7 +203,6 @@ export class ApproveEventPage implements OnInit {
       this.loadedEvent = await this.processes.GetTask(this.serialNumber).toPromise();
       this.addProcessToDB(this.loadedEvent)
       
-
       this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate);
 
       this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]);
@@ -346,6 +343,7 @@ export class ApproveEventPage implements OnInit {
       componentProps: {
         serialNumber: ev.serialNumber,
         InstanceId: ev.workflowInstanceDataFields.InstanceId,
+        activityInstanceName: this.loadedEvent.activityInstanceName
       },
     });
     return await popover.present();

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

@@ -52,6 +52,9 @@
                     <p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
                     <p *ngIf="event.workflowInstanceDataFields.StartDate == event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }}  |  {{event.workflowInstanceDataFields.Location}}</p>
                     <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
+                    <div *ngIf="event.activityInstanceName">
+                      <div class="label-event-type"> {{ event.activityInstanceName }} </div>
+                    </div>
                   </div>
                 </div>
               </ion-item>
@@ -74,6 +77,9 @@
                     <p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
                     <p *ngIf="event.workflowInstanceDataFields.StartDate == event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }}  |  {{event.workflowInstanceDataFields.Location}}</p>
                     <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
+                    <div *ngIf="event.activityInstanceName">
+                      <div class="label-event-type"> {{ event.activityInstanceName }} </div>
+                    </div>
                   </div>
                 </div>
               </ion-item>

src/app/pages/gabinete-digital/event-list/event-list.page.scss

@@ -123,3 +123,13 @@ ion-item-sliding{
   color: #000 !important;
   border: 1px solid red !important;
 }
+
+
+.label-event-type {
+  padding: 1px 7px;
+  display: inline-block;
+  background: #f05d5e;
+  border-radius: 17px;
+  color: white;
+  font-size: 10pt;
+}

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

@@ -158,14 +158,14 @@ export class EventListPage implements OnInit {
         this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
         this.eventsMDGPRList = this.sortService.sortDate(this.eventsMDGPRList, 'taskStartDate')
         this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList)
-        this.eventsMDGPRList = ( this.eventsMDGPRList || []).filter(function(item) {
+        // this.eventsMDGPRList = ( this.eventsMDGPRList || []).filter(function(item) {
-          return item.activityInstanceName != 'Editar Evento'
+        //   return item.activityInstanceName != 'Editar Evento'
-      })
+        // })
         
         this.storage.set('event-to-aproveMD',this.eventsMDGPRList).then(() => {
           
         })
-        //this.eventaprovacaostore.resetmd(this.sortService.sortArrayByDate(this.eventsMDGPRList).reverse());
+        
       }
       else if (this.segment == 'PR') {
         let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
@@ -173,14 +173,14 @@ export class EventListPage implements OnInit {
         this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
         this.eventsPRList = this.sortService.sortDate(this.eventsPRList, 'taskStartDate')
         this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList)
-        this.eventsPRList = (this.eventsPRList || []).filter(function(item) {
+        // this.eventsPRList = (this.eventsPRList || []).filter(function(item) {
-          return item.activityInstanceName != 'Editar Evento'
+        //   return item.activityInstanceName != 'Editar Evento'
-        })
+        // })
         
         this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => {
           
         })
-        //this.eventaprovacaostore.resetpr(this.sortService.sortArrayByDate(this.eventsPRList).reverse());
+        
       }
       this.showLoader = false;
       this.skeletonLoader = false

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

@@ -209,15 +209,6 @@ export class ExpedientTaskModalPage implements OnInit {
       Priority: new FormControl(this.postData.Priority, [
         Validators.required,
       ]),
-      // CalendarName: new FormControl(this.postEvent.CalendarName, [
-      //   Validators.required
-      // ]),
-      // Categories: new FormControl(this.postEvent.Categories, [
-      //   Validators.required
-      // ]),
-      // IsRecurring: new FormControl(this.postEvent.IsRecurring, [
-      //   Validators.required
-      // ]),
       participantes: new FormControl(this.taskParticipants, [
         Validators.required
       ]),
@@ -298,195 +289,6 @@ export class ExpedientTaskModalPage implements OnInit {
     this.dispatchFolder.SubjectTypes = this.selectedTypes;
     const loader = this.toastService.loading()
 
-      // switch (this.loggeduser.Profile) {
-      //   case 'MDGPR':
-      //   if(this.taskParticipants.length > 0) {
-      //     switch (this.taskType) {
-      //       case '0': // Despacho
-      //         this.postData = {
-      //           DistributionType: "Paralelo",
-      //           CountryCode: 'AO',
-      //           Priority: this.postData.Priority,
-      //           UserEmail: this.loggeduser.Email,
-      //           UsersSelected: attendees,
-      //           DispatchFolder: this.dispatchFolder,
-      //           AttachmentList: docs,
-      //         }
-
-      //         let action_despacho = {
-      //           "serialNumber": this.task.serialNumber,
-      //           "action": "Tratado",
-      //           "ActionTypeId": 94,
-      //           "dataFields": {
-      //             "Note": "",
-      //           }
-      //         }
-
-              
-
-      //         try {
-
-      //           this.taskResult = await this.processes.postDespatcho(this.postData).toPromise();
-      //           await this.toastService._successMessage('Processo efetuado');
-      //           this.modalController.dismiss(action_despacho);
-
-      //         } catch (error) {
-      //           await this.toastService._badRequest('Processo não efetuado')
-      //         } finally {
-      //           loader.remove()
-      //         }
-
-              
-      //         break;
-
-      //       case '1': // Parecer
-      //         this.postData = {
-      //           DistributionType: "Paralelo",
-      //           CountryCode: 'AO',
-      //           Priority: this.postData.Priority,
-      //           UserEmail: this.loggeduser.Email,
-      //           UsersSelected: attendees,
-      //           DispatchFolder: this.dispatchFolder,
-      //           AttachmentList: docs
-      //         }
-
-      //         let action_parecer = {
-      //           "serialNumber": this.task.serialNumber,
-      //           "action": "Tratado",
-      //           "ActionTypeId": 92,
-      //           "dataFields": {
-      //             "Note": "",
-      //           }
-      //         }
-
-      //         try {
-      //           this.taskResult = await this.processes.postParecer(this.postData).toPromise();
-      //           await this.toastService._successMessage('Pedido enviado');
-      //           this.modalController.dismiss(action_parecer);
-
-      //         } catch (error) {
-      //           await this.toastService._badRequest('Processo não efetuado')
-      //         } finally {
-      //           loader.remove()
-      //         }
-      //         break;
-      //       case '2': // Deferimento
-      //         this.postData = {
-      //           DistributionType: "Paralelo",
-      //           CountryCode: 'AO',
-      //           Priority: this.postData.Priority,
-      //           UserEmail: this.loggeduser.Email,
-      //           UsersSelected: attendees,
-      //           DispatchFolder: this.dispatchFolder,
-      //           AttachmentList: docs
-      //         }
-      //         //
-      //         let action_deferimento = {
-      //             "serialNumber": this.task.serialNumber,
-      //             "action": "Tratado",
-      //             "ActionTypeId": 93,
-      //             "dataFields": {
-      //               "Note": "",
-      //           }
-      //         }
-
-      //       try {
-
-      //         this.taskResult = await this.processes.postDeferimento(this.postData).toPromise();
-      //         this.toastService._successMessage('Processo efetuado');
-      //         this.modalController.dismiss(action_deferimento);
-      //       } catch (error) {
-      //         await this.toastService._badRequest('Processo não efetuado')
-      //       } finally {
-      //         loader.remove()
-      //       }
-
-            
-      //     break;
-      //   }
-      // }
-      // else {
-      //   this.alertController.presentAlert("Lista de i-ntervenientes vazia. Por favor, adicione 1 ou mais intervenientes.");
-      // }
-      //   break;
-      //   case 'PR':
-      //   switch (this.taskType) {
-      //     case '0': // despacho
-      //       this.postData = {
-      //         DistributionType: "Paralelo",
-      //         CountryCode: 'AO',
-      //         Priority: this.postData.Priority,
-      //         UserEmail: this.loggeduser.Email,
-      //         UsersSelected: attendees,
-      //         DispatchFolder: this.dispatchFolder,
-      //         AttachmentList: docs,
-      //       }
-            
-
-      //       let action_despacho_pr = {
-      //         "serialNumber": this.task.serialNumber,
-      //         "action": "Tratado",
-      //         "ActionTypeId": 99999881 ,
-      //         "dataFields": {
-      //           "Note": "",
-      //         }
-      //       }
-
-      //       if(this.postData.DispatchFolder.Message){
-      //         try {
-      //           this.taskResult = await this.despachoService.createDespacho(this.postData).toPromise();
-      //           await this.toastService._successMessage('Processo efetuado');
-      //           this.modalController.dismiss(action_despacho_pr);
-      //         } catch (error) {
-
-      //           await this.toastService._badRequest('Processo não efetuado')
-      //         } finally {
-      //           //loader.remove()
-      //         }
-      //       }
-      //       else{
-      //         this.validateField = true;
-      //         this.toastService._badRequest('Por favor adicione uma descrição');
-      //       }
-      //       loader.remove();
-      //       break;
-
-      //     case '1': // parecer
-      //       this.postData = {
-      //         DistributionType: "Paralelo",
-      //         CountryCode: 'AO',
-      //         Priority: this.postData.Priority,
-      //         UserEmail: this.loggeduser.Email,
-      //         UsersSelected: attendees,
-      //         DispatchFolder: this.dispatchFolder,
-      //         AttachmentList: docs
-      //       }
-
-      //       let action_parecer_pr = {
-      //         "serialNumber": this.task.serialNumber,
-      //         "action": "Tratado",
-      //         "ActionTypeId": 99999881,
-      //         "dataFields": {
-      //           "Note": "",
-      //         }
-      //       }
-
-      //       try {
-      //         this.taskResult = await this.processes.postParecerPr(this.postData).toPromise();
-      //         await this.toastService._successMessage('Pedido enviado');
-      //         this.modalController.dismiss(action_parecer_pr);
-      //       } catch (error) {
-
-      //         await this.toastService._badRequest('Processo não efetuado')
-      //       } finally {
-      //           loader.remove()
-      //       }
-
-      //       break;
-      //   }
-      //   break;
-      // }
-
       if(this.loggeduser.Profile != 'PR') {
         if(this.taskParticipants.length > 0) {
           switch (this.taskType) {
@@ -506,12 +308,10 @@ export class ExpedientTaskModalPage implements OnInit {
                 "action": "Tratado",
                 "ActionTypeId": 94,
                 "dataFields": {
-                  "Note": "",
+                  "Note": this.postData.DispatchFolder.Subject,
                 }
               }
 
-              
-
               try {
 
                 this.taskResult = await this.processes.postDespatcho(this.postData).toPromise();
@@ -543,7 +343,7 @@ export class ExpedientTaskModalPage implements OnInit {
                 "action": "Tratado",
                 "ActionTypeId": 92,
                 "dataFields": {
-                  "Note": "",
+                  "Note": this.postData.DispatchFolder.Subject,
                 }
               }
 
@@ -570,11 +370,11 @@ export class ExpedientTaskModalPage implements OnInit {
               }
               //
               let action_deferimento = {
-                  "serialNumber": this.task.serialNumber,
+                "serialNumber": this.task.serialNumber,
-                  "action": "Tratado",
+                "action": "Tratado",
-                  "ActionTypeId": 93,
+                "ActionTypeId": 93,
-                  "dataFields": {
+                "dataFields": {
-                    "Note": "",
+                  "Note": this.postData.DispatchFolder.Subject,
                 }
               }
 
@@ -612,7 +412,7 @@ export class ExpedientTaskModalPage implements OnInit {
               "action": "Tratado",
               "ActionTypeId": 99999881 ,
               "dataFields": {
-                "Note": "",
+                "Note": this.postData.DispatchFolder.Subject,
               }
             }
 
@@ -651,7 +451,7 @@ export class ExpedientTaskModalPage implements OnInit {
               "action": "Tratado",
               "ActionTypeId": 99999881,
               "dataFields": {
-                "Note": "",
+                "Note": this.postData.DispatchFolder.Subject,
               }
             }
 

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

@@ -32,6 +32,7 @@ import { BackgroundService } from 'src/app/services/background.service';
 import { SortService } from 'src/app/services/functions/sort.service';
 import { DataService } from 'src/app/services/data.service';
 import { Storage } from '@ionic/storage';
+import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
 
 @Component({
   selector: 'app-gabinete-digital',
@@ -113,6 +114,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
   //
   // pipe
 
+  expedienteTaskPipe = new ExpedienteTaskPipe();
   
   loadCount = false
 
@@ -161,12 +163,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
   }
 
   ngDoCheck(): void {
-    /* if( window.innerWidth < 701) {
+
-      this.segmentVista = "listview";
-    }
-    else{
-      this.segmentVista = "boxview";
-    } */
   }
 
   closeAllDesktopComponent() {
@@ -344,13 +341,6 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
     const totalHours = Math.floor(totalMinutes / 60);
     const totalDays = Math.floor(totalHours / 24);
 
-    //const hours = totalHours - (totalDays * 24);
-    //const minutes = totalMinutes - (totalDays * 24 * 60) - (hours * 60);
-    // const seconds = totalSeconds - (totalDays * 24 * 60 * 60) - (hours * 60 * 60) - (minutes * 60);
-
-    // let diffDays = totalDays;
-    // let diffMinutes = minutes;
-
     if (totalDays == 0) {
       if (allday) {
         customDate = this.getCustomDate(start) + ", " + this.getCustomHours(start) + " (todo dia)";
@@ -358,7 +348,6 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
         return customDate;
       }
       else {
-        //customDate = this.getCustomDate(start)+","+this.getCustomHours(start)+" ("+minutes+" mins)";
         customDate = this.getCustomDate(start) + ", " + this.getCustomHours(start) + " | " + this.getCustomHours(end);
         return customDate;
       }
@@ -562,7 +551,6 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
 
     let allProcessesList = allPreocesses_;
 
-    console.log(allProcessesList)
     allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento')
     allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Revisar Diploma')
     allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma')
@@ -615,10 +603,16 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
     this.allProcessesList = removeDuplicate(this.allProcessesList);
     this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate')
 
-    let expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise();
+    let expedientes: any = await this.processesbackend.GetTaskListExpediente(false).toPromise();
     expedientes = expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")
 
-    this.expedientegbstore.count = expedientes.length
+    expedientes = expedientes.filter((item) => {
+      return item.activityInstanceName != 'Retificar Expediente'
+    });
+
+    expedientes = expedientes.map((element) => this.expedienteTaskPipe.transform(element));
+    
+    this.expedientegbstore.count = expedientes.length;
     this.expedientegbstore.reset(expedientes);
 
 

src/app/shared/agenda/approve-event/approve-event.page.html

@@ -1,20 +1,5 @@
-<!-- <ion-header hidden class="ion-no-border px-20">
-  <div class="header-content d-flex justify-space-between">
-    <div class="header-icon-left">
-      <ion-icon (click)="close()" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
-    </div>
-    <div class="header-title flex-grow-1">
-      <label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
-    </div>
-    <div class="header-icon-right display-none-{{showAside}}">
-      <ion-icon (click)="notImplemented()" src="assets/images/icons-edit.svg"></ion-icon>
-    </div>
-  </div>
-</ion-header> -->
-
 <ion-content id="main-content">
 
-  
   <div class="main-content d-flex flex-column height-100" *ngIf="loadedEvent">
 
     <div class="pl-20 pr-20 text-center d-flex justify-center align-center" style="width:100%; height: 30px; background-color: var(--Event-approve-header-color); border-top-right-radius: 25px;">
@@ -121,30 +106,29 @@
             </ion-item>
             </ion-list>
           </div>
-  
         </div>
-  
       </div>
 
       <div *ngIf="showAside" class="aside-right flex-column height-100 cursor-pointer">
         <div class="aside-buttons">
-          <button hidden full class="btn-ok" shape="round" >Editar evento</button>
+          <button full class="btn-ok" shape="round" >Editar evento</button>
-          <button (click)="approveTask(loadedEvent.serialNumber)" full class="btn-ok" shape="round" >Aprovar</button>
+          <button (click)="approveTask(loadedEvent.serialNumber)"  full class="btn-ok" shape="round" >Aprovar</button>
-          <button (click)="emendTask(loadedEvent.serialNumber)" class="btn-cancel" shape="round" >Rever</button>
+          <button (click)="emendTask(loadedEvent.serialNumber)"  class="btn-cancel" shape="round" >Rever</button>
           <div class="solid"></div>
-          <button full  class="btn-cancel" shape="round" (click)="editar(loadedEvent.serialNumber)" >Editar</button>
+          <button full   class="btn-cancel" shape="round" (click)="editar(loadedEvent.serialNumber)" >Editar</button>
-          <button (click)="rejectTask(loadedEvent.serialNumber)" full class="btn-delete" shape="round" >Rejeitar</button>
+          <button  (click)="rejectTask(loadedEvent.serialNumber)" full class="btn-delete" shape="round" >Rejeitar</button>
         </div>
       </div>
     </div>
 
-
   </div>
 </ion-content>
 
 <ion-footer class="display-none-{{showAside}} ion-no-border">
   <div class="buttons">
-    <button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Rever</button>
+    <button *ngIf="loadedEvent.activityInstanceName != 'Editar Evento'" class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Rever</button>
-    <button class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
+    <button *ngIf="loadedEvent.activityInstanceName != 'Editar Evento'" class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
+    <button *ngIf="loadedEvent.activityInstanceName == 'Editar Evento'" full   class="btn-cancel" shape="round" (click)="editar(loadedEvent.serialNumber)" >Editar</button>
+    <button *ngIf="loadedEvent.activityInstanceName == 'Editar Evento'" full class="btn-delete" shape="round" (click)="rejectTask(loadedEvent.serialNumber)" >Rejeitar</button>
   </div>
 </ion-footer>

src/app/shared/agenda/approve-event/approve-event.page.ts

@@ -40,9 +40,9 @@ export class ApproveEventPage implements OnInit {
   @Output() EditApproveEventDismiss = new EventEmitter<any>();
 
   constructor(
-    private router:Router,
+    private router: Router,
     private modalController: ModalController,
-    private processes:ProcessesService,
+    private processes: ProcessesService,
     private attachmentsService: AttachmentsService,
     private popoverController: PopoverController,
     private toastService: ToastService,
@@ -61,24 +61,8 @@ export class ApproveEventPage implements OnInit {
     this.getAttachments();
   }
 
-  /* ngOnChanges() {
-    this.getTask();
-    this.getAttachments();
-
-    setTimeout(()=>{
-      this.getTask();
-      this.getAttachments();
-    }, 6000)
-
-    setTimeout(()=>{
-      this.getTask();
-      this.getAttachments();
-    }, 10000)
-
-  } */
 
   close() {
-    /* this.router.navigate(['/home/gabinete-digital/event-list']); */
     this.closeEventToApprove.emit();
     this.modalController.dismiss();
   }
@@ -105,20 +89,11 @@ export class ApproveEventPage implements OnInit {
       this.toastService.successMessage()
     } catch (error) {
       this.toastService.badRequest()
-    }   finally {
+    } finally {
       this.close()
       loader.remove()
     }
 
-    /* this.approveEventDismiss.emit({
-      "serialNumber": serialNumber,
-      "action": "Aprovar",
-      "saveData": {
-        loadedEvent: this.loadedEvent,
-        today: this.today,
-        customDate: this.customDate
-      }
-    }); */
   }
 
   async rejectTask(serialNumber:string) {
@@ -171,6 +146,9 @@ export class ApproveEventPage implements OnInit {
   async openOptions(ev:any) {
     const popover = await this.popoverController.create({
       component: EventActionsPopoverPage,
+      componentProps: {
+        activityInstanceName: this.loadedEvent.activityInstanceName
+      },
       cssClass: 'event-actions-popover',
       event: ev,
       translucent: true
@@ -180,7 +158,6 @@ export class ApproveEventPage implements OnInit {
 
   async emendTask(serialNumber:string) {
     
-
     const modal = await this.modalController.create({
       component: EmendMessageModalPage,
       componentProps:{
@@ -195,7 +172,7 @@ export class ApproveEventPage implements OnInit {
     .then( async (res) => {
       
 
-      if(res.data !== ''){
+      if(res.data !== '') {
         let body = { "serialNumber": serialNumber,
         "action": "Emendar",
             "dataFields": {
@@ -203,7 +180,7 @@ export class ApproveEventPage implements OnInit {
           }
         }
         
-        const loader = this.toastService.loading()
+        const loader = this.toastService.loading();
 
         try {
           await this.processes.PostTaskAction(body).toPromise();
@@ -216,12 +193,10 @@ export class ApproveEventPage implements OnInit {
         }
       }
       else{
-        //this.alertService.presentAlert('Operação cancelada!');
+        
       }
     });
 
-    //this.openEmendMessageModal(serialNumber);
-    //this.goBack();
   }
 
   goToEventsToApprove() {

src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html

@@ -2,6 +2,7 @@
   <!-- Edit event for Inicio -->
   <div class="main-content height-100 d-flex">
   
+
     <div class="content d-flex flex-column width-md-100 height-100">
 
       <div class="main-header pt-30 px-20 background-white pb-15">

src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts

@@ -14,6 +14,7 @@ import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'
 import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
 import { EventToApproveEdit } from 'src/app/models/event.model';
 import { ThemeService } from 'src/app/services/theme.service'
+import { Router } from '@angular/router';
 
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
@@ -115,6 +116,7 @@ export class EditEventToApprovePage implements OnInit {
   @Output() setIntervenientCC = new EventEmitter<any>();
   @Output() closeComponent = new EventEmitter<any>();
   @Output() closeEventToApprove = new EventEmitter<any>();
+  @Output() approveEventDismiss = new EventEmitter<any>(); 
 
   @Input() saveData: any;
   @Input() serialNumber: string
@@ -128,7 +130,8 @@ export class EditEventToApprovePage implements OnInit {
     private attachmentsService: AttachmentsService,
     private processes:ProcessesService,
     private toastService: ToastService,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    private router: Router,
   ) {
     this.isEventEdited = false;
   }
@@ -175,12 +178,12 @@ export class EditEventToApprovePage implements OnInit {
     });
   }
 
-  onSelectedRecurringChanged(ev:any){
+  onSelectedRecurringChanged(ev:any) {
-    if(ev.length > 1){
+    if(ev.length > 1) {
       
       this.eventProcess.workflowInstanceDataFields.OccurrenceType = ev.filter(data => data != '-1');
     }
-    if(ev.length == 0){
+    if(ev.length == 0) {
       this.eventProcess.workflowInstanceDataFields.OccurrenceType = "-1";
     }
   }
@@ -213,17 +216,21 @@ export class EditEventToApprovePage implements OnInit {
 
   close() {
 
-    window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = {}
+    window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = {};
-
-    // this.closeComponent.emit();
 
     this.closeEventToApprove.emit();
-    
     this.setIntervenient.emit([]);
     this.setIntervenientCC.emit([]);
     this.clearContact.emit();
 
-    //this.deleteTemporaryData();
+
+    this.approveEventDismiss.emit({
+      "serialNumber": this.eventProcess.serialNumber,
+      "action": "Aprovar",
+      "saveData": this.eventProcess
+    });
+
+    
   }
 
 

src/app/shared/agenda/event-list/event-list.page.html

@@ -29,7 +29,6 @@
   </ion-refresher>
   <div class="main-content overflow-y-auto height-100" [ngSwitch]="segment" *ngIf="eventsMDGPRList">
     <!--  <div class="header-content width-100"> -->
-
    <!-- </div> -->
      <ion-list class="width-100" *ngSwitchCase="'MDGPR'" >
       <div
@@ -46,6 +45,9 @@
               <p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) != toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
               <p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) == toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }}  |  {{event.workflowInstanceDataFields.Location}}</p>
               <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
+              <div *ngIf="event.activityInstanceName">
+                <div class="label-event-type"> {{ event.activityInstanceName }} </div>
+              </div>
             </div>
         </div>
       </div>
@@ -66,6 +68,9 @@
                 <p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) != toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
                 <p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) == toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }}  |  {{event.workflowInstanceDataFields.Location}}</p>
                 <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
+                <div *ngIf="event.activityInstanceName">
+                  <div class="label-event-type"> {{ event.activityInstanceName }} </div>
+                </div>
               </div>
               </div>
           </div>

src/app/shared/agenda/event-list/event-list.page.scss

@@ -103,3 +103,13 @@
     padding: 0;
   }
 }
+
+
+.label-event-type {
+  padding: 1px 7px;
+  display: inline-block;
+  background: #f05d5e;
+  border-radius: 17px;
+  color: white;
+  font-size: 10pt;
+}

src/app/shared/agenda/event-list/event-list.page.ts

@@ -73,7 +73,7 @@ export class EventListPage implements OnInit {
       let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
 
       let allEvents = mdEventsOficial.concat(mdEventsPessoal);
-      if(allEvents.length > 0){
+      if(allEvents.length > 0) {
         this.eventsMDGPRList = this.sortService.sortArrayByDate(allEvents).reverse();
       }
       this.showLoader = false;
@@ -83,7 +83,7 @@ export class EventListPage implements OnInit {
       let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
       let allEvents = prEventsOficial.concat(prEventsPessoal);
       
-      if(allEvents.length > 0){
+      if(allEvents.length > 0) {
         this.eventsPRList = this.sortService.sortArrayByDate(allEvents).reverse();
       }
       this.showLoader = false;
@@ -93,7 +93,7 @@ export class EventListPage implements OnInit {
 
   async openApproveModal(eventSerialNumber, data) {
 
-    let a = this.eventsMDGPRList.filter((elem)=>{
+    let a = this.eventsMDGPRList.filter((elem) => {
       //
       return eventSerialNumber == elem.serialNumber
     });

src/app/shared/chat/messages/messages.page.ts

@@ -428,7 +428,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   deleteMessage(msgId: string, msg: MessageService) {
     this.wsChatMethodsService.getDmRoom(this.roomId).sendDeleteRequest(msgId)
     if (msg.file.type == "application/webtrix") {
-      this.openViewDocumentModal(msg.file);
+     // this.openViewDocumentModal(msg.file);
     }
     else {
       
@@ -436,17 +436,12 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       str = str.substring(1, ((str.length) - 1));
 
       const encodedData = btoa(str);
-      /* let fullUrl;
-      fullUrl = "https://gabinetedigitalchat.dyndns.info" + url;
-      //fullUrl = "http://www.africau.edu/images/default/sample.pdf";
 
-      this.frameUrl = fullUrl; */
       let file = this.base64toBlob(encodedData, 'application/pdf')
       let fileURL = URL.createObjectURL(file)
       
       window.open(fileURL);
   
-      // this.chatService.getDocumentDetails(fullUrl);
     }
   }
 
@@ -631,9 +626,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       source: CameraSource.Camera
     });
 
-    //const imageData =  await this.fileToBase64Service.convert(file)
-    //
-
     const response = await fetch('data:image/jpeg;base64,' + file.base64String!);
     const blob = await response.blob();
 
@@ -781,13 +773,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
     const file: any = await this.fileService.getFileFromDevice(types);
     
-    //if (file.type == "application/pdf") {
-
-    
-    /* const imageData =  await this.fileToBase64Service.convert(file).then((filee) => {
-      
-    }) */
-    
 
     if (file.type != "application/img" && file.type != "image/png" && file.type != "image/jpeg" && file.type != "image/gif") {
 

src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html

@@ -8,7 +8,7 @@
         <ion-header>
           <div class="title-content">
             <div class="middle">
-              <ion-label class="title">Editar evento por aprovar</ion-label>
+              <ion-label class="title">Editar evento por aprovar ,.,.,.,.,..,.,</ion-label>
             </div>
           </div>
         </ion-header>

src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts

@@ -218,6 +218,7 @@ export class EditEventToApproveComponent implements OnInit {
     this.modalController.dismiss();
     
     
+
   }
 
   save() {

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts

@@ -123,38 +123,6 @@ export class EventsToApprovePage implements OnInit {
     this.router.navigate(['/home/gabinete-digital/event-list/approve-event',event.serialNumber, 'gabinete-digital'])
   }
 
-  /* async openApproveModal(eventToAprove) {
-    let classs;
-    if( window.innerWidth <= 800){
-      classs = 'modal modal-desktop'
-    } else  {
-      classs = 'modal modal-desktop showAsideOptions'
-    }
-
-    let InstanceId;
-
-    if(!eventToAprove.workflowInstanceDataFields.hasOwnProperty('InstanceId')){
-      InstanceId = ''
-    } else {
-      InstanceId =eventToAprove.workflowInstanceDataFields.InstanceId
-    }
-
-    const modal = await this.modalController.create({
-      component: ApproveEventPage,
-      componentProps:{
-        serialNumber: eventToAprove.serialNumber,
-        InstanceId: InstanceId ,
-        showAside: true,
-      },
-      cssClass: classs,
-    });
-    await modal.present();
-    modal.onDidDismiss().then((res) => {
-      
-
-      this.LoadToApproveEvents();
-    });
-  } */
 
   doRefresh() {