hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

CST-12455 Itemfilter dropdown for the edit inboundpatterns is working, now changing all remaining code and finalizing task

Browse Source
This commit is contained in:
Mattia Vianelli
2023-11-15 11:57:14 +01:00
parent 754a6822a7
commit 35c45850e7
2 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/app/admin/admin-ldn-services/ldn-service-form-edit/ldn-service-form-edit.component.html
View File

@@ -103,11 +103,11 @@
/> />
<!-- Main label TODO: remove after developing done cause it will pick the selected value to show --> <!-- Main label TODO: remove after developing done cause it will pick the selected value to show -->
<div>{{ selectedInboundPatterns ? ('ldn-service.form.pattern.' + selectedInboundPatterns + '.label' | translate) : ('ldn-new-service.form.label.placeholder.outboundPattern' | translate) }}</div> <div>{{ selectedInboundPatterns ? ('ldn-service.form.pattern.' + selectedInboundPatterns + '.label' | translate) : ('ldn-new-service.form.label.placeholder.inboundPattern' | translate) }}</div>
<div <div
class="small-text">{{ selectedInboundPatterns ? ('ldn-service.form.pattern.' + selectedInboundPatterns + '.description' | translate) : ('' | translate) }}</div> class="small-text">{{ selectedInboundPatterns ? ('ldn-service.form.pattern.' + selectedInboundPatterns + '.description' | translate) : ('' | translate) }}</div>
<!-- TODO: infinite scroll with 3 selects --> <!-- TODO: infinite scroll with 3 selects -->
<div aria-labelledby="outboundPatternDropdownButton" ngbDropdownMenu> <div aria-labelledby="inboundPatternDropdownButton" ngbDropdownMenu>
<button (click)="selectInboundPattern(pattern, i); $event.stopPropagation()" *ngFor="let pattern of inboundPatterns; let internalIndex = index" <button (click)="selectInboundPattern(pattern, i); $event.stopPropagation()" *ngFor="let pattern of inboundPatterns; let internalIndex = index"
ngbDropdownItem ngbDropdownItem
type="button"> type="button">
@@ -122,11 +122,34 @@
<div class="col"> <div class="col">
<ng-container *ngIf="getInboundPatternControlNames(i)"> <ng-container *ngIf="getInboundPatternControlNames(i)">
<select formControlName="constraint" id="constraint{{i}}" name="constraint{{i}}"> <div #inboundItemfilterDropdown="ngbDropdown" class="w-100" id="constraint{{i}}" ngbDropdown>
<option value="">{{ 'ldn-new-service.form.label.placeholder.selectedItemFilter' | translate }}</option> <div class="position-relative right-addon" role="combobox">
<option *ngFor="let itemFilter of (itemfiltersRD$ | async)?.payload?.page" <i aria-hidden="true" class="position-absolute scrollable-dropdown-toggle"
[value]="itemFilter.id">{{ itemFilter.id }}</option> ngbDropdownToggle></i>
</select> <input
(click)="inboundItemfilterDropdown.open();"
[readonly]="true"
[value]="selectedInboundItemfilters"
class="form-control w-100 scrollable-dropdown-input"
formControlName="constraint"
id="inboundItemfilterDropdown"
ngbDropdownAnchor
type="text"
/>
<div>{{ selectedInboundItemfilters ? ('ldn-service.form.pattern.' + selectedInboundItemfilters + '.label' | translate) : ('ldn-new-service.form.label.placeholder.outboundPattern' | translate) }}</div>
<div
class="small-text">{{ selectedInboundItemfilters ? ('ldn-service.form.pattern.' + selectedInboundItemfilters + '.description' | translate) : ('' | translate) }}</div>
<!-- TODO: infinite scroll with 3 selects -->
<div aria-labelledby="inboundItemfilterDropdownButton" ngbDropdownMenu>
<button (click)="selectInboundItemFilter(constraint.id, i); $event.stopPropagation()" *ngFor="let constraint of (itemfiltersRD$ | async)?.payload?.page; let internalIndex = index"
ngbDropdownItem
type="button">
<div>{{ constraint.id }}</div>
</button>
</div>
</div>
</div>
</ng-container> </ng-container>
</div> </div>

14
src/app/admin/admin-ldn-services/ldn-service-form-edit/ldn-service-form-edit.component.ts
View File

@@ -67,6 +67,7 @@ export class LdnServiceFormEditComponent implements OnInit {
private modalRef: any; private modalRef: any;
private service: LdnService; private service: LdnService;
selectedOutboundPatterns: string[]; selectedOutboundPatterns: string[];
selectedInboundItemfilters: any;
selectedInboundPatterns: string[]; selectedInboundPatterns: string[];
constructor( constructor(
@@ -214,6 +215,16 @@ export class LdnServiceFormEditComponent implements OnInit {
//this.getPatternControlNames(index) //this.getPatternControlNames(index)
} }
selectInboundItemFilter(filterValue: string, index: number): void {
// this.selectedOutboundPatterns = patternValue;
const filterArray = (this.formModel.get('notifyServiceInboundPatterns') as FormArray)
console.log((this.formModel.get('notifyServiceInboundPatterns') as FormArray))
filterArray.controls[index].patchValue({constraint: filterValue} )
//console.log(patternArray);
//this.getPatternControlNames(index)
}
selectInboundPattern(patternValue: string, index: number): void { selectInboundPattern(patternValue: string, index: number): void {
// this.selectedOutboundPatterns = patternValue; // this.selectedOutboundPatterns = patternValue;
const patternArray = (this.formModel.get('notifyServiceInboundPatterns') as FormArray) const patternArray = (this.formModel.get('notifyServiceInboundPatterns') as FormArray)
@@ -474,4 +485,7 @@ export class LdnServiceFormEditComponent implements OnInit {
//console.warn('inside setValueForControlInOutboundArray', formArray); //console.warn('inside setValueForControlInOutboundArray', formArray);
//formArray.at(index).setValue(value); //formArray.at(index).setValue(value);
//} //}
} }