Skip to content

Story #15416: Checkbox & radio buttons #3309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marob merged 1 commit into from
Dec 11, 2025
Merged

Story #15416: Checkbox & radio buttons #3309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...ive-search/additional-actions-search/dip-request-create/dip-request-create.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<mat-dialog-content>
<div class="gap-4">
<div class="gap-2">
<div class="text medium bold primary">{{ 'ARCHIVE_SEARCH.DIP.LOGS' | translate }}</div>
<div class="text medium bold primary uppercase">{{ 'ARCHIVE_SEARCH.DIP.LOGS' | translate }}</div>
<mat-button-toggle-group
formControlName="includeLifeCycleLogs"
#group="matButtonToggleGroup"
Expand All @@ -73,7 +73,7 @@
</div>

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

<div class="gap-5">
<div class="gap-2">
<div class="text medium bold primary">{{ 'ARCHIVE_SEARCH.DIP.INCLUDE_OBJECTS' | translate }}</div>
<div class="text medium bold primary uppercase">{{ 'ARCHIVE_SEARCH.DIP.INCLUDE_OBJECTS' | translate }}</div>
<mat-button-toggle-group formControlName="includeObjects" class="vitamui-button-toggle-group">
<mat-button-toggle [value]="UsageVersionEnum.ALL">{{ 'ARCHIVE_SEARCH.DIP.ALL' | translate }} </mat-button-toggle>
<mat-button-toggle [value]="UsageVersionEnum.NONE">{{ 'ARCHIVE_SEARCH.DIP.NONE' | translate }} </mat-button-toggle>
Expand Down Expand Up @@ -130,7 +130,7 @@
</div>

<div class="gap-2">
<div class="text medium bold primary">{{ 'ARCHIVE_SEARCH.DIP.EXPORT_FORMAT' | translate }}</div>
<div class="text medium bold primary uppercase">{{ 'ARCHIVE_SEARCH.DIP.EXPORT_FORMAT' | translate }}</div>
<div class="col-6">
<vitamui-slide-toggle formControlName="exportWithTree">
{{ 'ARCHIVE_SEARCH.DIP.EXPORT_FORMAT_MESSAGE' | translate }}
Expand Down
6 changes: 3 additions & 3 deletions ...ch/additional-actions-search/transfer-request-modal/transfer-request-modal.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<mat-dialog-content>
<div class="gap-4">
<div class="gap-2">
<div class="text medium bold primary">{{ 'ARCHIVE_SEARCH.DIP.LOGS' | translate }}</div>
<div class="text medium bold primary uppercase">{{ 'ARCHIVE_SEARCH.DIP.LOGS' | translate }}</div>
<mat-button-toggle-group
formControlName="includeLifeCycleLogs"
#group="matButtonToggleGroup"
Expand All @@ -86,7 +86,7 @@
</div>

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

<div class="gap-5">
<div class="gap-2">
<div class="text medium bold primary">{{ 'ARCHIVE_SEARCH.DIP.INCLUDE_OBJECTS' | translate }}</div>
<div class="text medium bold primary uppercase">{{ 'ARCHIVE_SEARCH.DIP.INCLUDE_OBJECTS' | translate }}</div>
<mat-button-toggle-group formControlName="includeObjects" class="vitamui-button-toggle-group">
<mat-button-toggle [value]="UsageVersionEnum.ALL">{{ 'ARCHIVE_SEARCH.DIP.ALL' | translate }} </mat-button-toggle>
<mat-button-toggle [value]="UsageVersionEnum.NONE">{{ 'ARCHIVE_SEARCH.DIP.NONE' | translate }} </mat-button-toggle>
Expand Down
17 changes: 2 additions & 15 deletions ...ve-search/archive-search-by-mgt-rules/access-rule-search/access-rule-search.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
.check-rule {
margin-right: 25%;
margin-left: -15%;
margin-top: 5px;
}

.title-text {
font-style: normal;
font-weight: bold;
font-size: 16px;
color: var(--vitamui-primary) !important;
}

.validate-date-small-button{
background-color: 'green';
width: 30px;
height: 30px;
}
height: 30px;
}
192 changes: 70 additions & 122 deletions ...e-search/archive-search-by-mgt-rules/access-rule-search/access-rule-search.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
<div class="container">
<form [formGroup]="accessRuleCriteriaForm">
<div class="row justify-content-start">
<div class="col-5 form-control">
<vitamui-select
formControlName="accessRuleIdentifier"
[options]="accessRuleOptions"
[multiple]="true"
[placeholder]="'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.PLACEHOLDER_ACCESS' | translate"
[searchBarPlaceHolder]="'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.PLACEHOLDER_SEARCHBAR_ACCESS' | translate"
>
</vitamui-select>
</div>
<div class="col-1 form-control"></div>
<form [formGroup]="accessRuleCriteriaForm" class="gap-4 align-items-stretch">
<div class="hgap-4">
<vitamui-select
class="w-100"
formControlName="accessRuleIdentifier"
[options]="accessRuleOptions"
[multiple]="true"
[placeholder]="'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.PLACEHOLDER_ACCESS' | translate"
[searchBarPlaceHolder]="'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.PLACEHOLDER_SEARCHBAR_ACCESS' | translate"
>
</vitamui-select>
<div class="w-100"></div>
</div>

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

<div class="row justify-content-start">
<div class="col-5 form-control">
<div class="hgap-4">
<vitamui-datepicker
class="w-100"
[label]="
(endDateInterval
? 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.END_DATE_ACCESS_BEGIN'
Expand All @@ -33,114 +31,64 @@
[max]="accessRuleCriteriaForm.get('accessRuleEndDate').value"
outputType="Date"
format="dd/MM/yyyy"
class="w-100"
></vitamui-datepicker>
</div>
<div class="col-1 form-control">
<button
class="validate-date-small-button"
*ngIf="!endDateInterval && accessRuleCriteriaForm.get('accessRuleStartDate').value"
type="button"
mat-mini-fab
(click)="addBeginDtAccessRuleCriteria()"
>
<i class="material-icons">check</i>
</button>
</div>

<div class="col-4 form-control">
@if (!endDateInterval) {
<p class="title-text text-clicable-uppercase" (click)="updateEndDateInterval(true)">
{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.ACCESS_RULE.CREATE_INTERVAL' | translate }}
</p>
} @else {
<vitamui-datepicker
[label]="'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.END_DATE_ACCESS_END' | translate"
formControlName="accessRuleEndDate"
[min]="accessRuleCriteriaForm.get('accessRuleStartDate').value"
outputType="Date"
format="dd/MM/yyyy"
class="w-100"
></vitamui-datepicker>
}
</div>
<div class="col-1 form-control">
<button
class="validate-date-small-button"
*ngIf="
endDateInterval &&
accessRuleCriteriaForm.get('accessRuleStartDate').value &&
accessRuleCriteriaForm.get('accessRuleEndDate').value
"
type="button"
mat-mini-fab
(click)="addIntervalDtAccessRuleCriteria()"
>
<i class="material-icons">check</i>
</button>
</div>
<div class="col-1 form-control">
<p *ngIf="endDateInterval" class="title-text text-clicable-uppercase" (click)="updateEndDateInterval(false)">
{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.ACCESS_RULE.DELETE_INTERVAL' | translate }}
</p>
<div class="w-100 hgap-2">
@if (!endDateInterval) {
@if (accessRuleCriteriaForm.get('accessRuleStartDate').value) {
<button class="validate-date-small-button" type="button" mat-mini-fab (click)="addBeginDtAccessRuleCriteria()">
<i class="material-icons">check</i>
</button>
}
<button class="btn link" (click)="updateEndDateInterval(true)">
{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.ACCESS_RULE.CREATE_INTERVAL' | translate }}
</button>
} @else {
<vitamui-datepicker
[label]="'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.END_DATE_ACCESS_END' | translate"
formControlName="accessRuleEndDate"
[min]="accessRuleCriteriaForm.get('accessRuleStartDate').value"
outputType="Date"
format="dd/MM/yyyy"
class="w-100"
></vitamui-datepicker>
@if (accessRuleCriteriaForm.get('accessRuleStartDate').value && accessRuleCriteriaForm.get('accessRuleEndDate').value) {
<button class="validate-date-small-button" type="button" mat-mini-fab (click)="addIntervalDtAccessRuleCriteria()">
<i class="material-icons">check</i>
</button>
}
<button class="btn link" (click)="updateEndDateInterval(false)">
{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.ACCESS_RULE.DELETE_INTERVAL' | translate }}
</button>
}
</div>
</div>
</div>

<div class="row justify-content-around">
<div class="col-4 form-control">
<div class="row criteria-choice">
<p class="title-text">
{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.ORIGIN.TITLE' | translate }}
</p>
</div>
<div class="row">
<label class="criteria-checkbox-choice">
<input
type="checkbox"
(click)="checkBoxChange('ORIGIN_HAS_AT_LEAST_ONE', $event)"
id="HAS_AT_LEAST_ONE_ACCESS_RULE_ORIGIN"
[checked]="accessAdditionalCriteria.get('ORIGIN_HAS_AT_LEAST_ONE')"
/>
<span>{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.ORIGIN.HAS_AT_LEAST_ONE_ACCESS_RULE' | translate }}</span>
</label>
</div>
<div class="row">
<label class="criteria-checkbox-choice">
<input
type="checkbox"
(click)="checkBoxChange('ORIGIN_INHERITE_AT_LEAST_ONE', $event)"
id="INHERITE_AT_LEAST_ONE_ACCESS_RULE_ORIGIN"
[checked]="accessAdditionalCriteria.get('ORIGIN_INHERITE_AT_LEAST_ONE')"
/>
<span>{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.ORIGIN.INHERITE_AT_LEAST_ONE_ACCESS_RULE' | translate }}</span>
</label>
</div>

<div class="row">
<label class="criteria-checkbox-choice">
<input
id="HAS_NO_ACCESS_RULE_ORIGIN"
type="checkbox"
(click)="checkBoxChange('ORIGIN_HAS_NO_ONE', $event)"
[checked]="accessAdditionalCriteria.get('ORIGIN_HAS_NO_ONE')"
/>
<span>{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.ORIGIN.HAS_NO_ACCESS_RULE' | translate }}</span>
</label>
</div>
<div class="row">
<label class="criteria-checkbox-choice">
<input
id="WAITING_TO_RE_CALCULATE_ACCESS_RULE_ORIGIN"
type="checkbox"
(click)="checkBoxChange('ORIGIN_WAITING_RECALCULATE', $event)"
[checked]="accessAdditionalCriteria.get('ORIGIN_WAITING_RECALCULATE')"
/>
<span>{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.ORIGIN.WAITING_TO_RE_CALCULATE_ACCESS_RULE' | translate }}</span>
</label>
</div>
<div class="gap-2">
<div class="text medium bold primary uppercase">
{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.ORIGIN.TITLE' | translate }}
</div>
<div class="col-4 form-control"></div>
<div class="col-3 form-control"></div>
<mat-checkbox
(click)="checkBoxChange('ORIGIN_HAS_AT_LEAST_ONE', $event)"
[checked]="accessAdditionalCriteria.get('ORIGIN_HAS_AT_LEAST_ONE')"
>
{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.ORIGIN.HAS_AT_LEAST_ONE_ACCESS_RULE' | translate }}
</mat-checkbox>
<mat-checkbox
(click)="checkBoxChange('ORIGIN_INHERITE_AT_LEAST_ONE', $event)"
[checked]="accessAdditionalCriteria.get('ORIGIN_INHERITE_AT_LEAST_ONE')"
>
{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.ORIGIN.INHERITE_AT_LEAST_ONE_ACCESS_RULE' | translate }}
</mat-checkbox>
<mat-checkbox (click)="checkBoxChange('ORIGIN_HAS_NO_ONE', $event)" [checked]="accessAdditionalCriteria.get('ORIGIN_HAS_NO_ONE')">
{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.ORIGIN.HAS_NO_ACCESS_RULE' | translate }}
</mat-checkbox>
<mat-checkbox
(click)="checkBoxChange('ORIGIN_WAITING_RECALCULATE', $event)"
[checked]="accessAdditionalCriteria.get('ORIGIN_WAITING_RECALCULATE')"
>
{{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.ORIGIN.WAITING_TO_RE_CALCULATE_ACCESS_RULE' | translate }}
</mat-checkbox>
</div>
</form>
</div>
26 changes: 0 additions & 26 deletions ...earch/archive-search-by-mgt-rules/access-rule-search/access-rule-search.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,30 +147,4 @@ describe('AccessRuleSearchComponent', () => {
// Then
expect(archiveSharedDataServiceSpy.addSimpleSearchCriteriaSubject).not.toHaveBeenCalled();
});

describe('DOM', () => {
it('should have 9 rows', () => {
const nativeElement = fixture.nativeElement;
const elementRow = nativeElement.querySelectorAll('.row');
expect(elementRow.length).toBe(9);
});

it('should have 3 text titles', () => {
const formTitlesHtmlElements = fixture.nativeElement.querySelectorAll('.title-text');

expect(formTitlesHtmlElements).toBeTruthy();
expect(formTitlesHtmlElements.length).toBe(3);
expect(formTitlesHtmlElements[0].textContent).toContain('ARCHIVE_SEARCH.SEARCH_CRITERIA_FILTER.FIELDS.END_DATE_ACCESS');
});

it('should have 1 vitamui select ', () => {
// When
const nativeElement = fixture.nativeElement;
const elementVitamuiInput = nativeElement.querySelectorAll('vitamui-select');

// Then
expect(elementVitamuiInput).toBeTruthy();
expect(elementVitamuiInput.length).toBe(1);
});
});
});
12 changes: 0 additions & 12 deletions ...rch/archive-search-by-mgt-rules/appraisal-rule-search/appraisal-rule-search.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +0,0 @@
.check-rule {
margin-right: 25%;
margin-left: -15%;
margin-top: 5px;
}

.title-text {
font-style: normal;
font-weight: bold;
font-size: 16px;
color: var(--vitamui-primary) !important;
}
Loading
Loading