diff --git a/.gitignore b/.gitignore
index 5ba2467e5..bc36db74b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -94,4 +94,6 @@ src/app/pipes/process.service.ts
 
 /.angular
 ./.angular
-src/app/domain
\ No newline at end of file
+src/app/domain
+_src/
+-src
diff --git a/src/app/modals/document-detail/document-detail.page.scss b/src/app/modals/document-detail/document-detail.page.scss
index 6372feb82..70ac70190 100644
--- a/src/app/modals/document-detail/document-detail.page.scss
+++ b/src/app/modals/document-detail/document-detail.page.scss
@@ -102,7 +102,7 @@ ion-button{
       background: #ffb703;
       float: right;
       padding: 5px 13.5px 5px 13.5px;
-      color: #fff;
+      color: black;
       font-size: rem(14);
   }
 
diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.html b/src/app/modals/profile/edit-profile/edit-profile.page.html
index a8b47979e..47c900925 100644
--- a/src/app/modals/profile/edit-profile/edit-profile.page.html
+++ b/src/app/modals/profile/edit-profile/edit-profile.page.html
@@ -60,15 +60,24 @@
       <div>
         <div class="d-flex align-center flex-column" (click)="takePicture()">
 
-          <ion-icon *ngIf="SessionStore.user.RoleDescription != 'Presidente da República' && SessionStore.user.RoleDescription != 'Ministro e Director do Gabinete do PR' && SessionStore.user.RoleDescription != 'Secretário Geral' " class="profile-pic"
-            src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
+          <div *ngIf="profilePicture == '' ">
+            <ion-icon
+              *ngIf="SessionStore.user.RoleDescription != 'Presidente da República' && SessionStore.user.RoleDescription != 'Ministro e Director do Gabinete do PR' && SessionStore.user.RoleDescription != 'Secretário Geral' "
+              class="profile-pic" src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
+
+            <img *ngIf="SessionStore.user.RoleDescription == 'Presidente da República' " class="profile-pic"
+              src='assets/images/presidente.png'>
+            <img *ngIf="SessionStore.user.RoleDescription == 'Ministro e Director do Gabinete do PR' "
+              class="profile-pic" src='assets/images/ministro.png'>
+            <img *ngIf="SessionStore.user.RoleDescription == 'Secretário Geral' " class="profile-pic"
+              src='assets/images/secretaria_geral.png'>
+          </div>
+
+          <div *ngIf="profilePicture != '' ">
+            <img class="profile-pic" src={{profilePicture}}>
+          </div>
+
 
-          <img *ngIf="SessionStore.user.RoleDescription == 'Presidente da República' " class="profile-pic"
-            src='assets/images/presidente.png'>
-          <img *ngIf="SessionStore.user.RoleDescription == 'Ministro e Director do Gabinete do PR' " class="profile-pic"
-            src='assets/images/ministro.png'>
-          <img *ngIf="SessionStore.user.RoleDescription == 'Secretário Geral' " class="profile-pic"
-            src='assets/images/secretaria_geral.png'>
 
           <!-- <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="profile-pic"
             src="assets/images/icons-default-profile.svg"></ion-icon>
@@ -76,11 +85,12 @@
             src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
           <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="profile-pic"
             src="assets/images/theme/{{ThemeService.currentTheme}}/icons-profile.svg"></ion-icon> -->
-            <div style="background: black;width: 50px;height: 50px;position: relative;top: -33px;left: 38px;border-radius: 55px;overflow: hidden;border: 5px solid white;">
-              <img src="assets/images/camera.png">
-            </div>
+          <div
+            style="background: black;width: 50px;height: 50px;position: relative;top: -33px;left: 38px;border-radius: 55px;overflow: hidden;border: 5px solid white;">
+            <img src="assets/images/camera.png">
+          </div>
         </div>
-        
+
       </div>
 
       <div class="profile-info">
diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.ts b/src/app/modals/profile/edit-profile/edit-profile.page.ts
index f10d05614..f053acd45 100644
--- a/src/app/modals/profile/edit-profile/edit-profile.page.ts
+++ b/src/app/modals/profile/edit-profile/edit-profile.page.ts
@@ -9,6 +9,7 @@ import { ThemeService } from 'src/app/services/theme.service';
 import { Camera, CameraResultType, CameraSource, Photo } from '@capacitor/camera';
 import { Filesystem, Directory } from '@capacitor/filesystem';
 import { File } from '@awesome-cordova-plugins/file/ngx';
+import { StorageService } from 'src/app/services/storage.service';
 
 
 @Component({
@@ -23,6 +24,7 @@ export class EditProfilePage implements OnInit {
   environment = environment
   capturedImage = '';
   capturedImageTitle = '';
+  profilePicture = "";
 
   constructor(private modalController: ModalController,
     private animationController: AnimationController,
@@ -30,9 +32,21 @@ export class EditProfilePage implements OnInit {
     private BackgroundService: BackgroundService,
     public ThemeService: ThemeService,
     private file: File,
+    private storageService: StorageService,
+
   ) { }
 
-  ngOnInit() { }
+  ngOnInit() { 
+    this.getProfilpicture()
+  }
+  getProfilpicture() {
+    this.storageService.get(this.SessionStore.user.RoleID.toString()).then((picture) => {
+      console.log(picture)
+      this.profilePicture = picture
+    }).catch((error ) => {
+      this.profilePicture = "";
+    })
+  }
 
   close() {
     this.modalController.dismiss();
@@ -132,6 +146,8 @@ export class EditProfilePage implements OnInit {
 
   async takePicture() {
     const capturedImage = await Camera.getPhoto({
+      width: 188,
+      height: 188,
       quality: 50,
       // allowEditing: true,
       resultType: CameraResultType.Base64,
@@ -139,12 +155,19 @@ export class EditProfilePage implements OnInit {
     });
 
     this.capturedImage = 'data:image/jpeg;base64,' + capturedImage.base64String;
+    console.log(this.SessionStore.user.RoleID.toString())
+    this.storageService.store(this.SessionStore.user.RoleID.toString(),this.capturedImage).then((value) => {
+      console.log('picture saved')
+    }).catch((error) => {
+      console.log('picture not saved')
+    })
+    this.getProfilpicture()
     this.capturedImageTitle = SessionStore.user.Profile;
-    this.saveFile(this.capturedImage,this.capturedImageTitle,'application/img');
+    /* this.saveFile(this.capturedImage,this.capturedImageTitle,'application/img'); */
 
   }
 
-  async saveFile(pdfString, filename, type) {
+/*   async saveFile(pdfString, filename, type) {
     const blob = this.b64toBlob(pdfString, type)
     console.log(blob)
     let pathFile = ''
@@ -165,11 +188,8 @@ export class EditProfilePage implements OnInit {
     }).then((dir) => {
       console.log('DIR ', dir)
     });
-  }
+  } */
 
-  getImagem() {
-
-  }
 
   b64toBlob(b64Data, contentType) {
     contentType = contentType || '';
diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html
index 0f303add4..02166f8f9 100644
--- a/src/app/modals/profile/profile.page.html
+++ b/src/app/modals/profile/profile.page.html
@@ -39,7 +39,8 @@
 
     <div class="d-flex align-center">
 
-      <ion-icon *ngIf="SessionStore.user.RoleDescription != 'Presidente da República' && SessionStore.user.RoleDescription != 'Ministro e Director do Gabinete do PR' && SessionStore.user.RoleDescription != 'Secretário Geral' " class="profile-pic"
+      <div *ngIf="profilePicture == ''" class="profile-pic">
+        <ion-icon *ngIf="SessionStore.user.RoleDescription != 'Presidente da República' && SessionStore.user.RoleDescription != 'Ministro e Director do Gabinete do PR' && SessionStore.user.RoleDescription != 'Secretário Geral' " class="profile-pic"
         src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
 
       <img *ngIf="SessionStore.user.RoleDescription == 'Presidente da República' " class="profile-pic"
@@ -48,6 +49,13 @@
         src='assets/images/ministro.png'>
       <img *ngIf="SessionStore.user.RoleDescription == 'Secretário Geral' " class="profile-pic"
         src='assets/images/secretaria_geral.png'>
+      </div>
+
+      <div *ngIf="profilePicture != ''" class="profile-pic">
+        <img class="profile-pic"
+        src={{profilePicture}}>
+      </div>
+      
 
       <!-- <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="profile-pic"
         src="assets/images/icons-default-profile.svg"></ion-icon>
diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts
index 70b095849..14ec3d905 100644
--- a/src/app/modals/profile/profile.page.ts
+++ b/src/app/modals/profile/profile.page.ts
@@ -39,6 +39,7 @@ export class ProfilePage implements OnInit {
   taskExist = true;
   taskNotExist = false;
   isloading = false;
+  profilePicture = "";
 
 
   SessionStore = SessionStore;
@@ -53,7 +54,8 @@ export class ProfilePage implements OnInit {
     public ThemeService: ThemeService,
     private notificationService: NotificationsService,
     private processesService: ProcessesService,
-    private eventsService: EventsService
+    private eventsService: EventsService,
+    private storageService: StorageService,
   ) {
 
 
@@ -62,18 +64,18 @@ export class ProfilePage implements OnInit {
       this.logoutOut = true
     });
 
-    this.eventTriger.getObservable().subscribe((event) => {
+   /*  this.eventTriger.getObservable().subscribe((event) => {
       if (event.notification == "recive") {
         this.getNotificationData();
       } else if (event.notification == "deleted") {
         console.log('header', event.notification)
         this.getNotificationData();
       }
-    });
+    }); */
 
-    this.notificationService.notificationReceived.subscribe(() => {
+    /* this.notificationService.notificationReceived.subscribe(() => {
       this.getNotificationData();
-    });
+    }); */
 
     setTimeout(() => {
       this.hideImage = true
@@ -83,9 +85,19 @@ export class ProfilePage implements OnInit {
   ngOnInit() {
 
     this.getNotificationData();
+    this.getProfilpicture();
 
   }
 
+  getProfilpicture() {
+    this.storageService.get(this.SessionStore.user.RoleID.toString()).then((picture) => {
+      console.log(picture)
+      this.profilePicture = picture
+    }).catch((error ) => {
+      this.profilePicture = "";
+    })
+  }
+
 
   close() {
     this.modalController.dismiss();
@@ -102,6 +114,8 @@ export class ProfilePage implements OnInit {
     //if(keyExist) {
     await this.storageservice.get("Notifications").then((value) => {
 
+      console.log('Getnotifications 111', value)
+
       this.DataArray = []
       value.forEach((element, i) => {
         console.log('Getnotifications', element, i)
@@ -207,11 +221,13 @@ export class ProfilePage implements OnInit {
       if (Service === "agenda" && Object === "event-list") {
         this.isloading = true
         this.processesService.GetTask(IdObject).subscribe((task) => {
+          console.log('evento exist')
           this.zone.run(() => this.router.navigate(['/home/agenda/event-list/approve-event', IdObject, 'agenda']));
           this.deleteNotification(index);
           this.isloading = false
 
         }, (error) => {
+          console.log('evento não existe')
           this.notificationdata[i].read = true;
           this.isloading = false
         })
diff --git a/src/app/modals/view-event/view-event.page.scss b/src/app/modals/view-event/view-event.page.scss
index 495418689..66362ad3e 100644
--- a/src/app/modals/view-event/view-event.page.scss
+++ b/src/app/modals/view-event/view-event.page.scss
@@ -297,5 +297,5 @@ ion-menu{
     background: var(--label-bg-color);
     float: right;
     padding: 5px 13.5px 5px 13.5px;
-    color: #fff;
+    color: black;
   }
diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 104fcbefa..3717b449d 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -14,11 +14,11 @@
         <!-- Toolbar -->
         <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
 
-        <div [class]="weeksToShow" > 
+        <div  class="weeksToShow"> 
           <!--  Calendar is here -->
 
           <div class="calendar-segment-{{profile}}" [class.calendar-segment-pr-force]="SessionStore.user.Profile =='PR'">
-            <div class="calendar-container"  [class]="calendarHeight">
+            <div class="calendar-container" class="calendarHeight" >
 
               <ion-row class="ion-justify-content-between calendar-tool-tip">
                 <ion-row class="ion-align-items-center first-row">
@@ -139,25 +139,28 @@
                 </thead>
               </table>
 
-              <calendar
-                class="calendar-component"
-                [eventSource]="listToPresent"
-                [calendarMode]="calendar.mode"
-                [currentDate]="calendar.currentDate"
-                (onEventSelected)="onEventSelected($event)"
-                (onTitleChanged)="onViewTitleChanged($event)"
-                (onRangeChanged)="onRangeChanged($event)"
-                (onCurrentDateChanged)="onCurrentChanged($event)"
-                queryMode="remote"
-                startHour="6"
-                endHour="20"
-                step="30"
-                startingDayMonth="1"
-                noEventsLabel="Sem Eventos"
-                allDayLabel="Todo o dia"
-                [monthviewDisplayEventTemplate]="template"
-              >
-              </calendar>
+              <div class="calendar-conteiner-height overflow-hidden" [style.height]="height">
+                <calendar
+                    class="calendar-component"
+                    [eventSource]="listToPresent"
+                    [calendarMode]="calendar.mode"
+                    [currentDate]="calendar.currentDate"
+                    (onEventSelected)="onEventSelected($event)"
+                    (onTitleChanged)="onViewTitleChanged($event)"
+                    (onRangeChanged)="onRangeChanged($event)"
+                    (onCurrentDateChanged)="onCurrentChanged($event)"
+                    queryMode="remote"
+                    startHour="6"
+                    endHour="20"
+                    step="30"
+                    startingDayMonth="1"
+                    noEventsLabel="Sem Eventos"
+                    allDayLabel="Todo o dia"
+                    [monthviewDisplayEventTemplate]="template"
+                  >
+                  </calendar>
+              </div>
+
 
               <!-- Adding a customized ng-template -->
               <ng-template #template let-view="view" let-row="row" let-col="col">
@@ -182,12 +185,12 @@
           <div class="calendar-title-container px-20 d-flex">
 
             <ion-row class="timeline-date align-center pr-10">
-              <button class="no-color"  *ngIf="showCalendar" (click)="calendarHeight=['height-75'];showCalendar=false">
+              <button class="no-color"  *ngIf="showCalendar" (click)="height='0px';showCalendar=false">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps  font-25" src="assets/images/icons-collaps-up.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps  font-25" src="assets/images/theme/gov/icons-collaps-up.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "  class="collaps  font-25"  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-up.svg"></ion-icon>
               </button>
-              <button  class="no-color" *ngIf="!showCalendar" (click)="calendarHeight=['height-356'];showCalendar=true">
+              <button  class="no-color" *ngIf="!showCalendar" (click)="weekToShow();showCalendar=true">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps  font-25" src="assets/images/icons-collaps-down.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps  font-25" src="assets/images/theme/gov/icons-collaps-down.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="collaps  font-25" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-down.svg" ></ion-icon>
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss
index 4d017eb84..3418faa07 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -242,7 +242,7 @@ label{
   color:  #e16817;
 }
 td.monthview-primary-with-event {
-  background-color: red !important;
+  background-color: white !important;
 }
 .header-title{
   font-family: Roboto;
@@ -1031,7 +1031,7 @@ $font-size: rem(15);
     }
     
     .height-356 {
-      height: 369px;
+      height: 360px;
     }
   }
 
@@ -1066,3 +1066,13 @@ $font-size: rem(15);
   
 }
 
+.calendar-conteiner-height {
+  height: 100%;
+  transition: 0.5s;
+  animation: 0.5s;
+  -webkit-transition: 0.5s;
+  -moz-transition: 0.5s;
+  -ms-transition: 0.5s;
+  -o-transition: 0.5s;
+  -webkit-animation: 0.5s;
+}
\ No newline at end of file
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 9903032c1..faefffa88 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -291,34 +291,37 @@ export class AgendaPage implements OnInit {
     }, 1000)
   }
 
-  weeksToShow = []
+  height = '75px'
 
   weekToShow() {
 
     setTimeout(() => {
-      let num = 0;
+      try {
+        let weekNum = 0;
 
-      function Week(a) {
-        for(let b of a.querySelectorAll('td')) {
-          if(!b.className.includes('text-muted')) {
-            num++;
-            return true
+        function Week(a) {
+          for(let b of a.querySelectorAll('td')) {
+            if(!b.className.includes('text-muted')) {
+              weekNum++;
+              return true
+            }
           }
         }
-      }
-  
-      for (let a of document.querySelectorAll('.monthview-container .swiper-container .swiper-slide-active table tbody tr') as any ){
-        Week(a)
-      } 
-  
-      if(num <= 5) {
         
-        this.weeksToShow = ["week-5"]
-      } else {
-        
-        this.weeksToShow = ["week-6"]
-      }
+        const dayBoxHeight = document.querySelector('.monthview-container .swiper-container .swiper-slide-active table tbody tr td').clientHeight
+        const weeks = document.querySelectorAll('.monthview-container .swiper-container .swiper-slide-active table tbody tr');
   
+        for (let week of weeks as any ){
+          Week(week)
+        } 
+    
+        this.showCalendar = true
+        this.height = (weekNum * dayBoxHeight) +'px'
+      } catch (e) {
+        setTimeout(()=> {
+          this.weekToShow()
+        }, 100)
+      }
     }, 250)
 
   }
@@ -588,6 +591,8 @@ export class AgendaPage implements OnInit {
     this.showLoader = true;
     const selectedCalendarIds = this.getSelectedAgendaCalendars();
     this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds)
+    // this.calendar.currentDate.setDate(1);
+
     this.updateEventListBox()
 
     try {
diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts
index 2b7d4caa7..4b40d1ec8 100644
--- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts
+++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts
@@ -26,11 +26,7 @@ export class EmendMessageModalPage implements OnInit {
   }
 
   save() {
-    if(this.emendMessage != '') {
-      this.modalController.dismiss({option:'save', note: this.emendMessage});
-    } else {
-      this.toastService._badRequest('É necessário adicionar uma nota');
-    }
+    this.modalController.dismiss({option:'save', note: this.emendMessage});
     
   }
 
diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
index 2afa6d17f..c18a9cef6 100644
--- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
+++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
@@ -108,7 +108,6 @@ export class EventActionsPopoverPage implements OnInit {
       
       
       if(res.data.option == 'save') { 
-        if(res.data.note !== '') {
           let body = { "serialNumber": this.serialNumber, 
           "action": "Emendar",
               "dataFields": {
@@ -130,10 +129,6 @@ export class EventActionsPopoverPage implements OnInit {
           finally {
             loader.remove()
           }
-        }
-        else {
-          this.toastService._badRequest('É necessário adicionar uma nota');
-        }
       } else {
         
       }
diff --git a/src/app/pages/agenda/view-event/view-event.page.scss b/src/app/pages/agenda/view-event/view-event.page.scss
index 84d69b8a3..ed7d6328f 100644
--- a/src/app/pages/agenda/view-event/view-event.page.scss
+++ b/src/app/pages/agenda/view-event/view-event.page.scss
@@ -298,7 +298,7 @@ ion-menu{
     background: var(--label-bg-color);
     float: right;
     padding: 5px 13.5px 5px 13.5px;
-    color: #fff;
+    color: black;
   }
 
   .text {
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss
index 2fb850abe..144435ba0 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss
@@ -112,7 +112,7 @@ ion-button{
       background: var(--label-bg-color);
       float: right;
       padding: 5px 13.5px 5px 13.5px;
-      color: #fff;
+      color: black;
       font-size: rem(14);
   }
 
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss
index 273144c69..e920d205a 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss
@@ -198,7 +198,7 @@ ion-item{
       /* font-size: 12px; */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
index cb2549b66..17bb8e5e6 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
@@ -71,7 +71,7 @@ ion-button{
       background: var(--label-bg-color);
       float: right;
       padding: 5px 13.5px 5px 13.5px;
-      color: #fff;
+      color: black;
       font-size: rem(14);
   }
 
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.scss b/src/app/pages/gabinete-digital/despachos/despachos.page.scss
index 9af2d194a..62af28fa0 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.scss
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.scss
@@ -177,7 +177,7 @@ ion-item{
       /* font-size: 12px; */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
index 931c581b2..df5a39020 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
@@ -137,7 +137,7 @@ ion-button{
       background: var(--label-bg-color);
       float: right;
       padding: 5px 13.5px 5px 13.5px;
-      color: #fff;
+      color: black;
       font-size: rem(14);
   }
 
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss
index 34a08d461..4d56b6331 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss
@@ -183,7 +183,7 @@ ion-item{
       /* font-size: rem(12); */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss
index c98ea15cc..12d6be55a 100644
--- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss
@@ -177,7 +177,7 @@ ion-item{
       /* font-size: 12px; */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss
index 5ae9a8021..8f8c0615c 100644
--- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss
@@ -124,7 +124,7 @@ ion-button{
       background: var(--label-bg-color);
       float: right;
       padding: 5px 13.5px 5px 13.5px;
-      color: #fff;
+      color: black;
       font-size: rem(14);
   }
 
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.scss b/src/app/pages/gabinete-digital/diplomas/diplomas.page.scss
index 40317712a..e9e427433 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.scss
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.scss
@@ -177,7 +177,7 @@ ion-item{
       /* font-size: 12px; */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
index 572617754..76682aa1a 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
@@ -195,39 +195,35 @@ export class ApproveEventModalPage implements OnInit {
 
     modal.onDidDismiss().then( async (res) => {
       if(res.data.option == 'save') { 
-        if(res.data.note !== '') {
-          let body = { 
-            "serialNumber": serialNumber, 
-            "action": "Emendar",
-            "dataFields": {
-              "ReviewUserComment": res.data,
-            }
+ 
+        let body = { 
+          "serialNumber": serialNumber, 
+          "action": "Emendar",
+          "dataFields": {
+            "ReviewUserComment": res.data,
           }
+        }
 
-          //
-          const loader = this.toastService.loading()
+        //
+        const loader = this.toastService.loading()
+        
+        try {
+          await this.processes.PostTaskAction(body).toPromise()
+          this.router.navigate(['/home/gabinete-digital/event-list']);
+          this.toastService._successMessage('Evento enviado para revisão');
+        } catch (error) {
+          if(error.status == 0) {
+            this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+          } else {
           
-          try {
-            await this.processes.PostTaskAction(body).toPromise()
-            this.router.navigate(['/home/gabinete-digital/event-list']);
-            this.toastService._successMessage('Evento enviado para revisão');
-          } catch (error) {
-            if(error.status == 0) {
-              this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
-            } else {
-            
-              this.toastService._badRequest('Evento não enviado para revisão');
-            }
-            this.router.navigate(['/home/gabinete-digital/event-list']);
-          }     
-          finally {
-            loader.remove()
+            this.toastService._badRequest('Evento não enviado para revisão');
           }
+          this.router.navigate(['/home/gabinete-digital/event-list']);
+        }     
+        finally {
+          loader.remove()
+        }
 
-        }
-        else {
-          this.toastService._badRequest('É necessário adicionar uma nota');
-        }
      }
     }, (error) => {
       console.log(error)
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
index a241a4a00..d7343c06a 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
@@ -190,37 +190,34 @@ export class ApproveEventPage implements OnInit {
       .then(async (res) => {
         
         if(res.data.option == 'save') { 
-          if (res.data !== '') {
-            let body = {
-              "serialNumber": serialNumber,
-              "action": "Emendar",
-              "dataFields": {
-                "ReviewUserComment": res.data,
-              }
+       
+          let body = {
+            "serialNumber": serialNumber,
+            "action": "Emendar",
+            "dataFields": {
+              "ReviewUserComment": res.data,
             }
-            
-
-            const loader = this.toastService.loading()
-
-            try {
-              await this.processes.PostTaskAction(body).toPromise()
-              .catch(() => {
-                
-                this.offlineManager.storeRequestData('event-listRever', body);
-              });
-              this.httpErrorHandle.httpsSucessMessagge('Rever')
-              this.TaskService.loadEventosParaAprovacao();
-              this.goBack();
-            } catch (error) {
-              this.httpErrorHandle.httpStatusHandle(error)
-            } finally {
-              loader.remove()
-            }
-
           }
-          else {
-            this.toastService._badRequest('É necessário adicionar uma nota');
+          
+
+          const loader = this.toastService.loading()
+
+          try {
+            await this.processes.PostTaskAction(body).toPromise()
+            .catch(() => {
+              
+              this.offlineManager.storeRequestData('event-listRever', body);
+            });
+            this.httpErrorHandle.httpsSucessMessagge('Rever')
+            this.TaskService.loadEventosParaAprovacao();
+            this.goBack();
+          } catch (error) {
+            this.httpErrorHandle.httpStatusHandle(error)
+          } finally {
+            loader.remove()
           }
+
+     
         }
       }, (error) => {
         console.log(error)
@@ -307,33 +304,30 @@ export class ApproveEventPage implements OnInit {
     modal.onDidDismiss().then(async (res) => {
       
       if(res.data.option == 'save') {
-        if (res.data.note !== '') {
-          let body = {
-            "serialNumber": serialNumber,
-            "action": "Emendar",
-            "dataFields": {
-              "ReviewUserComment": res.data,
-            }
+       
+        let body = {
+          "serialNumber": serialNumber,
+          "action": "Emendar",
+          "dataFields": {
+            "ReviewUserComment": res.data,
           }
-          
-  
-          const loader = this.toastService.loading()
-  
-          try {
-            await this.processes.PostTaskAction(body).toPromise();
-            this.goBack();
-            this.httpErrorHandle.httpsSucessMessagge('Rever')
-            this.TaskService.loadEventosParaAprovacao();
-          } catch (error) {
-            this.httpErrorHandle.httpStatusHandle(error)
-          } finally {
-            loader.remove()
-          }
-  
         }
-        else {
-          this.toastService._badRequest('É necessário adicionar uma nota');
+        
+
+        const loader = this.toastService.loading()
+
+        try {
+          await this.processes.PostTaskAction(body).toPromise();
+          this.goBack();
+          this.httpErrorHandle.httpsSucessMessagge('Rever')
+          this.TaskService.loadEventosParaAprovacao();
+        } catch (error) {
+          this.httpErrorHandle.httpStatusHandle(error)
+        } finally {
+          loader.remove()
         }
+
+  
       } else {
 
       }
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
index f43435ef9..7834c4878 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
@@ -103,7 +103,7 @@ ion-button{
       background: var(--label-bg-color);
       float: right;
       padding: 5px 13.5px 5px 13.5px;
-      color: #fff;
+      color: black;
       font-size: rem(14);
   }
 
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.scss b/src/app/pages/gabinete-digital/expediente/expediente.page.scss
index 65eb18af1..ea80faa0b 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.scss
@@ -173,7 +173,7 @@ ion-item{
       /*font-size: rem(12);
       */float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
       -webkit-border-radius: 15px;
       -moz-border-radius: 15px;
       -ms-border-radius: 15px;
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss
index 7eb4236d3..03768d15b 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss
@@ -102,7 +102,7 @@ ion-button{
       background: var(--label-bg-color);
       float: right;
       padding: 5px 13.5px 5px 13.5px;
-      color: #fff;
+      color: black;
       font-size: rem(14);
   }
 
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss
index 400a3d7be..824220758 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss
@@ -176,7 +176,7 @@ ion-item{
       /* font-size: 12px; */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
index b9229b099..760d40f48 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
@@ -396,7 +396,7 @@ ion-list {
           font-size: rem(12);
           float: right;
           padding: 2.5px 13.5px 2.5px 13.5px;
-          color: #fff;
+          color: black;
         }
       }
 
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
index 9c0983be6..24006f8a5 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
@@ -68,7 +68,7 @@ ion-button{
       background: var(--label-bg-color);
       float: right;
       padding: 5px 13.5px 5px 13.5px;
-      color: #fff;
+      color: black;
       font-size: rem(14);
   }
 
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.scss b/src/app/pages/gabinete-digital/pedidos/pedidos.page.scss
index efce40ae7..1b0caac3e 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.scss
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.scss
@@ -174,7 +174,7 @@ ion-item{
       /* font-size: rem(12); */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss b/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss
index 0effba5f3..8a0074db0 100644
--- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss
+++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss
@@ -172,7 +172,7 @@ ion-item{
       /* font-size: 12px; */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 43dec8c9e..2faa4d05d 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -19,6 +19,8 @@ import { Platform } from '@ionic/angular';
 import { FirstEnterService } from '../../services/first-enter.service';
 import { Storage } from '@ionic/storage';
 import { CPSession } from 'src/app/store/documentManagement';
+import { StorageService } from 'src/app/services/storage.service';
+
 @Component({
   selector: 'app-login',
   templateUrl: './login.page.html',
@@ -55,6 +57,7 @@ export class LoginPage implements OnInit {
     private platform: Platform,
     private FirstEnterService: FirstEnterService,
     private storage:Storage,
+    private storageService: StorageService,
   ) {}
 
   ngOnInit() {}
@@ -140,7 +143,8 @@ export class LoginPage implements OnInit {
             }
             
             this.changeProfileService.runLogin();
-           /*  this.getToken(); */
+            
+            this.getToken();
             SessionStore.setInativity(true);
 
             this.goback();
@@ -169,7 +173,7 @@ export class LoginPage implements OnInit {
               this.ChatService.setheader();
               this.ChatSystemService.loadChat();
             }
-
+            this.storageService.remove("Notifications")
              this.getToken();
 
             if(!this.platform.is('desktop') && !this.platform.is('mobileweb')) {
diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html
index 1834588e7..f9a0d1615 100644
--- a/src/app/pages/publications/publications.page.html
+++ b/src/app/pages/publications/publications.page.html
@@ -194,8 +194,8 @@
         *ngIf="desktopComponent.showAddNewPublication"
         class="height-100 d-flex flex-column overflow-hidden background-white flex-grow-1"
         [publicationType]="publicationType"
-        [publication]="publication"
         [folderId]="folderId"
+        [documentId]="documentId"
 
         (closeDesktopComponent)="closeDesktopComponent($event)"
         (goBacktoPublicationDetails)="goBacktoPublicationDetails()"
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 6ad6125a2..fe2c21fbb 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -48,6 +48,7 @@ export class PublicationsPage implements OnInit {
   }
 
   folderId: string;
+  documentId: any
   // data set from child component
   publicationType: any;
   publicationId: string;
@@ -386,6 +387,7 @@ export class PublicationsPage implements OnInit {
     }
 
     this.publication = publication;
+    this.documentId = publication?.DocumentId
     this.desktopComponent.showAddNewPublication = true;
   }
 
diff --git a/src/app/pages/publications/view-publications/view-publications.page.html b/src/app/pages/publications/view-publications/view-publications.page.html
index 71fb347f1..f99f84fb1 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.html
+++ b/src/app/pages/publications/view-publications/view-publications.page.html
@@ -39,7 +39,7 @@
         <div  class="post-img">
           <img [lazyLoad]="publication.FileBase64">
         </div>
-        <div class="post-content px-20">
+        <div class="post-content">
           <div class="post-title-time">
             <div class="post-title font-15-em">
               <ion-label>{{publication.Title}}</ion-label>
diff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts
index 6201dad59..4673ecb8d 100644
--- a/src/app/services/agenda/list-box.service.ts
+++ b/src/app/services/agenda/list-box.service.ts
@@ -72,8 +72,6 @@ export class ListBoxService {
 				endTime: event.end
 			})
 
-		
-			
 			const day = this.dateService.getDay(event.start) 
 			
 			event['manyDays'] = !this.dateService.isSameDate(event.start, event.end)
@@ -89,11 +87,10 @@ export class ListBoxService {
 			if (this.dateService.notSameDate(startDate, endDate)) {
 
 
-
-				if (diffDays <= 150 && !event.event.IsAllDayEvent ) {
+				if (diffDays <= 150 ) {
 
 					if (diffDays >= 1) {
-						
+
 						const StartEvent =  this.transForm(event, {startMany: true, endMany: false,	middle: false})
 						
 						if(this.CanPush(event, selectedDate)) days[day].push(StartEvent)
@@ -138,7 +135,6 @@ export class ListBoxService {
 						if(this.CanPush(event, selectedDate)) days[day].push(event)
 					}
 				} else {
-
 					if(this.CanPush(event, selectedDate)) days[day].push(event)
 				}
 			} else {
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index a1b6ab1e4..c9343aaff 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -698,4 +698,13 @@ export class MessageService {
     } catch (error) {}
 	}
 
+
+
+  UIdata() {
+    this.incomingFromCurrentUser = this.u.username!= SessionStore.user.UserName
+   this.hasMessage =  this.msg !=''
+  }
+
+  incomingFromCurrentUser = false
+  hasMessage = false
 }
diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts
index 589595ac2..88fdb6bcf 100644
--- a/src/app/services/events.service.ts
+++ b/src/app/services/events.service.ts
@@ -851,12 +851,22 @@ export class EventsService {
     const puturl = environment.apiURL + 'calendar/PutEvent';
     let params = new HttpParams();
 
+    // event.Organizer = {
+    //   "Id": SessionStore.user.UserId,
+    //   "EmailAddress": SessionStore.user.Email,
+    //   "Name": SessionStore.user.UserName,
+    //   "IsRequired": true,
+    //   "UserType": "GD"
+    // }
+    // params = params.set("notifyUsers", true)
+
     params = params.set("conflictResolutionMode", conflictResolutionMode.toString());
     params = params.set("sendInvitationsOrCancellationsMode", sendInvitationsOrCancellationsMode.toString());
     params.set('CalendarId', event.CalendarId)
     params.set('CalendarName', event.CalendarName)
     this.headers['CalendarId'] = event.CalendarId
     this.headers['CalendarName'] = event.CalendarName
+    //params = params.set("CalendarName", event.CalendarName);
 
     if (event.CalendarName == 'Oficial') {
       if (SessionStore.user.Profile == 'MDGPR') {
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts
index aa69e0fb3..dec1f2a5a 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.ts
+++ b/src/app/shared/agenda/approve-event/approve-event.page.ts
@@ -196,33 +196,26 @@ export class ApproveEventPage implements OnInit {
       if(res.data.option == 'save') { 
 
       
-        if(res.data.note !== '') {
-          let body = { "serialNumber": serialNumber,
-          "action": "Emendar",
-              "dataFields": {
-              "ReviewUserComment": res.data,
-            }
-          }
-          
-          const loader = this.toastService.loading();
 
-          try {
-            await this.processes.PostTaskAction(body).toPromise();
-            this.httpErroHandle.httpsSucessMessagge('Rever')
-            this.TaskService.loadEventosParaAprovacao();
-            this.close();
-          } catch (error) {
-            this.httpErroHandle.httpStatusHandle(error)
-          }  finally {
-            loader.remove()
-          }
-        }
-        else {
-          if(res.data.option == 'save') {
-            this.toastService._badRequest('É necessário adicionar uma nota');
+        let body = { "serialNumber": serialNumber,
+        "action": "Emendar",
+            "dataFields": {
+            "ReviewUserComment": res.data,
           }
         }
+        
+        const loader = this.toastService.loading();
 
+        try {
+          await this.processes.PostTaskAction(body).toPromise();
+          this.httpErroHandle.httpsSucessMessagge('Rever')
+          this.TaskService.loadEventosParaAprovacao();
+          this.close();
+        } catch (error) {
+          this.httpErroHandle.httpStatusHandle(error)
+        }  finally {
+          loader.remove()
+        }
         
       } else {
         
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index f09361839..a54507ade 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -435,15 +435,14 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
       if (recordData?.value?.recordDataBase64.includes('data:audio')) {
         this.audioRecorded = recordData?.value?.recordDataBase64;
       }
-      else if(recordData?.value?.mimeType && recordData?.value?.recordDataBase64) {
+      else if (recordData?.value?.mimeType && recordData?.value?.recordDataBase64) {
         this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`;
       }
 
-
       //Converting base64 to blob
       const encodedData = btoa(this.audioRecorded);
       const blob = this.fileService.base64toBlob(encodedData, recordData.value.mimeType)
-      
+
       const formData = new FormData();
       formData.append("blobFile", blob);
 
@@ -460,7 +459,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
         }],
         temporaryData: formData,
         attachmentsModelData: {
-          fileBase64: await this.fileService.blobToBase64(blob),
+          fileBase64: encodedData,
         }
       })
 
@@ -748,22 +747,39 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
         "title_link_download": false,
       }],
       attachmentsModelData: {
-        fileBase64: await this.fileService.blobToBase64(blob),
+        fileBase64: base64,
       }
     })
 
   }
 
   async takePicture() {
+    // const roomId = this.roomId
+
+    // const image = await this.CameraService.takePicture();
+    // await this.fileService.saveImage(image)
+    // const lastphoto: any = await this.fileService.loadFiles();
+    // const { capturedImage, capturedImageTitle } = await this.fileService.loadFileData(lastphoto);
+
+    // const base64 = await fetch(capturedImage);
+    // const blob = await base64.blob();
+    // const formData = new FormData();
+    // formData.append("blobFile", blob);
+
     const roomId = this.roomId
 
-    const image = await this.CameraService.takePicture();
-    await this.fileService.saveImage(image)
-    const lastphoto: any = await this.fileService.loadFiles();
-    const { capturedImage, capturedImageTitle } = await this.fileService.loadFileData(lastphoto);
+    const file = await Camera.getPhoto({
+      quality: 90,
+      // allowEditing: true,
+      resultType: CameraResultType.Base64,
+      source: CameraSource.Camera
+    });
+
+    const imageBase64 = 'data:image/jpeg;base64,' + file.base64String
+    const blob = this.dataURItoBlob(imageBase64)
+
+    console.log(imageBase64)
 
-    const base64 = await fetch(capturedImage);
-    const blob = await base64.blob();
     const formData = new FormData();
     formData.append("blobFile", blob);
 
@@ -773,13 +789,13 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
         "guid": ''
       },
       attachments: [{
-        "title": capturedImageTitle,
+        "title": 'file.jpg',
         "text": "description",
         "title_link_download": false,
       }],
       temporaryData: formData,
       attachmentsModelData: {
-        fileBase64: await this.fileService.blobToBase64(blob),
+        fileBase64: imageBase64,
       }
     })
 
@@ -847,14 +863,13 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
       quality: 90,
       // allowEditing: true,
       resultType: CameraResultType.Base64,
-      source: CameraSource.Photos
+      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();
+    const imageBase64 = 'data:image/jpeg;base64,' + file.base64String
+    const blob = this.dataURItoBlob(imageBase64)
+
+    console.log(imageBase64)
 
     const formData = new FormData();
     formData.append("blobFile", blob);
@@ -872,7 +887,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
         "title_link_download": false,
       }],
       attachmentsModelData: {
-        fileBase64: await this.fileService.blobToBase64(blob),
+        fileBase64: imageBase64,
       }
     })
 
@@ -884,6 +899,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     const roomId = this.roomId
 
     const file: any = await this.fileService.getFileFromDevice(types);
+
     
 
     if (file.type != "application/img" && file.type != "image/png" && file.type != "image/jpeg" && file.type != "image/gif") {
@@ -894,8 +910,10 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
       const blob = this.fileService.base64toBlob(encodedData, file.type)
       
 
+      const fileBase64 = await this._getBase64(file)
+
       const formData = new FormData();
-      formData.append("blobFile", blob);
+      formData.append('blobFile', blob);
 
       this.ChatSystemService.getGroupRoom(roomId).send({
         file: {
@@ -911,7 +929,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
         }],
         temporaryData: formData,
         attachmentsModelData: {
-          fileBase64: await this.fileService.blobToBase64(blob),
+          fileBase64: fileBase64,
         }
       })
 
@@ -1170,5 +1188,45 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     });
   }
 
+  dataURItoBlob(dataURI) {
+    // convert base64 to raw binary data held in a string
+    // doesn't handle URLEncoded DataURIs - see SO answer #6850276 for code that does this
+    var byteString = atob(dataURI.split(',')[1]);
+  
+    // separate out the mime component
+    var mimeString = dataURI.split(',')[0].split(':')[1].split(';')[0]
+  
+    // write the bytes of the string to an ArrayBuffer
+    var ab = new ArrayBuffer(byteString.length);
+  
+    // create a view into the buffer
+    var ia = new Uint8Array(ab);
+  
+    // set the bytes of the buffer to the correct values
+    for (var i = 0; i < byteString.length; i++) {
+        ia[i] = byteString.charCodeAt(i);
+    }
+  
+    // write the ArrayBuffer to a blob, and you're done
+    var blob = new Blob([ab], {type: mimeString});
+    return blob;
+  
+  }
+
+
+
+  _getBase64(file) {
+    return new Promise((resolve, reject)=>{
+      var reader = new FileReader();
+      reader.readAsDataURL(file);
+      reader.onload = function () {
+        resolve(reader.result)
+      };
+      reader.onerror = function (error) {
+        console.log('Error: ', error);
+      };
+    })
+ }
+
 }
 
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index b3263c6ad..ee1447331 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -676,7 +676,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
         "title_link_download": false,
       }],
       attachmentsModelData: {
-        fileBase64: await this.fileService.blobToBase64(blob),
+        fileBase64: base64,
       }
     })
 
@@ -686,13 +686,18 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
     const roomId = this.roomId
 
-    const image = await this.CameraService.takePicture();
-    await this.fileService.saveImage(image);
-    const lastphoto: any = await this.fileService.loadFiles();
-    const { capturedImage, capturedImageTitle } = await this.fileService.loadFileData(lastphoto);
-    const base64 = await fetch(capturedImage);
+    const file = await Camera.getPhoto({
+      quality: 90,
+      // allowEditing: true,
+      resultType: CameraResultType.Base64,
+      source: CameraSource.Camera
+    });
+
+    const imageBase64 = 'data:image/jpeg;base64,' + file.base64String
+    const blob = this.dataURItoBlob(imageBase64)
+
+    console.log(imageBase64)
 
-    const blob = await base64.blob();
     const formData = new FormData();
     formData.append("blobFile", blob);
 
@@ -704,13 +709,12 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       },
       temporaryData: formData,
       attachments: [{
-        "title": capturedImageTitle,
-        "image_url": capturedImage,
+        "title": "file.jpg",
         "text": "description",
         "title_link_download": false,
       }],
       attachmentsModelData: {
-        fileBase64: await this.fileService.blobToBase64(blob),
+        fileBase64: imageBase64,
       }
     })
 
@@ -795,6 +799,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     const response = await fetch(base64);
     const blob = await response.blob();
 
+    console.log(base64)
+
     const formData = new FormData();
     formData.append("blobFile", blob);
 
@@ -811,7 +817,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
         "title_link_download": false,
       }],
       attachmentsModelData: {
-        fileBase64: await this.fileService.blobToBase64(blob),
+        fileBase64: base64,
       }
     })
 
@@ -826,6 +832,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     const file: any = await this.fileService.getFileFromDevice(types);
 
 
+
     if (file.type != "application/img" && file.type != "image/png" && file.type != "image/jpeg" && file.type != "image/gif") {
 
       const encodedData = btoa(JSON.stringify(await this.getBase64(file).catch ((error) => {
@@ -833,9 +840,11 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       })));
       const blob = this.fileService.base64toBlob(encodedData, file.type)
 
+      const fileBase64 = await this._getBase64(file)
 
       const formData = new FormData();
-      formData.append("blobFile", blob);
+      formData.append('blobFile', blob);
+
 
       this.ChatSystemService.getDmRoom(roomId).send({
         file: {
@@ -851,7 +860,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
         }],
         temporaryData: formData,
         attachmentsModelData: {
-          fileBase64: await this.fileService.blobToBase64(blob),
+          fileBase64: fileBase64,
         }
       })
 
@@ -862,6 +871,18 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
   }
 
+  _getBase64(file) {
+    return new Promise((resolve, reject)=>{
+      var reader = new FileReader();
+      reader.readAsDataURL(file);
+      reader.onload = function () {
+        resolve(reader.result)
+      };
+      reader.onerror = function (error) {
+        console.log('Error: ', error);
+      };
+    })
+ }
   getFileReader(): FileReader {
     const fileReader = new FileReader();
     const zoneOriginalInstance = (fileReader as any)["__zone_symbol__originalInstance"];
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss
index a2c957e95..2f5182f82 100644
--- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss
+++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss
@@ -179,7 +179,7 @@ ion-item{
       /* font-size: rem(12); */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss
index 519f9804e..799c47275 100644
--- a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss
+++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss
@@ -181,7 +181,7 @@ ion-item{
       /* font-size: rem(12); */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
index 5d56820c6..abc4123d5 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
@@ -166,7 +166,7 @@
       /* font-size: 12px; */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss
index dea40fd19..af5483311 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss
@@ -102,7 +102,7 @@ ion-item{
       //font-size: 12px;
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.scss b/src/app/shared/gabinete-digital/expedients/expedients.page.scss
index 3274bc526..c5a08f3ea 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.scss
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.scss
@@ -102,7 +102,7 @@ ion-item{
       //font-size: 12px;
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.scss b/src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.scss
index 7c4765356..c70ef9556 100644
--- a/src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.scss
+++ b/src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.scss
@@ -72,7 +72,7 @@ ion-button{
       background: var(--label-bg-color);
       float: right;
       padding: 5px 13.5px 5px 13.5px;
-      color: #fff;
+      color: black;
       font-size: rem(14);
   }
 
diff --git a/src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.page.scss b/src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.page.scss
index 7c4765356..c70ef9556 100644
--- a/src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.page.scss
+++ b/src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.page.scss
@@ -72,7 +72,7 @@ ion-button{
       background: var(--label-bg-color);
       float: right;
       padding: 5px 13.5px 5px 13.5px;
-      color: #fff;
+      color: black;
       font-size: rem(14);
   }
 
diff --git a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss
index 5c08d1d8e..daaaf2299 100644
--- a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss
+++ b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss
@@ -77,7 +77,7 @@ ion-button{
       background: var(--label-bg-color);
       float: right;
       padding: 5px 13.5px 5px 13.5px;
-      color: #fff;
+      color: black;
       font-size: rem(14);
   }
 
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss b/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
index f5dcb9f2b..02f1e93f2 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
@@ -169,7 +169,7 @@ ion-item{
       /* font-size: 12px; */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.scss b/src/app/shared/gabinete-digital/pendentes/pendentes.page.scss
index 1d652537a..8752d7ce3 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.scss
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.scss
@@ -164,7 +164,7 @@ ion-item{
       /* font-size: 12px; */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html
index ff1646344..08a33ca51 100644
--- a/src/app/shared/header/header.page.html
+++ b/src/app/shared/header/header.page.html
@@ -47,14 +47,25 @@
         <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon font-45-em" src='assets/images/icons-profile.svg'></ion-icon>
         <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon font-45-em" src='assets/images/theme/gov/icons-profile.svg'></ion-icon> -->
 
-        <img *ngIf="loggeduser.RoleDescription == 'Presidente da República' " class="icon font-45-em"
-          src='assets/images/presidente.png'>
-        <img *ngIf="loggeduser.RoleDescription == 'Ministro e Director do Gabinete do PR' " class="icon font-45-em"
-          src='assets/images/ministro.png'>
-        <img *ngIf="loggeduser.RoleDescription == 'Secretário Geral' " class="icon font-45-em"
-          src='assets/images/secretaria_geral.png'>
+        <div *ngIf="profilePicture == ''" class="profile-image">
+          <img *ngIf="loggeduser.RoleDescription == 'Presidente da República' " class="profile-image"
+            src='assets/images/presidente.png'>
+          <img *ngIf="loggeduser.RoleDescription == 'Ministro e Director do Gabinete do PR' " class="profile-image"
+            src='assets/images/ministro.png'>
+          <img *ngIf="loggeduser.RoleDescription == 'Secretário Geral' " class="profile-image"
+            src='assets/images/secretaria_geral.png'>
+
+          <ion-icon
+            *ngIf="loggeduser.RoleDescription != 'Presidente da República'&& loggeduser.RoleDescription != 'Ministro e Director do Gabinete do PR' && loggeduser.RoleDescription != 'Secretário Geral' "
+            class="icon font-45-em" src='assets/images/theme/gov/icons-profile.svg'></ion-icon>
+        </div>
+
+
+        <div *ngIf="profilePicture != ''" class="profile-image">
+          <img class="profile-image" src={{profilePicture}}>
+        </div>
+
 
-          <ion-icon *ngIf="loggeduser.RoleDescription != 'Presidente da República'&& loggeduser.RoleDescription != 'Ministro e Director do Gabinete do PR' && loggeduser.RoleDescription != 'Secretário Geral' " class="icon font-45-em" src='assets/images/theme/gov/icons-profile.svg'></ion-icon>
 
         <div class="profile-text">
           <div *ngIf="notificationLength > 0" class="icon-badge" style="right: -6px;top: 38px;top: -6px;">
@@ -200,16 +211,23 @@
             <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt'  " class="icon" src='assets/images/theme/doneIt/icons-profile.svg'></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon" src='assets/images/theme/gov/icons-profile.svg'></ion-icon> -->
 
+            <div *ngIf="profilePicture == ''" class="profile-image">
+              <img *ngIf="loggeduser.RoleDescription == 'Presidente da República' " class="profile-image"
+                src='assets/images/presidente.png'>
+              <img *ngIf="loggeduser.RoleDescription == 'Ministro e Director do Gabinete do PR' " class="profile-image"
+                src='assets/images/ministro.png'>
+              <img *ngIf="loggeduser.RoleDescription == 'Secretário Geral' " class="profile-image"
+                src='assets/images/secretaria_geral.png'>
 
-            <img *ngIf="loggeduser.RoleDescription == 'Presidente da República' " class="profile-image"
-              src='assets/images/presidente.png'>
-            <img *ngIf="loggeduser.RoleDescription == 'Ministro e Director do Gabinete do PR' " class="profile-image"
-              src='assets/images/ministro.png'>
-            <img *ngIf="loggeduser.RoleDescription == 'Secretário Geral' " class="profile-image"
-              src='assets/images/secretaria_geral.png'>
+              <ion-icon
+                *ngIf="loggeduser.RoleDescription != 'Presidente da República'&& loggeduser.RoleDescription != 'Ministro e Director do Gabinete do PR' && loggeduser.RoleDescription != 'Secretário Geral' "
+                class="icon" src='assets/images/theme/gov/icons-profile.svg'></ion-icon>
+            </div>
 
-              <ion-icon *ngIf="loggeduser.RoleDescription != 'Presidente da República'&& loggeduser.RoleDescription != 'Ministro e Director do Gabinete do PR' && loggeduser.RoleDescription != 'Secretário Geral' " class="icon" src='assets/images/theme/gov/icons-profile.svg'></ion-icon>
 
+            <div *ngIf="profilePicture != ''" class="profile-image">
+              <img class="profile-image" src={{profilePicture}}>
+            </div>
 
             <div class="profile-text">
               <div *ngIf="notificationLength > 0" class="icon-badge" style="right: -6px;top: 38px;top: -6px;">
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts
index 040e778cb..0af966ca9 100644
--- a/src/app/shared/header/header.page.ts
+++ b/src/app/shared/header/header.page.ts
@@ -38,6 +38,7 @@ export class HeaderPage implements OnInit {
   showProfileModal = false
   permissionList = new PermissionList();
   notificationCount: number = 0;
+  profilePicture = "";
 
 
   constructor(
@@ -52,7 +53,8 @@ export class HeaderPage implements OnInit {
     private eventTriger: EventTrigger,
     public ActiveTabService: ActiveTabService,
     private notificationService: NotificationsService,
-    private cdRef: ChangeDetectorRef
+    private cdRef: ChangeDetectorRef,
+    private storageService: StorageService,
   ) {
     this.loggeduser = SessionStore.user;
     router.events.subscribe((val) => {
@@ -76,9 +78,19 @@ export class HeaderPage implements OnInit {
   async ngOnInit() {
     this.hideSearch();
     this.notificationLengthData();
+    this.getProfilpicture();
 
   }
 
+  getProfilpicture() {
+    this.storageService.get(this.SessionStore.user.RoleID.toString()).then((picture) => {
+      console.log(picture)
+      this.profilePicture = picture
+    }).catch((error ) => {
+      this.profilePicture = "";
+    })
+  }
+
   updateReciveNotification() {
     this.eventTriger.getObservable().subscribe((event) => {
       if (event.notification == "recive") {
diff --git a/src/app/shared/publication/new-publication/new-publication.page.html b/src/app/shared/publication/new-publication/new-publication.page.html
index c56c31771..b68341348 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.html
+++ b/src/app/shared/publication/new-publication/new-publication.page.html
@@ -12,6 +12,7 @@
 
 <ion-content>
 <div class="content-container">
+  <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
 
   <div  *ngIf="publicationType!='1'" class="ion-item-container" [class.input-error]="Form?.get('Subject')?.invalid && validateFrom ">
     <ion-input autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="pub.Title" name="title" placeholder="Título*" ></ion-input>
@@ -29,6 +30,11 @@
   </div>
 
 
+  <!-- <div *ngIf="publication">
+    OriginalFileName: {{ publication.OriginalFileName }}
+  </div> -->
+  
+
   <!-- Captured -->
   <div class="ion-item-container-no-border" *ngIf="capturedImage">
     <ion-label class="attached-title pb-10">Fotografia Anexada</ion-label>
diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts
index 90de00092..a642281fa 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.ts
+++ b/src/app/shared/publication/new-publication/new-publication.page.ts
@@ -32,6 +32,7 @@ export class NewPublicationPage implements OnInit {
   @Input() publication!: Publication;
   @Input() publicationType: string;
   @Input() folderId:string;
+  @Input() documentId:string;
 
   @Output() closeDesktopComponent =  new EventEmitter<any>();
   @Output() openPublicationDetails = new EventEmitter<any>();
@@ -64,16 +65,45 @@ export class NewPublicationPage implements OnInit {
 
 
   setData() {
-    if(!this.publication) {
+    if(!this.publicationType) {
       setTimeout(() => {
         this.setData()
       }, 500)
     } else {
-      this.pub = this.publication
+      // this.pub = this.publication
+      // this.publication = null
+      this.getPublicationDetail()
     }
   }
 
 
+  getPublicationDetail() {
+
+    if(this.publicationType != '2') { 
+      this.showLoader = true;
+      this.publications.GetPublicationById(this.documentId).subscribe( res => {
+        this.publication = {
+          DateIndex: res.DateIndex,
+          DocumentId: res.DocumentId,
+          ProcessId:res.ProcessId,
+          Title:res.Title,
+          Message: res.Message,
+          DatePublication: res.DatePublication,
+          FileBase64: "data:image/jpg;base64," + res.FileBase64,
+          OriginalFileName: res.OriginalFileName,
+          FileExtension: res.FileExtension,
+        }
+        this.pub = this.publication;
+        this.showLoader = false;
+      }, () => {
+        this.showLoader = false;
+        this.goBack()     
+      });
+    }
+
+
+  }
+
   async takePicture() {
     const capturedImage = await Camera.getPhoto({
       quality: 50,
@@ -150,6 +180,16 @@ export class NewPublicationPage implements OnInit {
     }
 
     if(this.publicationType == '3') {
+
+      if(!this.publication?.OriginalFileName || !this.pub.OriginalFileName) {
+        
+        if(this.pub?.OriginalFileName) {
+          console.log('this.pub',this.pub)
+        }
+        throw('no this.publication.OriginalFileName')
+        
+      }
+      
       const loader = this.toastService.loading()
 
       if(this.capturedImage != '') {
diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html
index c2bfb2b33..9242bb39d 100644
--- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html
+++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html
@@ -10,6 +10,7 @@
       <p class="post-data">{{publication.DatePublication | date: 'dd-MM-yyyy | h:mm'}}</p>
     </div>
   </div>
+  <!-- OriginalFileName: {{ publication.OriginalFileName }} -->
   <div *ngIf="publication.Title == ''" class="title-contentd-flex pl-20 pt-25">
     <div class="back-icon cursor-pointer">
       <ion-icon  (click)="goBack()" slot="end" src='assets/images/assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
index 971d9ea34..9e5919de0 100644
--- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
+++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
@@ -70,10 +70,13 @@ export class PublicationDetailPage implements OnInit {
     const localPublication = this.publicationFolderService.getLocalPublication(folderId, this.publicationId);
 
     if(localPublication?.ProcessId) {
+      console.log('console.log local storage')
   
       this.publication = localPublication
 
     } else {
+
+      console.log('API res')
           
       this.showLoader = true;
       this.publications.GetPublicationById(this.publicationId).subscribe(res => {
diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html
index c536289f6..83c670c64 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.html
+++ b/src/app/shared/publication/view-publications/view-publications.page.html
@@ -43,7 +43,7 @@
         <div  class="post-img">
           <img [lazyLoad]="publication.FileBase64">
         </div>
-        <div class="post-content px-20">
+        <div class="post-content">
           <div class="post-title-time">
             <div class="post-title">
               <ion-label>{{publication.Title}}</ion-label>
diff --git a/src/global.scss b/src/global.scss
index b756dd52a..a3ff1b1a5 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -257,7 +257,6 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
 } */
 
 .calendar-container{
-    height: 333px;
     z-index: 10;
     transition: 0.5s;
     overflow-y: hidden;
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index 29fb1618f..50e56fda6 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -648,7 +648,7 @@ $app-theme: mat-light-theme(
     font-size: rem(12);
     float: right;
     padding: 2.5px 13.5px 2.5px 13.5px;
-    color: #fff;
+    color: black;
   }
 }
 
diff --git a/tsconfig.json b/tsconfig.json
index 17534677a..7d035ff1f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -24,5 +24,10 @@
     "fullTemplateTypeCheck": true,
     "strictInjectionParameters": true
   },
-  "esModuleInterop": true
+  "esModuleInterop": true,
+  "exclude": [
+    "src/models",
+    "src/sql",
+    "src/connection",
+  ]
 }
\ No newline at end of file
diff --git a/version/git-version.ts b/version/git-version.ts
index a864edb64..42503e6cf 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "8525fcb8f",
-  "SHA": "8525fcb8f6be35b1ef298bf82482c8179de1fe1b",
+  "shortSHA": "1f2d76d89",
+  "SHA": "1f2d76d8955bd430aba5094d9b567428bf8600aa",
   "branch": "developer-prod",
   "lastCommitAuthor": "'Eudes Inácio'",
-  "lastCommitTime": "'Mon Aug 28 16:36:31 2023 +0100'",
-  "lastCommitMessage": "compress image of publications and chat",
-  "lastCommitNumber": "5220",
+  "lastCommitTime": "'Mon Aug 28 17:28:09 2023 +0100'",
+  "lastCommitMessage": "profile picture click added",
+  "lastCommitNumber": "5221",
   "change": "",
-  "changeStatus": "On branch developer-prod\nYour branch is ahead of 'origin/developer-prod' by 13 commits.\n  (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/profile/edit-profile/edit-profile.page.html\n\tmodified:   src/app/modals/profile/edit-profile/edit-profile.page.ts",
+  "changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 5 and 8 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   .gitignore\n\tmodified:   src/app/modals/document-detail/document-detail.page.scss\n\tmodified:   src/app/modals/profile/edit-profile/edit-profile.page.html\n\tmodified:   src/app/modals/profile/edit-profile/edit-profile.page.ts\n\tmodified:   src/app/modals/profile/profile.page.html\n\tmodified:   src/app/modals/profile/profile.page.ts\n\tmodified:   src/app/modals/view-event/view-event.page.scss\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/agenda/agenda.page.scss\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts\n\tmodified:   src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts\n\tmodified:   src/app/pages/agenda/view-event/view-event.page.scss\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss\n\tmodified:   src/app/pages/gabinete-digital/despachos/despachos.page.scss\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diplomas.page.scss\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente.page.scss\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.scss\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedidos.page.scss\n\tmodified:   src/app/pages/gabinete-digital/pendentes/pendentes.page.scss\n\tmodified:   src/app/pages/login/login.page.ts\n\tmodified:   src/app/pages/publications/publications.page.html\n\tmodified:   src/app/pages/publications/publications.page.ts\n\tmodified:   src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified:   src/app/services/agenda/list-box.service.ts\n\tmodified:   src/app/services/chat/message.service.ts\n\tmodified:   src/app/services/events.service.ts\n\tmodified:   src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified:   src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified:   src/app/shared/chat/messages/messages.page.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss\n\tmodified:   src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss\n\tmodified:   src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss\n\tmodified:   src/app/shared/gabinete-digital/expedients/expedients.page.scss\n\tmodified:   src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.scss\n\tmodified:   src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.page.scss\n\tmodified:   src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss\n\tmodified:   src/app/shared/gabinete-digital/pedidos/pedidos.page.scss\n\tmodified:   src/app/shared/gabinete-digital/pendentes/pendentes.page.scss\n\tmodified:   src/app/shared/header/header.page.html\n\tmodified:   src/app/shared/header/header.page.ts\n\tmodified:   src/app/shared/publication/new-publication/new-publication.page.html\n\tmodified:   src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified:   src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html\n\tmodified:   src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified:   src/app/shared/publication/view-publications/view-publications.page.html\n\tmodified:   src/global.scss\n\tmodified:   src/theme/variables.scss\n\tmodified:   tsconfig.json\n\tmodified:   workspace.code-workspace",
   "changeAuthor": "eudes.inacio"
 }
\ No newline at end of file
diff --git a/workspace.code-workspace b/workspace.code-workspace
index e238bd67d..07d71037b 100644
--- a/workspace.code-workspace
+++ b/workspace.code-workspace
@@ -2,14 +2,12 @@
     "folders": [
 		{
 			"path": "."
-		},
-		{
-			"path": "..\\powercon"
 		}
 	],
     "settings": {
         "cSpell.words": [
             "Chatmessage"
-        ]
+		],
+		"nuxt.isNuxtApp": false
     }
 }
\ No newline at end of file