-
search
diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss
index 318765330..09bb2e64f 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss
@@ -209,7 +209,7 @@
color: #129d99;
}
-::ng-deep .mat-form-field-wrapper {
+::ng-deep .search-form .mat-form-field-wrapper {
background-color: white !important;
padding-bottom: 0 !important;
}
diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
index 88b50b691..d9c351631 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
@@ -24,7 +24,7 @@ import { UiNotificationService, SnackBarNotificationLevel } from '@app/core/serv
import { isNullOrUndefined } from 'util';
import { AuthService } from '@app/core/services/auth/auth.service';
import { DmpCriteriaDialogComponent } from './criteria/dmp-criteria-dialog.component';
-import { FormBuilder, FormControl } from '@angular/forms';
+import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
@Component({
@@ -54,6 +54,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
pageSize: number = 5;
criteria: DmpCriteria;
+ criteriaFormGroup: FormGroup;
public formGroup = new FormBuilder().group({
like: new FormControl()
})
@@ -295,6 +296,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
showGrant: this.showGrant,
isPublic: this.isPublic,
criteria: this.criteria,
+ formGroup: this.criteriaFormGroup,
// criteria: this.grantId ? this.criteria : this.getDefaultCriteria(),
updateDataFn: this.updateDataFn.bind(this)
},
@@ -306,6 +308,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
}
updateDataFn(criteria: DmpCriteriaComponent): void {
+ this.criteriaFormGroup = criteria.formGroup;
this.toDmpCriteria(criteria);
this.refresh();
}
@@ -341,7 +344,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
}
hasScrollbar(): boolean {
- return document.getElementById("main-page").scrollHeight > document.documentElement.clientHeight;
+ return document.getElementById("main-page").scrollHeight > document.documentElement.clientHeight
}
}