Merge with developer-c

src/app/home/home.page.ts

@@ -31,7 +31,7 @@ export class HomePage implements OnInit {
   totalExpediente = 0;
   profile: string;
 
-  constructor(private ngZone: NgZone,private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController,) { }
+  constructor(private zone: NgZone,private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController,) { }
 
   ngOnInit() {
 /*     //Initialize profile as mdgpr
@@ -111,6 +111,42 @@ export class HomePage implements OnInit {
     ); */
   }
 
+  /* mobileFirstTest() {
+    this.zone.run(() => {
+      alert("Hello MobileFirst");
+      alert("Connecting to Server...");
+    });
+    WLAuthorizationManager.obtainAccessToken("").then(
+      (token) => {
+        console.log('-->  pingMFP(): Success ', token);
+        this.zone.run(() => {
+          alert("Yay!");
+          alert("Connected to MobileFirst Server");
+        });
+        var resourceRequest = new WLResourceRequest("/adapters/javaAdapter/resource/greet/",
+          WLResourceRequest.GET
+        );
+
+        resourceRequest.setQueryParameter("name", "world");
+        resourceRequest.send().then(
+          (response) => {
+            // Will display "Hello world" in an alert dialog.
+            alert("Success: " + response.responseText);
+          },
+          (error) => {
+            alert("Failure: " + JSON.stringify(error));
+          }
+        );
+      }, (error) => {
+        console.log('-->  pingMFP(): failure ', error.responseText);
+        this.zone.run(() => {
+          alert("Bummer...");
+          alert("Failed to connect to MobileFirst Server");
+        });
+      }
+    );
+  } */
+
    async openApproveModal(eventSerialNumber){
     const modal = await this.modalController.create({
       component: ApproveEventModalPage,

src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss

@@ -1,147 +1,4 @@
 ion-content{
-<<<<<<< HEAD
-    --padding-top:0px;
-    --padding-start: 20px;
-    --padding-end: 20px;
-    font-size: 18px;
-  }
-  ion-menu{
-    --height: 225px;
-  }
-  .header-content{
-    width: 360px;
-    overflow: auto;
-    margin: 25px auto;
-  }
-  .header-icon-left{
-    width: 36px;
-    font-size: 33px;
-    color: #42b9fe;
-    float: left;
-  }
-  .header-title{
-    width: 264px;
-    font-family: Roboto;
-    font-size: 25px;
-    margin: 0 5px 0 5px;
-    padding: 0;
-    color:#000;
-    float: left;
-  }
-  .header-icon-right{
-    width: 45px;
-    font-size: 45px;
-    float: left;
-    overflow: auto;
-  }
-  .upper-content{
-    margin-left: 50px;
-    overflow: auto;
-    font-size: 18px;
-  
-    .content-location{
-      width: 360px;
-      margin: 0 auto;
-      padding: 0;
-      overflow: auto;
-    }
-  
-    .location-detail{
-      width: 210px;
-      font-weight: 700;
-      font-size: 18px;
-      float: left;
-      margin: 5px 5px 5px 0px;
-    }
-    .button-calendar-type{
-        width: 91px;
-        --border-radius: 12.5px;
-        --background: #ffb703;
-        margin-left: 5px;
-        float: left;
-    }
-    .button-calendar-type ion-button{
-      height: 25px;
-    }
-    .button-edit-event {
-        width: 140px;
-        height: 44px;
-        border-radius: 22.5px;
-        --background: #e0e9ee;
-        --color:#061b52;
-    }
-    .content-details p{
-        font-size: 16px;
-    }
-  }
-  .middle-conten{
-    .middle-content h3, .middle-content p{
-      font-size: 16px;
-    }
-  }
-  
-  .bottom-content{
-    width: 360px;
-    margin: 0 auto;
-    
-    .bottom-content h3{
-      font-size: 16px;
-      margin: 0 0 0 10px;
-    }
-    .attach-document{
-      font-size: 15px;
-      color: #0d89d1;
-      margin: 5px 5px 5px 10px;
-      padding: 5px;
-      float: left;
-    }
-    .attach-icon{
-      width: 37px;
-      font-size: 35px;
-      float: left;
-    }
-    .attach-title-item{
-      width: 100%;
-      font-size: 15px;
-      color:#0d89d1;
-    }
-    /* SPAN */
-    .span-left{
-      float: left;
-      font-size: 15x;
-    }
-    .span-right{
-    text-align: right;
-    float: right;
-    font-size: 13px;
-    }
-  }
-  
-  .buttons{
-    width: 360px;
-    margin: 0 auto;
-  }
-  
-  .button-options {
-      height: 44px;
-       --color: #42b9fe;
-       /* opacity: 0; */
-  }
-  .button-approve {
-    width: 140px;
-    height: 44px;
-    border-radius: 22.5px;
-    --background: #42b9fe;
-  }
-  .button-reject {
-    width: 140px;
-    height: 44px;
-    --color: #d30a0a;
-    border-radius: 22.5px;
-    --background: #ffe0e0;
-  }
-  
-=======
   --padding-top:0px;
   --padding-start: 20px;
   --padding-end: 20px;
@@ -282,4 +139,3 @@ ion-menu{
   border-radius: 22.5px;
   --background: #ffe0e0;
 }
->>>>>>> developer-c

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

@@ -36,17 +36,10 @@ 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";
@@ -98,15 +91,9 @@ 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();
   }