ui fix
This commit is contained in:
parent
57a7d502f4
commit
65f868f11f
|
@ -62,9 +62,9 @@ export class DescriptionTemplateTypeService {
|
||||||
//
|
//
|
||||||
// tslint:disable-next-line: member-ordering
|
// tslint:disable-next-line: member-ordering
|
||||||
singleAutocompleteConfiguration: SingleAutoCompleteConfiguration = {
|
singleAutocompleteConfiguration: SingleAutoCompleteConfiguration = {
|
||||||
initialItems: (data?: any) => this.query(this.buildAutocompleteLookup()).pipe(map(x => x.items)),
|
initialItems: (data?: any) => this.query(this.buildAutocompleteLookup([IsActive.Active])).pipe(map(x => x.items)),
|
||||||
filterFn: (searchQuery: string, data?: any) => this.query(this.buildAutocompleteLookup(searchQuery)).pipe(map(x => x.items)),
|
filterFn: (searchQuery: string, data?: any) => this.query(this.buildAutocompleteLookup([IsActive.Active], searchQuery)).pipe(map(x => x.items)),
|
||||||
getSelectedItem: (selectedItem: any) => this.query(this.buildAutocompleteLookup(null, null, [selectedItem])).pipe(map(x => x.items[0])),
|
getSelectedItem: (selectedItem: any) => this.query(this.buildAutocompleteLookup([IsActive.Active, IsActive.Inactive], null, null, [selectedItem])).pipe(map(x => x.items[0])),
|
||||||
displayFn: (item: DescriptionTemplateType) => item.name,
|
displayFn: (item: DescriptionTemplateType) => item.name,
|
||||||
titleFn: (item: DescriptionTemplateType) => item.name,
|
titleFn: (item: DescriptionTemplateType) => item.name,
|
||||||
valueAssign: (item: DescriptionTemplateType) => item.id,
|
valueAssign: (item: DescriptionTemplateType) => item.id,
|
||||||
|
@ -72,9 +72,9 @@ export class DescriptionTemplateTypeService {
|
||||||
|
|
||||||
public getSingleAutocompleteConfiguration(statuses?: DescriptionTemplateTypeStatus[]): SingleAutoCompleteConfiguration {
|
public getSingleAutocompleteConfiguration(statuses?: DescriptionTemplateTypeStatus[]): SingleAutoCompleteConfiguration {
|
||||||
return {
|
return {
|
||||||
initialItems: (data?: any) => this.query(this.buildAutocompleteLookup(null, null, null, statuses ? statuses: null)).pipe(map(x => x.items)),
|
initialItems: (data?: any) => this.query(this.buildAutocompleteLookup([IsActive.Active], null, null, null, statuses ? statuses: null)).pipe(map(x => x.items)),
|
||||||
filterFn: (searchQuery: string, data?: any) => this.query(this.buildAutocompleteLookup(searchQuery, null, null, statuses ? statuses: null)).pipe(map(x => x.items)),
|
filterFn: (searchQuery: string, data?: any) => this.query(this.buildAutocompleteLookup([IsActive.Active], searchQuery, null, null, statuses ? statuses: null)).pipe(map(x => x.items)),
|
||||||
getSelectedItem: (selectedItem: any) => this.query(this.buildAutocompleteLookup(null, null, [selectedItem])).pipe(map(x => x.items[0])),
|
getSelectedItem: (selectedItem: any) => this.query(this.buildAutocompleteLookup([IsActive.Active, IsActive.Inactive], null, null, [selectedItem])).pipe(map(x => x.items[0])),
|
||||||
displayFn: (item: DescriptionTemplateType) => item.name,
|
displayFn: (item: DescriptionTemplateType) => item.name,
|
||||||
titleFn: (item: DescriptionTemplateType) => item.name,
|
titleFn: (item: DescriptionTemplateType) => item.name,
|
||||||
valueAssign: (item: DescriptionTemplateType) => item.id,
|
valueAssign: (item: DescriptionTemplateType) => item.id,
|
||||||
|
@ -83,9 +83,9 @@ export class DescriptionTemplateTypeService {
|
||||||
|
|
||||||
// tslint:disable-next-line: member-ordering
|
// tslint:disable-next-line: member-ordering
|
||||||
multipleAutocompleteConfiguration: MultipleAutoCompleteConfiguration = {
|
multipleAutocompleteConfiguration: MultipleAutoCompleteConfiguration = {
|
||||||
initialItems: (excludedItems: any[], data?: any) => this.query(this.buildAutocompleteLookup(null, excludedItems ? excludedItems : null)).pipe(map(x => x.items)),
|
initialItems: (excludedItems: any[], data?: any) => this.query(this.buildAutocompleteLookup([IsActive.Active], null, excludedItems ? excludedItems : null)).pipe(map(x => x.items)),
|
||||||
filterFn: (searchQuery: string, excludedItems: any[]) => this.query(this.buildAutocompleteLookup(searchQuery, excludedItems)).pipe(map(x => x.items)),
|
filterFn: (searchQuery: string, excludedItems: any[]) => this.query(this.buildAutocompleteLookup([IsActive.Active], searchQuery, excludedItems)).pipe(map(x => x.items)),
|
||||||
getSelectedItems: (selectedItems: any[]) => this.query(this.buildAutocompleteLookup(null, null, selectedItems)).pipe(map(x => x.items)),
|
getSelectedItems: (selectedItems: any[]) => this.query(this.buildAutocompleteLookup([IsActive.Active, IsActive.Inactive], null, null, selectedItems)).pipe(map(x => x.items)),
|
||||||
displayFn: (item: DescriptionTemplateType) => item.name,
|
displayFn: (item: DescriptionTemplateType) => item.name,
|
||||||
titleFn: (item: DescriptionTemplateType) => item.name,
|
titleFn: (item: DescriptionTemplateType) => item.name,
|
||||||
valueAssign: (item: DescriptionTemplateType) => item.id,
|
valueAssign: (item: DescriptionTemplateType) => item.id,
|
||||||
|
@ -93,21 +93,21 @@ export class DescriptionTemplateTypeService {
|
||||||
|
|
||||||
public getMultipleAutoCompleteSearchConfiguration(statuses?: DescriptionTemplateTypeStatus[]): MultipleAutoCompleteConfiguration {
|
public getMultipleAutoCompleteSearchConfiguration(statuses?: DescriptionTemplateTypeStatus[]): MultipleAutoCompleteConfiguration {
|
||||||
return {
|
return {
|
||||||
initialItems: (excludedItems: any[], data?: any) => this.query(this.buildAutocompleteLookup(null, excludedItems ? excludedItems : null, null, statuses ? statuses: null)).pipe(map(x => x.items)),
|
initialItems: (excludedItems: any[], data?: any) => this.query(this.buildAutocompleteLookup([IsActive.Active], null, excludedItems ? excludedItems : null, null, statuses ? statuses: null)).pipe(map(x => x.items)),
|
||||||
filterFn: (searchQuery: string, excludedItems: any[]) => this.query(this.buildAutocompleteLookup(searchQuery, excludedItems, null, statuses ? statuses: null)).pipe(map(x => x.items)),
|
filterFn: (searchQuery: string, excludedItems: any[]) => this.query(this.buildAutocompleteLookup([IsActive.Active], searchQuery, excludedItems, null, statuses ? statuses: null)).pipe(map(x => x.items)),
|
||||||
getSelectedItems: (selectedItems: any[]) => this.query(this.buildAutocompleteLookup(null, null, selectedItems)).pipe(map(x => x.items)),
|
getSelectedItems: (selectedItems: any[]) => this.query(this.buildAutocompleteLookup([IsActive.Active, IsActive.Inactive], null, null, selectedItems)).pipe(map(x => x.items)),
|
||||||
displayFn: (item: DescriptionTemplateType) => item.name,
|
displayFn: (item: DescriptionTemplateType) => item.name,
|
||||||
titleFn: (item: DescriptionTemplateType) => item.name,
|
titleFn: (item: DescriptionTemplateType) => item.name,
|
||||||
valueAssign: (item: DescriptionTemplateType) => item.id,
|
valueAssign: (item: DescriptionTemplateType) => item.id,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private buildAutocompleteLookup(like?: string, excludedIds?: Guid[], ids?: Guid[], statuses?: DescriptionTemplateTypeStatus[]): DescriptionTemplateTypeLookup {
|
private buildAutocompleteLookup(isActive: IsActive[], like?: string, excludedIds?: Guid[], ids?: Guid[], statuses?: DescriptionTemplateTypeStatus[]): DescriptionTemplateTypeLookup {
|
||||||
const lookup: DescriptionTemplateTypeLookup = new DescriptionTemplateTypeLookup();
|
const lookup: DescriptionTemplateTypeLookup = new DescriptionTemplateTypeLookup();
|
||||||
lookup.page = { size: 100, offset: 0 };
|
lookup.page = { size: 100, offset: 0 };
|
||||||
if (excludedIds && excludedIds.length > 0) { lookup.excludedIds = excludedIds; }
|
if (excludedIds && excludedIds.length > 0) { lookup.excludedIds = excludedIds; }
|
||||||
if (ids && ids.length > 0) { lookup.ids = ids; }
|
if (ids && ids.length > 0) { lookup.ids = ids; }
|
||||||
lookup.isActive = [IsActive.Active];
|
lookup.isActive = isActive;
|
||||||
lookup.statuses = statuses;
|
lookup.statuses = statuses;
|
||||||
lookup.project = {
|
lookup.project = {
|
||||||
fields: [
|
fields: [
|
||||||
|
|
Loading…
Reference in New Issue