Merge with developer-c

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

@@ -12,6 +12,7 @@ import { AlertService } from 'src/app/services/alert.service';
 import { ExpedientTaskModalPage } from '../expedient-task-modal/expedient-task-modal.page';
 import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.page';
 import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
+import { momentG }  from 'src/plugin/momentG'
 
 @Component({
   selector: 'app-expediente-detail',
@@ -35,18 +36,27 @@ export class ExpedienteDetailPage implements OnInit {
     private router: Router,
     private modalController: ModalController,
     private navParams: NavParams,
+<<<<<<< HEAD
     private alertService: AlertService) {
     this.serialnumber = this.navParams.get('serialNumber');
     this.profile = this.navParams.get('profile');
   }
+=======
+    private alertService: AlertService) { 
+      this.serialnumber = this.navParams.get('serialNumber');
+      this.profile = this.navParams.get('profile');
+    }
+>>>>>>> developer-c
 
   ngOnInit() {
     this.profile = "mdgpr";
+    console.log(this.serialnumber);
+    
     this.activateRoute.paramMap.subscribe(paramMap => {
       if (!paramMap.has('SerialNumber')) {
         return;
       }
-      this.serialnumber = paramMap.get('SerialNumber');
+      /* this.serialnumber = paramMap.get('SerialNumber'); */
       this.LoadTaskDetail(this.serialnumber);
       this.LoadRelatedEvents(this.serialnumber);
     });
@@ -61,9 +71,9 @@ export class ExpedienteDetailPage implements OnInit {
         "SerialNumber": res.serialNumber,
         "Folio": res.workflowInstanceFolio,
         "Senders": res.originator.email,
-        "CreateDate": formatDate(new Date(res.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-        "DocumentURL": res.formURL,
-        "Remetente": res.workflowInstanceDataFields.Remetente
+        "CreateDate": momentG(new Date(res.taskStartDate),'yyyy-MM-dd HH:mm:ss'),
+        "DocumentURL": res.workflowInstanceDataFields.ViewerRequest,
+        "Remetente": res.workflowInstanceDataFields.Sender,
       }
       this.fulltask = res;
       console.log(res);
@@ -88,9 +98,15 @@ export class ExpedienteDetailPage implements OnInit {
     }
   }
 
+<<<<<<< HEAD
   viewDocument() {
     const url: string = this.task.DocumentURL.replace("webTRIX.Viewer", "webTRIX.Viewer.Branch1");
     const browser = this.iab.create(url, "_blank");
+=======
+  viewDocument(){
+    const url: string = this.task.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
+    const browser = this.iab.create(url,"_parent");
+>>>>>>> developer-c
     browser.show();
   }