Skip to content

Commit f52ef1e

Browse files
committed
Make required option visible on smaller screens in edit Feature - #417
1 parent 5b37dca commit f52ef1e

File tree

3 files changed

+65
-56
lines changed

3 files changed

+65
-56
lines changed

src/app/modules/query-editor/components/editor-content/profile/header/profile-header.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
.display-container {
1010
border-right: 4px solid rgba(90, 121, 175, 0.1);
11-
padding: 20px;
11+
padding: 0 20px;
1212
font-size: larger;
1313
width: 100%;
1414
color: black;

src/app/modules/shared-filter/components/edit-fields/edit-fields.component.html

Lines changed: 53 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,64 @@
11
<div fxLayout="row" fxLayoutAlign="start" class="container">
22
<div fxLayout="column" style="width: 100%">
3-
<num-section-name>
4-
{{ 'EDITOR.CONTENT.PROFILE.FIELDS.HEADER' | translate }}
5-
</num-section-name>
63
<div class="main-content">
7-
<div class="width-70">
8-
<div *ngFor="let singleTree of tree">
9-
<num-tree
10-
[treeData]="singleTree"
11-
(selectedCheckbox)="setSelectedFieldElement($event)"
12-
></num-tree>
13-
</div>
14-
</div>
15-
</div>
16-
</div>
17-
<div class="sidebar" *ngIf="selectedBasicFields">
18-
<div fxLayout="column" class="height-100">
19-
<div fxLayout="row">
4+
<div class="field-box">
205
<num-section-name>
21-
{{ 'EDITOR.CONTENT.PROFILE.FIELDS.REQUIRED' | translate }}
6+
{{ 'EDITOR.CONTENT.PROFILE.FIELDS.HEADER' | translate }}
227
</num-section-name>
8+
<div class="table-box">
9+
<div *ngFor="let singleTree of tree">
10+
<num-tree
11+
[treeData]="singleTree"
12+
(selectedCheckbox)="setSelectedFieldElement($event)"
13+
></num-tree>
14+
</div>
15+
</div>
2316
</div>
24-
<div class="selected-fields-box">
25-
<div
26-
*ngFor="let selectedField of selectedBasicFields; let index = index"
27-
fxLayout="row"
28-
fxLayoutAlign="start center"
29-
class="selected-filter-container"
30-
>
31-
<div>
32-
<mat-checkbox
33-
[checked]="selectedField.getMustHave()"
34-
(change)="setFieldAsRequired(selectedField)"
35-
>
36-
</mat-checkbox>
17+
<div class="sidebar" *ngIf="selectedBasicFields">
18+
<div fxLayout="column" class="height-100">
19+
<div fxLayout="row">
20+
<num-section-name>
21+
{{ 'EDITOR.CONTENT.PROFILE.FIELDS.REQUIRED' | translate }}
22+
</num-section-name>
3723
</div>
38-
<div class="display-part">
39-
<span
40-
matTooltipPosition="below"
41-
matTooltipShowDelay="300"
42-
[matTooltip]="selectedField.getDisplay() | displayTranslation"
24+
<div class="selected-fields-box">
25+
<div
26+
*ngFor="let selectedField of selectedBasicFields; let index = index"
27+
fxLayout="row"
28+
fxLayoutAlign="start center"
29+
class="selected-filter-container"
4330
>
44-
{{ selectedField.getDisplay() | displayTranslation }}
45-
</span>
46-
</div>
47-
<div
48-
*ngIf="!selectedField.getIsRequired()"
49-
fxLayout="row"
50-
fxFlex="10"
51-
fxLayoutAlign="end center"
52-
class="padding-right-10"
53-
>
54-
<fa-icon
55-
[icon]="'times'"
56-
size="1x"
57-
(click)="removeSelectedField(selectedField)"
58-
class="delete-button"
59-
></fa-icon>
31+
<div>
32+
<mat-checkbox
33+
[checked]="selectedField.getMustHave()"
34+
(change)="setFieldAsRequired(selectedField)"
35+
>
36+
</mat-checkbox>
37+
</div>
38+
<div class="display-part">
39+
<span
40+
matTooltipPosition="below"
41+
matTooltipShowDelay="300"
42+
[matTooltip]="selectedField.getDisplay() | displayTranslation"
43+
>
44+
{{ selectedField.getDisplay() | displayTranslation }}
45+
</span>
46+
</div>
47+
<div
48+
*ngIf="!selectedField.getIsRequired()"
49+
fxLayout="row"
50+
fxFlex="10"
51+
fxLayoutAlign="end center"
52+
class="padding-right-10"
53+
>
54+
<fa-icon
55+
[icon]="'times'"
56+
size="1x"
57+
(click)="removeSelectedField(selectedField)"
58+
class="delete-button"
59+
></fa-icon>
60+
</div>
61+
</div>
6062
</div>
6163
</div>
6264
</div>

src/app/modules/shared-filter/components/edit-fields/edit-fields.component.scss

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,19 @@
6363
}
6464

6565
.main-content {
66-
flex-grow: 1;
67-
padding: 1rem;
66+
display: flex;
67+
padding: 0 1rem;
6868
height: 100%;
69-
overflow-y: auto;
69+
overflow-y: hidden;
7070
}
7171

72-
.width-70 {
72+
.field-box {
7373
width: 70%;
74+
height: 100%;
75+
display: flex;
76+
flex-direction: column;
77+
}
78+
.table-box {
79+
height: auto;
80+
overflow: auto;
7481
}

0 commit comments

Comments
 (0)