diff --git a/matsen-tool/src/app/_components/search-select/search-select.component.html b/matsen-tool/src/app/_components/search-select/search-select.component.html index c468ce6..9d2d7c6 100644 --- a/matsen-tool/src/app/_components/search-select/search-select.component.html +++ b/matsen-tool/src/app/_components/search-select/search-select.component.html @@ -26,7 +26,10 @@ - + + diff --git a/matsen-tool/src/app/_components/search-select/search-select.component.ts b/matsen-tool/src/app/_components/search-select/search-select.component.ts index 613c69a..b82c4db 100644 --- a/matsen-tool/src/app/_components/search-select/search-select.component.ts +++ b/matsen-tool/src/app/_components/search-select/search-select.component.ts @@ -19,6 +19,8 @@ export class SearchSelectComponent implements OnInit, AfterViewInit { @Input() public getDataFunction!: Function; @Input() public dataSource: any; @Input() public searchSelectColDefs!: SearchInputColDef[]; + @Input() public displayedDataField!: string; + @Input() public displayedDataSubResource!: string; @Output() rowSelected = new EventEmitter(); @@ -90,7 +92,11 @@ export class SearchSelectComponent implements OnInit, AfterViewInit { console.log(row, index); this.selectedRowIndex = index; this.documentForm.get(this.formId)?.setValue(row.id); - this.paragraphRef.nativeElement.textContent = row.fullName; + if (this.displayedDataSubResource !== undefined) { + this.paragraphRef.nativeElement.textContent = row[this.displayedDataSubResource][this.displayedDataField]; + } else { + this.paragraphRef.nativeElement.textContent = row[this.displayedDataField]; + } this.searchBoxFilled = true; this.searchBoxOpen = false; } diff --git a/matsen-tool/src/app/_views/documents/new-document/new-document.component.html b/matsen-tool/src/app/_views/documents/new-document/new-document.component.html index de2d814..25bb454 100644 --- a/matsen-tool/src/app/_views/documents/new-document/new-document.component.html +++ b/matsen-tool/src/app/_views/documents/new-document/new-document.component.html @@ -20,6 +20,7 @@ [getDataFunction]="getPartners" [dataSource]="dataSourcePartners" [searchSelectColDefs]="colDefPartners" + [displayedDataField]="'name'" > @@ -33,6 +34,7 @@ [getDataFunction]="getProducts" [dataSource]="dataSourceProducts" [searchSelectColDefs]="colDefProducts" + [displayedDataField]="'name'" > diff --git a/matsen-tool/src/app/_views/products/assign-product/assign-product.component.html b/matsen-tool/src/app/_views/products/assign-product/assign-product.component.html index 70f5b44..2138cf6 100644 --- a/matsen-tool/src/app/_views/products/assign-product/assign-product.component.html +++ b/matsen-tool/src/app/_views/products/assign-product/assign-product.component.html @@ -10,6 +10,7 @@ [getDataFunction]="getUnassignedProducts" [dataSource]="dataSourceProducts" [searchSelectColDefs]="colDefProducts" + [displayedDataField]="'name'" > @@ -22,6 +23,8 @@ [getDataFunction]="getUnassignedPartnerProducts" [dataSource]="dataSourcePartnerProducts" [searchSelectColDefs]="colDefPartnerProducts" + [displayedDataField]="'name'" + [displayedDataSubResource]="'product'" > diff --git a/matsen-tool/src/app/_views/sales/new-sale/new-sale.component.html b/matsen-tool/src/app/_views/sales/new-sale/new-sale.component.html index a72274b..8a5d30f 100644 --- a/matsen-tool/src/app/_views/sales/new-sale/new-sale.component.html +++ b/matsen-tool/src/app/_views/sales/new-sale/new-sale.component.html @@ -11,6 +11,7 @@ [getDataFunction]="getPartners" [dataSource]="dataSourcePartners" [searchSelectColDefs]="colDefPartners" + [displayedDataField]="'name'" > @@ -24,6 +25,7 @@ [getDataFunction]="getProducts" [dataSource]="dataSourceProducts" [searchSelectColDefs]="colDefProducts" + [displayedDataField]="'name'" > diff --git a/matsen-tool/src/app/_views/tasks/new-task-note/new-task-note.component.html b/matsen-tool/src/app/_views/tasks/new-task-note/new-task-note.component.html index 8c02452..410b3be 100644 --- a/matsen-tool/src/app/_views/tasks/new-task-note/new-task-note.component.html +++ b/matsen-tool/src/app/_views/tasks/new-task-note/new-task-note.component.html @@ -19,6 +19,7 @@ [getDataFunction]="getContacts" [dataSource]="dataSourceContacts" [searchSelectColDefs]="colDefContacts" + [displayedDataField]="'fullName'" > diff --git a/matsen-tool/src/app/_views/tasks/new-task/new-task.component.html b/matsen-tool/src/app/_views/tasks/new-task/new-task.component.html index cde2523..7cc238d 100644 --- a/matsen-tool/src/app/_views/tasks/new-task/new-task.component.html +++ b/matsen-tool/src/app/_views/tasks/new-task/new-task.component.html @@ -27,6 +27,7 @@ [getDataFunction]="getProducts" [dataSource]="dataSourceProducts" [searchSelectColDefs]="colDefProducts" + [displayedDataField]="'name'" > @@ -42,6 +43,7 @@ [getDataFunction]="getUsers" [dataSource]="dataSourceUsers" [searchSelectColDefs]="colDefUsers" + [displayedDataField]="'fullName'" >