Skip to content

Commit 1784c1b

Browse files
committed
chore:Apply patch for commit a5ab251 (resolved conflicts)
1 parent 0916edd commit 1784c1b

File tree

2 files changed

+27
-12
lines changed

2 files changed

+27
-12
lines changed

src/app/ideation/components/topic-ideation/topic-ideation.component.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -321,16 +321,16 @@
321321
/>
322322
<span class="checkmark"></span>
323323
</label>
324-
<label *ngFor="let number of [].constructor(AGE_LIMIT); let i = index" class="checkbox">
325-
<span>{{ i + 1 }}</span>
326-
<input
327-
type="checkbox"
328-
name="age"
329-
[checked]="ideaFilters.age.includes((i + 1).toString())"
330-
(change)="setAge(i + 1)"
331-
/>
332-
<span class="checkmark"></span>
333-
</label>
324+
<label *ngFor="let number of [].constructor(AGE_LIMIT); let i = index" class="checkbox">
325+
<span>{{ i + 1 }}</span>
326+
<input
327+
type="checkbox"
328+
name="age"
329+
[checked]="ideaFilters.age.includes((i + 1).toString())"
330+
(change)="setAge(i + 1)"
331+
/>
332+
<span class="checkmark"></span>
333+
</label>
334334
</div>
335335
</div>
336336
</cos-input>

src/app/ideation/components/topic-ideation/topic-ideation.component.ts

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export class TopicIdeationComponent {
6464
mobileIdeaFiltersList = false;
6565

6666
mobileIdeaFilters: any = {
67-
age: '',
67+
age: <string[]>[],
6868
gender: '',
6969
residence: '',
7070
type: '',
@@ -264,6 +264,21 @@ export class TopicIdeationComponent {
264264
this.ideaFilters.age = [...this.mobileAges];
265265
}
266266

267+
setMobileAge(_age: number | string) {
268+
const age = _age.toString();
269+
if (age === 'all' || age === '') {
270+
this.mobileIdeaFilters.age = [];
271+
return;
272+
}
273+
274+
const idx = this.mobileIdeaFilters.age.indexOf(age);
275+
if (idx > -1) {
276+
this.mobileIdeaFilters.age.splice(idx, 1);
277+
} else {
278+
this.mobileIdeaFilters.age.push(age);
279+
}
280+
}
281+
267282
setGender(value: string) {
268283
if (value === 'all') value = '';
269284
this.genderFilter$.next(value);
@@ -508,7 +523,7 @@ export class TopicIdeationComponent {
508523
showMobileOverlay() {
509524
const filtersShow = Object.entries(this.mobileIdeaFilters).find(([key, value]) => {
510525
if (key === 'age') {
511-
return Array.isArray(value) && value.length > 0;
526+
return value === true;
512527
}
513528
return !!value;
514529
});

0 commit comments

Comments
 (0)