From 13c7fb1ac9bba997747902948e59beda836b235b Mon Sep 17 00:00:00 2001 From: "balakrishna@mantralabsglobal.com" Date: Mon, 29 Jun 2020 17:29:45 +0530 Subject: [PATCH] Issue #SH-31 feat --- .../activity-details.module.ts | 2 ++ .../activity-details.page.html | 19 +++++++++++- .../activity-details.page.scss | 30 +++++++++++++++++++ .../activity-details/activity-details.page.ts | 11 +++++-- .../create-edit-group.page.html | 4 +-- .../group-details/group-details.page.scss | 16 ++++------ .../group-details/group-details.page.ts | 3 +- src/app/my-groups/my-groups.page.scss | 4 +++ src/assets/i18n/en.json | 6 ++-- 9 files changed, 77 insertions(+), 18 deletions(-) diff --git a/src/app/my-groups/activity-details/activity-details.module.ts b/src/app/my-groups/activity-details/activity-details.module.ts index eb0dec99eb..67fb7edd72 100644 --- a/src/app/my-groups/activity-details/activity-details.module.ts +++ b/src/app/my-groups/activity-details/activity-details.module.ts @@ -7,6 +7,7 @@ import { IonicModule } from '@ionic/angular'; import { ActivityDetailsPage } from './activity-details.page'; import { CommonConsumptionModule } from '@project-sunbird/common-consumption'; +import { TranslateModule } from '@ngx-translate/core'; const routes: Routes = [ { @@ -21,6 +22,7 @@ const routes: Routes = [ FormsModule, IonicModule, CommonConsumptionModule, + TranslateModule.forChild(), RouterModule.forChild(routes) ], declarations: [ActivityDetailsPage] diff --git a/src/app/my-groups/activity-details/activity-details.page.html b/src/app/my-groups/activity-details/activity-details.page.html index 13d0964c27..7b11fbeeaf 100644 --- a/src/app/my-groups/activity-details/activity-details.page.html +++ b/src/app/my-groups/activity-details/activity-details.page.html @@ -1,3 +1,20 @@ - +
+ +
+ + +
+
+
+
+
+ + +
+
+
+ \ No newline at end of file diff --git a/src/app/my-groups/activity-details/activity-details.page.scss b/src/app/my-groups/activity-details/activity-details.page.scss index e69de29bb2..8676107651 100644 --- a/src/app/my-groups/activity-details/activity-details.page.scss +++ b/src/app/my-groups/activity-details/activity-details.page.scss @@ -0,0 +1,30 @@ +@import "src/assets/styles/_variables.scss"; +.ad-container{ + padding: 16px; +} +.gd-member-search { + position: relative; + margin: 8px 0; + .gd-member-search-icon { + position: absolute; + top: 8px; + left: 8px; + font-size: 20px; + color: $gray-400; + } + input { + width: 100%; + height: 35px; + padding: 0 8px 0 30px; + border: 1px solid $blue; + border-radius: 4px; + } +} +.ad-timestamp{ + color: $gray-300; + padding: 8px 0; + text-align: right; +} +.ad-mebers-container{ + box-shadow: 0 2px 7px 0 rgba(0,0,0,0.25); +} \ No newline at end of file diff --git a/src/app/my-groups/activity-details/activity-details.page.ts b/src/app/my-groups/activity-details/activity-details.page.ts index 07c8a99855..28747e95af 100644 --- a/src/app/my-groups/activity-details/activity-details.page.ts +++ b/src/app/my-groups/activity-details/activity-details.page.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; @Component({ selector: 'app-activity-details', @@ -6,8 +7,14 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./activity-details.page.scss'], }) export class ActivityDetailsPage implements OnInit { - - constructor() { } + memberList: any; + constructor( + private router: Router + ) { + const extras = this.router.getCurrentNavigation().extras.state; + this.memberList = extras.memberList; + console.log('memberList', this.memberList); + } ngOnInit() { } diff --git a/src/app/my-groups/create-edit-group/create-edit-group.page.html b/src/app/my-groups/create-edit-group/create-edit-group.page.html index b1e5f97efa..7a07e1494f 100644 --- a/src/app/my-groups/create-edit-group/create-edit-group.page.html +++ b/src/app/my-groups/create-edit-group/create-edit-group.page.html @@ -6,13 +6,13 @@ 'cr-input-error': ((createGroupFormControls.groupName.touched || createGroupFormSubmitted) && createGroupFormControls.groupName.errors?.required)}"> {{'GROUP_NAME' | translate }}* - {{50 - createGroupFormControls.groupName.value?.length}} {{'CHARECTERS_REMAINING' | translate}} + {{50 - createGroupFormControls.groupName.value?.length}} {{'CHARACTERS_REMAINING' | translate}} {{ errorMessages.groupName.message | translate }} {{'GROUP_DESCRIPTION' | translate }} - {{150 - createGroupFormControls.groupDesc.value?.length}} {{'CHARECTERS_REMAINING' | translate}} + {{150 - createGroupFormControls.groupDesc.value?.length}} {{'CHARACTERS_REMAINING' | translate}}
diff --git a/src/app/my-groups/group-details/group-details.page.scss b/src/app/my-groups/group-details/group-details.page.scss index eccf099fda..1685d02d08 100644 --- a/src/app/my-groups/group-details/group-details.page.scss +++ b/src/app/my-groups/group-details/group-details.page.scss @@ -16,7 +16,7 @@ .gd-name { padding-right: 60px; - color: #333333; + color: $gray-800; font-family: "Noto Sans"; font-size: 16px; font-weight: bold; @@ -24,7 +24,7 @@ line-height: 20px; .gd-created-by { - color: #666666; + color: $gray-400; font-family: "Noto Sans"; font-size: 11px; letter-spacing: 0; @@ -32,18 +32,15 @@ } } - .gd-opts { position: absolute; right: 8px; top: 16px; - .add-member-icon { position: relative; bottom: 6px; margin-right: 8px; } - ion-icon { color: $blue; } @@ -62,7 +59,6 @@ &.active { border-bottom: 2px solid $blue; - .gd-tab-name { font-weight: bold; } @@ -74,7 +70,7 @@ text-align: center; margin-bottom: 5px; margin-top: 8px; - color: #024f9d; + color: $blue; font-size: 16px; &.gd-tab-border { @@ -86,21 +82,21 @@ .gd-member-search { position: relative; margin: 8px 0; - border: 1px solid $blue; - border-radius: 4px; .gd-member-search-icon { position: absolute; top: 8px; left: 8px; font-size: 20px; - color: #969696; + color: $gray-400; } input { width: 100%; height: 35px; padding: 0 8px 0 30px; + border: 1px solid $blue; + border-radius: 4px; } } diff --git a/src/app/my-groups/group-details/group-details.page.ts b/src/app/my-groups/group-details/group-details.page.ts index a3d8ed2904..5484c25617 100644 --- a/src/app/my-groups/group-details/group-details.page.ts +++ b/src/app/my-groups/group-details/group-details.page.ts @@ -408,7 +408,8 @@ export class GroupDetailsPage { navigateToActivityDetails() { const navigationExtras: NavigationExtras = { state: { - groupId: this.groupId + groupId: this.groupId, + memberList: this.memberList } }; this.router.navigate([`/${RouterLinks.MY_GROUPS}/${RouterLinks.ACTIVITY_DETAILS}`], navigationExtras); diff --git a/src/app/my-groups/my-groups.page.scss b/src/app/my-groups/my-groups.page.scss index 102c032e59..c5c9287486 100644 --- a/src/app/my-groups/my-groups.page.scss +++ b/src/app/my-groups/my-groups.page.scss @@ -28,6 +28,10 @@ box-shadow: 0 3px 5px 4px rgba(0,0,0,0.05); margin: 0 8px; text-align: center; + display: flex; + flex-direction: column; + height: 80vh; + justify-content: space-between; } .my-cr-card-img{ diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index abdc1d51e7..0f15a0e9ee 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -782,8 +782,10 @@ "EXP_VIDEOS": "explanation videos", "QUES_BANKS": "question banks", "INTERACTIVE_MATERIAL": "interactive study material", - "CHARECTERS_REMAINING": "Charecters remaining", + "CHARACTERS_REMAINING": "Characters remaining", "WHAT_IS_MEMBER_ID": "What is a DIKSHA ID? ", "I_AGREE_TO": "I agree to", - "TERMS_OF_SERVICES": "terms of services" + "TERMS_OF_SERVICES": "terms of services", + "LAST_UPDATED": "Last updated: {{%s}}%", + "SEARCH_FOR_GROUP_MEMBER": "Search for group member" }