buf displaing the role

2026-04-18 20:47:54 +00:00 · 2023-02-10 20:16:10 +01:00
parent d46b8a34bc 16d2fac864
commit 700a960188
50 changed files with 163 additions and 116 deletions
@@ -70,7 +70,7 @@
                    <mat-option *ngFor="let calendars of _eventService.calendarNamesAry" value="{{calendars.Fullname || calendars}}">
                     <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> Agenda do PR </div>
                     <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
-                     <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.FullName}} </div>
+                     <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
                     <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
                  </mat-option>
    
@@ -131,7 +131,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
      this.taskParticipants = [{
        EmailAddress: SessionStore.user.Email,
        IsRequired: true,
-        Name: SessionStore.user.UserName
+        Name: SessionStore.user.FullName
      }]
    }

@@ -236,7 +236,7 @@
                <mat-option *ngFor="let calendars of eventService.calendarNamesAry" value="{{calendars.Fullname || calendars}}">
                  <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> Agenda do PR </div>
                  <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
-                  <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.FullName}} </div>
+                  <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
                    
                </mat-option>
              </div>
@@ -38,7 +38,7 @@
                <mat-option *ngFor="let calendars of eventService.calendarNamesAry" value="{{calendars.Fullname || calendars}}">
                 <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> Agenda do PR </div>
                 <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
-                 <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.FullName}} </div>
+                 <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
                 <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
              </mat-option>

@@ -410,7 +410,9 @@ export class ChatPage implements OnInit {

  doRefresh(event) {
    setTimeout(() => {
-      event?.target?.complete();
+      try {
+  event?.target?.complete();
+} catch(error) {}
    }, 1000);
  }

@@ -211,9 +211,13 @@ export class EditEventPage implements OnInit {
  }
  doRefresh(event){
    /* this.RefreshEvents(); */
-    event?.target?.complete();
+    try {
+  event?.target?.complete();
+} catch(error) {}
     setTimeout(() => {
-       event?.target?.complete();
+       try {
+  event?.target?.complete();
+} catch(error) {}
     }, 2000);

  }
@@ -209,9 +209,13 @@ export class EventDetailModalPage implements OnInit {
  }
  doRefresh(event){
    /* this.RefreshEvents(); */
-    event?.target?.complete();
+    try {
+  event?.target?.complete();
+} catch(error) {}
     setTimeout(() => {
-       event?.target?.complete();
+       try {
+  event?.target?.complete();
+} catch(error) {}
     }, 2000);

  }
@@ -207,9 +207,13 @@ export class EventDetailPage implements OnInit {
  }
  doRefresh(event){
    /* this.RefreshEvents(); */
-    event?.target?.complete();
+    try {
+  event?.target?.complete();
+} catch(error) {}
     setTimeout(() => {
-       event?.target?.complete();
+       try {
+  event?.target?.complete();
+} catch(error) {}
     }, 2000);

  }
@@ -129,7 +129,9 @@ export class EventsPage implements OnInit {
  doRefresh(event) {
    if (event) {
      setTimeout(() => {
-        event?.target?.complete();
+        try {
+  event?.target?.complete();
+} catch(error) {}
      }, 2000);
    }
    this.RefreshEvents();
@@ -227,7 +227,9 @@ export class DespachosPrPage implements OnInit {
  doRefresh(event) {
    if (event) {
      setTimeout(() => {
-        event?.target?.complete();
+        try {
+  event?.target?.complete();
+} catch(error) {}
      }, 2000);
    }
    setTimeout(() => {
@@ -117,7 +117,9 @@ export class DespachosPage implements OnInit {
    this.LoadList();

    setTimeout(() => {
-      event?.target?.complete();
+      try {
+  event?.target?.complete();
+} catch(error) {}
    }, 2000);
  }

@@ -22,7 +22,7 @@
      <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry" value="PR">
        <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> Agenda do PR </div>
        <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
-        <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.FullName}} </div>
+        <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
      </ion-segment-button>
    </ion-segment>
  </ion-toolbar>
@@ -234,7 +234,9 @@ export class EventListPage implements OnInit {

    setTimeout(() => {
      this.LoadToApproveEvents();
-      event?.target?.complete();
+      try {
+  event?.target?.complete();
+} catch(error) {}
    }, 1000);
  }

@@ -44,7 +44,7 @@
                    <mat-option *ngFor="let calendars of eventService.calendarNamesAry" value="{{calendars.Fullname || calendars}}">
                     <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> Agenda do PR </div>
                     <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
-                     <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.FullName}} </div>
+                     <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
                     <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
                  </mat-option>
    
@@ -153,7 +153,7 @@ export class BookMeetingModalPage implements OnInit {
      this.taskParticipants = [{
        EmailAddress: SessionStore.user.Email,
        IsRequired: true,
-        Name: SessionStore.user.UserName
+        Name: SessionStore.user.FullName
      }]
    }

@@ -103,7 +103,9 @@ export class ExpedientePage implements OnInit {
  doRefresh(event) {
    this.LoadList();
    setTimeout(() => {
-      event?.target?.complete();
+      try {
+  event?.target?.complete();
+} catch(error) {}
    }, 1000);
  }

@@ -95,7 +95,9 @@ export class ExpedientesPrPage implements OnInit {
  doRefresh(event) {
    this.LoadList();
    setTimeout(() => {
-      event?.target?.complete();
+      try {
+  event?.target?.complete();
+} catch(error) {}
    }, 2000);
  }

@@ -792,7 +792,9 @@ export class GabineteDigitalPage implements OnInit {
    if (event) {
      setTimeout(() => {
        try {
-          event?.target?.complete();
+          try {
+  event?.target?.complete();
+} catch(error) {}
        } catch(error) {}
        
      }, 2000);
@@ -299,7 +299,9 @@ export class PedidosPage implements OnInit {
  doRefresh(event) {
    this.LoadList();
    setTimeout(() => {
-      event?.target?.complete();
+      try {
+  event?.target?.complete();
+} catch(error) {}
    }, 2000);
  }

@@ -170,7 +170,9 @@ export class PendentesPage implements OnInit {
    this.LoadList();

    setTimeout(() => {
-      event?.target?.complete();
+      try {
+  event?.target?.complete();
+} catch(error) {}
    }, 2000);
  }

@@ -18,8 +18,6 @@ import { Camera, CameraResultType, CameraSource, Photo } from '@capacitor/camera

 import { Filesystem, Directory } from '@capacitor/filesystem';
 import { NgxImageCompressService } from "ngx-image-compress";
-import { readAndCompressImage } from 'browser-image-resizer';
-import { environment } from 'src/environments/environment';

 const IMAGE_DIR = 'stored-images';

@@ -110,7 +108,7 @@ export class NewPublicationPage implements OnInit {
  }

  async takePicture() {
-    alert('take')
+
    const capturedImage = await Camera.getPhoto({
      quality: 90,
      // allowEditing: true,
@@ -121,30 +119,11 @@ export class NewPublicationPage implements OnInit {
    const response = await fetch(capturedImage.webPath!);
    const blob = await response.blob();

-    const config = {
-      quality: 0.5,
-      maxWidth: 800,
-      debug: true
-    };
-
-    var file = new File([blob], "camera.jpg");
-
-    // Note: A single file comes from event.target.files on <input>
-    readAndCompressImage(file, config)
-      .then(resizedImage => {
-        console.log('resizedImage', resizedImage);
-
-        this.convertBlobToBase64Worker.postMessage(resizedImage);
-        this.convertBlobToBase64Worker.onmessage = async (oEvent)=> {
-          this.capturedImage = oEvent.data
-    
-        }
-      })
-      .then(result => {
-        // TODO: Handle the result
-        console.log('result', result);
-      });
+    this.convertBlobToBase64Worker.postMessage(blob);
+    this.convertBlobToBase64Worker.onmessage = async (oEvent)=> {
+      this.capturedImage = oEvent.data

+    }
  }

  imageSize(image) {
@@ -200,35 +179,12 @@ export class NewPublicationPage implements OnInit {

    const response = await fetch(capturedImage.webPath!);
    const blob = await response.blob();
-    
-
-    const config = {
-      quality: 0.9,
-      maxWidth: 800,
-      debug: !environment.production
-    };
-
-    var file = new File([blob], "camera.jpg");
-
-    // Note: A single file comes from event.target.files on <input>
-    readAndCompressImage(file, config)
-      .then(resizedImage => {
-        console.log('resizedImage', resizedImage);
-
-        this.convertBlobToBase64Worker.postMessage(resizedImage);
-        this.convertBlobToBase64Worker.onmessage = async (oEvent)=> {
-          this.capturedImage = oEvent.data
-    
-        }
-      })
-      .then(result => {
-        // TODO: Handle the result
-        // console.log('result', result);
-      });
-
-    

+    this.convertBlobToBase64Worker.postMessage(blob);
+    this.convertBlobToBase64Worker.onmessage = async (oEvent)=> {
+      this.capturedImage = oEvent.data

+    }

  }

@@ -242,7 +198,7 @@ export class NewPublicationPage implements OnInit {

    this.Form = new FormGroup({
      Subject: new FormControl(this.pub.Title, [
-        Validators.required,
+        //Validators.required,
        // Validators.minLength(4)
      ]),
      capturedImage: new FormControl(this.capturedImage, [
@@ -285,11 +241,11 @@ export class NewPublicationPage implements OnInit {
        try {

          await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
-          this.toastService.successMessage("Publicação editada")
+          this.toastService._successMessage("Publicação editada")

          this.close();
        } catch (error) {
-          this.toastService.badRequest("Publicação não editada")
+          this.toastService._badRequest("Publicação não editada")
        } finally {
          loader.remove()
        }
@@ -54,7 +54,9 @@ export class PublicationDetailPage implements OnInit {
    this.getPublicationDetail();

    setTimeout(() => {
-      event?.target?.complete();
+      try {
+  event?.target?.complete();
+} catch(error) {}
    }, 2000);
  }

@@ -124,7 +124,9 @@ export class PublicationsPage implements OnInit {
  doRefresh(event) {
    this.getActions();
    setTimeout(() => {
-      event?.target?.complete();
+      try {
+        event?.target?.complete();
+      } catch(error) {}
    }, 250);
  }

@@ -63,7 +63,9 @@ export class PublicationDetailPage implements OnInit {
    this.getPublicationDetail();

    setTimeout(() => {
-      event?.target?.complete();
+      try {
+  event?.target?.complete();
+} catch(error) {}
    }, 2000);
  }

@@ -98,7 +98,9 @@ export class ViewPublicationsPage implements OnInit {
      //this.testForkJoin()
      this.getPublicationDetail();
      this.getPublicationsIds();
-      event?.target?.complete();
+      try {
+  event?.target?.complete();
+} catch(error) {}
    //}, 3000);

  }
@@ -102,6 +102,11 @@ export class ChatSystemService {
      }
    });

+
+    if(SessionStore.user?.ChatData?.data) {
+      this.restoreRooms();
+    }
+
  }

  loadChat() {
@@ -166,7 +171,7 @@ export class ChatSystemService {
  async restoreRooms() {

    try {
-      const rooms = await this.storage.remove('Rooms');
+      const rooms = await this.storage.get('Rooms');

      if(rooms) {
        for (let  roomData of rooms.result.update) { 
@@ -206,9 +206,13 @@ export class EditEventPage implements OnInit {
  }
  doRefresh(event){
    /* this.RefreshEvents(); */
-    event?.target?.complete();
+    try {
+  event?.target?.complete();
+} catch(error) {}
     setTimeout(() => {
-       event?.target?.complete();
+       try {
+  event?.target?.complete();
+} catch(error) {}
     }, 2000);

  }
@@ -203,9 +203,13 @@ export class EventDetailModalPage implements OnInit {
  }
  doRefresh(event){
    /* this.RefreshEvents(); */
-    event?.target?.complete();
+    try {
+  event?.target?.complete();
+} catch(error) {}
     setTimeout(() => {
-       event?.target?.complete();
+       try {
+  event?.target?.complete();
+} catch(error) {}
     }, 2000);

  }
@@ -204,9 +204,13 @@ export class EventDetailPage implements OnInit {
  }
  doRefresh(event){
    /* this.RefreshEvents(); */
-    event?.target?.complete();
+    try {
+  event?.target?.complete();
+} catch(error) {}
     setTimeout(() => {
-       event?.target?.complete();
+       try {
+  event?.target?.complete();
+} catch(error) {}
     }, 2000);

  }
@@ -125,7 +125,9 @@ export class EventsPage implements OnInit {
  doRefresh(event) {
    this.RefreshEvents();
    this.LoadList();
-    event?.target?.complete();
+    try {
+  event?.target?.complete();
+} catch(error) {}
  }

  onSegmentChange() {
@@ -16,7 +16,7 @@
      <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry" value="PR">
        <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> Agenda do PR </div>
        <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
-        <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.FullName}} </div>
+        <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
      </ion-segment-button>
    </ion-segment>
  </ion-toolbar>
@@ -170,7 +170,9 @@ export class EventListPage implements OnInit {
    this.LoadToApproveEvents();
    
    setTimeout(() => {
-      event?.target?.complete();
+      try {
+  event?.target?.complete();
+} catch(error) {}
    }, 2000);
  }

@@ -49,7 +49,7 @@
                <mat-option *ngFor="let calendars of eventService.calendarNamesAry" value="{{calendars.Fullname || calendars}}">
                 <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> Agenda do PR </div>
                 <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
-                 <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.FullName}} </div>
+                 <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
                 <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
              </mat-option>

@@ -62,7 +62,9 @@ export class AllProcessesPage implements OnInit {
  doRefresh(event) {
    if (event) {
      setTimeout(() => {
-        event?.target?.complete();
+        try {
+  event?.target?.complete();
+} catch(error) {}
      }, 2000);
    }
    setTimeout(() => {
@@ -89,13 +89,19 @@ constructor (
  doRefresh(event) {
    if (event) {
      setTimeout(() => {
+      
+      try {
        event?.target?.complete();
+      } catch(error) {}
+      
      }, 2000);
    }
    
    setTimeout(() => {
      this.LoadList();
-      //event?.target?.complete();
+      try {
+        event?.target?.complete();
+      } catch(error) {}
    }, 1000);
  }

@@ -49,7 +49,9 @@ export class DespachosPage implements OnInit {
  doRefresh(event) {
    if (event) {
      setTimeout(() => {
-        event?.target?.complete();
+        try {
+  event?.target?.complete();
+} catch(error) {}
      }, 2000);
    }

@@ -52,7 +52,9 @@ export class DiplomasAssinarPage implements OnInit {
  doRefresh(event) {
    if (event) {
      setTimeout(() => {
-        event?.target?.complete();
+        try {
+  event?.target?.complete();
+} catch(error) {}
      }, 2000);
    }

@@ -41,7 +41,9 @@ export class DiplomasGerarPage implements OnInit {
  doRefresh(event) {
    if (event) {
      setTimeout(() => {
-        event?.target?.complete();
+        try {
+  event?.target?.complete();
+} catch(error) {}
      }, 2000);
    }
    
@@ -97,7 +97,9 @@ export class ExpedientsPage implements OnInit {
  doRefresh(event) {
    if (event) {
      setTimeout(() => {
-        event?.target?.complete();
+        try {
+  event?.target?.complete();
+} catch(error) {}
      }, 2000);
    }
      setTimeout(() => {
@@ -121,7 +121,9 @@ export class DiplomasPage implements OnInit {
  doRefresh(event) {
    if (event) {
      setTimeout(() => {
-        event?.target?.complete();
+        try {
+  event?.target?.complete();
+} catch(error) {}
      }, 2000);
    }

@@ -15,7 +15,7 @@
        <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry" value="PR">
          <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> Agenda do PR </div>
          <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
-          <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.FullName}} </div>
+          <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
        </ion-segment-button>
      </ion-segment>
    </ion-toolbar>
@@ -129,7 +129,9 @@ export class EventsToApprovePage implements OnInit {
  doRefresh(event) {
    if (event) {
      setTimeout(() => {
-        event?.target?.complete();
+        try {
+  event?.target?.complete();
+} catch(error) {}
      }, 2000);
    }

@@ -87,7 +87,9 @@ export class ExpedientesPrPage implements OnInit {
  doRefresh(event) {
    this.LoadList();
    setTimeout(() => {
-      event?.target?.complete();
+      try {
+  event?.target?.complete();
+} catch(error) {}
    }, 2000);
  }

@@ -96,7 +96,9 @@ export class ExpedientsPage implements OnInit {
  doRefresh(event) {
    if (event) {
      setTimeout(() => {
-        event?.target?.complete();
+        try {
+  event?.target?.complete();
+} catch(error) {}
      }, 2000);
    }

@@ -124,7 +124,9 @@ export class PedidosPage implements OnInit {
  doRefresh(event) {
    if (event) {
      setTimeout(() => {
-        event?.target?.complete();
+        try {
+  event?.target?.complete();
+} catch(error) {}
      }, 2000);
    }
    setTimeout(() => {
@@ -90,7 +90,9 @@ export class PendentesPage implements OnInit {
  doRefresh(event) {
    if (event) {
      setTimeout(() => {
-        event?.target?.complete();
+        try {
+  event?.target?.complete();
+} catch(error) {}
      }, 2000);
    }

@@ -54,7 +54,9 @@ export class PublicationDetailPage implements OnInit {
    this.getPublicationDetail();

    setTimeout(() => {
-      event?.target?.complete();
+      try {
+  event?.target?.complete();
+} catch(error) {}
    }, 2000);
  }

@@ -3,4 +3,4 @@ import { oaprProd } from './suport/oapr'
 import { doneITProd } from './suport/doneIt'


-export const environment: Environment = doneITProd;
+export const environment: Environment = oaprProd;
@@ -3,4 +3,4 @@ import { oaprDev } from './suport/oapr'
 import { doneITDev } from './suport/doneIt'


-export const environment: Environment = doneITDev;
+export const environment: Environment = oaprDev;
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "3e2d797c9",
-  "SHA": "3e2d797c908bc1e109cf519adaad36d02f043cf8",
+  "shortSHA": "d46b8a34b",
+  "SHA": "d46b8a34bcff9131feaeefa60e9bca2c0c69f75c",
  "branch": "no_bug_movemente",
  "lastCommitAuthor": "'Eudes Inácio'",
-  "lastCommitTime": "'Thu Feb 9 17:03:26 2023 +0100'",
-  "lastCommitMessage": "changed xcalendario to agenda",
-  "lastCommitNumber": "4760",
+  "lastCommitTime": "'Thu Feb 9 17:04:59 2023 +0100'",
+  "lastCommitMessage": "merge with Peter changes",
+  "lastCommitNumber": "4763",
  "change": "",
-  "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 2 and 2 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:   package-lock.json\n\tmodified:   package.json\n\tmodified:   src/app/models/dailyworktask.model.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified:   version/git-version.ts",
+  "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 3 and 2 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:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.html\n\tmodified:   src/app/pages/chat/chat.page.ts\n\tmodified:   src/app/pages/events/edit-event/edit-event.page.ts\n\tmodified:   src/app/pages/events/event-detail-modal/event-detail-modal.page.ts\n\tmodified:   src/app/pages/events/event-detail/event-detail.page.ts\n\tmodified:   src/app/pages/events/events.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos/despachos.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified:   src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified:   src/app/pages/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified:   src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified:   src/app/pages/publications/publication-detail/publication-detail.page.ts\n\tmodified:   src/app/pages/publications/publications.page.ts\n\tmodified:   src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified:   src/app/pages/publications/view-publications/view-publications.page.ts\n\tmodified:   src/app/services/chat/chat-system.service.ts\n\tmodified:   src/app/services/events/edit-event/edit-event.page.ts\n\tmodified:   src/app/services/events/event-detail-modal/event-detail-modal.page.ts\n\tmodified:   src/app/services/events/event-detail/event-detail.page.ts\n\tmodified:   src/app/services/events/events.page.ts\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.html\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.html\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified:   src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified:   src/app/shared/gabinete-digital/despachos/despachos.page.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified:   src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified:   src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified:   src/app/shared/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified:   src/app/shared/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified:   src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified:   src/environments/environment.prod.ts\n\tmodified:   src/environments/environment.ts",
  "changeAuthor": "eudes.inacio"
 }