Release 6.0.0 v13

src/app/home/user-home/user-home.page.ts

@@ -854,14 +854,14 @@ export class UserHomePage implements OnInit, OnDestroy, OnTabViewWillEnter {
     if (!event || !event.data || !event.data.length) {
       return;
     }
-    const title = event.data[0]['name'] === 'Project' ? 'FRMELEMENTS_MSG_YOU_MUST_JOIN_TO_PROJECT' :'FRMELEMENTS_MSG_YOU_MUST_JOIN_TO_OBSERVATIONS';
-    const meta = event.data[0]['name'] === 'Project' ? 'FRMELEMENTS_MSG_ONLY_REGISTERED_USERS_CAN_TAKE_PROJECT': 'FRMELEMENTS_MSG_ONLY_REGISTERED_USERS_CAN_TAKE_OBSERVATION';
+    const title = 'FRMELEMENTS_MSG_YOU_MUST_LOGIN_TO_ACCESS';
+    const meta = 'FRMELEMENTS_MSG_ONLY_REGISTERED_USERS_CAN_ACCESS';
     const selectedPill = event.data[0].value.name;
     const confirm = await this.popoverCtrl.create({
       component: SbPopoverComponent,
       componentProps: {
-        sbPopoverMainTitle: this.commonUtilService.translateMessage(title),
-        metaInfo: this.commonUtilService.translateMessage(meta),
+        sbPopoverMainTitle: this.commonUtilService.translateMessage(title, selectedPill),
+        metaInfo: this.commonUtilService.translateMessage(meta, selectedPill),
         sbPopoverHeading: this.commonUtilService.translateMessage('OVERLAY_SIGN_IN'),
         isNotShowCloseIcon: true,
         actionsButtons: [

src/app/manage-learn/generic-reports/reports/reports.component.html

@@ -87,7 +87,7 @@ <h3>{{ section.criteriaName }}</h3>
         <reports-text [data]="element" [questionNumber]="i + 1" *ngSwitchDefault></reports-text>
       </ion-card>
       <ion-button class="view-more custom-btn-txt-transform-none" expand="block" (click)="loadMoreReports(element,section?.questionArray,i+1)"   *ngIf="element?.answers?.length && element?.count > element?.answers?.length">
-        {{ "VIEW_MORE" | translate }}
+        {{ "FRMELEMNTS_BTN_VIEW_MORE" | translate }}
       </ion-button>
       <ion-grid>
         <ion-row>

src/app/manage-learn/project/attachment-listing/attachment-listing.page.html

@@ -43,6 +43,6 @@ <h5 class="sb--card__title projects-labels"><span>{{'FRMELEMNTS_LBL_TASK_LEVEL'
     </div>
   </div>
   <div *ngIf="!attachments?.project?.attachments?.length && !attachments?.tasks?.length">
-    <app-no-data [message]="'FRMELEMENTS_NO_EVIDENCES_FOR_FILE'" [color]="'text-primary'"></app-no-data>
+    <app-no-data message="{{'FRMELEMENTS_NO_EVIDENCES_FOR_FILE' | translate:{'fileType':selectedTab} }}" [color]="'text-primary'"></app-no-data>
   </div>
 </ion-content>

src/app/manage-learn/project/project-details/project-details.component.html

@@ -13,7 +13,7 @@
         *ngIf="projectDetails?.status?.length &&  projectDetails?.status !== allStatusTypes.submitted" id="projectStatus">
         <p><strong>{{'YOUR_PROGRESS_LABEL' | translate}}</strong>
         </p>
-        <p>{{projectCompletionPercent?.completedTasks}} / {{projectCompletionPercent?.totalTasks}} {{'COMPLETED' |
+        <p>{{projectCompletionPercent?.completedTasks}} / {{projectCompletionPercent?.totalTasks}} {{'FRMELEMNTS_LBL_TASKS_COMPLETED' |
           translate}}
         </p>
         <ion-progress-bar

src/app/manage-learn/project/project-details/project-details.component.ts

@@ -140,7 +140,7 @@ export class ProjectDetailsComponent implements OnInit {
             this.setActionButtons();
             this.isNotSynced = this.projectDetails ? (this.projectDetails.isNew || this.projectDetails.isEdit) : false;
             this.projectDetails.categories.forEach((category: any) => {
-              category.label ? this.categories.push(category.label) : this.categories.push(category.name);
+              category.label ? this.categories.push(` ${category.label}`) : this.categories.push(` ${category.name}`);
             });
             this.setCardMetaData();
             this.projectCompletionPercent = this.projectServ.getProjectCompletionPercentage(this.projectDetails);

src/app/manage-learn/shared/components/entity-search-local/entity-search-local.component.html

@@ -9,6 +9,7 @@
         [(ngModel)]="searchQuery"
         placeholder="Search {{data.entityType}}"
         (ionClear)="searchQuery = ''; onSearch()"
+        (keyup.enter)="onSearch()"
       ></ion-searchbar>
       <ion-button ion-button icon-only (click)="onSearch()" class="serachBtn">
         <ion-icon role="button" aria-label="search" name="search" class="searchIcon"></ion-icon>

src/app/manage-learn/shared/components/metadata-details/metadata-details.component.html

@@ -3,7 +3,7 @@
     <div class="d-flex flex-ai-center flex-jc-space-between">
       <div class="w-70">
         <ion-card-title>{{data?.title}}</ion-card-title>
-        <ion-card-subtitle>{{data?.subTitle | titlecase}}</ion-card-subtitle>
+        <ion-card-subtitle>{{data?.subTitle}}</ion-card-subtitle>
       </div>
       <div> <ng-content select="[certificate]"></ng-content> </div>
     </div>

src/assets/i18n/en.json

@@ -1314,7 +1314,7 @@
   "FRMELEMNTS_BTN_LOAD_MORE_IMAGES": "Load more images",
   "FRMELEMNTS_LBL_GALLERY": "Gallery",
   "FRMELEMNTS_MSG_ERROR_FILE_SIZE_LIMIT": "You have attached a file that exceeds the limit",
-  "FRMELEMENTS_NO_EVIDENCES_FOR_FILE": "No files found for this project",
+  "FRMELEMENTS_NO_EVIDENCES_FOR_FILE": "No {{fileType}}s found for this project",
   "CERTIFICATE_VERIFIED": "Certificate verified",
   "CERTIFICATE_ISSUED_TO": "Certificate issued to",
   "SUCCESSFULLY_COMPLETING_COURSE": "For successfully completing the course",
@@ -1401,5 +1401,8 @@
   "FRMELEMNTS_LBL_START_OBSERVATION_POPUP":"Start observation",
   "FRMELEMNTS_LBL_START_OBSERVATION_POPUP_MSG1":"You must click on the Start observation button to access and edit the observation.",
   "FRMELEMNTS_LBL_START_OBSERVATION_POPUP_MSG2":"Click on the Start observation to get complete access to the content",
-  "FRMELEMNTS_MSG_NOT_LOGGEDIN_USER":"Please login with HT & Officials to access this content"
+  "FRMELEMNTS_MSG_NOT_LOGGEDIN_USER":"Please login with HT & Officials to access this content",
+  "FRMELEMENTS_MSG_YOU_MUST_LOGIN_TO_ACCESS":"You must login to access {{%s}}s",
+  "FRMELEMENTS_MSG_ONLY_REGISTERED_USERS_CAN_ACCESS": "Only registered users can take {{%s}}s",
+  "FRMELEMNTS_LBL_TASKS_COMPLETED": "tasks completed"
 }