diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index cbc2cca9e..694ed8c56 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -293,7 +293,7 @@
               </div>
             </div>
 
-            <div  class="fs-timeline flex-grow-1 d-none d-md-block d-md-block text-black  pr-20 width-100 height-100 overflow-y-auto" *ngIf="loggeduser.OwnerCalendars.length">
+            <div  class="fs-timeline flex-grow-1 d-none d-md-block d-md-block text-black  pr-20 width-100 height-100 overflow-y-auto" *ngIf="loggeduser.OwnerCalendars.length && loggeduser.Profile != 'PR' ">
               <div *ngFor="let events of TimelineMDList | keyvalue;" >
 
                 <div class="EventListBox-container" >
@@ -334,7 +334,7 @@
               </div>
             </div>
             
-            <div  class="sd-timeline flex-grow-1 d-none d-md-block timeline-md text-black pl-20 pr-20 width-100 height-100 overflow-y-auto" *ngIf="loggeduser.SharedCalendars.length != 0" >
+            <div  class="sd-timeline flex-grow-1 d-none d-md-block timeline-md text-black pl-20 pr-20 width-100 height-100 overflow-y-auto" *ngIf="loggeduser.SharedCalendars.length != 0 || loggeduser.Profile == 'PR' " >
               <div *ngFor="let events of TimelinePRList | keyvalue;">
 
                 <div class="EventListBox-container"  >
diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html
index 2194acc24..96ae78e19 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -40,12 +40,13 @@
           <div class="content-location">
             <span class="date">{{loadedEvent.Location}}</span>
             <div *ngIf="loadedEvent.Organizer">
-              <div *ngIf="eventsService.isMyEvent(loadedEvent) == false">
+
+              <div *ngIf="eventsService.isMyEvent(loadedEvent) == false || sesseionStora.user.Profile =='PR'">
                 <span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' " style="background-color: #99e47b;">{{loadedEvent.CalendarName}}</span>
                 <span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #958bfc;">{{loadedEvent.CalendarName}}</span>
               </div>
 
-              <div *ngIf="eventsService.isMyEvent(loadedEvent) == true">
+              <div *ngIf="eventsService.isMyEvent(loadedEvent) == true && sesseionStora.user.Profile !='PR'">
                 <span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' "  style="background-color: #ffb703;">{{loadedEvent.CalendarName}}</span>
                 <span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #f05d5e;">{{loadedEvent.CalendarName}}</span>
               </div>
diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts
index 953f4812e..02b2b5de7 100644
--- a/src/app/pages/agenda/view-event/view-event.page.ts
+++ b/src/app/pages/agenda/view-event/view-event.page.ts
@@ -71,8 +71,9 @@ export class ViewEventPage implements OnInit {
     public ThemeService: ThemeService,
     private RouteService: RouteService,
     private ionicStorage: Storage,
-    private CalendarService: CalendarService
+    private CalendarService: CalendarService,
   ) {
+
     
     this.isEventEdited = false;
     this.loadedEvent = new Event();
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
index 72a00a4c8..515e0b03a 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
@@ -43,7 +43,7 @@ export class DespachoPrPage implements OnInit {
   serialNumber: string;
   caller: string;
   profile: string;
-  intervenientes: any = []
+  intervenientes: any =[]
   cc: any = [];
 
   constructor(
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
index 39f4f7fd9..4b5d29bc3 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
@@ -16,10 +16,10 @@
   <ion-toolbar>
     <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
       <ion-segment-button value="validar" *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])">
-        Por validar ...
+        Por validar
       </ion-segment-button>
       <ion-segment-button value="assinados">
-        Assinados PR ...
+        Assinados PR
       </ion-segment-button>
     </ion-segment>
   </ion-toolbar>
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
index d0be4c730..195d17574 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
@@ -59,9 +59,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>
         </div>
diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html
index 34e1c398b..6617d4ee9 100644
--- a/src/app/pages/search/search.page.html
+++ b/src/app/pages/search/search.page.html
@@ -11,7 +11,7 @@
     <ion-progress-bar type="indeterminate" class="loader" *ngIf="showLoader"></ion-progress-bar>
 
 
-    <div class="top-box d-flex ion-justify-content-between">
+    <div class="top-box d-flex ion-justify-content-between pb-10">
       <!-- search -->
       <div *ngIf="!showAdvanceSearch" class="icon-z icon-most-searched-word-open cursor-pointer" (click)="showHideAdvanceSearch(true)">
         <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/theme/blue/icons-most-searched-words-open.svg" class="icon" slot="end"></ion-icon>
@@ -34,7 +34,7 @@
     </div>
 
     <!-- Search drop down -->
-    <div class="advance-search pa-0 pt-10  flex-md-grow-1" >
+    <div class="advance-search pa-0 pt-10 pr-10 flex-md-grow-1" >
 
       <ion-form  [class.d-none]="!showSearchInput">
         <div class="d-flex search-input-container ion-justify-content-between" >
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
index 91363486f..a1a99a38e 100644
--- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
+++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
@@ -254,6 +254,7 @@
                     placeholder="Choose a date"
                     [(ngModel)]="eventProcess.workflowInstanceDataFields.LastOccurrence"
                     [disabled]="disabled"
+                    [min]="eventProcess.workflowInstanceDataFields.EndDate"
                   >
                   <mat-datepicker-toggle id="last-occurrence" matSuffix [for]="occurrrence"></mat-datepicker-toggle>
                   <ngx-mat-datetime-picker #occurrrence
diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html
index 1bb5b3fb3..856eb4426 100644
--- a/src/app/shared/agenda/view-event/view-event.page.html
+++ b/src/app/shared/agenda/view-event/view-event.page.html
@@ -36,12 +36,13 @@
         <span class="date">{{loadedEvent.Location}}</span>
 
         <div *ngIf="loadedEvent.Organizer">
-          <div *ngIf="eventsService.isMyEvent(loadedEvent) == false">
+          
+          <div *ngIf="eventsService.isMyEvent(loadedEvent) == false || sesseionStora.user.Profile =='PR'">
             <span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' " style="background-color: #99e47b;">{{loadedEvent.CalendarName}}</span>
             <span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #958bfc;">{{loadedEvent.CalendarName}}</span>
           </div>
 
-          <div *ngIf="eventsService.isMyEvent(loadedEvent) == true">
+          <div *ngIf="eventsService.isMyEvent(loadedEvent) == true && sesseionStora.user.Profile !='PR'">
             <span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' "  style="background-color: #ffb703;">{{loadedEvent.CalendarName}}</span>
             <span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #f05d5e;">{{loadedEvent.CalendarName}}</span>
           </div>
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
index 72ec3d7d4..1bc3ba743 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
@@ -84,13 +84,13 @@
     </div>
 
     <div
-      *ngIf="!skeletonLoader && allProcessesList.length == 0"
+      *ngIf="!skeletonLoader && getAllProcessCount == 0"
       class="empty-list d-flex height-100 align-center justify-content-center"
     >
       <span>Lista vazia</span>
     </div>
 
-    <div *ngIf="skeletonLoader && allProcessesList.length == 0">
+    <div *ngIf="skeletonLoader && getAllProcessCount == 0">
 
       <ion-list>
         <ion-item>
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
index b8ed791a3..925331d61 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
@@ -80,6 +80,9 @@ export class AllProcessesPage implements OnInit {
 
 
   get AllProcess() {
+    setTimeout(() => {
+      this.skeletonLoader = false;
+    }, 5000);
     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.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.despachoStore.list)
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
index 3214adf1d..957ff060b 100644
--- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
+++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
@@ -111,6 +111,7 @@
                     placeholder="Choose a date"
                     [(ngModel)]="startDate"
                     [disabled]="disabled"
+                    [min]="currentDate"
                   >
                   <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
                   <ngx-mat-datetime-picker #picker1
@@ -138,6 +139,7 @@
                     placeholder="Choose a date"
                     [(ngModel)]="endDate"
                     [disabled]="disabled"
+                    [min]="currentDate"
                   >
                   <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
                   <ngx-mat-datetime-picker #fim
@@ -196,6 +198,7 @@
                     placeholder="Choose a date"
                     [(ngModel)]="eventProcess.workflowInstanceDataFields.LastOccurrence"
                     [disabled]="disabled"
+                    [min]="endDate"
                   >
                   <mat-datepicker-toggle id="last-occurrence" matSuffix [for]="occurrrence"></mat-datepicker-toggle>
                   <ngx-mat-datetime-picker #occurrrence
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
index b3e6ebf86..95d4a0d6c 100644
--- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
+++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
@@ -51,6 +51,7 @@ export class EditEventToApproveComponent implements OnInit {
   public stepSecond = 5;
   recurringTypes: any;
   selectedRecurringType: any;
+  currentDate = new Date()
 
   showLoader = false
 
@@ -181,14 +182,54 @@ export class EditEventToApproveComponent implements OnInit {
   }
 
   onSelectedRecurringChanged(ev:any){
-    /* 
+    
+    this.calculetedLastOccurrence(ev);
+    
     if(ev.length > 1){
       
-      this.selectedRecurringType = ev.filter(data => data != '-1');
+      this.postEvent.EventRecurrence.Type = ev.filter(data => data != '-1');
     }
     if(ev.length == 0){
-      this.selectedRecurringType = "-1";
-    } */
+      this.postEvent.EventRecurrence.Type = "-1";
+    }
+  }
+
+  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.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;
+    }
+    
   }
 
   openLastOccurrence() {