Skip to content

Commit b7f492b

Browse files
marobmarob
committed
Story #15416: Checkbox & radio buttons
1 parent 9ebf7fa commit b7f492b

File tree

64 files changed

+1207
-2027
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1207
-2027
lines changed

‎ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/dip-request-create/dip-request-create.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<mat-dialog-content>
6262
<div class="gap-4">
6363
<div class="gap-2">
64-
<div class="text medium bold primary">{{ 'ARCHIVE_SEARCH.DIP.LOGS' | translate }}</div>
64+
<div class="text medium bold primary uppercase">{{ 'ARCHIVE_SEARCH.DIP.LOGS' | translate }}</div>
6565
<mat-button-toggle-group
6666
formControlName="includeLifeCycleLogs"
6767
#group="matButtonToggleGroup"
@@ -73,7 +73,7 @@
7373
</div>
7474

7575
<div class="gap-2">
76-
<div class="text medium bold primary">{{ 'ARCHIVE_SEARCH.DIP.SEDA_VERSION' | translate }}</div>
76+
<div class="text medium bold primary uppercase">{{ 'ARCHIVE_SEARCH.DIP.SEDA_VERSION' | translate }}</div>
7777
<mat-button-toggle-group formControlName="sedaVersion" class="vitamui-button-toggle-group">
7878
<mat-button-toggle value="2.1">SEDA 2.1</mat-button-toggle>
7979
<mat-button-toggle value="2.2">SEDA 2.2</mat-button-toggle>
@@ -83,7 +83,7 @@
8383

8484
<div class="gap-5">
8585
<div class="gap-2">
86-
<div class="text medium bold primary">{{ 'ARCHIVE_SEARCH.DIP.INCLUDE_OBJECTS' | translate }}</div>
86+
<div class="text medium bold primary uppercase">{{ 'ARCHIVE_SEARCH.DIP.INCLUDE_OBJECTS' | translate }}</div>
8787
<mat-button-toggle-group formControlName="includeObjects" class="vitamui-button-toggle-group">
8888
<mat-button-toggle [value]="UsageVersionEnum.ALL">{{ 'ARCHIVE_SEARCH.DIP.ALL' | translate }} </mat-button-toggle>
8989
<mat-button-toggle [value]="UsageVersionEnum.NONE">{{ 'ARCHIVE_SEARCH.DIP.NONE' | translate }} </mat-button-toggle>
@@ -130,7 +130,7 @@
130130
</div>
131131

132132
<div class="gap-2">
133-
<div class="text medium bold primary">{{ 'ARCHIVE_SEARCH.DIP.EXPORT_FORMAT' | translate }}</div>
133+
<div class="text medium bold primary uppercase">{{ 'ARCHIVE_SEARCH.DIP.EXPORT_FORMAT' | translate }}</div>
134134
<div class="col-6">
135135
<vitamui-slide-toggle formControlName="exportWithTree">
136136
{{ 'ARCHIVE_SEARCH.DIP.EXPORT_FORMAT_MESSAGE' | translate }}

‎ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/transfer-request-modal/transfer-request-modal.component.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<mat-dialog-content>
7575
<div class="gap-4">
7676
<div class="gap-2">
77-
<div class="text medium bold primary">{{ 'ARCHIVE_SEARCH.DIP.LOGS' | translate }}</div>
77+
<div class="text medium bold primary uppercase">{{ 'ARCHIVE_SEARCH.DIP.LOGS' | translate }}</div>
7878
<mat-button-toggle-group
7979
formControlName="includeLifeCycleLogs"
8080
#group="matButtonToggleGroup"
@@ -86,7 +86,7 @@
8686
</div>
8787

8888
<div class="gap-2">
89-
<div class="text medium bold primary">{{ 'ARCHIVE_SEARCH.DIP.SEDA_VERSION' | translate }}</div>
89+
<div class="text medium bold primary uppercase">{{ 'ARCHIVE_SEARCH.DIP.SEDA_VERSION' | translate }}</div>
9090
<mat-button-toggle-group formControlName="sedaVersion" class="vitamui-button-toggle-group">
9191
<mat-button-toggle value="2.1">SEDA 2.1</mat-button-toggle>
9292
<mat-button-toggle value="2.2">SEDA 2.2</mat-button-toggle>
@@ -96,7 +96,7 @@
9696

9797
<div class="gap-5">
9898
<div class="gap-2">
99-
<div class="text medium bold primary">{{ 'ARCHIVE_SEARCH.DIP.INCLUDE_OBJECTS' | translate }}</div>
99+
<div class="text medium bold primary uppercase">{{ 'ARCHIVE_SEARCH.DIP.INCLUDE_OBJECTS' | translate }}</div>
100100
<mat-button-toggle-group formControlName="includeObjects" class="vitamui-button-toggle-group">
101101
<mat-button-toggle [value]="UsageVersionEnum.ALL">{{ 'ARCHIVE_SEARCH.DIP.ALL' | translate }} </mat-button-toggle>
102102
<mat-button-toggle [value]="UsageVersionEnum.NONE">{{ 'ARCHIVE_SEARCH.DIP.NONE' | translate }} </mat-button-toggle>

‎ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/access-rule-search/access-rule-search.component.css‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
1-
.check-rule {
2-
margin-right: 25%;
3-
margin-left: -15%;
4-
margin-top: 5px;
5-
}
6-
7-
.title-text {
8-
font-style: normal;
9-
font-weight: bold;
10-
font-size: 16px;
11-
color: var(--vitamui-primary) !important;
12-
}
13-
141
.validate-date-small-button{
152
background-color: 'green';
163
width: 30px;
17-
height: 30px;
18-
}
4+
height: 30px;
5+
}

‎ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/access-rule-search/access-rule-search.component.html‎

Lines changed: 70 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
11
<div class="container">
2-
<form [formGroup]="accessRuleCriteriaForm">
3-
<div class="row justify-content-start">
4-
<div class="col-5 form-control">
5-
<vitamui-select
6-
formControlName="accessRuleIdentifier"
7-
[options]="accessRuleOptions"
8-
[multiple]="true"
9-
[placeholder]="'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.PLACEHOLDER_ACCESS' | translate"
10-
[searchBarPlaceHolder]="'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.PLACEHOLDER_SEARCHBAR_ACCESS' | translate"
11-
>
12-
</vitamui-select>
13-
</div>
14-
<div class="col-1 form-control"></div>
2+
<form [formGroup]="accessRuleCriteriaForm" class="gap-4 align-items-stretch">
3+
<div class="hgap-4">
4+
<vitamui-select
5+
class="w-100"
6+
formControlName="accessRuleIdentifier"
7+
[options]="accessRuleOptions"
8+
[multiple]="true"
9+
[placeholder]="'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.PLACEHOLDER_ACCESS' | translate"
10+
[searchBarPlaceHolder]="'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.PLACEHOLDER_SEARCHBAR_ACCESS' | translate"
11+
>
12+
</vitamui-select>
13+
<div class="w-100"></div>
1514
</div>
1615

17-
<div class="row justify-content-start">
18-
<div class="col-11 form-control">
19-
<p class="title-text">{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.END_DATE_ACCESS' | translate }}</p>
16+
<div class="gap-2 align-items-stretch">
17+
<div class="text medium bold primary uppercase">
18+
{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.END_DATE_ACCESS' | translate }}
2019
</div>
21-
</div>
2220

23-
<div class="row justify-content-start">
24-
<div class="col-5 form-control">
21+
<div class="hgap-4">
2522
<vitamui-datepicker
23+
class="w-100"
2624
[label]="
2725
(endDateInterval
2826
? 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.END_DATE_ACCESS_BEGIN'
@@ -33,114 +31,64 @@
3331
[max]="accessRuleCriteriaForm.get('accessRuleEndDate').value"
3432
outputType="Date"
3533
format="dd/MM/yyyy"
36-
class="w-100"
3734
></vitamui-datepicker>
38-
</div>
39-
<div class="col-1 form-control">
40-
<button
41-
class="validate-date-small-button"
42-
*ngIf="!endDateInterval && accessRuleCriteriaForm.get('accessRuleStartDate').value"
43-
type="button"
44-
mat-mini-fab
45-
(click)="addBeginDtAccessRuleCriteria()"
46-
>
47-
<i class="material-icons">check</i>
48-
</button>
49-
</div>
50-
51-
<div class="col-4 form-control">
52-
@if (!endDateInterval) {
53-
<p class="title-text text-clicable-uppercase" (click)="updateEndDateInterval(true)">
54-
{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.ACCESS_RULE.CREATE_INTERVAL' | translate }}
55-
</p>
56-
} @else {
57-
<vitamui-datepicker
58-
[label]="'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.END_DATE_ACCESS_END' | translate"
59-
formControlName="accessRuleEndDate"
60-
[min]="accessRuleCriteriaForm.get('accessRuleStartDate').value"
61-
outputType="Date"
62-
format="dd/MM/yyyy"
63-
class="w-100"
64-
></vitamui-datepicker>
65-
}
66-
</div>
67-
<div class="col-1 form-control">
68-
<button
69-
class="validate-date-small-button"
70-
*ngIf="
71-
endDateInterval &&
72-
accessRuleCriteriaForm.get('accessRuleStartDate').value &&
73-
accessRuleCriteriaForm.get('accessRuleEndDate').value
74-
"
75-
type="button"
76-
mat-mini-fab
77-
(click)="addIntervalDtAccessRuleCriteria()"
78-
>
79-
<i class="material-icons">check</i>
80-
</button>
81-
</div>
82-
<div class="col-1 form-control">
83-
<p *ngIf="endDateInterval" class="title-text text-clicable-uppercase" (click)="updateEndDateInterval(false)">
84-
{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.ACCESS_RULE.DELETE_INTERVAL' | translate }}
85-
</p>
35+
<div class="w-100 hgap-2">
36+
@if (!endDateInterval) {
37+
@if (accessRuleCriteriaForm.get('accessRuleStartDate').value) {
38+
<button class="validate-date-small-button" type="button" mat-mini-fab (click)="addBeginDtAccessRuleCriteria()">
39+
<i class="material-icons">check</i>
40+
</button>
41+
}
42+
<button class="btn link" (click)="updateEndDateInterval(true)">
43+
{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.ACCESS_RULE.CREATE_INTERVAL' | translate }}
44+
</button>
45+
} @else {
46+
<vitamui-datepicker
47+
[label]="'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.END_DATE_ACCESS_END' | translate"
48+
formControlName="accessRuleEndDate"
49+
[min]="accessRuleCriteriaForm.get('accessRuleStartDate').value"
50+
outputType="Date"
51+
format="dd/MM/yyyy"
52+
class="w-100"
53+
></vitamui-datepicker>
54+
@if (accessRuleCriteriaForm.get('accessRuleStartDate').value && accessRuleCriteriaForm.get('accessRuleEndDate').value) {
55+
<button class="validate-date-small-button" type="button" mat-mini-fab (click)="addIntervalDtAccessRuleCriteria()">
56+
<i class="material-icons">check</i>
57+
</button>
58+
}
59+
<button class="btn link" (click)="updateEndDateInterval(false)">
60+
{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.ACCESS_RULE.DELETE_INTERVAL' | translate }}
61+
</button>
62+
}
63+
</div>
8664
</div>
8765
</div>
8866

89-
<div class="row justify-content-around">
90-
<div class="col-4 form-control">
91-
<div class="row criteria-choice">
92-
<p class="title-text">
93-
{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.ORIGIN.TITLE' | translate }}
94-
</p>
95-
</div>
96-
<div class="row">
97-
<label class="criteria-checkbox-choice">
98-
<input
99-
type="checkbox"
100-
(click)="checkBoxChange('ORIGIN_HAS_AT_LEAST_ONE', $event)"
101-
id="HAS_AT_LEAST_ONE_ACCESS_RULE_ORIGIN"
102-
[checked]="accessAdditionalCriteria.get('ORIGIN_HAS_AT_LEAST_ONE')"
103-
/>
104-
<span>{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.ORIGIN.HAS_AT_LEAST_ONE_ACCESS_RULE' | translate }}</span>
105-
</label>
106-
</div>
107-
<div class="row">
108-
<label class="criteria-checkbox-choice">
109-
<input
110-
type="checkbox"
111-
(click)="checkBoxChange('ORIGIN_INHERITE_AT_LEAST_ONE', $event)"
112-
id="INHERITE_AT_LEAST_ONE_ACCESS_RULE_ORIGIN"
113-
[checked]="accessAdditionalCriteria.get('ORIGIN_INHERITE_AT_LEAST_ONE')"
114-
/>
115-
<span>{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.ORIGIN.INHERITE_AT_LEAST_ONE_ACCESS_RULE' | translate }}</span>
116-
</label>
117-
</div>
118-
119-
<div class="row">
120-
<label class="criteria-checkbox-choice">
121-
<input
122-
id="HAS_NO_ACCESS_RULE_ORIGIN"
123-
type="checkbox"
124-
(click)="checkBoxChange('ORIGIN_HAS_NO_ONE', $event)"
125-
[checked]="accessAdditionalCriteria.get('ORIGIN_HAS_NO_ONE')"
126-
/>
127-
<span>{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.ORIGIN.HAS_NO_ACCESS_RULE' | translate }}</span>
128-
</label>
129-
</div>
130-
<div class="row">
131-
<label class="criteria-checkbox-choice">
132-
<input
133-
id="WAITING_TO_RE_CALCULATE_ACCESS_RULE_ORIGIN"
134-
type="checkbox"
135-
(click)="checkBoxChange('ORIGIN_WAITING_RECALCULATE', $event)"
136-
[checked]="accessAdditionalCriteria.get('ORIGIN_WAITING_RECALCULATE')"
137-
/>
138-
<span>{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.ORIGIN.WAITING_TO_RE_CALCULATE_ACCESS_RULE' | translate }}</span>
139-
</label>
140-
</div>
67+
<div class="gap-2">
68+
<div class="text medium bold primary uppercase">
69+
{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.ORIGIN.TITLE' | translate }}
14170
</div>
142-
<div class="col-4 form-control"></div>
143-
<div class="col-3 form-control"></div>
71+
<mat-checkbox
72+
(click)="checkBoxChange('ORIGIN_HAS_AT_LEAST_ONE', $event)"
73+
[checked]="accessAdditionalCriteria.get('ORIGIN_HAS_AT_LEAST_ONE')"
74+
>
75+
{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.ORIGIN.HAS_AT_LEAST_ONE_ACCESS_RULE' | translate }}
76+
</mat-checkbox>
77+
<mat-checkbox
78+
(click)="checkBoxChange('ORIGIN_INHERITE_AT_LEAST_ONE', $event)"
79+
[checked]="accessAdditionalCriteria.get('ORIGIN_INHERITE_AT_LEAST_ONE')"
80+
>
81+
{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.ORIGIN.INHERITE_AT_LEAST_ONE_ACCESS_RULE' | translate }}
82+
</mat-checkbox>
83+
<mat-checkbox (click)="checkBoxChange('ORIGIN_HAS_NO_ONE', $event)" [checked]="accessAdditionalCriteria.get('ORIGIN_HAS_NO_ONE')">
84+
{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.ORIGIN.HAS_NO_ACCESS_RULE' | translate }}
85+
</mat-checkbox>
86+
<mat-checkbox
87+
(click)="checkBoxChange('ORIGIN_WAITING_RECALCULATE', $event)"
88+
[checked]="accessAdditionalCriteria.get('ORIGIN_WAITING_RECALCULATE')"
89+
>
90+
{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.ORIGIN.WAITING_TO_RE_CALCULATE_ACCESS_RULE' | translate }}
91+
</mat-checkbox>
14492
</div>
14593
</form>
14694
</div>

‎ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/access-rule-search/access-rule-search.component.spec.ts‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -147,30 +147,4 @@ describe('AccessRuleSearchComponent', () => {
147147
// Then
148148
expect(archiveSharedDataServiceSpy.addSimpleSearchCriteriaSubject).not.toHaveBeenCalled();
149149
});
150-
151-
describe('DOM', () => {
152-
it('should have 9 rows', () => {
153-
const nativeElement = fixture.nativeElement;
154-
const elementRow = nativeElement.querySelectorAll('.row');
155-
expect(elementRow.length).toBe(9);
156-
});
157-
158-
it('should have 3 text titles', () => {
159-
const formTitlesHtmlElements = fixture.nativeElement.querySelectorAll('.title-text');
160-
161-
expect(formTitlesHtmlElements).toBeTruthy();
162-
expect(formTitlesHtmlElements.length).toBe(3);
163-
expect(formTitlesHtmlElements[0].textContent).toContain('ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.END_DATE_ACCESS');
164-
});
165-
166-
it('should have 1 vitamui select ', () => {
167-
// When
168-
const nativeElement = fixture.nativeElement;
169-
const elementVitamuiInput = nativeElement.querySelectorAll('vitamui-select');
170-
171-
// Then
172-
expect(elementVitamuiInput).toBeTruthy();
173-
expect(elementVitamuiInput.length).toBe(1);
174-
});
175-
});
176150
});

‎ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search-by-mgt-rules/appraisal-rule-search/appraisal-rule-search.component.css‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +0,0 @@
1-
.check-rule {
2-
margin-right: 25%;
3-
margin-left: -15%;
4-
margin-top: 5px;
5-
}
6-
7-
.title-text {
8-
font-style: normal;
9-
font-weight: bold;
10-
font-size: 16px;
11-
color: var(--vitamui-primary) !important;
12-
}

0 commit comments

Comments
 (0)