Skip to content
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

Issue #ED-4085 fix: Added fix for activities not showing in groups. #3595

Merged
merged 2 commits into from
Apr 18, 2024
Merged

Issue #ED-4085 fix: Added fix for activities not showing in groups. #3595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11466c9
Issue #ED-4085 fix: Added fix for acctivities not showing in groups.
swayangjit Apr 18, 2024
3bd9673
Issue #ED-4085 fix: Added fix for acctivities not showing in groups.
swayangjit Apr 18, 2024
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
41 changes: 24 additions & 17 deletions src/app/my-groups/group-details/group-details.page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@
</div>
</div>
<div class="gd-opts">
<accessDiscussion aria-label="access discussion forum" [fetchForumIdReq]="fetchForumIdReq" [createUserReq]="createUserReq" (forumData)="assignForumData($event)"> </accessDiscussion>
<span aria-label="more actions menu"><ion-icon ios="ellipsis-horizontal" role="button" aria-label="more actions menu" md="ellipsis-vertical" (click)="groupMenuClick($event)"></ion-icon></span>
<accessDiscussion aria-label="access discussion forum" [fetchForumIdReq]="fetchForumIdReq"
[createUserReq]="createUserReq" (forumData)="assignForumData($event)"> </accessDiscussion>
<span aria-label="more actions menu">
<ion-icon ios="ellipsis-horizontal" role="button" aria-label="more actions menu" md="ellipsis-vertical"
(click)="groupMenuClick($event)"></ion-icon>
</span>
</div>
</div>
</div>
Expand All @@ -31,9 +35,9 @@
</div>
</div>
<div class="gd-tab-header" tabindex="0">
<div class="gd-tab" (click)="switchTabs('activities')" [ngClass]="{'active': activeTab=='activities'}" tabindex="0">
<div class="gd-tab-name gd-tab-border"
[attr.aria-label]="activeTab=='activities' ?
<div class="gd-tab" (click)="switchTabs('activities')" [ngClass]="{'active': activeTab=='activities'}"
tabindex="0">
<div class="gd-tab-name gd-tab-border" [attr.aria-label]="activeTab=='activities' ?
'Selected activities tab' :
'activities tab'">{{'ACTIVITIES' | translate}}</div>
</div>
Expand All @@ -54,7 +58,8 @@
</div>
<div class="gd-tab-member-container" tabindex="0">
<div class="gd-add-member-container">
<div *ngIf="(platform.is('ios') ? false : true) && (!isSuspended && loggedinUser?.role === 'admin')" class="gd-add-member" (click)="navigateToAddUserPage()" tabindex="0">
<div *ngIf="(platform.is('ios') ? false : true) && (!isSuspended && loggedinUser?.role === 'admin')"
class="gd-add-member" (click)="navigateToAddUserPage()" tabindex="0">
<span class="gd-add-member-icon">
<img src="assets/imgs/ic_person_add_white.svg" alt="add-member">
</span>
Expand All @@ -72,8 +77,9 @@
<div *ngIf="!isGroupLoading">
<div *ngFor="let member of filteredMemberList; let i = index">
<sb-member-card [config]="{size:'medium', isBold:false, isSelectable:false, view:'horizontal'}"
[identifier]="member.userId" [indexOfMember]="i" [initial]="commonUtilService.extractInitial(member.name)"
[title]="getMemberName(member)" [isMenu]="!isSuspended && showMemberMenu(member)" [isAdmin]="member.role === 'admin'"
[identifier]="member.userId" [indexOfMember]="i"
[initial]="commonUtilService.extractInitial(member.name)" [title]="getMemberName(member)"
[isMenu]="!isSuspended && showMemberMenu(member)" [isAdmin]="member.role === 'admin'"
(menuClick)="memberMenuClick($event, member)">
</sb-member-card>
</div>
Expand All @@ -96,7 +102,7 @@
<input type="text" [(ngModel)]="searchActivity" placeholder="{{'ACTIVITIESE_SEARCH_PLACEHOLDER' | translate}}"
(ngModelChange)="onActivitySearch(searchActivity)">
</div>
<div *ngIf="!isGroupLoading && (!flattenedActivityList || !flattenedActivityList.length)" class="text-center" >
<div *ngIf="!isGroupLoading && (!flattenedActivityList || !flattenedActivityList.length)" class="text-center">
<div class="gd-empty-result" *ngIf="!activitySearchQuery">
<img src="assets/imgs/no_activity.svg" alt="no-activity">
</div>
Expand All @@ -105,23 +111,24 @@
<p>{{'EMPTY_SEARCH_RESULT_GROUPS' | translate}}</p>
</div>
</div>
<div *ngIf="isGroupLoading" >
<div *ngIf="isGroupLoading">
<div *ngFor="let item of [0,1,2,3,4,5,6,7,8,9]">
<sb-course-card [isLoading]="true"></sb-course-card>
</div>
</div>
<div *ngIf="!isGroupLoading && flattenedActivityList && flattenedActivityList.length">
<div *ngFor="let activityGroup of activityList; let i = index" class="mb-8" >
<div *ngFor="let activityGroup of activityList; let i = index" class="mb-8">
<div class="gd-card-head" *ngIf="filteredGroupedActivityListMap[activityGroup?.title].length">
<span class="gd-card-title-icon"><img src="assets/imgs/book.png" alt="book-icon"></span>
<span class="gd-card-titile" role="heading" aria-level="2">{{activityGroup.title}}</span>
</div>
<div *ngFor="let activity of filteredGroupedActivityListMap[activityGroup?.title]; let j = index" tabindex="0">
<sb-library-card
(cardClick)="!isSuspended && onActivityCardClick($event)" [content]="activity" [section]="null"
[isMenu]="!isSuspended && loggedinUser.role === 'admin'" [cardImg]="activity?.appIcon
|| config?.assetsPath?.book" (menuClick)="!isSuspended && activityMenuClick($event)">
</sb-library-card>
<div *ngFor="let activity of filteredGroupedActivityListMap[activityGroup?.title]; let j = index"
tabindex="0">
<sb-library-card (cardClick)="!isSuspended && onActivityCardClick($event)" [content]="activity"
[section]="null" [isMenu]="!isSuspended && loggedinUser.role === 'admin'"
[cardImg]=commonUtilService.getContentImg(activity)
(menuClick)="!isSuspended && activityMenuClick($event)">
</sb-library-card>
</div>
</div>
</div>
Expand Down
Loading