Skip to content

Release 7.0.0 #3539

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
swayangjit merged 2 commits into from
Feb 13, 2024
Merged

Release 7.0.0 #3539

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
75cc34e
ISSUE #ED-3479 : implementing program tile unique element id's
Feb 12, 2024
93b3a0a
Merge pull request #444 from shikshalokam/ED-3479
vishwanath1004 Feb 12, 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
16 changes: 8 additions & 8 deletions src/app/manage-learn/programs/program-details/program-details.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<ion-content class="ion-padding">
<div class="details-block">
<div class="details-block" id="programMetaDataCard">
<ion-card class="w-100">
<div class="title">{{programDetails?.programName}}</div>
<div class="description">{{description}}
<div class="title" id="programTitle">{{programDetails?.programName}}</div>
<div class="description" id="programDescription">{{description}}
<span class="read-more" (click)="showMore=!showMore; readMoreOrLess()" *ngIf="programDetails?.description?.length > characterLimit">
{{ (showMore ? 'READ_LESS' : 'READ_MORE') | translate }}
</span>
</div>
<div *ngIf="isNewProgram">
<div class="hr-line"></div>
<ion-button class="custom-btn-txt-transform-none" (click)="join()" expand="block" *ngIf="!programDetails?.programJoined; else showMessage">
<ion-button class="custom-btn-txt-transform-none" (click)="join()" expand="block" *ngIf="!programDetails?.programJoined; else showMessage" id="programJoinButton">
{{"FRMELEMNTS_LBL_JOIN_PROGRAM_POPUP" | translate}}
</ion-button>
<ng-template #showMessage>
<div class="program-joined-message">
<div class="program-joined-message" id="programJoined">
{{"FRMELEMNTS_MSG_PROGRAM_JOINED" | translate:{'date':(programDetails?.programEndDate | date: 'MMM dd, YYYY')} }}
</div>
</ng-template>
Expand All @@ -23,11 +23,11 @@

<div class="section-filter">
<sb-library-filters [list]="filtersList" [layout]="layout" selectedItems="{{[selectedFilterIndex]}}"
(selectedFilter)="onFilterChange($event);" *ngIf="filtersList?.length">
(selectedFilter)="onFilterChange($event);" *ngIf="filtersList?.length" id="resourceTab">
</sb-library-filters>
</div>

<ion-card class="custom-card-style" *ngFor="let data of filteredList">
<ion-card class="custom-card-style" *ngFor="let data of filteredList" id="resourceCard">
<div class="section-card" *ngIf="!selectedFilterIndex || data?.sectionName == selectedSection">
<div class="d-flex flex-jc-space-between p-10 section-details" (click)="selectSection(data)">
<div class="section-name">{{data?.sectionName}}</div>
Expand All @@ -37,7 +37,7 @@
</div>
<div *ngIf="data?.show">
<div *ngFor="let section of data?.sectionList">
<app-item-list-card [title]="section?.name" (click)="cardClick(section)">
<app-item-list-card [title]="section?.name" (click)="cardClick(section)" id="resourceItemCard">
<div class="certificate-tag" certificate *ngIf="section?.certificate || section?.certificateTemplateId">
{{'CERTIFICATE' | translate}}
</div>
Expand Down
8 changes: 4 additions & 4 deletions src/app/manage-learn/programs/program-listing/program-listing.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<ion-content hide-header-footer overflow-scroll="true"
class="main-container avoid-bottom-tabs-space ui-container" scrollEvents="true">
<div class="header-section">
<div class="header-section" id="programListHeader">
<div class="title">{{'EXPLORE_PROGRAMS' | translate }}</div>
<div class="desc">{{ description }}</div>
<ion-searchbar debounce="1000" placeholder="{{'FRMELEMNTS_LBL_SEARCH_PROGRAMS_PLACEHOLDER' | translate}}" [(ngModel)]="search"
(ionChange)="searchPrograms($event)" search-icon="search">
(ionChange)="searchPrograms($event)" search-icon="search" id="programSearch">
</ion-searchbar>
</div>
<app-item-list-card [title]="data?.name" [id]="data?._id" [state]="data?.metaInformation?.state" [roles]="data?.metaInformation?.roles"
(cardSelect)="selectedProgram($event)" *ngFor="let data of programs">
(cardSelect)="selectedProgram($event)" *ngFor="let data of programs" id="programCard">
</app-item-list-card>
<app-no-data *ngIf="!programs?.length" message="{{ search ? 'EMPTY_SEARCH_RESULTS' : 'NO_DATA_FOUND' }}"></app-no-data>
</ion-content>
<ion-button class="custom-btn-txt-transform-none mx-8 mt-16 load-more" fill="outline" expand="block"
(click)="loadMore()" *ngIf="programs?.length && count > programs?.length">
(click)="loadMore()" *ngIf="programs?.length && count > programs?.length" id="programsLoadMoreButton">
{{ 'FRMELEMNTS_BTN_LOAD_MORE' | translate }}
</ion-button>