fix apresentation labels

src/app/pages/agenda/edit-event/edit-event.page.html

@@ -462,9 +462,9 @@
                 </p>
                 <!-- <p *ngIf="document.Stakeholders" ><span class="span-left" >{{document.Stakeholders}}</span></p>  -->
                 <p>
-                  <span class="app-name span-left" *ngIf="document.ApplicationId  == 8"> Correspondência </span>
+                  <span class="app-name span-left" *ngIf="document.applicationId  == 8 || document.ApplicationId  == 8"> Correspondência </span>
-                  <span class="app-name span-left" *ngIf="document.ApplicationId == 386"> Acções Presidenciais </span>
+                  <span class="app-name span-left" *ngIf="document.applicationId == 386 || document.ApplicationId == 386"> Acções Presidenciais </span>
-                  <span class="app-name span-left" *ngIf="document.ApplicationId == 361 "> Arquivo Despacho Electrónico </span>
+                  <span class="app-name span-left" *ngIf="document.applicationId == 361 || document.ApplicationId == 361 "> Arquivo Despacho Electrónico </span>
 
                 </p>
               </ion-label>

src/app/pages/agenda/edit-event/edit-event.page.ts

@@ -422,9 +422,12 @@ export class EditEventPage implements OnInit {
     this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
     try {
 
+      const events = []
 
       this.agendaDataRepository.updateEvent(this.postEvent.EventId, this.postEvent, editAllEvent).subscribe((value) => {
         console.log(value)
+        this.goBack();
+        this.httpErrorHandle.httpsSucessMessagge('Editar evento')
       }, ((error) => {
         console.log('edit event error: ', error)
       }));
@@ -456,8 +459,6 @@ export class EditEventPage implements OnInit {
 
 
       this.isEventEdited = true;
-      this.goBack();
-      this.httpErrorHandle.httpsSucessMessagge('Editar evento')
 
     } catch (error) {
       this.httpErrorHandle.httpStatusHandle(error)

src/app/pages/agenda/view-event/view-event.page.ts

@@ -440,14 +440,22 @@ export class ViewEventPage implements OnInit {
     await modal.present();
     modal.onDidDismiss().then((res) => {
 
-      if (res) {
+
-        setTimeout(() => {
+
-          this.loadEvent();
+      if (res.data?.action == 'cancel') {
-          /* this.loadEvent1() */
+
-        }, 250);
+        console.log('res', res)
+      } else {
+        this.loadEvent()
         this.isEventEdited = true;
-        console.log('res', res, res.data?.action, 'cancel')
+
+        if (res.data.Attendees?.length >= 1) {
+          this.loadedEvent.HasAttachments = true
+          this.getAttachments()
+        }
+        console.log('res', res)
       }
+
     });
 
   }
@@ -475,24 +483,10 @@ export class ViewEventPage implements OnInit {
 
 
       if (res.data?.action == 'cancel') {
-        setTimeout(() => {
-          this.loadEvent();
-          /*  this.loadEvent1() */
 
-        }, 250);
-        this.isEventEdited = true;
-
-        if (res.data.Attendees?.length >= 1) {
-          this.loadedEvent.HasAttachments = true
-          this.getAttachments()
-        }
         console.log('res', res)
       } else {
-        setTimeout(() => {
+        this.loadEvent()
-          /* this.loadEvent(); */
-          this.loadEvent()
-
-        }, 250);
         this.isEventEdited = true;
 
         if (res.data.Attendees?.length >= 1) {
@@ -502,7 +496,6 @@ export class ViewEventPage implements OnInit {
         console.log('res', res)
       }
 
-      this.getAttachments()
     });
 
     await modal.present();

src/app/pages/search/search.page.html

@@ -301,11 +301,16 @@
                   <div class="d-flex ion-justify-content-between ">
                     <span class="result-name">{{ searchDocument.subject || searchDocument.Assunto}}</span>
                     <span class="app-name"
-                      *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' || itemIcons() == 'Correspondencia' ">{{
+                      *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' || itemIcons() == 'Correspondencia' ">
-                      searchDocument.appName}}</span>
+
+                      <span class="app-name" *ngIf="searchDocument.applicationId  == '8' || searchDocument.applicationId  == 8">  Correspondencia </span>
+                      <span class="app-name" *ngIf="searchDocument.applicationId == '386' || searchDocument.applicationId == 386"> AccoesPresidenciais </span>
+                      <span class="app-name" *ngIf="searchDocument.applicationId == '361' || searchDocument.applicationId == 361 "> ArquivoDespachoElect </span>
+
+                    </span>
                   </div>
                   <div class="d-flex ion-justify-content-between ">
-                    <span class="organic-entity">{{ searchDocument.EntidadeOrganicaNome }}</span>
+                    <span class="organic-entity"></span>
                     <span class="documente-date">{{ formateIsoDate(searchDocument.dateEntry || searchDocument.Data) }}</span>
                   </div>
 

src/app/pages/search/search.page.scss

@@ -201,7 +201,6 @@ ion-slide {
           background: var(--font-awesome);
           border-radius: 18px;
           text-align: center;
-          display: flex;
           align-items: center;
           padding: 0px 5px;
           color: white;
@@ -212,6 +211,9 @@ ion-slide {
           -moz-border-radius: 18px;
           -ms-border-radius: 18px;
           -o-border-radius: 18px;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
         }
         span.documente-date {
         }

src/app/shared/agenda/edit-event/edit-event.page.html

@@ -408,16 +408,16 @@
         <ion-item class="width-100">
           <ion-label class="width-100">
             <p class="d-flex ion-justify-content-between">
+              {{ document | json }}
               <span class="attach-title-item">{{document.subject || document.sourceName || document.SourceName || 'Sem título'}}</span>
-              <span class="app-name" *ngIf="document.ApplicationId  == '8'"> Correspondencia </span>
+              <span class="app-name" *ngIf="document.applicationId  == 8 || document.ApplicationId  == 8"> Correspondencia </span>
-              <span class="app-name" *ngIf="document.ApplicationId == '386'"> AccoesPresidenciais </span>
+              <span class="app-name" *ngIf="document.applicationId == 386 || document.ApplicationId == 386"> AccoesPresidenciais </span>
-              <span class="app-name" *ngIf="document.ApplicationId == '361' "> ArquivoDespachoElect </span>
+              <span class="app-name" *ngIf="document.applicationId == 361 || document.ApplicationId == 361 "> ArquivoDespachoElect </span>
               <span class="close-button text-black cursor-pointer" (click)="deleteAttachment(document.Id, i)">
                 <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
               </span>
             </p>
-            <p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.dateEntry |
+            <p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{ document.dateEntry }}  </span></p>
-                date: 'dd-MM-yyyy HH:mm'}} </span></p>
           </ion-label>
         </ion-item>
       </ion-list>

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

@@ -410,6 +410,13 @@ export class EditEventPage implements OnInit {
 
       this.agendaDataRepository.updateEvent(this._postEvent.EventId, this._postEvent, editAllEvent).subscribe((value) => {
         console.log(value)
+
+        this.httpErrorHandle.httpsSucessMessagge('Editar evento')
+        this.clearPostEvent.emit();
+        this.deleteTemporaryData();
+        this.showLoader = false;
+        this.close();
+
       }, ((error) => {
         console.log('edit event error: ', error)
       }));
@@ -442,14 +449,6 @@ export class EditEventPage implements OnInit {
       }
 
 
-      this.clearPostEvent.emit();
-      this.deleteTemporaryData();
-      this.showLoader = false;
-      this.close();
-
-
-      this.httpErrorHandle.httpsSucessMessagge('Editar evento')
-
     } catch (error) {
       this.httpErrorHandle.httpStatusHandle(error)
       console.log('edit: ', error)
@@ -677,8 +676,9 @@ export class EditEventPage implements OnInit {
           SerialNumber: '',
         }*/
 
+        console.log({data})
 
-        let newDocObject: SearchList_v2 = {
+        let newDocObject: SearchList_v2 & {ApplicationId: any} = {
           docId: data.selected.docId,
           sourceName: data.selected.sourceName,
           description: data.selected.description,
@@ -687,7 +687,8 @@ export class EditEventPage implements OnInit {
           dateEntry: data.selected.dateEntry,
           docNumber: data.selected.docNumber,
           subject: data.selected.subject,
-          userId: data.selected.userId
+          userId: data.selected.userId,
+          ApplicationId: data.selected.applicationId
 
         }