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

src/app/pages/events/events.page.ts

@@ -68,7 +68,7 @@ export class EventsPage implements OnInit {
     private alertController: AlertService,
     private authService: AuthService,
     private processes:ProcessesService,
-    private gabineteService: GabineteDigitalPage,
+    /* private gabineteService: GabineteDigitalPage, */
     private modalController:ModalController) {
       this.prEventList = null;
 
@@ -316,7 +316,7 @@ export class EventsPage implements OnInit {
     else{
       console.log('ttt');
       this.router.navigate(['/home/gabinete-digital']);
-      this.gabineteService.openExpedientListPage();
+     /*  this.gabineteService.openExpedientListPage(); */
     }
   }
 

src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts

@@ -39,9 +39,17 @@ export class DiscartExpedientModalPage implements OnInit {
 
   } */
   save(){
+
     let body = { "serialNumber": this.serialNumber, "action": "Tratado" }
+    let body2 = { "serialNumber": this.serialNumber, "action": "Passivo" }
     console.log(body);
+    
+    if(this.folderId){
       this.processes.PostTaskAction(body);
+    }
+    else{
+      this.processes.PostTaskAction(body2);
+    }
     this.router.navigate(['/home/gabinete-digital/expediente']);
     this.modalController.dismiss();
   }

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -135,7 +135,7 @@ export class ExpedienteDetailPage implements OnInit {
   }
 
   discartExpedient() {
-    let body = { "serialNumber": this.serialnumber, "action": "Task Completed" }
+    let body = { "serialNumber": this.serialnumber, "action": "Passivo" }
     console.log(body);
     this.processes.PostTaskAction(body);
     this.router.navigate(['/home/gabinete-digital/expediente']);