Skip to content

Commit

Permalink
Remove ordering params that don't work
Browse files Browse the repository at this point in the history
  • Loading branch information
@ilmartyrk
ilmartyrk committed Mar 19, 2024
1 parent df14da5 commit 6f4ced8
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 31 deletions.
20 changes: 10 additions & 10 deletions src/app/group/group.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -709,8 +709,8 @@
<span translate="VIEWS.GROUP.FILTER_ALL" *ngIf="!topicFilters.orderBy"></span>
<span translate="VIEWS.GROUP.TOPICS_FILTER_ORDER_RECENT_ACTIVITY"
*ngIf="topicFilters.orderBy === 'lastActivity'"></span>
<span translate="VIEWS.GROUP.TOPICS_FILTER_ORDER_MOST_ACTIVITIES"
*ngIf="topicFilters.orderBy === 'activityCount'"></span>
<!--span-- translate="VIEWS.GROUP.TOPICS_FILTER_ORDER_MOST_ACTIVITIES"
*ngIf="topicFilters.orderBy === 'activityCount'"></!--span-->
<span translate="VIEWS.GROUP.TOPICS_FILTER_ORDER_MOST_PARTICIPANTS"
*ngIf="topicFilters.orderBy === 'membersCount'"></span>
<span translate="VIEWS.GROUP.TOPICS_FILTER_ORDER_MOST_RECENT"
Expand All @@ -725,8 +725,8 @@
<div class="option" translate="VIEWS.GROUP.TOPICS_FILTERS_ORDER_ALL" (click)="orderBy('')"></div>
<div class="option" translate="VIEWS.GROUP.TOPICS_FILTER_ORDER_RECENT_ACTIVITY"
(click)="orderBy('lastActivity')"></div>
<div class="option" translate="VIEWS.GROUP.TOPICS_FILTER_ORDER_MOST_ACTIVITIES"
(click)="orderBy('activityCount')"></div>
<!--div-- class="option" translate="VIEWS.GROUP.TOPICS_FILTER_ORDER_MOST_ACTIVITIES"
(click)="orderBy('activityCount')"></!--div-->
<div class="option" translate="VIEWS.GROUP.TOPICS_FILTER_ORDER_MOST_PARTICIPANTS"
(click)="orderBy('membersCount')"></div>
<div class="option" translate="VIEWS.GROUP.TOPICS_FILTER_ORDER_MOST_RECENT"
Expand Down Expand Up @@ -759,8 +759,8 @@
<div class="option" translate="VIEWS.GROUP.TOPICS_FILTERS_ORDER_ALL" (click)="orderBy('')"></div>
<div class="option" translate="VIEWS.GROUP.TOPICS_FILTER_ORDER_RECENT_ACTIVITY"
(click)="orderBy('lastActivity')"></div>
<div class="option" translate="VIEWS.GROUP.TOPICS_FILTER_ORDER_MOST_ACTIVITIES"
(click)="orderBy('activityCount')"></div>
<!--div-- class="option" translate="VIEWS.GROUP.TOPICS_FILTER_ORDER_MOST_ACTIVITIES"
(click)="orderBy('activityCount')"></!--div-->
<div class="option" translate="VIEWS.GROUP.TOPICS_FILTER_ORDER_MOST_PARTICIPANTS"
(click)="orderBy('membersCount')"></div>
<div class="option" translate="VIEWS.GROUP.TOPICS_FILTER_ORDER_MOST_RECENT"
Expand Down Expand Up @@ -936,8 +936,8 @@
<span translate="VIEWS.GROUP.FILTER_ALL" *ngIf="!topicFilters.orderBy"></span>
<span translate="VIEWS.GROUP.TOPICS_FILTER_ORDER_RECENT_ACTIVITY"
*ngIf="topicFilters.orderBy === 'lastActivity'"></span>
<span translate="VIEWS.GROUP.TOPICS_FILTER_ORDER_MOST_ACTIVITIES"
*ngIf="topicFilters.orderBy === 'activityCount'"></span>
<!--span-- translate="VIEWS.GROUP.TOPICS_FILTER_ORDER_MOST_ACTIVITIES"
*ngIf="topicFilters.orderBy === 'activityCount'"></!--span-->
<span translate="VIEWS.GROUP.TOPICS_FILTER_ORDER_MOST_PARTICIPANTS"
*ngIf="topicFilters.orderBy === 'membersCount'"></span>
<span translate="VIEWS.GROUP.TOPICS_FILTER_ORDER_MOST_RECENT"
Expand Down Expand Up @@ -1041,11 +1041,11 @@
<span class="checkmark"></span>
</label>

<label class="checkbox" (click)="mobileTopicFilters.orderBy = 'activityCount';">
<!--label class="checkbox" (click)="mobileTopicFilters.orderBy = 'activityCount';">
<span [innerHTML]="'VIEWS.GROUP.TOPICS_FILTER_ORDER_MOST_ACTIVITIES' | translate | titlecase"></span>
<input type="radio" name="orderBy">
<span class="checkmark"></span>
</label>
</!--label-->

<label class="checkbox" (click)="mobileTopicFilters.orderBy = 'membersCount';">
<span [innerHTML]="'VIEWS.GROUP.TOPICS_FILTER_ORDER_MOST_PARTICIPANTS' | translate | titlecase"></span>
Expand Down
40 changes: 20 additions & 20 deletions src/app/my-topics/my-topics.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,10 @@
<div class="selection">
<div class="selected_item">
<span translate="VIEWS.MY_TOPICS.FILTER_ALL" *ngIf="!topicFilters.orderBy"></span>
<span translate="VIEWS.MY_TOPICS.FILTERS.ORDER_RECENT_ACTIVITY"
*ngIf="topicFilters.orderBy === 'activityTime'"></span>
<span translate="VIEWS.MY_TOPICS.FILTERS.ORDER_MOST_ACTIVITIES"
*ngIf="topicFilters.orderBy === 'activityCount'"></span>
<!--span translate="VIEWS.MY_TOPICS.FILTERS.ORDER_RECENT_ACTIVITY"
*ngIf="topicFilters.orderBy === 'activityTime'"></!--span>
<span-- translate="VIEWS.MY_TOPICS.FILTERS.ORDER_MOST_ACTIVITIES"
*ngIf="topicFilters.orderBy === 'activityCount'"></span-->
<span translate="VIEWS.MY_TOPICS.FILTERS.ORDER_MOST_PARTICIPANTS"
*ngIf="topicFilters.orderBy === 'membersCount'"></span>
<span translate="VIEWS.MY_TOPICS.FILTERS.ORDER_MOST_RECENT"
Expand All @@ -135,10 +135,10 @@
</div>
<div class="options">
<div class="option" translate="VIEWS.MY_TOPICS.FILTER_ALL" (click)="orderBy('')"></div>
<div class="option" translate="VIEWS.MY_TOPICS.FILTERS.ORDER_RECENT_ACTIVITY"
(click)="orderBy('activityTime')"></div>
<div class="option" translate="VIEWS.MY_TOPICS.FILTERS.ORDER_MOST_ACTIVITIES"
(click)="orderBy('activityCount')"></div>
<!--div class="option" translate="VIEWS.MY_TOPICS.FILTERS.ORDER_RECENT_ACTIVITY"
(click)="orderBy('activityTime')"></!--div>
<div-- class="option" translate="VIEWS.MY_TOPICS.FILTERS.ORDER_MOST_ACTIVITIES"
(click)="orderBy('activityCount')"></div-->
<div class="option" translate="VIEWS.MY_TOPICS.FILTERS.ORDER_MOST_PARTICIPANTS"
(click)="orderBy('membersCount')"></div>
<div class="option" translate="VIEWS.MY_TOPICS.FILTERS.ORDER_MOST_RECENT" (click)="orderBy('created')">
Expand Down Expand Up @@ -199,10 +199,10 @@
</div>
<div class="options">
<div class="option" translate="VIEWS.MY_TOPICS.FILTER_ALL" (click)="orderBy('')"></div>
<div class="option" translate="VIEWS.MY_TOPICS.FILTERS.ORDER_RECENT_ACTIVITY"
(click)="orderBy('activityTime')"></div>
<div class="option" translate="VIEWS.MY_TOPICS.FILTERS.ORDER_MOST_ACTIVITIES"
(click)="orderBy('activityCount')"></div>
<!--div class="option" translate="VIEWS.MY_TOPICS.FILTERS.ORDER_RECENT_ACTIVITY"
(click)="orderBy('activityTime')"></!--div>
<div-- class="option" translate="VIEWS.MY_TOPICS.FILTERS.ORDER_MOST_ACTIVITIES"
(click)="orderBy('activityCount')"></div-->
<div class="option" translate="VIEWS.MY_TOPICS.FILTERS.ORDER_MOST_PARTICIPANTS"
(click)="orderBy('membersCount')"></div>
<div class="option" translate="VIEWS.MY_TOPICS.FILTERS.ORDER_MOST_RECENT" (click)="orderBy('created')">
Expand Down Expand Up @@ -347,10 +347,10 @@
<div class="filter_option">
<span translate="VIEWS.MY_TOPICS.FILTER_ORDER"></span><a class="bold" (click)="mobileFilters.orderBy = true">
<span translate="VIEWS.MY_TOPICS.FILTER_ALL" *ngIf="!topicFilters.orderBy"></span>
<span translate="VIEWS.MY_TOPICS.FILTERS.ORDER_RECENT_ACTIVITY"
*ngIf="topicFilters.orderBy === 'activityTime'"></span>
<span translate="VIEWS.MY_TOPICS.FILTERS.ORDER_MOST_ACTIVITIES"
*ngIf="topicFilters.orderBy === 'activityCount'"></span>
<!--span translate="VIEWS.MY_TOPICS.FILTERS.ORDER_RECENT_ACTIVITY"
*ngIf="topicFilters.orderBy === 'activityTime'"></!--span>
<span-- translate="VIEWS.MY_TOPICS.FILTERS.ORDER_MOST_ACTIVITIES"
*ngIf="topicFilters.orderBy === 'activityCount'"></span-->
<span translate="VIEWS.MY_TOPICS.FILTERS.ORDER_MOST_PARTICIPANTS"
*ngIf="topicFilters.orderBy === 'membersCount'"></span>
<span translate="VIEWS.MY_TOPICS.FILTERS.ORDER_MOST_RECENT"
Expand Down Expand Up @@ -478,16 +478,16 @@
<input type="radio" name="type">
<span class="checkmark"></span>
</label>
<label class="checkbox" (click)="mobileFilters.orderBy = 'activityTime'">
<!--label class="checkbox" (click)="mobileFilters.orderBy = 'activityTime'">
<span translate="VIEWS.MY_TOPICS.FILTERS.ORDER_RECENT_ACTIVITY"></span>
<input type="radio" name="type">
<span class="checkmark"></span>
</label>
<label class="checkbox" (click)="mobileFilters.orderBy = 'activityCount'">
</!--label>
<label-- class="checkbox" (click)="mobileFilters.orderBy = 'activityCount'">
<span translate="VIEWS.MY_TOPICS.FILTERS.ORDER_MOST_ACTIVITIES"></span>
<input type="radio" name="type">
<span class="checkmark"></span>
</label>
</label-->
<label class="checkbox" (click)="mobileFilters.orderBy = 'membersCount'">
<span translate="VIEWS.MY_TOPICS.FILTERS.ORDER_MOST_PARTICIPANTS"></span>
<input type="radio" name="type">
Expand Down
3 changes: 2 additions & 1 deletion src/app/my-topics/my-topics.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,8 @@ export class MyTopicsComponent {
}

setStatus(status: string) {
if (status === 'all') status = '';
console.log(status);
if (status === 'all' || status == 'true') status = '';
this.statusFilter$.next(status);
this.topicFilters.status = status;
}
Expand Down

0 comments on commit 6f4ced8

Please sign in to comment.