Merge branch 'feature/agenda-new-api-eudes' of bitbucket.org:equilibriumito/gabinete-digital-fo into feature/agenda-new-api-eudes

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

@@ -170,12 +170,12 @@ export class EditEventPage implements OnInit {
   }
 
   ngOnInit() {
-    if(!this.postEvent.IsRecurring) {
+    if (!this.postEvent.IsRecurring) {
       this.postEvent.EventRecurrence.frequency = 'never'
     } else {
       this.postEvent.EventRecurrence.frequency = this.utils.recurenceTypeSeleted(this.postEvent.EventRecurrence.frequency)
     }
-    
+
     console.log(this.postEvent?.Attachments)
     console.log(this.loadedEventAttachments)
     window.onresize = (event) => {
@@ -377,11 +377,25 @@ export class EditEventPage implements OnInit {
       this.alertController.create({
         header: 'Editar evento?',
         message: 'Este evento tem recorrência, deseja editar a Sequência de eventos?',
+        inputs: [
+          {
+            name: 'confirm',
+            type: 'checkbox',
+            label: '',
+            value: 'confirm',
+            checked: false
+          }
+        ],
         buttons: [
           {
             text: 'Sim',
-            handler: () => {
-              this.save_v2(true)
+            handler: (data) => {
+              // Check if the checkbox is checked
+              if (data.includes('confirm')) {
+                this.save_v2(true)
+              } else {
+                this.save_v2(false)
+              }
             }
           },
           {

src/app/pages/search/search.page.ts

@@ -165,9 +165,10 @@ export class SearchPage implements OnInit {
   }
 
   async view(item: SearchList) {
+    console.log('doc item',item)
 
-    const ApplicationType = item.ApplicationType.toString()
-    const Id = item.Id
+    const ApplicationType = item.applicationId.toString()
+    const Id = item.docId 
 
     if (ApplicationType == '8') {
 
@@ -178,12 +179,12 @@ export class SearchPage implements OnInit {
         componentProps: {
           trustedUrl: '',
           file: {
-            title: item.Assunto,
+            title: item.subject,
             url: '',
             title_link: '',
           },
           applicationId: ApplicationType,
-          docId: item.Id,
+          docId: item.docId,
         },
         cssClass: 'modal-width-100-width-background modal'
       });
@@ -196,12 +197,12 @@ export class SearchPage implements OnInit {
         componentProps: {
           trustedUrl: '',
           file: {
-            title: item.Assunto,
+            title: item.subject,
             url: '',
             title_link: '',
           },
           applicationId: ApplicationType,
-          docId: item.Id,
+          docId: item.docId,
         },
         cssClass: 'modal-width-100-width-background modal'
       });