Improve

src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts

@@ -190,51 +190,6 @@ export class DespachosPrPage implements OnInit {
     });
   }
 
-  // old
-  async openExpedientActionsModal(taskAction: any, task: any) {
-    //this.modalController.dismiss();
-    let classs;
-    if( window.innerWidth <= 800){
-      classs = 'modal modal-desktop'
-    } else  {
-      classs = 'modal modal-desktop showAsideOptions'
-    }
-
-    const doc = this.loadedAttachments[ this.dicIndex];
-
-    task = {
-      serialNumber: doc.SourceId,
-      taskStartDate: doc.CreateDate,
-      isEvent: true,
-      workflowInstanceDataFields: {
-        FsId: doc.ApplicationId,
-        FolderID: null,
-        DocId: doc.SourceId,
-        Subject: doc.SourceName
-      },
-    }
-
-    const modal = await this.modalController.create({
-      component: ExpedientTaskModalPage,
-      componentProps: {
-        taskAction: taskAction,
-        task: task,
-        profile: this.profile,
-      },
-      cssClass: classs,
-    });
-    await modal.present();
-    modal.onDidDismiss().then(res=>{
-      console.log(res['data']);
-      if(res['data']=='openDiscart'){
-        console.log('open discart');
-
-        // this.distartExpedientModal();
-
-      }
-
-    });
-  }
 
   async openBookMeetingModal(task: customFullTask) {
 

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

@@ -125,26 +125,19 @@ export class ExpedientTaskModalPage implements OnInit {
         Nad: 30,
         Subject: '',
         Message: '',
-        SourceSecFsId: this.task.workflowInstanceDataFields.FsId, //361
-        SourceType: 'DOC', //FOLDER
-        SourceId: this.task.workflowInstanceDataFields.DocID, //FolderId
+        SourceSecFsId: this.task.workflowInstanceDataFields.SourceSecFsID, //361
+        SourceType: this.task.workflowInstanceDataFields.SourceType, //FOLDER
+        SourceId: this.task.workflowInstanceDataFields.SourceID, //FolderId
         DeadlineType: '',
         SubjectTypes: this.selectedTypes,
         NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber,
 
       };
 
+      console.log('task 123123', this.task)
+      console.log('this.aplicationId', this.aplicationId)
 
-      if(this.aplicationId == 361) {
-        this.dispatchFolder.SourceType = 'FOLDER'
-        this.dispatchFolder.SourceId = this.task.workflowInstanceDataFields.FolderID
-      } else if(this.aplicationId == 8) {
-        this.dispatchFolder.SourceType = 'DOC'
-        this.dispatchFolder.SourceId = this.task.workflowInstanceDataFields.DocId
-      }
-
-
-
+      
       this.postData.DispatchFolder = this.dispatchFolder;
       this.postData.UsersSelected = this.participants;
       /* By Default TypeDeadline should be 'Normal' */
@@ -152,6 +145,8 @@ export class ExpedientTaskModalPage implements OnInit {
       /* Initialize 'Subject' with the title of the expedient */
       this.postData.DispatchFolder.Subject = this.task.workflowInstanceDataFields.Subject;
       this.profile = this.navParams.get('profile');
+
+      console.log(this.postData);
   }
 
   async setAdding(type:  "intervenient" | "CC") {
@@ -159,7 +154,7 @@ export class ExpedientTaskModalPage implements OnInit {
   }
 
   ngOnInit() {
-    console.log(this.postData);
+
 
     this.taskDate = new Date(this.task.taskStartDate);
     if(!this.task.hasOwnProperty('isEvent')) {

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

@@ -20,6 +20,7 @@ import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
 import { PermissionService } from 'src/app/OtherService/permission.service';
 import { SearchDocumentPipe } from 'src/app/pipes/search-document.pipe';
 import { ExpedientesService } from 'src/app/Rules/expedientes.service';
+import { expedienteTask } from 'src/app/models/dailyworktask.model';
 
 @Component({
   selector: 'app-expediente-detail',
@@ -33,7 +34,7 @@ export class ExpedienteDetailPage implements OnInit {
 
   customDate:any;
 
-  task: any;
+  task: expedienteTask;
   fulltask: any;
   eventsList: Event[];
   serialNumber: string;
@@ -256,6 +257,7 @@ export class ExpedienteDetailPage implements OnInit {
         "AttachmentsProcessLastInstanceID": res.workflowInstanceDataFields.AttachmentsProcessLastInstanceID,
         "InstanceID": res.workflowInstanceDataFields.InstanceID
       }
+
       this.fulltask = res;
 
       let thedate = new Date(this.task.CreateDate);

src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts

@@ -535,6 +535,7 @@ export class ExpedientePrPage implements OnInit {
   }
 
   async openOptions(taskAction?: any) {
+
     const popover = await this.popoverController.create({
       component: OptsExpedientePrPage,
       cssClass: 'exp-options',