-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #429 from IntegratedBreedingPlatform/IBP-4098-Impo…
…rtGermplasm IBP-4098 import germplasm
- Loading branch information
Showing
75 changed files
with
3,467 additions
and
974 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
...hipster/src/main/webapp/app/entities/breeding-method/breeding-method-manager.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| import { Component, OnInit } from '@angular/core'; | ||
| import { ActivatedRoute } from '@angular/router'; | ||
| import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; | ||
| import { DomSanitizer } from '@angular/platform-browser'; | ||
| import { PopupService } from '../../shared/modal/popup.service'; | ||
| import { ParamContext } from '../../shared/service/param.context'; | ||
| import { BREEDING_METHODS_BROWSER_DEFAULT_URL } from '../../app.constants'; | ||
| import { GermplasmComponent } from '../germplasm/germplasm.component'; | ||
|
|
||
| @Component({ | ||
| selector: 'jhi-breeding-method-manager', | ||
| template: ` | ||
| <div class="modal-header"> | ||
| <h4 class="modal-title font-weight-bold"> | ||
| <span jhiTranslate="breeding-method.browser.title"></span> | ||
| </h4> | ||
| <button type="button" class="close" data-dismiss="modal" aria-hidden="true" | ||
| (click)="close()">× | ||
| </button> | ||
| </div> | ||
| <div class="modal-body"> | ||
| <iframe [src]="safeUrl" style="border: 0" width="100%" height="650"></iframe> | ||
| </div> | ||
| ` | ||
| }) | ||
| export class BreedingMethodManagerComponent implements OnInit { | ||
| safeUrl: string; | ||
|
|
||
| constructor(private route: ActivatedRoute, | ||
| public activeModal: NgbActiveModal, | ||
| private sanitizer: DomSanitizer) { | ||
| } | ||
|
|
||
| ngOnInit(): void { | ||
| } | ||
|
|
||
| close() { | ||
| this.activeModal.close(); | ||
| } | ||
| } | ||
|
|
||
| @Component({ | ||
| selector: 'jhi-breeding-method-manager-popup', | ||
| template: `` | ||
| }) | ||
| export class BreedingMethodManagerPopupComponent implements OnInit { | ||
|
|
||
| constructor(private route: ActivatedRoute, | ||
| private popupService: PopupService, | ||
| private sanitizer: DomSanitizer, | ||
| private paramContext: ParamContext) { | ||
| } | ||
|
|
||
| ngOnInit(): void { | ||
| const params = '?programId=' + this.paramContext.selectedProjectId; | ||
|
|
||
| const modal = this.popupService.open(BreedingMethodManagerComponent as Component, { windowClass: 'modal-autofit' }); | ||
| modal.then((modalRef) => { | ||
| modalRef.componentInstance.safeUrl = | ||
| this.sanitizer.bypassSecurityTrustResourceUrl(BREEDING_METHODS_BROWSER_DEFAULT_URL + params); | ||
| }); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
src/main/jhipster/src/main/webapp/app/entities/breeding-method/breeding-method.route.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,16 @@ | ||
| import { Routes } from '@angular/router'; | ||
| import { BreedingMethodPopupComponent } from './breeding-method.component'; | ||
| import { BreedingMethodManagerPopupComponent } from './breeding-method-manager.component'; | ||
|
|
||
| export const breedingMethodRoutes: Routes = [ | ||
| { | ||
| path: 'breeding-method/:breedingMethodId', | ||
| component: BreedingMethodPopupComponent, | ||
| outlet: 'popup' | ||
| }, | ||
| { | ||
| path: 'breeding-method-browser', | ||
| component: BreedingMethodManagerPopupComponent, | ||
| outlet: 'popup' | ||
| } | ||
| ]; |
10 changes: 0 additions & 10 deletions
10
src/main/jhipster/src/main/webapp/app/entities/germplasm/germplasm-name-type.model.ts
This file was deleted.
Oops, something went wrong.
2 changes: 2 additions & 0 deletions
2
src/main/jhipster/src/main/webapp/app/entities/germplasm/germplasm.model.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/main/jhipster/src/main/webapp/app/entities/sample/sample.route.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.