improve

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

@@ -66,9 +66,14 @@
             <ion-label>
               <p>{{customDate}}</p>
               <p *ngIf="toDateString(loadedEvent.workflowInstanceDataFields.StartDate) == toDateString(loadedEvent.workflowInstanceDataFields.EndDate)">das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'HH:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
-              <p *ngIf="toDateString(loadedEvent.workflowInstanceDataFields.StartDate) != toDateString(loadedEvent.workflowInstanceDataFields.EndDate)">{{loadedEvent.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ loadedEvent.workflowInstanceDataFields.StartDate | date: 'dd/M/yy'}} </p>
-              <p *ngIf="!loadedEvent.workflowInstanceDataFields.IsRecurring">(Não se repete)</p>
-              <p *ngIf="loadedEvent.workflowInstanceDataFields.IsRecurring">Repete</p>
+              <p *ngIf="toDateString(loadedEvent.workflowInstanceDataFields.StartDate) != toDateString(loadedEvent.workflowInstanceDataFields.EndDate)">{{loadedEvent.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ loadedEvent.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} </p>
+              <p>
+                <span *ngIf="loadedEvent.workflowInstanceDataFields.OccurrenceType == 0">Diário</span>
+                <span *ngIf="loadedEvent.workflowInstanceDataFields.OccurrenceType == 1">Semanal</span>
+                <span *ngIf="loadedEvent.workflowInstanceDataFields.OccurrenceType == 2">Mensal</span>
+                <span *ngIf="loadedEvent.workflowInstanceDataFields.OccurrenceType == 3">Anual</span>
+                <span *ngIf="loadedEvent.workflowInstanceDataFields.OccurrenceType == -1">(Não se repete)</span>            
+              </p>
   
             </ion-label>
           </div>

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

@@ -71,6 +71,7 @@ export class ApproveEventPage implements OnInit {
     this.processes.GetTask(this.serialNumber).subscribe(res => {
       
       this.loadedEvent = res;
+      console.log(this.loadedEvent);
       this.today = new Date(res.workflowInstanceDataFields.StartDate);
       // 
       this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]);
@@ -86,9 +87,9 @@ export class ApproveEventPage implements OnInit {
     try {
       await this.processes.PostTaskAction(body).toPromise()
       this.modalController.dismiss(serialNumber);
-      this.toastService.successMessage()
+      this.toastService._successMessage()
     } catch (error) {
-      this.toastService.badRequest()
+      this.toastService._badRequest()
     } finally {
       this.close()
       loader.remove()
@@ -105,9 +106,9 @@ export class ApproveEventPage implements OnInit {
 
     try {
       await this.processes.PostTaskAction(body).toPromise()
-      this.toastService.successMessage('Evento rejeitado')
+      this.toastService._successMessage('Evento rejeitado')
     } catch (error) {
-      this.toastService.badRequest('Processo não efectuado')
+      this.toastService._badRequest('Processo não efectuado')
     } finally {
       loader.remove()
       this.close()
@@ -171,8 +172,7 @@ export class ApproveEventPage implements OnInit {
     modal.onDidDismiss()
     .then( async (res) => {
       
-
-      if(res.data !== '') {
+      if(res.data.note !== '') {
         let body = { "serialNumber": serialNumber,
         "action": "Emendar",
             "dataFields": {
@@ -184,17 +184,19 @@ export class ApproveEventPage implements OnInit {
 
         try {
           await this.processes.PostTaskAction(body).toPromise();
-          this.toastService.successMessage('Pedido enviado');
+          this.toastService._successMessage('Pedido enviado');
           this.close();
         } catch (error) {
-          this.toastService.badRequest();
+          this.toastService._badRequest();
         }  finally {
           loader.remove()
         }
       }
-      else{
-        
-      }
+      else {
+        if(res.data.option == 'save') {
+          this.toastService._badRequest('É necessário adicionar uma nota');
+        }
+      } 
     });
 
   }

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

@@ -2,14 +2,13 @@
   <!-- 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">
         <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>
@@ -157,7 +156,8 @@
                 <mat-form-field appearance="none" class="width-100 date-hour-picker d-none d-md-block">
                   <input matInput [ngxMatDatetimePicker]="picker1"
                     placeholder="Choose a date"
-                    [formControl]="dateControlStart"
+                    [(ngModel)]="eventProcess.workflowInstanceDataFields.StartDate"
+                    [min]="minDate" [max]="maxDate"
                     [disabled]="disabled"
                   >
                   <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
@@ -192,7 +192,8 @@
                 <mat-form-field appearance="none" class="width-100 date-hour-picker d-none d-md-block">
                   <input matInput [ngxMatDatetimePicker]="fim"
                     placeholder="Choose a date"
-                    [formControl]="dateControlEnd"
+                    [(ngModel)]="eventProcess.workflowInstanceDataFields.EndDate"
+                    [min]="endMinDate" [max]="maxDate"
                     [disabled]="disabled"
                   >
                   <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
@@ -366,6 +367,6 @@
 <ion-footer class="background-whit">
   <div class="buttons">
     <button class="btn-cancel cursor-pointer" shape="round" (click)="close()">Cancelar</button>
-    <button class="btn-ok cursor-pointer" shape="round" (click)="save()">Gravar</button>
+    <button class="btn-ok cursor-pointer" shape="round" (click)="gravasAction()">Gravar</button>
   </div>
 </ion-footer>

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

@@ -41,7 +41,7 @@ export class EditEventToApprovePage implements OnInit {
   public showSeconds = false;
   public touchUi = false;
   public enableMeridian = false;
-  public minDate = new Date().toISOString().slice(0,10)
+  public minDate = new Date()
   public endMinDate = new Date(new Date().getTime() + 15 * 60000);
   public maxDate: any;
   public stepHour = 1;
@@ -150,7 +150,7 @@ export class EditEventToApprovePage implements OnInit {
 
   async getTask() {
 
-    this.processes.GetTask(this.serialNumber).subscribe( (result) =>{
+    this.processes.GetTask(this.serialNumber).subscribe( (result) => {
       this.eventProcess = result
 
       this.eventProcess.workflowInstanceDataFields.LastOccurrence = new Date(this.eventProcess.workflowInstanceDataFields.LastOccurrence)
@@ -179,6 +179,9 @@ export class EditEventToApprovePage implements OnInit {
   }
 
   onSelectedRecurringChanged(ev:any) {
+
+    this.calculetedLastOccurrence(ev);
+
     if(ev.length > 1) {
       
       this.eventProcess.workflowInstanceDataFields.OccurrenceType = ev.filter(data => data != '-1');
@@ -188,6 +191,44 @@ export class EditEventToApprovePage implements OnInit {
     }
   }
 
+  calculetedLastOccurrence(type:number){
+    var valor; 
+    var opcao: boolean;
+    if (type == 0) {
+      valor = 7;
+      opcao = true;
+    } else if(type == 1){
+      valor = 30;
+      opcao = true;
+    } else if(type == 2){
+      valor = 1;
+      opcao = false;
+    }else if(type == 3){
+      valor = 5;
+      opcao = false;
+    }
+    this.defineLastOccurrence(valor, opcao);
+  }
+
+
+  defineLastOccurrence(valor:number, opcao:boolean){
+    var time = new Date(this.eventProcess.workflowInstanceDataFields.EndDate);
+    if (opcao == true) {
+      time.setDate(time.getDate() + valor);
+      this.eventProcess.workflowInstanceDataFields.LastOccurrence = time;
+    } else {
+      time = new Date(
+        time.getFullYear() + valor, 
+        time.getMonth(), 
+        time.getDate(), 
+        time.getHours(), 
+        time.getMinutes()
+      );
+      this.eventProcess.workflowInstanceDataFields.LastOccurrence = time;
+    }
+    
+  }
+
   setOtherData() {
     if(this.eventProcess.workflowInstanceDataFields.ParticipantsList) {
       this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e => {
@@ -223,14 +264,12 @@ export class EditEventToApprovePage implements OnInit {
     this.setIntervenientCC.emit([]);
     this.clearContact.emit();
 
-
     this.approveEventDismiss.emit({
-      "serialNumber": this.eventProcess.serialNumber,
-      "action": "Aprovar",
-      "saveData": this.eventProcess
+      serialNumber: this.eventProcess.serialNumber,
+      action: "Aprovar",
+      saveData: this.eventProcess
     });
 
-    
   }
 
 
@@ -276,7 +315,10 @@ export class EditEventToApprovePage implements OnInit {
     if(this.Form.invalid) return false
 
     // set dates to eventProcess object
-    this.getDatepickerData()
+    this.dateControlStart = new FormControl(moment(new Date(this.eventProcess.workflowInstanceDataFields.StartDate)).add(1, 'hours'));
+    this.dateControlEnd = new FormControl(moment(new Date(this.eventProcess.workflowInstanceDataFields.EndDate)).add(1, 'hours'));
+    // this.restoreDatepickerData()
+    // this.getDatepickerData()
 
     this.taskParticipantsCc.forEach( e => {
       e.IsRequired = false
@@ -291,13 +333,14 @@ export class EditEventToApprovePage implements OnInit {
       }
     })
 
+
     const event: EventToApproveEdit = {
       SerialNumber: this.eventProcess.serialNumber,
       Body: this.eventProcess.workflowInstanceDataFields.Body,
       Location: this.eventProcess.workflowInstanceDataFields.Location,
       Subject: this.eventProcess.workflowInstanceDataFields.Subject,
-      StartDate: this.eventProcess.workflowInstanceDataFields.StartDate,
-      EndDate: this.eventProcess.workflowInstanceDataFields.EndDate,
+      StartDate: this.dateControlStart.value,
+      EndDate: this.dateControlEnd.value,
       ReviewUserComment: '',
       Agenda: this.eventProcess.workflowInstanceDataFields.Agenda,
       MDName: this.eventProcess.workflowInstanceDataFields.MDName,
@@ -330,14 +373,14 @@ export class EditEventToApprovePage implements OnInit {
       if(document['action'] == 'add') {
         delete document.action
         this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{
-          // this.toastService.successMessage();
+
         }, error =>{
           this.toastService.badRequest();
         });
       } else if(document['action'] == 'delete') {
         delete document.action
         this.attachmentsService.deleteEventAttachmentById(document.Id).subscribe( res=>{
-          // this.toastService.successMessage()
+
         }, error =>{
           this.toastService.badRequest()
         })
@@ -347,6 +390,42 @@ export class EditEventToApprovePage implements OnInit {
 
   }
 
+  async gravasAction() {
+    
+    await this.save();
+
+    if(this.eventProcess['activityInstanceName'] == 'Editar Evento') {
+      this.reenviar();
+    }
+
+  }
+
+  async reenviar() {
+    let body = {
+      serialNumber: this.eventProcess.serialNumber,
+      action: "Reenviar",
+        dataFields: {
+        ReviewUserComment: "",
+      }
+    }
+    
+    const loader = this.toastService.loading();
+
+    try {
+      await this.processes.PostTaskAction(body).toPromise();
+      this.toastService._successMessage();
+      this.goToApproveEventList();
+    } catch (error) {
+      this.toastService._badRequest();
+    }  finally {
+      loader.remove()
+    }
+  }
+
+  goToApproveEventList() {
+    this.closeEventToApprove.emit();
+    this.modalController.dismiss();
+  }
 
   dynamicSetIntervenient({taskParticipants, taskParticipantsCc}) {
     this.taskParticipants = removeDuplicate(taskParticipants) ;
@@ -472,7 +551,6 @@ export class EditEventToApprovePage implements OnInit {
   }
 
   getDatepickerData() {
-
     this.eventProcess.workflowInstanceDataFields.StartDate = this.dateStart
     this.eventProcess.workflowInstanceDataFields.EndDate = this.dateEnd
 

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

@@ -118,6 +118,7 @@
               [(ngModel)]="postEvent.StartDate"
               [max]="maxDate"
               [disabled]="disabled"
+              [min]="currentDate"
             >
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker1
@@ -146,6 +147,7 @@
               [(ngModel)]="postEvent.EndDate"
               [max]="maxDate"
               [disabled]="disabled"
+              [min]="currentDate"
             >
             <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #fim

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

@@ -48,6 +48,7 @@ export class EditEventPage implements OnInit {
   public stepHour = 1;
   public stepMinute = 5;
   public stepSecond = 5;
+  currentDate = new Date();
 
   Form: FormGroup;
   validateFrom = false
@@ -118,14 +119,6 @@ export class EditEventPage implements OnInit {
       this.setIntervenient.emit(this.taskParticipants);
       this.setIntervenientCC.emit(this.taskParticipantsCc);
 
-      this.isEventEdited = false;
-
-      if(this.postEvent.IsRecurring == false) {
-        this.isRecurring = "Não se repete";
-      }
-      else{
-        this.isRecurring = "Repete";
-      }
     }
 
     this.initCalendarName = this.postEvent.CalendarName;
@@ -136,6 +129,8 @@ export class EditEventPage implements OnInit {
 
     this.postEvent.EventRecurrence.Type = this.postEvent.EventRecurrence.Type.toString();
 
+    this.postEvent.EventRecurrence.LastOccurrence = this.currentDate;
+
     setTimeout(() => {
       this.postEvent.EventRecurrence.Type = this.postEvent.EventRecurrence.Type.toString();
       
@@ -225,6 +220,8 @@ export class EditEventPage implements OnInit {
   }
 
   onSelectedRecurringChanged(ev:any){
+
+    this.calculetedLastOccurrence(ev);
     
     if(ev.length > 1){
       
@@ -235,6 +232,45 @@ export class EditEventPage implements OnInit {
     }
   }
 
+  calculetedLastOccurrence(type:number){
+    console.log(type);
+    var valor; 
+    var opcao: boolean;
+    if (type == 0) {
+      valor = 7;
+      opcao = true;
+    } else if(type == 1){
+      valor = 30;
+      opcao = true;
+    } else if(type == 2){
+      valor = 1;
+      opcao = false;
+    }else if(type == 3){
+      valor = 5;
+      opcao = false;
+    }
+    this.defineLastOccurrence(valor, opcao);
+  }
+
+
+  defineLastOccurrence(valor:number, opcao:boolean){
+    var time = new Date(this.postEvent.EndDate);
+    if (opcao == true) {
+      time.setDate(time.getDate() + valor);
+      this.postEvent.EventRecurrence.LastOccurrence = time;
+    } else {
+      time = new Date(
+        time.getFullYear() + valor, 
+        time.getMonth(), 
+        time.getDate(), 
+        time.getHours(), 
+        time.getMinutes()
+      );
+      this.postEvent.EventRecurrence.LastOccurrence = time;
+    }
+    
+  }
+
 
   async save() {
 

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

@@ -98,6 +98,7 @@
     font-style: normal;
     line-height: normal;
     letter-spacing: normal;
+    text-transform: none ;
     color: var(--title-text-color);
     margin: 0;
     padding: 0;

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

@@ -128,6 +128,7 @@
               placeholder="Choose a date"
               [(ngModel)]="postEvent.StartDate"
               [disabled]="disabled"
+              [min]="currentDate"
             >
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker1
@@ -159,6 +160,7 @@
               placeholder="Choose a date"
               [(ngModel)]="postEvent.EndDate"
               [disabled]="disabled"
+              [min]="currentDate"
             >
             <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #fim

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

@@ -63,6 +63,7 @@ export class NewEventPage implements OnInit {
   public stepHour = 1;
   public stepMinute = 5;
   public stepSecond = 5;
+  currentDate = new Date();
   public color: ThemePalette = 'primary';
   recurringTypes = []
   selectedRecurringType: any;
@@ -364,6 +365,8 @@ export class NewEventPage implements OnInit {
 
   onSelectedRecurringChanged(ev:any){
     
+    this.calculetedLastOccurrence(ev);
+    
     if(ev.length > 1){
       
       this.postEvent.EventRecurrence.Type = ev.filter(data => data != '-1');
@@ -373,8 +376,45 @@ export class NewEventPage implements OnInit {
     }
   }
 
+  calculetedLastOccurrence(type:number){
+    console.log(type);
+    var valor; 
+    var opcao: boolean;
+    if (type == 0) {
+      valor = 7;
+      opcao = true;
+    } else if(type == 1){
+      valor = 30;
+      opcao = true;
+    } else if(type == 2){
+      valor = 1;
+      opcao = false;
+    }else if(type == 3){
+      valor = 5;
+      opcao = false;
+    }
+    this.defineLastOccurrence(valor, opcao);
+  }
 
 
+  defineLastOccurrence(valor:number, opcao:boolean){
+    var time = new Date(this.postEvent.EndDate);
+    if (opcao == true) {
+      time.setDate(time.getDate() + valor);
+      this.postEvent.EventRecurrence.LastOccurrence = time;
+    } else {
+      time = new Date(
+        time.getFullYear() + valor, 
+        time.getMonth(), 
+        time.getDate(), 
+        time.getHours(), 
+        time.getMinutes()
+      );
+      this.postEvent.EventRecurrence.LastOccurrence = time;
+    }
+    
+  }
+
   async save() {
 
     this.injectValidation()

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

@@ -53,13 +53,12 @@
           <p>{{customDate}}</p>
           <p *ngIf="toDateString(loadedEvent.StartDate) == toDateString(loadedEvent.EndDate)">das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}</p>
           <p *ngIf="toDateString(loadedEvent.StartDate) != toDateString(loadedEvent.EndDate)">{{loadedEvent.StartDate | date: 'd/M/yy' }} - {{ loadedEvent.StartDate | date: 'dd/M/yy'}} </p>
-          <p *ngIf="!loadedEvent.IsRecurring">(Não se repete)</p>
-          <p *ngIf="loadedEvent.IsRecurring">
+          <p>
             <span *ngIf="loadedEvent.EventRecurrence.Type == 0">Diário</span>
             <span *ngIf="loadedEvent.EventRecurrence.Type == 1">Semanal</span>
             <span *ngIf="loadedEvent.EventRecurrence.Type == 2">Mensal</span>
             <span *ngIf="loadedEvent.EventRecurrence.Type == 3">Anual</span>
-            <span *ngIf="loadedEvent.EventRecurrence.Type == -1">Nunca</span>            
+            <span *ngIf="loadedEvent.EventRecurrence.Type == -1">(Não se repete)</span>            
           </p>
 
         </ion-label>

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

@@ -105,6 +105,7 @@ export class ViewEventPage implements OnInit {
       this.eventsService.getEvent(this.eventId).subscribe(res => {
         
         this.loadedEvent = res;
+        console.log(this.loadedEvent);
         this.today = new Date(res.StartDate);
         this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]);
       }, (error)=> {

src/app/shared/chat/edit-group/edit-group.page.ts

@@ -1,3 +1,4 @@
+import { HttpErrorResponse } from '@angular/common/http';
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { ModalController, PickerController } from '@ionic/angular';
 import { AuthService } from 'src/app/services/auth.service';
@@ -33,6 +34,7 @@ export class EditGroupPage implements OnInit {
    }
 
   ngOnInit() {
+    this.chatService.refreshtoken();
     this.getRoomInfo();
   }
 

src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts

@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { HttpClient, HttpErrorResponse, HttpHeaders } from '@angular/common/http';
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { ModalController, NavParams } from '@ionic/angular';
 import * as _ from 'lodash';
@@ -57,6 +57,7 @@ export class GroupContactsPage implements OnInit {
   }
 
   ngOnInit() {
+    this.chatService.refreshtoken();
     //this.getRoomInfo();
     this.loadUsers();
     

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

@@ -34,6 +34,7 @@ import { AlertController } from '@ionic/angular';
 import { File } from '@awesome-cordova-plugins/file/ngx';
 import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx';
 import { SessionStore } from 'src/app/store/session.service';
+import { HttpErrorResponse } from '@angular/common/http';
 
 
 /*
@@ -74,6 +75,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   scrollToBottomBtn = false;
   roomCountDownDate: string;
   roomCountDownTime: string;
+  isAdmin = false;
 
   @Input() roomId: string;
   @Output() closeAllDesktopComponents: EventEmitter<any> = new EventEmitter<any>();
@@ -159,10 +161,11 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   }
 
   ngOnInit() {
+    this.chatService.refreshtoken();
     console.log(this.roomId)
     this.loggedUser = this.loggedUserChat;
     //setTimeout(() => {
-      this.getRoomInfo();
+      this.getRoomInfo()
     //}, 1000);
     this.getChatMembers();
     //this.getMessageDB();
@@ -399,10 +402,18 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   async getRoomInfo() {
     this.wsChatMethodsService.getGroupRoom(this.roomId).loadHistory({});
     let room = await this.chatService.getRoomInfo(this.roomId).toPromise();
+    console.log('ROOM',room)
     this.room = room['room'];
     if (this.room.name) {
       this.roomName = this.room.name.split('-').join(' ');
     }
+    
+
+    if(SessionStore.user.ChatData.data.userId == this.room.u._id){
+      this.isAdmin = true
+    } else {
+      this.isAdmin = false
+    }
 
     if (this.room.customFields.countDownDate) {
       this.roomCountDownDate = this.room.customFields.countDownDate;
@@ -501,82 +512,84 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   }
 
   async openGroupMessagesOptions() {
-
-    const enterAnimation = (baseEl: any) => {
-      const backdropAnimation = this.animationController.create()
-        .addElement(baseEl.querySelector('ion-backdrop')!)
-        .fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
-
-      const wrapperAnimation = this.animationController.create()
-        .addElement(baseEl.querySelector('.modal-wrapper')!)
-        .keyframes([
-          { offset: 0, opacity: '1', right: '-100%' },
-          { offset: 1, opacity: '1', right: '0px' }
-        ]);
-
-      return this.animationController.create()
-        .addElement(baseEl)
-        .easing('ease-out')
-        .duration(500)
-        .addAnimation([backdropAnimation, wrapperAnimation]);
-    }
-
-    const leaveAnimation = (baseEl: any) => {
-      return enterAnimation(baseEl).direction('reverse');
-    }
-
-
-    /* const popover = await this.popoverController.create({
-      component: MessagesOptionsPage,
-      componentProps: {
-        roomId: this.dm._id,
-      },
-      cssClass: 'messages-options',
-      event: ev,
-      translucent: true,
-    });
-    return await popover.present(); */
+      const enterAnimation = (baseEl: any) => {
+        const backdropAnimation = this.animationController.create()
+          .addElement(baseEl.querySelector('ion-backdrop')!)
+          .fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
+  
+        const wrapperAnimation = this.animationController.create()
+          .addElement(baseEl.querySelector('.modal-wrapper')!)
+          .keyframes([
+            { offset: 0, opacity: '1', right: '-100%' },
+            { offset: 1, opacity: '1', right: '0px' }
+          ]);
+  
+        return this.animationController.create()
+          .addElement(baseEl)
+          .easing('ease-out')
+          .duration(500)
+          .addAnimation([backdropAnimation, wrapperAnimation]);
+      }
+  
+      const leaveAnimation = (baseEl: any) => {
+        return enterAnimation(baseEl).direction('reverse');
+      }
+  
+  
+      /* const popover = await this.popoverController.create({
+        component: MessagesOptionsPage,
+        componentProps: {
+          roomId: this.dm._id,
+        },
+        cssClass: 'messages-options',
+        event: ev,
+        translucent: true,
+      });
+      return await popover.present(); */
+  
+      
+  
+  
+      const modal = await this.modalController.create({
+        enterAnimation,
+        leaveAnimation,
+        component: ChatPopoverPage,
+        cssClass: 'model profile-modal search-submodal',
+        componentProps: {
+          roomId: this.roomId,
+          members: this.members,
+          isAdmin: this.isAdmin
+        }
+      });
+      await modal.present();
+      modal.onDidDismiss().then(res => {
+        
+        if (res.data == 'leave') {
+          this.getRoomInfo();
+          this.closeAllDesktopComponents.emit();
+          this.showEmptyContainer.emit();
+          this.wsChatMethodsService.hidingRoom(this.roomId);
+        }
+        else if (res.data == 'delete') {
+          this.closeAllDesktopComponents.emit();
+          this.showEmptyContainer.emit();
+        }
+        else if (res.data == 'cancel') {
+          
+        }
+        else if (res.data == 'edit') {
+          
+          //this.closeAllDesktopComponents.emit();
+          this.openEditGroupPage.emit(this.roomId);
+        }
+        else {
+          this.roomName = res.data.name.split('-').join(' ');
+          
+        };
+  
+      });
 
     
-
-
-    const modal = await this.modalController.create({
-      enterAnimation,
-      leaveAnimation,
-      component: ChatPopoverPage,
-      cssClass: 'model profile-modal search-submodal',
-      componentProps: {
-        roomId: this.roomId,
-        members: this.members,
-      }
-    });
-    await modal.present();
-    modal.onDidDismiss().then(res => {
-      
-      if (res.data == 'leave') {
-        this.getRoomInfo();
-        this.closeAllDesktopComponents.emit();
-        this.showEmptyContainer.emit();
-        this.wsChatMethodsService.hidingRoom(this.roomId);
-      }
-      else if (res.data == 'delete') {
-        this.closeAllDesktopComponents.emit();
-        this.showEmptyContainer.emit();
-      }
-      else if (res.data == 'cancel') {
-        
-      }
-      else if (res.data == 'edit') {
-        
-        //this.closeAllDesktopComponents.emit();
-        this.openEditGroupPage.emit(this.roomId);
-      }
-      else {
-        this.roomName = res.data.name.split('-').join(' ');
-        
-      };
-
-    });
   }
 
   openSendGroupMessageOptions(ev?: any) {

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

@@ -1,4 +1,4 @@
-import { HttpHeaders } from '@angular/common/http';
+import { HttpErrorResponse, HttpHeaders } from '@angular/common/http';
 import { Component, EventEmitter, OnInit, Output } from '@angular/core';
 import { ModalController } from '@ionic/angular';
 import { AuthService } from 'src/app/services/auth.service';
@@ -42,7 +42,9 @@ export class ContactsPage implements OnInit {
   }
 
   ngOnInit() {
+    
     this.loadUsers();
+    this.chatService.refreshtoken();
   }
 
   onChange(event){

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

@@ -31,6 +31,7 @@ import { AlertController, Platform } from '@ionic/angular';
 import { File } from '@awesome-cordova-plugins/file/ngx';
 import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx';
 import { SessionStore } from 'src/app/store/session.service';
+import { HttpErrorResponse } from '@angular/common/http';
 
 
 const IMAGE_DIR = 'stored-images';
@@ -154,6 +155,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   }
 
   ngOnInit() {
+    this.chatService.refreshtoken();
     this.scrollToBottom();
 
     this.getChatMembers();

src/app/shared/gabinete-digital/all-processes/all-processes.page.ts

@@ -14,6 +14,7 @@ import { TotalDocumentStore } from 'src/app/store/total-document.service';
 import { DespachosprStore } from 'src/app/store/despachospr-store.service';
 import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service';
 import { PedidosStore } from 'src/app/store/pedidos-store.service';
+import { SessionStore } from 'src/app/store/session.service';
 
 
 @Component({
@@ -50,14 +51,14 @@ export class AllProcessesPage implements OnInit {
 
   ngOnInit() {
 
-    this.loadAllProcesses();
+    // this.loadAllProcesses();
 
       this.router.events.forEach((event) => {
         if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital')) {
           if (window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
             this.refreshing();
           } else {
-            this.loadAllProcesses();
+            // this.loadAllProcesses();
           }
         }
       });
@@ -66,7 +67,7 @@ export class AllProcessesPage implements OnInit {
   doRefresh() {
 
     setTimeout(() => {
-      this.loadAllProcesses();
+
     }, 1000);
   }
 
@@ -77,62 +78,11 @@ export class AllProcessesPage implements OnInit {
     }, 1000);
   }
 
-  async loadAllProcesses() {
-    let allProcessesList = await this.processesService.GetTasksList("", false).toPromise();
-    //
-    allProcessesList = allProcessesList || [];
-    
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Revisar Diploma')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Prorrogar prazo')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Concluir Despacho por Delegação')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Tarefa de Despacho por Delegação')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Reexecutar Despacho por Delegação')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Editar Evento')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Retificar Expediente')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Agendar Reunião para o Ministro e Director')
-
-    this.skeletonLoader = true;
-
-    this.allProcessesList = [];
-
-    allProcessesList.forEach(element => {
-      let date = new Date(element.taskStartDate);
-      date.setMonth(date.getMonth() + 1);
-
-      let task = {
-        "SerialNumber": element.serialNumber,
-        "Folio": element.workflowInstanceDataFields.Subject,
-        "Senders": element.workflowInstanceDataFields.Sender,
-        "CreateDate": new Date(element.taskStartDate),
-        "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-        "Remetente": element.workflowInstanceDataFields.Remetente,
-        "DocumentsQty": element.totalDocuments,
-        "DocId": element.workflowInstanceDataFields.DispatchDocId,
-        "FolderID": element.workflowInstanceDataFields.FolderID,
-        "WorkflowName": element.workflowDisplayName,
-        "activityInstanceName": element.activityInstanceName,
-        "Status": element.workflowInstanceDataFields.Status,
-        "Agenda": element.workflowInstanceDataFields.Agenda,
-        "customDate": this.setFormatDate(new Date(element.workflowInstanceDataFields.StartDate), new Date(element.workflowInstanceDataFields.EndDate), element.workflowInstanceDataFields.IsAllDayEvent),
-      }
-
-      this.allProcessesList.push(task);
-      this.allProcessesList = removeDuplicate(this.allProcessesList)
-
-      this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate');
-
-    });
-
-    this.skeletonLoader = false;
-  }
 
   get AllProcess() {
     return this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento)
     .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr)
-    .concat(this.deplomasStore.diplomasList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.despachoStore.list)
+    .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.despachoStore.list)
   }
 
   get getAllProcessCount() {
@@ -147,9 +97,6 @@ export class AllProcessesPage implements OnInit {
 
   setFormatDate(start: any, end: any, allday: boolean) {
     let customDate;
-    /* start = new Date();
-    end= new Date("2021-08-04T18:01:04.753Z"); */
-    //end = new Date("2021-09-04T18:01:04.753Z");
 
     const totalSeconds = Math.floor((end - (start)) / 1000);;
     const totalMinutes = Math.floor(totalSeconds / 60);
@@ -160,8 +107,6 @@ export class AllProcessesPage implements OnInit {
     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) {
@@ -193,6 +138,8 @@ export class AllProcessesPage implements OnInit {
   }
 
   goToProcess(serialNumber: string, workflowName: string, activityName: string) {
+
+
     if (workflowName == 'Despacho') {
       if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho') {
         this.router.navigate(['/home/gabinete-digital/despachos', serialNumber, 'gabinete-digital']);
@@ -207,6 +154,8 @@ export class AllProcessesPage implements OnInit {
       }
       else if (activityName == 'Diploma Assinado') {
         this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']);
+      } else {
+        alert('Bug!');
       }
     }
     else if (workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') {
@@ -221,9 +170,6 @@ export class AllProcessesPage implements OnInit {
     else if (workflowName == "Pedido de Parecer do Presidente") {
       this.router.navigate(['/home/gabinete-digital/pedidos', serialNumber, 'gabinete-digital']);
     }
-    /* else if (workflowName == "Expediente") {
-      this.router.navigate(['/home/gabinete-digital/pedidos',serialNumber,'gabinete-digital']);
-    } */
     else if (workflowName == 'Agenda Pessoal PR' || workflowName == 'Agenda Oficial PR' || workflowName == 'Agenda Oficial MDGPR' || workflowName == 'Agenda Pessoal MDGPR') {
       this.router.navigate(['/home/gabinete-digital/event-list/approve-event', serialNumber, 'gabinete-digital']);
     }

src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts

@@ -57,10 +57,9 @@ constructor (
 
     let despachosPr;
 
-
     if(this.loggeduser.Profile != 'PR') {
       despachosPr = result.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
-    } else if(this.loggeduser.Profile != 'PR') {
+    } else if(this.loggeduser.Profile == 'PR') {
       despachosPr = result.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
     }
 

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

@@ -1,7 +1,7 @@
 <ion-header class="ion-no-border">
   <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
   <div class="title">
-    <div class="thetitle"><ion-label >Diplomas</ion-label></div>
+    <div class="thetitle"><ion-label >Diplomas para assinar</ion-label></div>
     <div class="theicon">
       <button title="Atualizar" class="btn-no-color" (click)="doRefresh()">
         <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
@@ -30,7 +30,7 @@
         (click)="viewExpedientDetail(task.SerialNumber)" -->
         <div
           class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
-          *ngFor = "let task of deplomasStore.diplomasAssinadoList"
+          *ngFor = "let task of deplomasStore.diplomasParaAssinarList"
           (click)="goToDiploma(task.SerialNumber)"
         >
           <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->

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

@@ -75,7 +75,7 @@ export class DiplomasAssinarPage implements OnInit {
     this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate')
 
 
-    this.deplomasStore.resetDiplomasList(this.diplomasList);
+    this.deplomasStore.resetDiplomasParaAssinar(this.diplomasList);
   }
 
 }

src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DiplomasGerarPage } from './diplomas-gerar.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DiplomasGerarPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DiplomasGerarPageRoutingModule {}

src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.module.ts

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { DiplomasGerarPageRoutingModule } from './diplomas-gerar-routing.module';
+
+import { DiplomasGerarPage } from './diplomas-gerar.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    DiplomasGerarPageRoutingModule
+  ],
+  declarations: [DiplomasGerarPage],
+  exports: [DiplomasGerarPage]
+})
+export class DiplomasGerarPageModule {}

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

@@ -0,0 +1,100 @@
+<ion-header class="ion-no-border">
+  <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
+  <div class="title">
+    <div class="thetitle"><ion-label >Diplomas por gerar</ion-label></div>
+    <div class="theicon">
+      <button title="Atualizar" class="btn-no-color" (click)="doRefresh()">
+        <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
+      </button>
+    </div>
+  </div>
+</ion-header>
+<ion-content>
+  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
+      <ion-refresher-content
+        pullingIcon="chevron-down-circle-outline"
+        pullingText="deslize para actualizar"
+        refreshingSpinner="circles"
+        refreshingText="A actualizar...">
+      </ion-refresher-content>
+  </ion-refresher>
+
+
+  <div class="main-container width-100 overflow-y-auto height-100">
+
+    <div  *ngIf="diplomasList.length >= 1">
+
+
+      <ion-list >
+        <div
+          class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
+          *ngFor = "let task of deplomasStore.DiplomaGerarList"
+          (click)="goToDiploma(task.SerialNumber)"
+        >
+          <div class="item width-100">
+            <div class="exp-top-detail">
+              <div class="subject">
+                <ion-label>{{ task.Folio }}</ion-label>
+              </div>
+              <div class="exp-icon">
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
+              </div>
+            </div>
+            <div class="exp-bottom-detail">
+              <div class="exp-remetente">
+                <ion-label>{{task.Senders}}</ion-label>
+              </div>
+            </div>
+            <div class="exp-middle-detail">
+              <div class="exp-workflow">
+                <span class="label">{{task.activityInstanceName}}</span>
+              </div>
+              <div class="exp-date">
+                <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
+              </div>
+            </div>
+          </div>
+        </div>
+
+      </ion-list>
+    </div>
+
+    <div
+      *ngIf="!skeletonLoader && diplomasList.length == 0"
+      class="empty-list d-flex height-100 align-center justify-content-center"
+    >
+      <span>Lista vazia</span>
+    </div>
+
+    <div *ngIf="skeletonLoader && diplomasList.length == 0">
+
+      <ion-list>
+        <ion-item>
+          <ion-thumbnail slot="end">
+            <ion-skeleton-text animated></ion-skeleton-text>
+          </ion-thumbnail>
+          <ion-label>
+            <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+            <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
+        <ion-item>
+          <ion-thumbnail slot="end">
+            <ion-skeleton-text animated></ion-skeleton-text>
+          </ion-thumbnail>
+          <ion-label>
+            <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+            <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
+      </ion-list>
+    </div>
+  </div>
+
+
+</ion-content>
+

src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss

@@ -0,0 +1,240 @@
+@import '~src/function.scss';
+/* CONTENT */
+/* :host{
+    padding: 30px 20px 0 20px !important;
+    margin: 0;
+    border: 1px solid red;
+} */
+
+.title{
+  padding: 30px 20px 0 20px !important;
+    font-family: Roboto;
+    font-size: 25px;
+    color:#000;
+    overflow: auto;
+
+    .thetitle{
+      width: fit-content;
+      float: left;
+    }
+    .theicon{
+      width: fit-content;
+      float: right;
+    }
+  }
+  .bottom-title{
+    width: calc(100% - 40px);
+    margin-left: 20px !important;
+    margin-right: 20px !important;
+    margin: 0 auto;
+    align-items: center;
+    justify-content: center;
+    border-bottom: 5px solid #42b9fe;
+
+    .bottom-text{
+      font-size: 15px !important;
+      font-family: Roboto !important;
+      color: #0d89d1 !important;
+    }
+  }
+  .main-container{
+    padding: 0px 20px 0 20px !important;
+    margin: 0;
+    color:#000;
+  }
+.item-list-small{
+    font-size: 11px;
+    overflow: hidden;
+  }
+  .ion-item-class{
+    padding: 0;
+
+  }
+  .label-text{
+    width: 100%;
+    padding: 0;
+    margin: 0;
+  }
+//DIV
+ion-item{
+  --background: none;
+}
+.item {
+    //background-color: var(--white);
+    margin: 0 auto;
+    overflow: hidden;
+  }
+.div-content-expediente{
+  width: 100%;
+  float: left;
+  border-left: 3px solid #dae3f3;
+  padding:5px 5px 15px 5px;
+  margin: 10px 0 10px 0;
+  background:  #dae3f3;
+  border-radius: 20px;
+}
+.div-content-pendentes{
+  width: 100%;
+  float: left;
+  border-left: 3px solid #d9d9d9;
+  padding: 5px;
+}
+  .div-content-expediente h3, .div-content-pendentes h3{
+    margin: 0;
+    padding: 0;
+    font-size: 14pt;
+    width: 100%;
+  }
+  .div-icon{
+    width: 10%;
+    font-size: 20px;
+    float: left;
+    color: #808080;
+  }
+  .div-icon ion-icon{
+    display: block;
+    margin: 0 auto;
+
+  }
+  .div-content-expediente p, .div-content-pendentes p{
+    font-size: 14pt;
+    color: rgb(94, 92, 92);
+    padding: 0;
+    margin: 0;
+  }
+  .span-left{
+      float: left;
+      font-size: 12px;
+      padding-left: 18px;
+  }
+  .span-right{
+    text-align: right;
+    float: right;
+    font-size: 12px;
+    padding-right: 18px;
+}
+
+
+/* New CSS */
+.expediente{
+  border-radius: 15px;
+  box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
+  border:1px solid #e9e9e9 !important;
+  background-color: var(--white);
+  margin-bottom: 10px !important;
+  padding: 15px;
+}
+.exp-list-item{
+  //width: 368px;
+  overflow: auto;
+  /* border-bottom: 1px solid gray; */
+  margin: 10px auto;
+}
+
+.exp-top-detail{
+  width: 100%;
+  float: left;
+  font-family: Roboto;
+  font-size: 12pt;
+  font-weight: 700;
+  color: var(--title-text-color);
+  padding-left: 3px;
+
+  .subject{
+    width: 84%;
+    float: left;
+  }
+
+  .exp-icon{
+    width: fit-content;
+    float: right;
+   /* font-size: 13px; */
+    margin: 0 !important;
+    padding: 0 !important;
+
+    ion-icon{
+      font-size: 12pt;
+      color: #42b9fe;
+      float: left;
+    }
+    label{
+      font-size: 10pt;
+    }
+  }
+}
+.exp-middle-detail, .exp-bottom-detail{
+  margin-bottom: 5px;
+
+}
+.exp-middle-detail{
+  font-size: 12pt;
+  width: 100%;
+  overflow: auto;
+
+  .exp-workflow{
+    float: left;
+    margin: 0 !important;
+
+    .label{
+      border-radius: 15px;
+      background: #ffb703;
+      /* font-size: 12px; */
+      float: right;
+      padding: 2.5px 13.5px 2.5px 13.5px;
+      color: #fff;
+  }
+  }
+  .exp-date{
+    width: auto;
+    font-family: Roboto;
+    font-size: 10pt;
+    font-weight: normal;
+    font-stretch: normal;
+    font-style: normal;
+    line-height: normal;
+    letter-spacing: normal;
+    color: #797979;
+    float: right;
+  }
+}
+.exp-bottom-detail{
+  font-size: 8pt;
+  width: 100%;
+  overflow: auto;
+  padding-left: 3px;
+
+  .exp-remetente{
+    //width: 200px;
+    font-family: Roboto;
+   /*  font-size: 13px; */
+    font-weight: normal;
+    color: #000000;
+    float: left;
+    /* border: 1px solid red; */
+  }
+}
+.div-top-header{
+  width: 400px;
+  margin: 6px auto;
+  background-color: #0782c9;
+  overflow: auto;
+}
+.div-search{
+  font-size: 45px;
+  float: left;
+  margin: 0 0 0 10px
+}
+.div-logo{
+  background: transparent;
+  width: 150px;
+  margin: 2.5px 0 2.5px 71px;
+  float: left;
+}
+.div-logo img{
+  width: 100%;
+}
+.div-profile{
+  font-size: 45px;
+  float: right;
+  margin-right: 10px;
+}

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

@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DiplomasGerarPage } from './diplomas-gerar.page';
+
+describe('DiplomasGerarPage', () => {
+  let component: DiplomasGerarPage;
+  let fixture: ComponentFixture<DiplomasGerarPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DiplomasGerarPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DiplomasGerarPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,72 @@
+import { Component, OnInit } from '@angular/core';
+import { NavigationStart, Router } from '@angular/router';
+import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { DeplomasStore } from 'src/app/store/deplomas.service';
+import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
+import { SortService } from 'src/app/services/functions/sort.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
+@Component({
+  selector: 'app-diplomas-gerars',
+  templateUrl: './diplomas-gerar.page.html',
+  styleUrls: ['./diplomas-gerar.page.scss'],
+})
+export class DiplomasGerarPage implements OnInit {
+
+  diplomasList:DailyWorkTask[] = [];
+  serialNumber:string;
+  skeletonLoader = true
+
+  deplomasStore = DeplomasStore
+  customTaskPipe = new CustomTaskPipe()
+
+  constructor(
+    private processes:ProcessesService,
+    private router: Router,
+    private sortService: SortService,
+    public ThemeService: ThemeService
+    ) {}
+
+  ngOnInit() {
+
+    this.LoadList()
+
+  }
+
+  goToDiploma(serialNumber:any){
+    this.router.navigate(['/home/gabinete-digital/diplomas-gerar', serialNumber, 'gabinete-digital']);
+  }
+
+  doRefresh() {
+    setTimeout(() => {
+      this.LoadList();
+    }, 1000);
+  }
+
+  async LoadList() {
+
+
+
+    this.skeletonLoader = true
+
+    let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
+    this.diplomasList = new Array();
+
+    this.skeletonLoader = false;
+
+    let gerarDiploma =  diplomas.reverse().filter(data => data.activityInstanceName == "Gerar Diploma" || data.activityInstanceName == "Retificar Diploma");
+
+    gerarDiploma.forEach(element => {
+      let task: customTask = this.customTaskPipe.transform(element);
+      this.diplomasList.push(task);
+    });
+
+    this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate')
+
+
+    this.deplomasStore.resetDiplomaGerar(this.diplomasList);
+  }
+
+
+}

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

@@ -23,11 +23,11 @@
 
   <div class="main-container width-100 overflow-y-auto height-100" [ngSwitch]="segment">
 
-    <div *ngIf="deplomasStore.diplomasList.length >= 1 && p.userPermission([p.permissionList.Gabinete.md_tasks])">
+    <div *ngIf="deplomasStore.diplomasReviewList.length >= 1 && p.userPermission([p.permissionList.Gabinete.md_tasks])">
       <ion-list *ngSwitchCase="'validar'">
         <div
           class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
-          *ngFor = "let task of deplomasStore.diplomasList"
+          *ngFor = "let task of deplomasStore.diplomasReviewList"
           (click)="goToDiploma(task.SerialNumber)"
         >
           <div class="item width-100">
@@ -97,13 +97,13 @@
     </div>
 
     <div
-      *ngIf="!skeletonLoader && deplomasStore.diplomasList.length == 0 && deplomasStore.diplomasAssinadoList.length == 0"
+      *ngIf="!skeletonLoader && deplomasStore.diplomasReviewList.length == 0 && deplomasStore.diplomasAssinadoList.length == 0"
       class="empty-list d-flex height-100 align-center justify-content-center"
     >
       <span>Lista vazia</span>
     </div>
 
-    <div *ngIf="skeletonLoader && deplomasStore.diplomasAssinadoList.length == 0 && skeletonLoader && deplomasStore.diplomasList.length == 0">
+    <div *ngIf="skeletonLoader && deplomasStore.diplomasAssinadoList.length == 0 && skeletonLoader && deplomasStore.diplomasReviewList.length == 0">
 
       <ion-list>
         <ion-item>

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

@@ -14,26 +14,26 @@ import { PermissionService } from 'src/app/services/permission.service';
   styleUrls: ['./diplomas.page.scss'],
 })
 export class DiplomasPage implements OnInit {
-//profile:string;
-diplomasList:DailyWorkTask[] = [];
-diplomasAssinadoList:DailyWorkTask[] = [];
-showLoader: boolean;
-serialNumber:string;
-skeletonLoader = false
 
-@Input() segment:string;
+  diplomasList:DailyWorkTask[] = [];
+  diplomasAssinadoList:DailyWorkTask[] = [];
+  showLoader: boolean;
+  serialNumber:string;
+  skeletonLoader = false
+
+  @Input() segment:string;
 
 
-deplomasStore = DeplomasStore
-customTaskPipe = new CustomTaskPipe()
+  deplomasStore = DeplomasStore
+  customTaskPipe = new CustomTaskPipe()
 
-constructor(
-  private processes:ProcessesService,
-  private router: Router,
-  private activatedRoute: ActivatedRoute,
-  public ThemeService: ThemeService,
-  private sortService: SortService,
-  public p: PermissionService,
+  constructor(
+    private processes:ProcessesService,
+    private router: Router,
+    private activatedRoute: ActivatedRoute,
+    public ThemeService: ThemeService,
+    private sortService: SortService,
+    public p: PermissionService,
   ) {}
 
   ngOnInit() {
@@ -69,18 +69,20 @@ constructor(
     this.diplomasList = [];
     let diplomasList = [];
 
-    let diplomasValidar = diplomas.filter(data => data.activityInstanceName == "Revisar Diploma");
-    diplomasValidar.forEach(element => {
+    // let diplomasReview = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
+
+    diplomas.forEach(element => {
 
       let task = this.pipeTask(element)
       diplomasList.push(task);
     });
 
     this.diplomasList = this.sortService.sortDate(diplomasList, 'CreateDate')
-    this.deplomasStore.resetDiplomasList(this.diplomasList)
+    this.deplomasStore.resetDiplomasReview(this.diplomasList)
 
     let diplomasAssinadoList = []
     let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
+
     diplomasAssinados.forEach(async element => {
 
       let task = this.pipeTask(element)

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

@@ -131,6 +131,10 @@
                 <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
               </div>
               <div class="ion-input-class width-100">
+<<<<<<< HEAD
+=======
+
+>>>>>>> secrete-group
 
                 <mat-form-field appearance="none"
                 class="width-100 date-hour-picker">

src/app/shared/popover/chat-popover/chat-popover.page.html

@@ -7,9 +7,9 @@
   </div>
   <div class="buttons">
     <button (click)="leaveGroup()" class="btn-cancel" shape="round" >Sair do Grupo</button>
-    <button (click)="openChangeGroupName()" class="btn-cancel" shape="round" >Alterar nome do grupo</button>
+    <button *ngIf="isAdmin" (click)="openChangeGroupName()" class="btn-cancel" shape="round" >Alterar nome do grupo</button>
     <div class="solid"></div>
-    <button (click)="close('cancel')" full class="btn-cancel mobile-only" shape="round" >Cancelar</button>
-    <button (click)="deleteGroup()" class="btn-delete" shape="round">Apagar grupo</button>
+    <button  (click)="close('cancel')" full class="btn-cancel mobile-only" shape="round" >Cancelar</button>
+    <button *ngIf="isAdmin" (click)="deleteGroup()" class="btn-delete" shape="round">Apagar grupo</button>
   </div>
 </ion-content>

src/app/shared/popover/chat-popover/chat-popover.page.ts

@@ -5,6 +5,8 @@ import { ToastService } from 'src/app/services/toast.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { SetRoomOwnerPage } from 'src/app/modals/set-room-owner/set-room-owner.page';
 import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service';
+import { HttpErrorResponse } from '@angular/common/http';
+import { SessionStore } from 'src/app/store/session.service';
 
 
 @Component({
@@ -16,6 +18,7 @@ export class ChatPopoverPage implements OnInit {
   roomId:string;
   room: any;
   members:any;
+  isAdmin = false;
 
   constructor(
     private popoverController: PopoverController,
@@ -28,10 +31,11 @@ export class ChatPopoverPage implements OnInit {
   ) {
     this.roomId = this.navParams.get('roomId');
     this.members = this.navParams.get('members');
+    this.isAdmin = this.navParams.get('isAdmin');
   }
 
   ngOnInit() {
-    
+    this.chatService.refreshtoken();
   }
 
   close(action:any){
@@ -62,6 +66,7 @@ export class ChatPopoverPage implements OnInit {
       componentProps: {
         roomId: this.roomId,
         members: this.members,
+        isAdmin: this.isAdmin
       }
     });
     await modal.present();
@@ -79,9 +84,6 @@ export class ChatPopoverPage implements OnInit {
 
     let res:any = await this.wsChatMethodsService.leaveRoom(this.roomId);
     this.wsChatMethodsService.deleteRoom(this.roomId)
-    
-
-    
 
     if(res.error){
       if(res.error.error = "error-you-are-last-owner"){
@@ -101,55 +103,7 @@ export class ChatPopoverPage implements OnInit {
     }
 
     this.close('leave');
-    //this.wsChatMethodsService.subscribeToRoomUpdate(this.roomId, res.result);
 
-
-    /* this.chatService.getRoomInfo(this.roomId).subscribe(room=>{
-      this.room = room['room'];
-
-      if(this.room.t === 'p'){
-        this.chatService.leaveGroup(body).subscribe(res=>{
-          
-          this.close('leave');
-        },
-        (e)=>{
-          if(e.error.errorType = "error-you-are-last-owner"){
-            this.toastService._badRequest("Você é o último administrador do grupo. Por favor, defina o novo administrador antes de sair da grupo.");
-
-            this.close('cancel');
-
-            this.setRoomOwner();
-          }
-          else{
-            this.toastService._badRequest("Não foi possível sair do grupo");
-            this.close('cancel');
-          }
-
-        },
-        ()=>{
-          //loader.remove()
-        });
-      }
-      else{
-        this.chatService.leaveChannel(body).subscribe(res=>{
-          
-          this.close('leave');
-        },
-        (e)=>{
-          if(e.error.errorType = "error-you-are-last-owner"){
-            this.toastService._badRequest("Você é o último administrador do grupo. Por favor, defina o novo administrador antes de sair da grupo.");
-            this.close('cancel');
-          }
-          else{
-            this.toastService._badRequest("Não foi possível sair do grupo");
-            this.close('cancel');
-          }
-        },
-        ()=>{
-          //loader.remove()
-        });
-      }
-    }); */
   }
 
   //Delete
@@ -160,12 +114,12 @@ export class ChatPopoverPage implements OnInit {
 
       if(this.room.t === 'p'){
         this.chatService.deleteGroup(body).subscribe(res=>{
-          
+          this.wsChatMethodsService.deleteRoom(this.roomId)
         });
       }
       else{
         this.chatService.deleteChannel(body).subscribe(res=>{
-          
+          this.wsChatMethodsService.deleteRoom(this.roomId)
         });
       }
     });

src/app/shared/popover/messages-options/messages-options.page.ts

@@ -1,3 +1,4 @@
+import { HttpErrorResponse } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
 import { ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { ChatService } from 'src/app/services/chat.service';
@@ -24,6 +25,7 @@ export class MessagesOptionsPage implements OnInit {
   }
 
   ngOnInit() {
+    this.chatService.refreshtoken();
   }
 
   close(){

src/app/shared/publication/edit-action/edit-action.page.html

@@ -28,16 +28,15 @@
             minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
             monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
             min="{{minDate}}"
-            max="2025"
-            class="d-block d-md-none">
+            max="2025">
           </ion-datetime>
 
 
           <mat-form-field appearance="none" class="width-100 date-hour-picker d-none  d-md-block">
             <input matInput [ngxMatDatetimePicker]="picker1"
               placeholder="Choose a date*"
-              [formControl]="dateControlEnd"
-              [min]="minDate"
+              [(ngModel)]="folder.DateBegin"
+              [min]="currentDate"
               [disabled]="disabled"
             >
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
@@ -67,19 +66,19 @@
             displayFormat="D MMM YYYY H:mm"
             minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
             monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-            min="{{minDate}}"
-            max="2022">
+            min="{{endMinDate}}"
+            max="2025">
           </ion-datetime>
 
           <mat-form-field  appearance="none" class="width-100 date-hour-picker d-none d-md-block">
-            <input matInput [ngxMatDatetimePicker]="picker1"
+            <input matInput [ngxMatDatetimePicker]="fim"
               placeholder="Choose a date*"
-              [formControl]="dateControlEnd"
-              [min]="minDate"
+              [(ngModel)]="folder.DateEnd"
+              [min]="endMinDate"
               [disabled]="disabled"
             >
-            <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
-            <ngx-mat-datetime-picker #picker1
+            <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
+            <ngx-mat-datetime-picker #fim
               [showSpinners]="showSpinners"
               [showSeconds]="showSeconds"
               [stepHour]="stepHour" [stepMinute]="stepMinute"

src/app/shared/publication/edit-action/edit-action.page.ts

@@ -29,6 +29,7 @@ export class EditActionPage implements OnInit {
   public stepSecond = 5;
   public dateControlStart = new FormControl(moment("DD MM YYYY hh"));
   public dateControlEnd = new FormControl(moment("DD MM YYYY hh"));
+  public currentDate = new Date();
 
   folder: PublicationFolder;
   @Input() folderId: string;
@@ -87,6 +88,9 @@ export class EditActionPage implements OnInit {
   }
 
   async save() {
+    this.injectValidation();
+    this.runValidation();
+
     let body = {
       ProcessId: this.folderId,
       Description: this.folder.Description,
@@ -95,7 +99,7 @@ export class EditActionPage implements OnInit {
       DateEnd: this.folder.DateEnd,
       ActionType: this.folder.ActionType,
     }
-    
+    console.log(this.folder.DateEnd);
 
     const loader = this.toastService.loading()
 

src/app/shared/publication/new-action/new-action.page.html

@@ -46,6 +46,7 @@
               placeholder="Choose a date*"
               [(ngModel)]="folder.DateBegin"
               [disabled]="disabled"
+              [min]="currentDate"
             >
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker1
@@ -82,6 +83,7 @@
               placeholder="Choose a date*"
               [(ngModel)]="folder.DateEnd"
               [disabled]="disabled"
+              [min]="currentDate"
             >
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker2"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker2

src/app/shared/publication/new-action/new-action.page.ts

@@ -25,6 +25,7 @@ export class NewActionPage implements OnInit {
   public stepHour = 1;
   public stepMinute = 5;
   public stepSecond = 5;
+  currentDate = new Date();
   public endMinDate = new Date(new Date().getTime() + 15 * 60000);
 
   Form: FormGroup;

src/app/shared/publication/view-publications/view-publications.page.ts

@@ -33,7 +33,7 @@ export class ViewPublicationsPage implements OnInit {
   @Output() goBackToViewPublications = new EventEmitter();
   @Output() closeDesktopComponent =  new EventEmitter<any>();
   @Output() goBacktoPublicationDetails = new EventEmitter<any>();
-
+  @Output() getActions= new EventEmitter<any>();
 
   publicationPipe = new PublicationPipe()
 
@@ -53,10 +53,10 @@ export class ViewPublicationsPage implements OnInit {
       this.folderId = this.folderId['ProcessId']
     }
 
-    this.getPublicationsIds();
-    this.getPublicationDetail();
+    //this.getPublicationsIds();
 
     window['app-view-publications-page-doRefresh'] = this.doRefresh
+    this.getPublicationDetail();
   }
 
   ngOnChanges(changes: any): void {
@@ -195,7 +195,8 @@ export class ViewPublicationsPage implements OnInit {
 
   }
 
-  async openEditPublication(folderId?:any) {
+  async openEditPublication(folderId?:any){
+
     if( window.innerWidth < 701) {
       const modal = await this.modalController.create({
         component: EditActionPage,
@@ -226,6 +227,8 @@ export class ViewPublicationsPage implements OnInit {
     finally {
       loader.remove()
     }
+    this.close();
+    this.getActions.emit();
   }
 
   async viewPublicationDetail(publicationId:string) {