From 173da1dcdc25d4f854fbf7479378d0e893c8d089 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Thu, 1 Oct 2020 18:15:08 +0200
Subject: [PATCH] FEAT #13271 TIME 0:30 fix menu criteria css + fix search term
control
---
.../adv-search/criteria-tool/criteria-tool.component.html | 6 +++---
.../adv-search/criteria-tool/criteria-tool.component.scss | 4 ++--
.../app/adv-search/criteria-tool/criteria-tool.component.ts | 2 --
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.html b/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.html
index fd4a6375977..c5400e93a85 100755
--- a/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.html
+++ b/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.html
@@ -1,6 +1,6 @@
<form (ngSubmit)="getCurrentCriteriaValues()" #criteriaFormUp="ngForm">
<mat-form-field *ngIf="!adminMode" floatLabel="never" class="basket-search">
- <input class="metaSearch" type="text" matInput
+ <input class="metaSearch" type="text" matInput [formControl]="searchTermControl"
[placeholder]="'lang.quickSearch' |Â translate">
<button mat-icon-button matPrefix>
<mat-icon class="fas fa-search"></mat-icon>
@@ -15,8 +15,8 @@
<button type="button" mat-icon-button [matMenuTriggerFor]="menu" (menuOpened)="focusFilter()" (click)="$event.stopPropagation()" [title]="'lang.displayCriteria' | translate">
<mat-icon class="fa fa-plus"></mat-icon>
</button>
- <mat-menu #menu="matMenu">
- <div class="menuTitle" style="position: sticky;top: 0px;background: white;z-index: 1;">
+ <mat-menu #menu="matMenu" class="searchTemplateMenu">
+ <div class="menuTitle" style="position: sticky;top: 0px;background: white;z-index: 1;display: flex;justify-content: center;">
<mat-form-field floatLabel="never" appearance="outline" class="smallInput" (click)="$event.stopPropagation();" style="width: 220px !important; padding-top: 10px;">
<input matInput id="searchTerm" #searchCriteriaInput [formControl]="getFilterControl()" placeholder="{{'lang.filterBy' | translate}}"
#listFilter autocomplete="off" (click)="$event.stopPropagation();"
diff --git a/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.scss b/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.scss
index 6c9b86f0697..fa0dce3274f 100644
--- a/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.scss
+++ b/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.scss
@@ -129,8 +129,6 @@
}
}
-.hide {}
-
.myCriterias {
flex-grow: 0;
margin-right: 0px;
@@ -138,6 +136,8 @@
::ng-deep.searchTemplateMenu.mat-menu-panel {
max-width: 400px !important;
+ width: 400px !important;
+ max-height: 400px !important;
}
.menuTitle {
diff --git a/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.ts b/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.ts
index 02bc1f5a251..d841d8b7243 100644
--- a/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.ts
+++ b/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.ts
@@ -155,7 +155,6 @@ export class CriteriaToolComponent implements OnInit {
}
this.initField(criteria);
this.currentCriteria.push(criteria);
- this.searchTermControl.setValue(this.searchTerm);
if (this.adminMode) {
criteria.control.disable();
}
@@ -657,7 +656,6 @@ export class CriteriaToolComponent implements OnInit {
if (index > -1) {
element.control = new FormControl({ value: searchTemplate.query[index].values, disabled: false });
element.control.value = searchTemplate.query[index].values;
- console.log(element.control);
this.addCriteria(element, openPanel);
--
GitLab