mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 04:57:52 +00:00
Merge with developer-c
This commit is contained in:
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user