merge

2026-04-18 12:37:53 +00:00 · 2023-08-30 17:14:59 +01:00
parent 0379b722cf 71ab74974d
commit f472d5ac0b
43 changed files with 70 additions and 54 deletions
@@ -87,7 +87,7 @@
              <div class="list-people">
                <ion-item lines="none">
                  <ion-list>
-                    <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Participantes*</ion-label>
+                    <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Intervenientes*</ion-label>
                    <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
                  </ion-list>
                </ion-item>
@@ -17,7 +17,7 @@
              <div class="list-people">
                <ion-item lines="none">
                  <ion-list>
-                    <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
+                    <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Intervenientes</ion-label>
                    <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
                  </ion-list>
                </ion-item>
@@ -25,7 +25,7 @@
      </div>
      <div class="line"></div>
      <div class="middle-content">
-        <h5 *ngIf="LoadedDocument.ApplicationId == 361 || LoadedDocument.ApplicationID == 361" >Participantes</h5>
+        <h5 *ngIf="LoadedDocument.ApplicationId == 361 || LoadedDocument.ApplicationID == 361" >Intervenientes</h5>
        <h5 *ngIf="LoadedDocument.ApplicationId == 8 || LoadedDocument.ApplicationID == 8" >Remetente</h5>

        <ion-item class="ion-no-margin ion-no-padding">
@@ -249,7 +249,7 @@
              <div class="list-people">
                <ion-item lines="none">
                  <ion-list>
-                    <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Participantes*</ion-label>
+                    <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Intervenientes*</ion-label>
                    <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
                  </ion-list>
                </ion-item>
@@ -18,7 +18,7 @@
              <div class="list-people">
                <ion-item lines="none">
                  <ion-list>
-                    <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Participantes*</ion-label>
+                    <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Intervenientes*</ion-label>
                    <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
                  </ion-list>
                </ion-item>
@@ -148,7 +148,7 @@ export class EditProfilePage implements OnInit {
    const capturedImage = await Camera.getPhoto({
      width: 188,
      height: 188,
-      quality: 50,
+      quality: 100,
      // allowEditing: true,
      resultType: CameraResultType.Base64,
      source: CameraSource.Camera
@@ -422,6 +422,7 @@ export class ProfilePage implements OnInit {

      modal.onDidDismiss().then(() => {
        this.isProfileOpen = false;
+        this.getProfilpicture()
      }, (error) => {
        console.log(error)
      })
@@ -74,7 +74,7 @@
        <div class="line"></div>
        <div class="middle-content">
          <div *ngIf="loadedEvent.Attendees">
-            <h5 class="font-17-rem">Participantes</h5>
+            <h5 class="font-17-rem">Intervenientes</h5>
            <ion-item class="ion-no-margin ion-no-padding">
              <ion-label>
                <div *ngFor="let attendee of loadedEvent.Attendees">
@@ -45,7 +45,7 @@
                  </div>


-                  <div style="
+                  <div *ngIf="SessionStore.user.RoleID !== 100000014" style="
                  padding-bottom: 10px;
                  padding-left: 10px;
                  padding-right: 10px;
@@ -252,7 +252,7 @@
                <div class="list-people flex-grow-1">
                  <ion-item lines="none">
                    <ion-list>
-                      <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Participantes*</ion-label>
+                      <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Intervenientes*</ion-label>
                      <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
                    </ion-list>
                  </ion-item>
@@ -275,7 +275,7 @@
                <div class="list-people flex-grow-1">
                  <ion-item lines="none">
                    <ion-list>
-                      <ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Adicionar Participantes*</ion-label>
+                      <ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Adicionar Intervenientes*</ion-label>
                      <ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
                    </ion-list>
                  </ion-item>
@@ -209,7 +209,7 @@
          <div class="list-people">
            <ion-item lines="none">
              <ion-list>
-                <ion-label  *ngIf="taskParticipants?.length < 1"  class="list-people-title">Adicionar Participantes*</ion-label>
+                <ion-label  *ngIf="taskParticipants?.length < 1"  class="list-people-title">Adicionar Intervenientes*</ion-label>
                <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
              </ion-list>
            </ion-item>
@@ -69,7 +69,7 @@
        <div class="line"></div>
        <div class="middle-content">
          <div *ngIf="loadedEvent.Attendees">
-            <h5 class="font-17-rem">Participantes</h5>
+            <h5 class="font-17-rem">Intervenientes</h5>
            <ion-item class="ion-no-margin ion-no-padding">
              <ion-label>
                <div *ngFor="let attendee of loadedEvent.Attendees">
@@ -747,6 +747,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
  }

  async addFileToChatMobile(types: typeof FileType[]) {
+    console.log('add image from gallery')
    const roomId = this.roomId

    const file = await Camera.getPhoto({
@@ -819,7 +820,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
 }

  async addFileToChat(types: typeof FileType[]) {
-
+    console.log('add file')
    const roomId = this.roomId

    const file: any = await this.fileService.getFileFromDevice(types);
@@ -837,6 +838,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {

      const formData = new FormData();
      formData.append('blobFile', blob);
+      console.log('add file', fileBase64)

      this.ChatSystemService.getDmRoom(roomId).send({
        file: {
@@ -855,7 +857,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
        }
      });
    } else {
-
+      console.log('file not supported')
    }


@@ -901,6 +903,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
        this.takePicture()
      }
      else if (res['data'] == 'add-picture') {
+        console.log('add-picture')
        this.addImageMobile()
      }
      else if (res['data'] == 'add-document') {
@@ -1041,7 +1044,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
    await Filesystem.writeFile({
      path: fileName,
      data: pdfString,
-      directory: Directory.Documents,
+      directory: Directory.Data,
    }).then((dir) => {
      console.log('DIR ', dir)
      this.fileOpener
@@ -66,7 +66,7 @@
              <ion-buttons slot="end" (click)="openAttendees()">
                <ion-label color="secondary">Editar</ion-label>
              </ion-buttons>
-              <ion-label class="attach-label">Participantes</ion-label>
+              <ion-label class="attach-label">Intervenientes</ion-label>
            </ion-item>
            <div *ngIf="loadedEvent.Attendees">
            <div *ngFor="let attendee of loadedEvent.Attendees; let i=index">
@@ -68,7 +68,7 @@
              <ion-buttons slot="end" (click)="openAttendees()">
                <ion-label color="secondary">Editar</ion-label>
              </ion-buttons>
-              <ion-label class="attach-label">Participantes</ion-label>
+              <ion-label class="attach-label">Intervenientes</ion-label>
            </ion-item>
            <div *ngIf="loadedEvent.Attendees">
            <div *ngFor="let attendee of loadedEvent.Attendees; let i=index">
@@ -68,7 +68,7 @@
              <ion-buttons slot="end" (click)="openAttendees()">
                <ion-label color="secondary">Editar</ion-label>
              </ion-buttons>
-              <ion-label class="attach-label">Participantes</ion-label>
+              <ion-label class="attach-label">Intervenientes</ion-label>
            </ion-item>
            <div *ngIf="loadedEvent.Attendees">
            <div *ngFor="let attendee of loadedEvent.Attendees; let i=index">
@@ -36,7 +36,7 @@
      <div class="overflow-y-auto">
        <div class="middle-content" >
          <div *ngIf="intervenientes.length > 0">
-            <h5 >Participantes</h5>
+            <h5 >Intervenientes</h5>
            <ion-item class="ion-no-margin ion-no-padding">
              <ion-label *ngIf="intervenientes">
                <div *ngFor="let interveniente of intervenientes">
@@ -35,7 +35,7 @@

      <div class="overflow-y-auto" style="margin-right: -20px; margin-right: -20px;">
        <div class="middle-content">
-          <h5 *ngIf="intervenientes">Participantes</h5>
+          <h5 *ngIf="intervenientes">Intervenientes</h5>
          <ion-item class="ion-no-margin ion-no-padding">
            <ion-label>
              <div *ngFor="let task of intervenientes">
@@ -37,7 +37,7 @@
      </div>
      <div class="line"></div>
      <div class="middle-content">
-        <h5 *ngIf="intervenientes">Participantes</h5>
+        <h5 *ngIf="intervenientes">Intervenientes</h5>
        <ion-item class="ion-no-margin ion-no-padding">
          <ion-label>
            <div *ngFor="let interveniente of intervenientes">
@@ -74,7 +74,7 @@
  </div>
  <div *ngIf="loadedEvent.workflowInstanceDataFields.Participants" class="middle-content">
    <div *ngIf="loadedEvent.workflowInstanceDataFields.Participants">
-      <h5 class="font-17-rem">Participantes</h5>
+      <h5 class="font-17-rem">Intervenientes</h5>
      <div *ngFor="let att of loadedEvent.workflowInstanceDataFields.ParticipantsList">
        <ion-label>{{att.Name}}</ion-label>
      </div>
@@ -73,7 +73,7 @@
        <div class="overflow-y-auto">
          <div class="middle-content">
            <div *ngIf="loadedEvent.workflowInstanceDataFields.ParticipantsList">
-              <h5 class="font-17-rem">Participantes</h5>
+              <h5 class="font-17-rem">Intervenientes</h5>
              <div *ngFor="let att of loadedEvent.workflowInstanceDataFields.ParticipantsList">
                <ion-label>{{att.Name}}</ion-label>
              </div>
@@ -213,7 +213,7 @@
              <div class="list-people">
                <ion-item lines="none">
                  <ion-list>
-                    <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Participantes*</ion-label>
+                    <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Intervenientes*</ion-label>
                    <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
                  </ion-list>
                </ion-item>
@@ -140,7 +140,7 @@
              <div class="list-people">
                <ion-item lines="none">
                  <ion-list>
-                    <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Participantes*</ion-label>
+                    <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Intervenientes*</ion-label>
                    <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
                  </ion-list>
                </ion-item>
@@ -44,7 +44,7 @@

      <div class="overflow-y-auto">
        <div class="middle-content">
-          <!-- <h5 *ngIf="intervenientes">Participantes</h5>
+          <!-- <h5 *ngIf="intervenientes">Intervenientes</h5>
          <ion-item class="ion-no-margin ion-no-padding">
            <ion-label>
              <div *ngFor="let interveniente of intervenientes">
@@ -37,7 +37,7 @@

      <div class="overflow-y-auto">
        <div class="middle-content">
-          <h5 *ngIf="intervenientes">Participantes</h5>
+          <h5 *ngIf="intervenientes">Intervenientes</h5>
          <ion-item class="ion-no-margin ion-no-padding">
            <ion-label>
              <div *ngFor="let interveniente of intervenientes">
@@ -66,7 +66,7 @@
              <ion-buttons slot="end" (click)="openAttendees()">
                <ion-label color="secondary">Editar</ion-label>
              </ion-buttons>
-              <ion-label class="attach-label">Participantes</ion-label>
+              <ion-label class="attach-label">Intervenientes</ion-label>
            </ion-item>
            <div *ngIf="loadedEvent.Attendees">
            <div *ngFor="let attendee of loadedEvent.Attendees; let i=index">
@@ -68,7 +68,7 @@
              <ion-buttons slot="end" (click)="openAttendees()">
                <ion-label color="secondary">Editar</ion-label>
              </ion-buttons>
-              <ion-label class="attach-label">Participantes</ion-label>
+              <ion-label class="attach-label">Intervenientes</ion-label>
            </ion-item>
            <div *ngIf="loadedEvent.Attendees">
            <div *ngFor="let attendee of loadedEvent.Attendees; let i=index">
@@ -68,7 +68,7 @@
              <ion-buttons slot="end" (click)="openAttendees()">
                <ion-label color="secondary">Editar</ion-label>
              </ion-buttons>
-              <ion-label class="attach-label">Participantes</ion-label>
+              <ion-label class="attach-label">Intervenientes</ion-label>
            </ion-item>
            <div *ngIf="loadedEvent.Attendees">
            <div *ngFor="let attendee of loadedEvent.Attendees; let i=index">
@@ -140,6 +140,7 @@ export class NotificationsService {
          this.eventtrigger.publishSomeData({
            notification: "recive"
          })
+          
        }
      );

@@ -174,6 +175,7 @@ export class NotificationsService {
      
      console.log(result);

+      


      this.storageService.store("Notifications", result)
@@ -487,4 +487,13 @@ export class ProcessesService {
    return this.http.get<any>(`${geturl}`, options);
  }

+  uploadFiles(file) {
+    const geturl = environment.apiURL + 'Tasks/AttachDocImage';
+
+    let options = {
+      headers: this.headers,
+    };
+    return this.http.post<any>(`${geturl}`,file, options);
+  }
+
 }
@@ -311,9 +311,9 @@ export class TaskService {

  async loadEventosParaAprovacao() {
    this.showLoaderNum++
-
+    console.log('PR')
    // PR dont have event to approve
-    if(this.SessionStore.user.Profile != 'PR') {
+    /* if(this.SessionStore.user.Profile != 'PR') { */
      try { 
        for(let calendar of this.eventService.calendarNamesAry) {
          if(calendar == 'Meu calendario') {
@@ -345,7 +345,7 @@ export class TaskService {
      } catch (error) {
  
      }
-    }
+   /*  } */

     this.showLoaderNum--

@@ -83,7 +83,7 @@
        <div class="overflow-y-auto">
          <div class="middle-content">
            <div *ngIf="loadedEvent.workflowInstanceDataFields.ParticipantsList">
-              <h5 class="font-17-rem">Participantes</h5>
+              <h5 class="font-17-rem">Intervenientes</h5>
              <div *ngFor="let att of loadedEvent.workflowInstanceDataFields.ParticipantsList">
                <ion-label>{{att.Name}}</ion-label>
              </div>
@@ -282,7 +282,7 @@
                <div class="list-people flex-grow-1">
                  <ion-item lines="none">
                    <ion-list>
-                      <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Participantes*</ion-label>
+                      <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Intervenientes*</ion-label>
                      <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
                    </ion-list>
                  </ion-item>
@@ -305,7 +305,7 @@
                <div class="list-people flex-grow-1">
                  <ion-item lines="none">
                    <ion-list>
-                      <ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
+                      <ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Adicionar Intervenientes</ion-label>
                      <ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
                    </ion-list>
                  </ion-item>
@@ -219,7 +219,7 @@
          <div class="list-people">
            <ion-item lines="none">
              <ion-list>
-                <div *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Participantes*</div>
+                <div *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Intervenientes*</div>
                <div *ngFor="let participant of taskParticipants">{{participant.Name}}</div>
              </ion-list>
            </ion-item>
@@ -96,9 +96,9 @@ export class EventListPage implements OnInit {
  async LoadToApproveEvents() {


-    if(SessionStore.user.Profile == 'PR') {
+    /* if(SessionStore.user.Profile == 'PR') {
      return false
-    }
+    } */
    
    this.showLoader = true;

@@ -246,7 +246,7 @@
          <div class="list-people">
            <ion-item lines="none">
              <ion-list>
-                <ion-label *ngIf="taskParticipants.length ==0" class="list-people-title">Adicionar Participantes*</ion-label>
+                <ion-label *ngIf="taskParticipants.length ==0" class="list-people-title">Adicionar Intervenientes*</ion-label>
                <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
              </ion-list>
            </ion-item>
@@ -95,7 +95,7 @@
    <div class="line"></div>
    <div class="middle-content">
      <div *ngIf="loadedEvent.Attendees">
-        <h5 class="font-17-rem">Participantes</h5>
+        <h5 class="font-17-rem">Intervenientes</h5>
        <ion-item class="ion-no-margin ion-no-padding">
          <ion-label>
            <div *ngFor="let attendee of loadedEvent.Attendees">
@@ -863,7 +863,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
      quality: 90,
      // allowEditing: true,
      resultType: CameraResultType.Base64,
-      source: CameraSource.Camera
+      source: CameraSource.Photos
    });

    const imageBase64 = 'data:image/jpeg;base64,' + file.base64String
@@ -224,7 +224,7 @@
                <div class="list-people flex-grow-1">
                  <ion-item lines="none">
                    <ion-list>
-                      <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Participantes*</ion-label>
+                      <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Intervenientes*</ion-label>
                      <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
                    </ion-list>
                  </ion-item>
@@ -247,7 +247,7 @@
                <div class="list-people flex-grow-1">
                  <ion-item lines="none">
                    <ion-list>
-                      <ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
+                      <ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Adicionar Intervenientes</ion-label>
                      <ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
                    </ion-list>
                  </ion-item>
@@ -1,7 +1,7 @@
 <ion-content>
  <div *ngIf="task" class="overflow-y-auto height-100">
    <div class="middle-content">
-      <h5 class="font-17-rem" *ngIf="intervenientes">Participantes</h5>
+      <h5 class="font-17-rem" *ngIf="intervenientes">Intervenientes</h5>
      <ion-item class="ion-no-margin ion-no-padding">
        <ion-label>
          <div *ngFor="let interveniente of intervenientes">
@@ -33,7 +33,7 @@
 <ion-content>
  <div *ngIf="task" class="overflow-y-auto height-100 px-20">
    <div class="middle-content">
-      <h5 class="font-17-rem" *ngIf="intervenientes">Participantes</h5>
+      <h5 class="font-17-rem" *ngIf="intervenientes">Intervenientes</h5>
      <ion-item class="ion-no-margin ion-no-padding">
        <ion-label>
          <div *ngFor="let interveniente of intervenientes">
@@ -77,7 +77,7 @@ export class HeaderPage implements OnInit {

  async ngOnInit() {
    this.hideSearch();
-    this.notificationLengthData();
+    /* this.notificationLengthData(); */
    this.getProfilpicture();

  }
@@ -115,7 +115,7 @@ export class HeaderPage implements OnInit {
    await this.storageservice.get("Notifications").then((value) => {


-      /*  var data = JSON.parse(value); */
+      
      this.notificationLength = value.length;

    }).catch((error) => {
@@ -223,6 +223,7 @@ export class HeaderPage implements OnInit {

      modal.onDidDismiss().then(() => {
        this.notificationLengthData()
+        this.getProfilpicture()
        this.showProfileModal = false
      })

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "7ee834558",
-  "SHA": "7ee834558ce74ba7341b794ce916853ce0ffdd39",
+  "shortSHA": "0379b722c",
+  "SHA": "0379b722cf410a9a53b892b968d6ef44a0dafedf",
  "branch": "developer-prod",
  "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Wed Aug 30 14:39:27 2023 +0100'",
-  "lastCommitMessage": "improve action on mobile",
-  "lastCommitNumber": "5238",
+  "lastCommitTime": "'Wed Aug 30 17:11:31 2023 +0100'",
+  "lastCommitMessage": "change icons",
+  "lastCommitNumber": "5239",
  "change": "",
-  "changeStatus": "On branch developer-prod\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/pages/publications/publications.page.html\n\tmodified:   src/app/shared/agenda/view-event/view-event.page.scss\n\tmodified:   src/app/shared/publication/view-publications/view-publications.page.html\n\tmodified:   src/assets/icon/theme/gov/icons-chat-record-audio.svg\n\tmodified:   src/assets/icon/theme/gov/icons-chat-send.svg\n\tmodified:   src/assets/icon/theme/gov/icons-most-searched-words-open.svg\n\tdeleted:    src/assets/images/icons-menu.svg\n\tdeleted:    src/assets/images/icons-nav-agenda-active.svg\n\tdeleted:    src/assets/images/icons-profile-calendar-md.svg\n\tmodified:   src/assets/images/icons-received-event.svg\n\tmodified:   src/assets/images/theme/gov/advance-search-show-modal.svg\n\tnew file:   src/assets/images/theme/gov/icon-reload.svg\n\tmodified:   src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg\n\tmodified:   src/assets/images/theme/gov/icons-attach-doc.svg\n\tmodified:   src/assets/images/theme/gov/icons-chat-new-conversation.svg\n\tmodified:   src/assets/images/theme/gov/icons-chat-new-group.svg\n\trenamed:    src/assets/images/theme/gov/icons-chat-record-audio.svg -> src/assets/images/theme/gov/icons-chat-record-audio1.svg\n\tmodified:   src/assets/images/theme/gov/icons-chat-send.svg\n\tmodified:   src/assets/images/theme/gov/icons-collaps-down.svg\n\tmodified:   src/assets/images/theme/gov/icons-collaps-up.svg\n\tmodified:   src/assets/images/theme/gov/icons-edit.svg\n\tmodified:   src/assets/images/theme/gov/icons-received-event.svg\n\tmodified:   src/assets/images/theme/gov/icons-search-close.svg\n\tmodified:   src/assets/images/theme/gov/icons-search.svg\n\tmodified:   src/theme/variables.scss",
+  "changeStatus": "On branch developer-prod\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/create-process/create-process.page.html\n\tmodified:   src/app/modals/delegar/delegar.page.html\n\tmodified:   src/app/modals/document-detail/document-detail.page.html\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified:   src/app/modals/forward/forward.page.html\n\tmodified:   src/app/modals/profile/edit-profile/edit-profile.page.ts\n\tmodified:   src/app/modals/profile/profile.page.ts\n\tmodified:   src/app/modals/view-event/view-event.page.html\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.html\n\tmodified:   src/app/pages/agenda/view-event/view-event.page.html\n\tmodified:   src/app/pages/chat/messages/messages.page.ts\n\tmodified:   src/app/pages/events/edit-event/edit-event.page.html\n\tmodified:   src/app/pages/events/event-detail-modal/event-detail-modal.page.html\n\tmodified:   src/app/pages/events/event-detail/event-detail.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified:   src/app/services/events/edit-event/edit-event.page.html\n\tmodified:   src/app/services/events/event-detail-modal/event-detail-modal.page.html\n\tmodified:   src/app/services/events/event-detail/event-detail.page.html\n\tmodified:   src/app/services/notifications.service.ts\n\tmodified:   src/app/services/processes.service.ts\n\tmodified:   src/app/services/task.service.ts\n\tmodified:   src/app/shared/agenda/approve-event/approve-event.page.html\n\tmodified:   src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.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/agenda/view-event/view-event.page.html\n\tmodified:   src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified:   src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified:   src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.html\n\tmodified:   src/app/shared/gabinete-digital/generic/task-details/task-details.page.html\n\tmodified:   src/app/shared/header/header.page.ts",
  "changeAuthor": "peter.maquiran"
 }