Skip to content
Snippets Groups Projects
Commit a8f3c5ce authored by Augustin LECONTE's avatar Augustin LECONTE
Browse files

Merge branch 'feat/US8-conseiller-numerique' into 'dev'

feat/US8-conseiller-numerique

See merge request web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client!166
parents 3d67fe10 3465e9f5
No related branches found
No related tags found
3 merge requests!180release V1.10.0,!178release V1.10.0,!166feat/US8-conseiller-numerique
......@@ -101,13 +101,29 @@
type="checkbox"
value="passNumerique"
[checked]="searchService.getIndex(checkedModulesFilter, 'passNumerique', 'labelsQualifications') > -1"
(change)="numericPassCheck($event, 'labelsQualifications')"
(change)="externalCheckboxCheck($event, 'labelsQualifications')"
/>
<span class="customCheck"></span>
<div class="label pass">Pass numérique</div>
</label>
</div>
</div>
<div class="checkbox no-width">
<div class="checkboxItem">
<label>
<input
type="checkbox"
value="conseillerNumFranceServices"
[checked]="
searchService.getIndex(checkedModulesFilter, 'conseillerNumFranceServices', 'labelsQualifications') > -1
"
(change)="externalCheckboxCheck($event, 'labelsQualifications')"
/>
<span class="customCheck"></span>
<div class="label pass">Conseiller numérique</div>
</label>
</div>
</div>
<a routerLink="/create-structure" tabindex="0">Ajouter une structure</a>
</div>
</div>
......@@ -89,11 +89,29 @@ describe('StructureListSearchComponent', () => {
component.closeModal();
expect(component.modalTypeOpened).toBeUndefined();
});
// numericPassCheck function
// externalCheckboxCheck function
it('should add numericPass filter to array of current filters and increment by one number of moreFilters element', () => {
const evt = { target: { checked: true, value: 'Pass numérique' } };
const categ = 'Labels et qualifications';
component.numericPassCheck(evt, categ);
component.externalCheckboxCheck(evt, categ);
const expectArray: Module[] = [new Module(evt.target.value, categ)];
expect(component.checkedModulesFilter).toEqual(expectArray);
expect(component.numberMoreFiltersChecked).toEqual(1);
});
it('should remove conseillerNumFranceServices filter to array of current filters and increment by one number of moreFilters element', () => {
const evt = { target: { checked: false, value: 'Conseiller numérique' } };
const categ = 'Labels et qualifications';
const checkedModules: Module[] = [{ id: evt.target.value, text: categ, count: 0 }];
component.checkedModulesFilter = checkedModules;
component.externalCheckboxCheck(evt, categ);
new Module(evt.target.value, categ);
expect(component.checkedModulesFilter.length).toEqual(0);
expect(component.numberMoreFiltersChecked).toEqual(0);
});
it('should add conseillerNumFranceServices filter to array of current filters and increment by one number of moreFilters element', () => {
const evt = { target: { checked: true, value: 'Conseiller numérique' } };
const categ = 'Labels et qualifications';
component.externalCheckboxCheck(evt, categ);
const expectArray: Module[] = [new Module(evt.target.value, categ)];
expect(component.checkedModulesFilter).toEqual(expectArray);
expect(component.numberMoreFiltersChecked).toEqual(1);
......@@ -103,7 +121,7 @@ describe('StructureListSearchComponent', () => {
const categ = 'Labels et qualifications';
const checkedModules: Module[] = [{ id: evt.target.value, text: categ, count: 0 }];
component.checkedModulesFilter = checkedModules;
component.numericPassCheck(evt, categ);
component.externalCheckboxCheck(evt, categ);
new Module(evt.target.value, categ);
expect(component.checkedModulesFilter.length).toEqual(0);
expect(component.numberMoreFiltersChecked).toEqual(0);
......
......@@ -171,7 +171,7 @@ export class StructureListSearchComponent implements OnInit {
}
// Management of the checkbox event (Check / Uncheck)
public numericPassCheck(event, categ): void {
public externalCheckboxCheck(event, categ): void {
const checkValue: string = event.target.value;
const inputTerm = this.searchForm.get('searchTerm').value;
if (event.target.checked) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment