MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

added grant id to displayfn

This commit is contained in:
Diamantis Tziotzios 2019-12-13 17:05:19 +02:00
parent e51f855737
commit 3bab68265b
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts
View File

@ -241,8 +241,8 @@ export class MultipleAutoCompleteComponent extends _CustomComponentMixinBase imp
onContainerClick(event: MouseEvent) { onContainerClick(event: MouseEvent) {
event.stopPropagation(); event.stopPropagation();
this._onInputFocus();
if (this.disabled) { return; } if (this.disabled) { return; }
this._onInputFocus();
if (!this.autocomplete.isOpen) { if (!this.autocomplete.isOpen) {
this.autocompleteTrigger.openPanel(); this.autocompleteTrigger.openPanel();
} }

2
dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts
View File

@ -262,8 +262,8 @@ export class SingleAutoCompleteComponent extends _CustomComponentMixinBase imple
onContainerClick(event: MouseEvent) { onContainerClick(event: MouseEvent) {
event.stopPropagation(); event.stopPropagation();
this._onInputFocus();
if (this.disabled) { return; } if (this.disabled) { return; }
this._onInputFocus();
if (!this.autocomplete.isOpen) { if (!this.autocomplete.isOpen) {
this.autocompleteTrigger.openPanel(); this.autocompleteTrigger.openPanel();
} }

12
dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.ts
View File

@ -45,6 +45,14 @@ export class GrantTabComponent extends BaseComponent implements OnInit {
super(); super();
} }
getGrantIdText(item) {
if (item.reference != null && typeof item.reference == 'string') {
const parts = (item.reference as String).split('::');
return parts.length > 1 ? ' (' + parts[parts.length - 1] + ')' : '';
}
return '';
}
ngOnInit() { ngOnInit() {
const grantRequestItem: RequestItem<GrantCriteria> = new RequestItem(); const grantRequestItem: RequestItem<GrantCriteria> = new RequestItem();
@ -61,8 +69,8 @@ export class GrantTabComponent extends BaseComponent implements OnInit {
this.grantAutoCompleteConfiguration = { this.grantAutoCompleteConfiguration = {
filterFn: this.searchGrant.bind(this), filterFn: this.searchGrant.bind(this),
initialItems: () => this.searchGrant(''), initialItems: () => this.searchGrant(''),
displayFn: (item) => item['label'], displayFn: (item) => item['label'] + this.getGrantIdText(item),
titleFn: (item) => item['label'], titleFn: (item) => item['label'] + this.getGrantIdText(item),
subtitleFn: (item) => item['source'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['source'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE') subtitleFn: (item) => item['source'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['source'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE')
}; };

13
dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.ts
View File

@ -17,6 +17,7 @@ import { ValidationErrorModel } from '@common/forms/validation/error-model/valid
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { Observable, of as observableOf } from 'rxjs'; import { Observable, of as observableOf } from 'rxjs';
import { takeUntil } from 'rxjs/operators'; import { takeUntil } from 'rxjs/operators';
import { strict } from 'assert';
@Component({ @Component({
selector: 'app-quick-wizard-grant-editor-component', selector: 'app-quick-wizard-grant-editor-component',
@ -44,6 +45,14 @@ export class GrantEditorWizardComponent extends BaseComponent implements OnInit,
super(); super();
} }
getGrantIdText(item) {
if (item.reference != null && typeof item.reference == 'string') {
const parts = (item.reference as String).split('::');
return parts.length > 1 ? ' (' + parts[parts.length - 1] + ')' : '';
}
return '';
}
ngOnInit() { ngOnInit() {
this.breadCrumbs = observableOf([{ this.breadCrumbs = observableOf([{
parentComponentName: 'QuickCreate', parentComponentName: 'QuickCreate',
@ -57,8 +66,8 @@ export class GrantEditorWizardComponent extends BaseComponent implements OnInit,
this.grantAutoCompleteConfiguration = { this.grantAutoCompleteConfiguration = {
filterFn: this.searchGrant.bind(this), filterFn: this.searchGrant.bind(this),
initialItems: (extraData) => this.searchGrant(''), initialItems: (extraData) => this.searchGrant(''),
displayFn: (item) => item['label'], displayFn: (item) => item['label'] + this.getGrantIdText(item),
titleFn: (item) => item['label'], titleFn: (item) => item['label'] + this.getGrantIdText(item),
subtitleFn: (item) => item['source'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['source'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE') subtitleFn: (item) => item['source'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['source'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE')
}; };