Merge made with Peter changes

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

@@ -42,17 +42,18 @@ export class EventListPage implements OnInit {
     public eventService: EventsService,
     ) {
       this.loggeduser = SessionStore.user;
+
+      if(!this.segment) {
+        if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
+          this.segment = 'Meu calendario';
+        } else {
+          this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
+        }
+      }
   }
 
   ngOnInit() {
 
-    if(!this.segment) {
-      if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
-        this.segment = 'Meu calendario';
-      } else {
-        this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
-      }
-    }
     const pathname = window.location.pathname
 
     this.router.events.forEach((event) => {
@@ -103,7 +104,7 @@ export class EventListPage implements OnInit {
 
       this.color = 'pr'
 
-      let allEvents = await this.processes.eventsToApprove(segment).toPromise()
+      let allEvents = await this.processes.eventsToApprove(segment,'agenda desktop').toPromise()
       try {
         this.eventsList = this.sortService.sortArrayByDate(allEvents).reverse();
       } catch(error) {

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

@@ -42,23 +42,23 @@ export class AllProcessesPage implements OnInit {
   ) {
     this.loggeduser = SessionStore.user;
 
-    window['all-process'] = this.updateAllProcess
+    window['all-process'] = () => {
+      if(window.location.href.includes('?processes=true'))  {
+        this.updateAllProcess()
+      }
+    }
   }
 
   ngOnInit() {
+    this.updateAllProcess()
 
-    // this.loadAllProcesses();
-      this.updateAllProcess()
-
-      this.router.events.forEach((event) => {
-        if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital')) {
-          if (window.location.pathname.startsWith('/home/gabinete-digital')) {
-            this.refreshing();
-          } else {
-            // this.loadAllProcesses();
-          }
+    this.router.events.forEach((event) => {
+      if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital')) {
+        if (window.location.pathname.startsWith('/home/gabinete-digital')) {
+          this.refreshing();
         }
-      });
+      }
+    });
   }
 
   doRefresh(event) {

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

@@ -103,7 +103,7 @@ export class EventsToApprovePage implements OnInit {
 
       this.color = 'pr'
 
-      let allEvents = await this.processes.eventsToApprove(segment).toPromise()
+      let allEvents = await this.processes.eventsToApprove(segment, 'gabinete').toPromise()
       try {
         this.eventsList = this.sortService.sortArrayByDate(allEvents).reverse();
       } catch(error) {

src/app/shared/header/header.page.html

@@ -1,4 +1,4 @@
-<div class="header-container">
+<div class="header-container header-fix">
   <div class="main-tab pb-10 ion-toolbar header-color">
 
     <div class="mobile pt-20 d-flex  div-top-header justify-space-between">

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

@@ -249,7 +249,14 @@ export class NewPublicationPage implements OnInit {
       try {
         
         await this.publications.CreatePublication(this.folderId, this.publication).toPromise()
-        this.httpErroHandle.httpsSucessMessagge('Criar publicação')
+        if(this.publicationTitle == '1') {
+          
+        } else if (this.publicationTitle == '2') {
+          this.httpErroHandle.httpsSucessMessagge('Criar publicação')
+        } else if (this.publicationTitle == '3') {
+          this.httpErroHandle.httpsSucessMessagge('Editar publicação')
+        }
+        
 
         this.goBackToViewPublications.emit();
       } catch (error) {

src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html

@@ -37,7 +37,7 @@
         <img src="/assets/icon/icon-no-image.svg" alt="image">
       </div>
       <div class="post-description">
-        <p>{{publication.Message}}</p>
+        <pre class="text">{{publication.Message}}</pre>
       </div>
     </div>
     </div>

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

@@ -50,7 +50,7 @@
             <div class="post-data">{{publication.DatePublication | date: 'dd-MM-yy  HH:mm'}}</div>
           </div>
           <div class="post-description">
-            <p>{{publication.Message}}</p>
+            <pre class="text">{{publication.Message}}</pre>
           </div>
         </div>
       </ion-card-content>