Merge with developer-c

This commit is contained in:
Eudes Inácio
2021-02-25 09:42:06 +01:00
parent 1baa7d07e2
commit 50b3a203ca
38 changed files with 46 additions and 182 deletions
@@ -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();
}