Issue #SH-25 merge: Merge pull request #1109 from AmiableAnil/Release…

…-3.1.0-router Issue #SH-25 feat: Integrated the date pipe.
Sunbird-Ed · Jul 16, 2020 · 7466637 · 7466637
2 parents d38a317 + 550051a
commit 7466637
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/app/my-groups/activity-details/activity-details.page.html b/src/app/my-groups/activity-details/activity-details.page.html
@@ -9,7 +9,7 @@
         placeholder="{{'SEARCH_FOR_GROUP_MEMBER' | translate}}">
     </div>
     <div *ngIf="activityDetail?.agg?.lastUpdatedOn" class="ad-timestamp"
-      [innerHTML]="'LAST_UPDATED' | translate:  {'%s': activityDetail.agg.lastUpdatedOn || 'time' }">
+      [innerHTML]="'LAST_UPDATED' | translate:  {'%s': (activityDetail.agg.lastUpdatedOn | dateAgo: 'day' : 'M/d/yy') }">
     </div>
 
     <div class="ad-mebers-container">
@@ -27,12 +27,12 @@
           </sb-member-card>
         </div>
       </div>
-      <div *ngIf="(!isActivityLoading && !filteredMemberList) || (!isActivityLoading && filteredMemberList.length <= 1)"
+      <div *ngIf="(!isActivityLoading && !filteredMemberList) || (!isActivityLoading && filteredMemberList?.length <= 1)"
         class="text-center">
-        <div class="gd-empty-result" *ngIf="!memberSearchQuery">
+        <div class="ad-empty-result" *ngIf="!memberSearchQuery">
           <img src="assets/imgs/no_member.svg" alt="">
         </div>
-        <div class="gd-empty-result" *ngIf="memberSearchQuery && !filteredMemberList.length">
+        <div class="ad-empty-result" *ngIf="memberSearchQuery && !filteredMemberList?.length">
           <img src="assets/imgs/empty_search_result.svg" alt="">
           <p>{{'EMPTY_SEARCH_RESULT_GROUPS' | translate}}</p>
         </div>

diff --git a/src/app/my-groups/activity-details/activity-details.page.scss b/src/app/my-groups/activity-details/activity-details.page.scss
@@ -27,4 +27,12 @@
 }
 .ad-mebers-container{
     box-shadow: 0 2px 7px 0 rgba(0,0,0,0.25);
+}
+.ad-empty-result{
+    img{
+        max-width: 65%;
+        margin-top: 20%;
+        margin-bottom: 16px;
+        font-size: 16px;
+    }
 }