Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

src/app/modals/profile/profile.page.ts

@@ -42,26 +42,48 @@ export class ProfilePage implements OnInit {
   }
 
   ngOnInit() {
+    
     this.storageservice.get("Notifications").then((value) => {
+      console.log("Init get store", value)
 
       var data = JSON.parse(value);
-      data.forEach((element, i) => {
+      console.log("Init store parse", data)
+      data.forEach((element,i) => {
         console.log("ARaaAA", element)
-        var payload = JSON.parse(element.payload)
-        let notificationObject = {
-          index: i,
-          alert: element.alert,
-          Service: payload.Service,
-          Object: payload.Object,
-          IdObject: payload.IdObject,
-          FolderId: payload.FolderId,
-          desc: payload.desc,
-          dateInit: payload.dateInit,
-          dateEnd: payload.dateEnd,
-          Location: payload.Location,
-          TypeAgenda: payload.TypeAgenda,
-          Status: payload.Status
+        let notificationObject;
+        if(element.payload){
+          var payload = JSON.parse(element.payload)
+          notificationObject = {
+            index: i,
+            alert: element.alert,
+            Service: payload.Service,
+            Object: payload.Object,
+            IdObject: payload.IdObject,
+            FolderId: payload.FolderId,
+            desc: payload.desc,
+            dateInit: payload.dateInit,
+            dateEnd: payload.dateEnd,
+            Location: payload.Location,
+            TypeAgenda: payload.TypeAgenda,
+            Status: payload.Status
+          }
+        } else {
+          notificationObject = {
+            index: i,
+            alert: element.alert,
+            Service: element.Service,
+            Object: element.Object,
+            IdObject: element.IdObject,
+            FolderId: element.FolderId,
+            desc: element.desc,
+            dateInit: element.dateInit,
+            dateEnd: element.dateEnd,
+            Location: element.Location,
+            TypeAgenda: element.TypeAgenda,
+            Status: element.Status
+          }
         }
+        
 
         this.DataArray.push(notificationObject)
       });
@@ -69,6 +91,8 @@ export class ProfilePage implements OnInit {
       console.log("Notificaaa", this.notificationdata)
     })
     console.log("Notificaaa", this.notificationdata)
+    
+    
 
   }
 
@@ -124,16 +148,21 @@ export class ProfilePage implements OnInit {
       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', IdObject, 'gabinete-digital']));
     }
 
-    const indexx = this.notificationdata.indexOf(index, 0);
-    if (indexx > -1) {
-      this.notificationdata.splice(index, 1);
-      console.log('This notificatio', this.notificationdata);
-    }
+    this.deleteNotification(index);
+
+
+  }
+
+  deleteNotification(index){
+    console.log("Delete notification first stata", this.notificationdata)
+    this.notificationdata = this.notificationdata.filter(item=>item.index !=index );
     
-    this.notificationservice.removeDepartment(index);
-    console.log('This notificatio 2', this.notificationdata);
-
-
+    this.storageservice.store("Notifications",JSON.stringify(this.notificationdata)).then(() =>{
+      this.storageservice.get("Notifications").then((value) =>{
+        console.log("notfication state", value, )
+      });
+    });
+    console.log("Delete notification last stata", this.notificationdata)
 
   }