From db3c71e57d3cd2b5f062fef032b6508e321168c7 Mon Sep 17 00:00:00 2001 From: Bharath Kumar Date: Thu, 1 Aug 2024 12:34:14 +0530 Subject: [PATCH 01/67] changes in the url based on bucket name --- .../library/sunbird-cb/utils-v2/package.json | 2 +- .../pipe-certimage-URL.pipe.ts | 30 +++++++++++++++---- sb-cb-ui-utils-v2/package.json | 2 +- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/sb-cb-ui-utils-v2/library/sunbird-cb/utils-v2/package.json b/sb-cb-ui-utils-v2/library/sunbird-cb/utils-v2/package.json index eee3107c8..adff29369 100644 --- a/sb-cb-ui-utils-v2/library/sunbird-cb/utils-v2/package.json +++ b/sb-cb-ui-utils-v2/library/sunbird-cb/utils-v2/package.json @@ -1,6 +1,6 @@ { "name": "@sunbird-cb/utils-v2", - "version": "0.0.8", + "version": "0.0.9", "main": "./src/public-api.ts", "dependencies": {}, "peerDependencies": { diff --git a/sb-cb-ui-utils-v2/library/sunbird-cb/utils-v2/src/lib/pipes/pipe-certificate-image-URL/pipe-certimage-URL.pipe.ts b/sb-cb-ui-utils-v2/library/sunbird-cb/utils-v2/src/lib/pipes/pipe-certificate-image-URL/pipe-certimage-URL.pipe.ts index 2df58830f..ebf0f6875 100644 --- a/sb-cb-ui-utils-v2/library/sunbird-cb/utils-v2/src/lib/pipes/pipe-certificate-image-URL/pipe-certimage-URL.pipe.ts +++ b/sb-cb-ui-utils-v2/library/sunbird-cb/utils-v2/src/lib/pipes/pipe-certificate-image-URL/pipe-certimage-URL.pipe.ts @@ -33,13 +33,13 @@ export class PipeCertificateImageURL implements PipeTransform { const finalURL = `${this.environment.contentHost}/${this.environment.contentBucket}${mainUrl}` return value ? finalURL : '' } - if (value.indexOf('/igotbm/collection') > -1) { - const mainUrl = value && value.split('/igotbm').pop() || '' + if (value.indexOf('/igotuat/collection') > -1) { + const mainUrl = value && value.split('/igotuat').pop() || '' const finalURL = `${this.environment.contentHost}/${this.environment.contentBucket}${mainUrl}` return value ? finalURL : '' } - if (value.indexOf('/igotbm/content') > -1) { - const mainUrl = value && value.split('/igotbm').pop() || '' + if (value.indexOf('/igotuat/content') > -1) { + const mainUrl = value && value.split('/igotuat').pop() || '' const finalURL = `${this.environment.contentHost}/${this.environment.contentBucket}${mainUrl}` return value ? finalURL : '' } @@ -63,8 +63,8 @@ export class PipeCertificateImageURL implements PipeTransform { const finalURL = `${this.environment.contentHost}/${this.environment.contentBucket}${mainUrl}` return value ? finalURL : '' } - if (value.indexOf('/igotbm/profileImage') > -1) { - const mainUrl = value && value.split('/igotbm').pop() || '' + if (value.indexOf('/igotuat/profileImage') > -1) { + const mainUrl = value && value.split('/igotuat').pop() || '' const finalURL = `${this.environment.contentHost}/${this.environment.contentBucket}${mainUrl}` return value ? finalURL : '' } @@ -84,6 +84,24 @@ export class PipeCertificateImageURL implements PipeTransform { return value ? finalURL : '' } + if(this.environment && this.environment.bucketName){ + if (value.indexOf(`/${this.environment.bucketName}/profileImage`) > -1) { + const mainUrl = value && value.split(`/${this.environment.bucketName}`).pop() || '' + const finalURL = `${this.environment.contentHost}/${this.environment.contentBucket}${mainUrl}` + return value ? finalURL : '' + } + if (value.indexOf(`/${this.environment.bucketName}/content`) > -1) { + const mainUrl = value && value.split(`/${this.environment.bucketName}`).pop() || '' + const finalURL = `${this.environment.contentHost}/${this.environment.contentBucket}${mainUrl}` + return value ? finalURL : '' + } + if (value.indexOf(`/${this.environment.bucketName}/collection`) > -1) { + const mainUrl = value && value.split(`/${this.environment.bucketName}`).pop() || '' + const finalURL = `${this.environment.contentHost}/${this.environment.contentBucket}${mainUrl}` + return value ? finalURL : '' + } + } + } } } diff --git a/sb-cb-ui-utils-v2/package.json b/sb-cb-ui-utils-v2/package.json index e8b96819a..b3ad6c87b 100644 --- a/sb-cb-ui-utils-v2/package.json +++ b/sb-cb-ui-utils-v2/package.json @@ -1,6 +1,6 @@ { "name": "sb-cb-ui-utils-v2", - "version": "0.0.8", + "version": "0.0.9", "scripts": { "ng": "ng", "prebuild": "npm run lint:fix", From 31d2b92dea1354399dc83adc2a3f1ac73904518f Mon Sep 17 00:00:00 2001 From: Bharath Kumar Date: Thu, 1 Aug 2024 12:47:33 +0530 Subject: [PATCH 02/67] lint -fix --- .../pipes/pipe-certificate-image-URL/pipe-certimage-URL.pipe.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sb-cb-ui-utils-v2/library/sunbird-cb/utils-v2/src/lib/pipes/pipe-certificate-image-URL/pipe-certimage-URL.pipe.ts b/sb-cb-ui-utils-v2/library/sunbird-cb/utils-v2/src/lib/pipes/pipe-certificate-image-URL/pipe-certimage-URL.pipe.ts index ebf0f6875..1c7a7b67c 100644 --- a/sb-cb-ui-utils-v2/library/sunbird-cb/utils-v2/src/lib/pipes/pipe-certificate-image-URL/pipe-certimage-URL.pipe.ts +++ b/sb-cb-ui-utils-v2/library/sunbird-cb/utils-v2/src/lib/pipes/pipe-certificate-image-URL/pipe-certimage-URL.pipe.ts @@ -84,7 +84,7 @@ export class PipeCertificateImageURL implements PipeTransform { return value ? finalURL : '' } - if(this.environment && this.environment.bucketName){ + if (this.environment && this.environment.bucketName) { if (value.indexOf(`/${this.environment.bucketName}/profileImage`) > -1) { const mainUrl = value && value.split(`/${this.environment.bucketName}`).pop() || '' const finalURL = `${this.environment.contentHost}/${this.environment.contentBucket}${mainUrl}` From b011b03da5e26f420c0c8f3e2a4b967d7588ac3e Mon Sep 17 00:00:00 2001 From: vishnubansaltarento Date: Mon, 12 Aug 2024 17:10:26 +0530 Subject: [PATCH 03/67] update for removal of email address --- .../library/sunbird-cb/collection/package.json | 2 +- .../lib/card-content/card-content.component.html | 13 ------------- sb-cb-ui-collection/package.json | 2 +- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/sb-cb-ui-collection/library/sunbird-cb/collection/package.json b/sb-cb-ui-collection/library/sunbird-cb/collection/package.json index fd5ea75cc..a276670de 100644 --- a/sb-cb-ui-collection/library/sunbird-cb/collection/package.json +++ b/sb-cb-ui-collection/library/sunbird-cb/collection/package.json @@ -1,6 +1,6 @@ { "name": "@sunbird-cb/collection", - "version": "1.0.45", + "version": "1.0.46", "main": "src/public-api.ts", "peerDependencies": { "@angular/animations": "~8.2.1", diff --git a/sb-cb-ui-collection/library/sunbird-cb/collection/src/lib/card-content/card-content.component.html b/sb-cb-ui-collection/library/sunbird-cb/collection/src/lib/card-content/card-content.component.html index dd042e2f3..3659201fb 100644 --- a/sb-cb-ui-collection/library/sunbird-cb/collection/src/lib/card-content/card-content.component.html +++ b/sb-cb-ui-collection/library/sunbird-cb/collection/src/lib/card-content/card-content.component.html @@ -516,19 +516,6 @@

{{ widgetData.content.name -
-
- Asked by - {{'Amit Kumar'}} - -
-
-
- Law -
-
-
- - - +{{contentTabEmptyResponseCount}}hiiii + +
diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/mdo-channels/mdo-channel-v2/mdo-channel-v2.component.ts b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/mdo-channels/mdo-channel-v2/mdo-channel-v2.component.ts index 38607f785..e10b21726 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/mdo-channels/mdo-channel-v2/mdo-channel-v2.component.ts +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/mdo-channels/mdo-channel-v2/mdo-channel-v2.component.ts @@ -81,9 +81,9 @@ export class MdoChannelV2Component implements OnInit { public tabClicked(tabEvent: MatTabChangeEvent) { this.raiseTelemetry(`${tabEvent.tab.textLabel} tab`) } - hideContentStrip(event: any, contentStripData: any) { + hideContentStrip(event: any, colData: any) { if (event) { - contentStripData['hideSection'] = true + colData.contentStripData['hideSection'] = true this.contentTabEmptyResponseCount = this.contentTabEmptyResponseCount + 1 // if(this.contentTabEmptyResponseCount === 4 ) { // this.selectedIndex = 1 @@ -153,18 +153,13 @@ export class MdoChannelV2Component implements OnInit { } } - showAllContent(_stripData: any, contentStrip: any) { - if (contentStrip && contentStrip.strips && contentStrip.strips.length) { - const stripData: any = contentStrip.strips[0] - if (stripData && stripData.request) { - delete(stripData['loaderWidgets']) + showAllContent(_stripData: any, columnData: any) { + if (columnData && columnData.contentStrip && columnData.contentStrip.strips && columnData.contentStrip.strips.length) { + const stripData: any = _stripData + let tabSelected = stripData.viewMoreUrl && stripData.viewMoreUrl.queryParams && stripData.viewMoreUrl.queryParams.tabSelected && stripData.viewMoreUrl.queryParams.tabSelected || '' this.router.navigate( [`/app/learn/mdo-channels/${this.channnelName}/${this.orgId}/all-content`], - { queryParams: { stripData: JSON.stringify(stripData) } }) - } - } else { - this.router.navigate( - [`/app/learn/browse-by/provider/${this.channnelName}/${this.orgId}/all-CBP`]) + { queryParams: { tabSelected, key: columnData.sectionKey } }) } } diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/providers/providers-v2/providers-v2.component.html b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/providers/providers-v2/providers-v2.component.html index ef6ad0f6c..56de80121 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/providers/providers-v2/providers-v2.component.html +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/providers/providers-v2/providers-v2.component.html @@ -17,10 +17,14 @@ [ngTemplateOutletContext]="{data: column?.data}"> - - + + {{data?.title || providerName}}

- - + +
- +
+ [widgetData]="data?.contentStrip">
diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/providers/providers-v2/providers-v2.component.ts b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/providers/providers-v2/providers-v2.component.ts index 5f906797a..240b0f3ff 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/providers/providers-v2/providers-v2.component.ts +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/providers/providers-v2/providers-v2.component.ts @@ -88,7 +88,7 @@ export class ProvidersV2Component implements OnInit { } hideContentStrip(event: any, contentStripData: any) { if (event) { - contentStripData['hideSection'] = true + contentStripData.contentStrip['hideSection'] = true } } hideLearnerReview(event: any, learnerReview: any) { @@ -97,15 +97,14 @@ export class ProvidersV2Component implements OnInit { } } - showAllContent(_stripData: any, contentStrip: any) { - if (contentStrip && contentStrip.strips && contentStrip.strips.length) { - const stripData: any = contentStrip.strips[0] - if (stripData && stripData.request) { - delete(stripData['loaderWidgets']) + showAllContent(_stripData: any, columnData: any) { + if (columnData && columnData.contentStrip && columnData.contentStrip.strips && columnData.contentStrip.strips.length) { + const stripData: any = _stripData + let tabSelected = stripData.viewMoreUrl && stripData.viewMoreUrl.queryParams && stripData.viewMoreUrl.queryParams.tabSelected && stripData.viewMoreUrl.queryParams.tabSelected || '' this.router.navigate( [`/app/learn/browse-by/provider/${this.providerName}/${this.providerId}/all-content`], - { queryParams: { stripData: JSON.stringify(stripData), pageDetails: true } }) - } + { queryParams: { pageDetails: true, tabSelected, key: columnData.sectionKey } }) + } else { this.router.navigate( [`/app/learn/browse-by/provider/${this.providerName}/${this.providerId}/all-CBP`], diff --git a/sb-cb-ui-consumption/package.json b/sb-cb-ui-consumption/package.json index 9903c514e..10ed40619 100644 --- a/sb-cb-ui-consumption/package.json +++ b/sb-cb-ui-consumption/package.json @@ -1,6 +1,6 @@ { "name": "sb-cb-ui-consumption", - "version": "0.0.73", + "version": "0.0.74", "scripts": { "ng": "ng", "build": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --watch=true", From a11b19cab88622b69e77a1922860f36bb9de5ef5 Mon Sep 17 00:00:00 2001 From: Bharath Kumar Date: Wed, 21 Aug 2024 11:49:31 +0530 Subject: [PATCH 08/67] version change --- .../library/sunbird-cb/consumption/package.json | 2 +- sb-cb-ui-consumption/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/package.json b/sb-cb-ui-consumption/library/sunbird-cb/consumption/package.json index 06c3ab20d..a430fcf3c 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/package.json +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/package.json @@ -1,6 +1,6 @@ { "name": "@sunbird-cb/consumption", - "version": "0.0.74", + "version": "0.0.75", "peerDependencies": { "@angular/common": "^8.2.14", "@angular/core": "^8.2.14", diff --git a/sb-cb-ui-consumption/package.json b/sb-cb-ui-consumption/package.json index 10ed40619..380fde087 100644 --- a/sb-cb-ui-consumption/package.json +++ b/sb-cb-ui-consumption/package.json @@ -1,6 +1,6 @@ { "name": "sb-cb-ui-consumption", - "version": "0.0.74", + "version": "0.0.75", "scripts": { "ng": "ng", "build": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --watch=true", From bb277954485c8c197ad36829864332d9d21e76e0 Mon Sep 17 00:00:00 2001 From: Venkat Kandagaddala Date: Wed, 21 Aug 2024 22:54:09 +0530 Subject: [PATCH 09/67] National learning micro-site page setup --- .../national-learning.module.ts | 29 ++++++++++++++++ .../national-learning.component.html | 33 +++++++++++++++++++ .../national-learning.component.scss | 9 +++++ .../national-learning.component.spec.ts | 25 ++++++++++++++ .../national-learning.component.ts | 15 +++++++++ .../sunbird-cb/consumption/src/public-api.ts | 1 + 6 files changed, 112 insertions(+) create mode 100644 sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning.module.ts create mode 100644 sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.html create mode 100644 sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.scss create mode 100644 sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.spec.ts create mode 100644 sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.ts diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning.module.ts b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning.module.ts new file mode 100644 index 000000000..24599d54e --- /dev/null +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning.module.ts @@ -0,0 +1,29 @@ +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { MatChipsModule, MatIconModule, MatTabsModule } from '@angular/material'; +import { SkeletonLoaderLibModule } from '../../skeleton-loader-lib/skeleton-loader-lib.module'; +import { NationalLearningComponent } from './national-learning/national-learning.component'; +import { CommonMethodsService } from '../../../_services/common-methods.service'; +import { SlidersLibModule } from '../../sliders/sliders.module'; + + + +@NgModule({ + declarations: [NationalLearningComponent], + imports: [ + CommonModule, + MatIconModule, + MatChipsModule, + SkeletonLoaderLibModule, + SlidersLibModule, + MatTabsModule, + ], + exports: [ + NationalLearningComponent + ], + providers:[ + CommonMethodsService + ], + schemas:[CUSTOM_ELEMENTS_SCHEMA] +}) +export class NationalLearningModule { } diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.html b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.html new file mode 100644 index 000000000..7f7534b48 --- /dev/null +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.html @@ -0,0 +1,33 @@ +
+
+ + + +
+ +
+ + + + +
+ +
+ + + +
+
+ + + +
+
+ +
+
+ \ No newline at end of file diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.scss b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.scss new file mode 100644 index 000000000..b27868cb5 --- /dev/null +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.scss @@ -0,0 +1,9 @@ +.topSection { + + ::ng-deep.prev { + margin-left: 15px!important; + } + ::ng-deep.next { + margin-right: 15px!important; + } +} \ No newline at end of file diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.spec.ts b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.spec.ts new file mode 100644 index 000000000..0af334cdd --- /dev/null +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NationalLearningComponent } from './national-learning.component'; + +describe('NationalLearningComponent', () => { + let component: NationalLearningComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ NationalLearningComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(NationalLearningComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.ts b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.ts new file mode 100644 index 000000000..5e2da9b5d --- /dev/null +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.ts @@ -0,0 +1,15 @@ +import { Component, Input, OnInit } from '@angular/core'; + +@Component({ + selector: 'sb-uic-national-learning', + templateUrl: './national-learning.component.html', + styleUrls: ['./national-learning.component.scss'] +}) +export class NationalLearningComponent implements OnInit { + @Input() sectionList:any = [] + constructor() { } + + ngOnInit() { + } + +} diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/public-api.ts b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/public-api.ts index dfaaaacbd..61b2f23ff 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/public-api.ts +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/public-api.ts @@ -23,6 +23,7 @@ export * from './lib/_common/content-progress/content-progress.module' export * from './lib/_common/microsites/mdo-channels/mdo-channel.module' export * from './lib/_common/microsites/providers/providers.module' +export * from './lib/_common/microsites/national-learning-week/national-learning.module' export * from './lib/_services/widget-content.service' export * from './lib/_services/common-methods.service' From df678069fcdcad34afd233ddaf30a7d6b3e2656d Mon Sep 17 00:00:00 2001 From: Venkat Kandagaddala Date: Thu, 22 Aug 2024 19:50:36 +0530 Subject: [PATCH 10/67] Key highlights component added to Natioanl learning microsite --- .../key-highlights.component.html | 47 +++++++++++ .../key-highlights.component.scss | 63 ++++++++++++++ .../key-highlights.component.spec.ts | 25 ++++++ .../key-highlights.component.ts | 29 +++++++ .../key-highlights/key-highlights.module.ts | 23 ++++++ .../national-learning.module.ts | 6 +- .../national-learning.component.html | 82 ++++++++++++++++++- .../national-learning.component.scss | 19 ++++- .../national-learning.component.ts | 36 +++++++- .../sliders-ng-content.component.html | 4 +- .../sliders-ng-content.component.scss | 58 +++++++++++++ .../sliders-ng-content.component.ts | 1 + .../consumption/src/lib/consumption.module.ts | 1 + .../sunbird-cb/consumption/src/public-api.ts | 3 +- 14 files changed, 387 insertions(+), 10 deletions(-) create mode 100644 sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.component.html create mode 100644 sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.component.scss create mode 100644 sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.component.spec.ts create mode 100644 sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.component.ts create mode 100644 sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.module.ts diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.component.html b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.component.html new file mode 100644 index 000000000..f7df39c18 --- /dev/null +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.component.html @@ -0,0 +1,47 @@ + +
+ +
+
+
+
Key Highlights
+
{{content.title}}
+
+
+
+ +
+ + + +
+
+ +
+
+
+
Key Highlights
+
+
+
{{content.title}}
+
+
+
+ +
+
+ \ No newline at end of file diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.component.scss b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.component.scss new file mode 100644 index 000000000..d4d49a49f --- /dev/null +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.component.scss @@ -0,0 +1,63 @@ + +@font-face { + font-family: 'Poppins'; + /* src: url('../../../assets/fonts/poppins/Poppins-Regular.ttf'); */ + src: url('https://cdn.jsdelivr.net/fontsource/fonts/poppins@latest/latin-400-normal.woff2') format('woff2'), url('https://cdn.jsdelivr.net/fontsource/fonts/poppins@latest/latin-400-normal.woff') format('woff'); + } + + .mob-key-highlighs-container { + background-color: #EAF1F8; + + .kh-left { + background-color: #1B4CA1; + padding: 24.95px 50px 25.45px 30px; + color: white; + font-family: "Poppins"; + font-size: 18px; + font-weight: 500; + line-height: 21.6px; + text-align: left; + border-top-right-radius: 50px; + border-bottom-right-radius: 50px; + min-width: 127px; + } + .kh-description { + color: #5F77A7; + font-family: Poppins; + font-size: 16px; + font-weight: 500; + line-height: 22px; + text-align: left; + padding: 25px 15px; + } + } + +.key-highlighs-container{ + background-color: #EAF1F8; + border-radius: 50px; + + .kh-left { + background-color: #1B4CA1; + padding: 24.95px 50px 25.45px 30px; + color: white; + font-family: "Poppins"; + font-size: 18px; + font-weight: 500; + line-height: 21.6px; + text-align: left; + border-top-left-radius: 50px; + border-bottom-left-radius: 50px; + min-width: 127px; + } + .kh-right { + font-family: "Poppins"; + font-size: 15px; + font-weight: 500; + line-height: 19.2px; + display: flex; + align-items: center; + padding: 0 100px 0 25px; + color: #5F77A7; + + } +} \ No newline at end of file diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.component.spec.ts b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.component.spec.ts new file mode 100644 index 000000000..81904c54f --- /dev/null +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { KeyHighlightsComponent } from './key-highlights.component'; + +describe('KeyHighlightsComponent', () => { + let component: KeyHighlightsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ KeyHighlightsComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(KeyHighlightsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.component.ts b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.component.ts new file mode 100644 index 000000000..0f1ff9e32 --- /dev/null +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.component.ts @@ -0,0 +1,29 @@ +import { Component, EventEmitter, Input, OnInit, Output, QueryList, ViewChildren } from '@angular/core'; +import { ScrollableItemDirective } from '../../_directives/scrollable-item/scrollable-item.directive'; + +@Component({ + selector: 'sb-uic-key-highlights', + templateUrl: './key-highlights.component.html', + styleUrls: ['./key-highlights.component.scss'] +}) +export class KeyHighlightsComponent implements OnInit { + currentIndex: any = 0 + @Input() providerId : any = '' + @Input() formData : any = '' + @Input() mode: any + @Output() emptyResponse = new EventEmitter() + + styleData: any = {} + contentdata: any = [] + @ViewChildren(ScrollableItemDirective) scrollableItems: QueryList + constructor() { } + + ngOnInit() { + this.styleData = this.formData && this.formData.sliderData && this.formData.sliderData.styleData + this.contentdata = this.formData && this.formData.content + } + + getCurrentIndex(indexValue: any) { + this.currentIndex = indexValue + } +} diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.module.ts b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.module.ts new file mode 100644 index 000000000..95ad018e9 --- /dev/null +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.module.ts @@ -0,0 +1,23 @@ +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { KeyHighlightsComponent } from './key-highlights.component'; +import { MatIconModule } from '@angular/material'; +import { SlidersNgContentLibModule } from '../sliders-ng-content/sliders-ng-content.module'; +import { ScrollableItemModule } from '../../_directives/scrollable-item/scrollable-item.module'; + + + +@NgModule({ + declarations: [KeyHighlightsComponent], + imports: [ + CommonModule, + MatIconModule, + SlidersNgContentLibModule, + ScrollableItemModule + ], + exports: [ + KeyHighlightsComponent + ], + schemas:[CUSTOM_ELEMENTS_SCHEMA] +}) +export class KeyHighlightsModule { } diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning.module.ts b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning.module.ts index 24599d54e..f65150ae5 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning.module.ts +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning.module.ts @@ -5,6 +5,8 @@ import { SkeletonLoaderLibModule } from '../../skeleton-loader-lib/skeleton-load import { NationalLearningComponent } from './national-learning/national-learning.component'; import { CommonMethodsService } from '../../../_services/common-methods.service'; import { SlidersLibModule } from '../../sliders/sliders.module'; +import { KeyHighlightsModule } from '../../key-highlights/key-highlights.module'; +import { ContentStripWithTabsLibModule } from '../../content-strip-with-tabs-lib/content-strip-with-tabs-lib.module'; @@ -17,9 +19,11 @@ import { SlidersLibModule } from '../../sliders/sliders.module'; SkeletonLoaderLibModule, SlidersLibModule, MatTabsModule, + KeyHighlightsModule, + ContentStripWithTabsLibModule, ], exports: [ - NationalLearningComponent + NationalLearningComponent, ], providers:[ CommonMethodsService diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.html b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.html index 7f7534b48..d3dbe6a43 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.html +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.html @@ -1,4 +1,4 @@ -
+
@@ -9,10 +9,14 @@ - + [ngTemplateOutletContext]="{data: column?.data}"> +
@@ -30,4 +34,74 @@
- \ No newline at end of file + + + +
+
+
+ +
+ +
+
+
+
+ + + +
+
+
+
+ {{data.content.data.title}} +
+
+ {{data.mdoLeaderboard.data.title}} +
+
+
+
+ + + +
+
+
+ {{data.title}} +
+
+
+ + + + +
+ +
+
+ + +
+
+
+ + + + + \ No newline at end of file diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.scss b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.scss index b27868cb5..a03a11f07 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.scss +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.scss @@ -1,9 +1,26 @@ -.topSection { +::ng-deep.micro-white { + background-color: white!important; +} +.nlm-micro-sites { + ::ng-deep.container { + max-width: 1200px!important; + } +} +.topSection { ::ng-deep.prev { margin-left: 15px!important; } ::ng-deep.next { margin-right: 15px!important; } + + @media screen and (min-width: 320px) and (max-width: 769px) { + ::ng-deep.prev { + margin-left: 15px!important; + } + ::ng-deep.next { + margin-right: 15px!important; + } + } } \ No newline at end of file diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.ts b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.ts index 5e2da9b5d..7400becba 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.ts +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.ts @@ -1,4 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; @Component({ selector: 'sb-uic-national-learning', @@ -7,9 +8,42 @@ import { Component, Input, OnInit } from '@angular/core'; }) export class NationalLearningComponent implements OnInit { @Input() sectionList:any = [] - constructor() { } + providerId: string = '123456789' + providerName: '' + constructor(public router: Router) { } ngOnInit() { } + hideKeyHightlight(event: any, learnerReview: any) { + if (event) { + learnerReview['hideSection'] = true + } + } + + showAllContent(_stripData: any, columnData: any) { + if (columnData && columnData.contentStrip && columnData.contentStrip.strips && columnData.contentStrip.strips.length) { + const stripData: any = _stripData + let tabSelected = stripData.viewMoreUrl && stripData.viewMoreUrl.queryParams && stripData.viewMoreUrl.queryParams.tabSelected && stripData.viewMoreUrl.queryParams.tabSelected || '' + this.router.navigate( + [`app/learn/national-learning-week/see-all`], + { queryParams: { pageDetails: true, tabSelected, key: columnData.sectionKey } }) + + } else { + this.router.navigate( + [`/app/learn/browse-by/provider/${this.providerName}/${this.providerId}/all-CBP`], + { queryParams: { pageDetails: true } }) + } + } + + hideContentStrip(event: any, contentStripData: any) { + if (event) { + contentStripData.contentStrip['hideSection'] = true + } + } + + raiseTelemetryInteratEvent(event: any) { + + } + } diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/sliders-ng-content/sliders-ng-content.component.html b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/sliders-ng-content/sliders-ng-content.component.html index 4c7defdcd..643af36ab 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/sliders-ng-content/sliders-ng-content.component.html +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/sliders-ng-content/sliders-ng-content.component.html @@ -1,4 +1,4 @@ -
- @@ -20,7 +20,7 @@ - +
Key Highlights
-
{{content.title}}
+
{{content?.title}}
diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.component.ts b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.component.ts index 0f1ff9e32..d15afcb63 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.component.ts +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/key-highlights/key-highlights.component.ts @@ -20,7 +20,7 @@ export class KeyHighlightsComponent implements OnInit { ngOnInit() { this.styleData = this.formData && this.formData.sliderData && this.formData.sliderData.styleData - this.contentdata = this.formData && this.formData.content + this.contentdata = this.formData && this.formData.content ? this.formData.content : [] } getCurrentIndex(indexValue: any) { diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.html b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.html new file mode 100644 index 000000000..c87839e3c --- /dev/null +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.html @@ -0,0 +1,43 @@ +
+ {{object?.mdoLeaderboard?.data?.title}} info +
+
+
+ Greater than 50K + 10K-50K + 1K-10K + 500 +
+
+ search + + +
+
+
+
+ +
{{user.row_num}}
+
+
+
+
{{user.org_name}} - {{user.org_name}}
+
+ +
{{user.total_points}} points
+
+
+
+ +
+
+
+
+
+
+ No data found! +
+
+
\ No newline at end of file diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.scss b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.scss new file mode 100644 index 000000000..80caf1ef3 --- /dev/null +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.scss @@ -0,0 +1,150 @@ +.l-title { + font-family: Montserrat; + font-size: 24px; + font-weight: 600; + line-height: 29.26px; + text-align: left; + align-items: center; +} + +.l-content { + background-color: #E9EEF6; + border-radius: 16px; + padding: 16px 16px 0 16px; +} + +.l-tabs { + justify-content: space-between; + border-bottom: 1px solid #c3c3c3; + .tab-title { + font-family: Lato; + font-size: 14px; + line-height: 16.8px; + text-align: left; + cursor: pointer; + } + .active { + font-weight: 700; + border-bottom: 2px solid #1b4ca1;; + padding-bottom: 8px; + } +} +.search-field { + height: 34px; + padding: 0px 16px 0px 40px; + border-radius: 52px; + background: #fff; + border: 2px solid #00000014; + width: 100%; +} + +.icon-search { + top: 10px; + left: 15px; + height: 15px; + width: 17px; +} + +.item { + border-radius: 12px; + background-color: white; + padding: 16px; + align-items: flex-start; + cursor: pointer; +} +.rank1 { + background: #ffca28; + font-family: Lato; + font-size: 14px; + font-weight: 700; + line-height: 9px; + text-align: center; + border-radius: 50%; + padding: 10px; +} +.rank2 { + background: #1B4CA1; + font-family: Lato; + font-size: 14px; + font-weight: 700; + line-height: 9px; + text-align: center; + border-radius: 50%; + padding: 10px; + color: white; +} + +.rank3{ + background: #FF8228; + font-family: Lato; + font-size: 14px; + font-weight: 700; + line-height: 9px; + text-align: center; + border-radius: 50%; + padding: 10px; +} + +.rank0 { + font-family: Lato; + font-size: 14px; + font-weight: 700; + line-height: 9px; + text-align: center; + border-radius: 50%; + padding: 10px; + border: 1px solid #c3c3c3; +} + +.rank-name { + font-family: Montserrat; + font-size: 16px; + font-weight: 600; + line-height: 19.5px; + text-align: left; + align-items: center; + display: -webkit-box; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; + -webkit-line-clamp: 2; + line-clamp: 2; + line-height: 1.5em; +} + +.rank-points { + align-items: center; +} + +.nlw-kb { + height: 24px; + width: 24px; +} + +.points { + font-family: Lato; + font-size: 14px; + font-weight: 600; + line-height: 16.8px; + text-align: right; +} + +.crown { + left: -14px; + top: -16px; + width: 36px; + height: 36px; +} + +.l-tab-data { + height: 520px; + overflow: auto; +} + +.l-tab-data::-webkit-scrollbar { + display: none; +} +.active-item { + background-color: #1B4CA1; + color: white; +} \ No newline at end of file diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.spec.ts b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.spec.ts new file mode 100644 index 000000000..3211c62d7 --- /dev/null +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MdoLeaderboardComponent } from './mdo-leaderboard.component'; + +describe('MdoLeaderboardComponent', () => { + let component: MdoLeaderboardComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ MdoLeaderboardComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(MdoLeaderboardComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.ts b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.ts new file mode 100644 index 000000000..da16154ee --- /dev/null +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.ts @@ -0,0 +1,249 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { InsiteDataService } from '../../_services/insite-data.service'; + +@Component({ + selector: 'sb-uic-mdo-leaderboard', + templateUrl: './mdo-leaderboard.component.html', + styleUrls: ['./mdo-leaderboard.component.scss'] +}) +export class MdoLeaderboardComponent implements OnInit { + + currentTab: any = 'XL' + result: any = [] + filteredData: any + searchTerm: string = '' + + @Input() object: any + constructor(private insiteDataService: InsiteDataService) { } + + ngOnInit() { + this.getData() + } + + getData() { + + // this.insiteDataService.fetchLeaderboard().subscribe((res: any) => { + // this.result = res + // }, error => { + // console.log(error) + // }) + this.result = { + "mdoLeaderBoard": [ + { + "size": "L", + "last_credit_date": "2024-06-18 17:58:20+0530", + "org_id": "01376822290813747263", + "total_points": 53, + "row_num": 1, + "total_users": 3, + "org_name": "TarentoCBP" + }, + { + "size": "L", + "last_credit_date": "2024-06-24 15:59:59+0530", + "org_id": "0135071359030722569", + "total_points": 24, + "row_num": 2, + "total_users": 3, + "org_name": "Karmayogi Bharat" + }, + { + "size": "L", + "last_credit_date": "2024-06-26 15:58:26+0530", + "org_id": "01379305664500531251", + "total_points": 12, + "row_num": 3, + "total_users": 3, + "org_name": "Ministry for Testing" + }, + { + "size": "M", + "last_credit_date": "2024-06-25 19:37:13+0530", + "org_id": "013826080908025856107", + "total_points": 29, + "row_num": 1, + "total_users": 2, + "org_name": "Ministry of testing" + }, + { + "size": "M", + "last_credit_date": "2024-06-24 19:14:24+0530", + "org_id": "01390354700029132834", + "total_points": 19, + "row_num": 2, + "total_users": 2, + "org_name": "Agrinnovate India" + }, + { + "size": "S", + "last_credit_date": "2024-06-21 14:29:01+0530", + "org_id": "01376822910112563268", + "total_points": 129, + "row_num": 1, + "total_users": 1, + "org_name": "TarentoMDO" + }, + { + "size": "S", + "last_credit_date": "2024-06-26 11:09:09+0530", + "org_id": "01372729081852723241", + "total_points": 12, + "row_num": 2, + "total_users": 1, + "org_name": "Bharat Sanchar Nigam Limited Portal(BSNL)" + }, + { + "size": "S", + "last_credit_date": "2024-06-20 01:05:02+0530", + "org_id": "0132593267437813768", + "total_points": 10, + "row_num": 3, + "total_users": 1, + "org_name": "JPAL" + }, + { + "size": "S", + "last_credit_date": "2024-06-19 09:41:00+0530", + "org_id": "0140801732728668160", + "total_points": 5, + "row_num": 4, + "total_users": 1, + "org_name": "Commercial Taxes and Registration Department Tamil Nadu" + }, + { + "size": "S", + "last_credit_date": "2024-06-19 12:21:20+0530", + "org_id": "0140802491947827204", + "total_points": 5, + "row_num": 5, + "total_users": 1, + "org_name": "Information and Broadcasting Department Gujarat" + }, + { + "size": "S", + "last_credit_date": "2024-06-24 15:23:45+0530", + "org_id": "01381906916850892825", + "total_points": 5, + "row_num": 6, + "total_users": 1, + "org_name": "Ministry of Finance" + }, + { + "size": "S", + "last_credit_date": "2024-06-26 10:44:55+0530", + "org_id": "01359132123730739281", + "total_points": 5, + "row_num": 7, + "total_users": 1, + "org_name": "Ministry of Power" + }, + { + "size": "S", + "last_credit_date": "2024-06-19 20:08:32+0530", + "org_id": "0140788863598264326", + "total_points": 2, + "row_num": 8, + "total_users": 1, + "org_name": "Tarento CBP Provider" + }, + { + "size": "S", + "last_credit_date": "2024-06-19 09:41:00+0530", + "org_id": "0140801732728668160", + "total_points": 5, + "row_num": 9, + "total_users": 1, + "org_name": "Commercial Taxes and Registration Department Tamil Nadu" + }, + { + "size": "S", + "last_credit_date": "2024-06-19 12:21:20+0530", + "org_id": "0140802491947827204", + "total_points": 5, + "row_num": 10, + "total_users": 1, + "org_name": "Information and Broadcasting Department Gujarat" + }, + { + "size": "S", + "last_credit_date": "2024-06-24 15:23:45+0530", + "org_id": "01381906916850892825", + "total_points": 5, + "row_num": 11, + "total_users": 1, + "org_name": "Ministry of Finance" + }, + { + "size": "S", + "last_credit_date": "2024-06-26 10:44:55+0530", + "org_id": "01359132123730739281", + "total_points": 5, + "row_num": 12, + "total_users": 1, + "org_name": "Ministry of Power" + }, + { + "size": "S", + "last_credit_date": "2024-06-19 20:08:32+0530", + "org_id": "0140788863598264326", + "total_points": 2, + "row_num": 13, + "total_users": 1, + "org_name": "Tarento CBP Provider" + }, + { + "size": "XL", + "last_credit_date": "2024-07-01 18:27:40+0530", + "org_id": "0140788510336040962", + "total_points": 94, + "row_num": 1, + "total_users": 8, + "org_name": "Finance And Budget" + } + ] + } + this.filteredData = this.result.mdoLeaderBoard + .filter(user => user.size === this.currentTab) + .map(user => ({ ...user, children: [], selected: false })) + } + + getTabData(name: any) { + this.currentTab = name + this.searchTerm = '' + this.filteredData = this.result.mdoLeaderBoard + .filter(user => user.size === this.currentTab) + .map(user => ({ ...user, children: [], selected: false })) + } + + getRank(rank: number) { + return [1,2,3].includes(rank) ? `rank${rank}` : 'rank0' + } + + getMedal(rank: number) { + if (rank === 1) { + return 'assets/images/national-learning/Medal1.svg' + } else if(rank === 2) { + return 'assets/images/national-learning/Medal2.svg' + } else { + return 'assets/images/national-learning/Medal3.svg' + } + } + + getChildren(obj: any) { + this.filteredData = this.result.mdoLeaderBoard + .filter(user => user.size === this.currentTab) + .map(user => ({ ...user, children: [], selected: user.org_id === obj.org_id })) + } + + handleSearchQuery(e: any) { + if (e.target.value && e.target.value.length > 0) { + this.searchTerm = e.target.value + this.filteredData = this.result.mdoLeaderBoard + .filter(user => user.size === this.currentTab && user.org_name.toLowerCase().includes(e.target.value)) + } else { + this.filteredData = this.result.mdoLeaderBoard + .filter(user => user.size === this.currentTab) + } + } + +} diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.module.ts b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.module.ts new file mode 100644 index 000000000..9429afd32 --- /dev/null +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.module.ts @@ -0,0 +1,25 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { MdoLeaderboardComponent } from './mdo-leaderboard.component'; +import { MatIconModule, MatTabsModule } from '@angular/material'; +import { SkeletonLoaderLibModule } from '../skeleton-loader-lib/skeleton-loader-lib.module'; +import { InsiteDataService } from '../../_services/insite-data.service'; +import { FormsModule } from '@angular/forms'; + + + +@NgModule({ + declarations: [MdoLeaderboardComponent], + imports: [ + CommonModule, + MatIconModule, + SkeletonLoaderLibModule, + MatTabsModule, + FormsModule, + ], + exports: [ + MdoLeaderboardComponent + ], + providers: [InsiteDataService] +}) +export class MdoLeaderboardModule { } diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning.module.ts b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning.module.ts index f65150ae5..0a2329f90 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning.module.ts +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning.module.ts @@ -7,6 +7,8 @@ import { CommonMethodsService } from '../../../_services/common-methods.service' import { SlidersLibModule } from '../../sliders/sliders.module'; import { KeyHighlightsModule } from '../../key-highlights/key-highlights.module'; import { ContentStripWithTabsLibModule } from '../../content-strip-with-tabs-lib/content-strip-with-tabs-lib.module'; +import { EventsModule } from '../../events/events.module'; +import { MdoLeaderboardModule } from '../../mdo-leaderboard/mdo-leaderboard.module'; @@ -21,6 +23,8 @@ import { ContentStripWithTabsLibModule } from '../../content-strip-with-tabs-lib MatTabsModule, KeyHighlightsModule, ContentStripWithTabsLibModule, + EventsModule, + MdoLeaderboardModule, ], exports: [ NationalLearningComponent, diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.html b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.html index d3dbe6a43..626995d07 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.html +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.html @@ -40,6 +40,7 @@
+ @@ -55,11 +56,11 @@
-
- {{data.content.data.title}} +
+ {{data?.content?.data?.title}}
-
- {{data.mdoLeaderboard.data.title}} +
+
@@ -70,7 +71,7 @@
- {{data.title}} +
@@ -80,7 +81,7 @@
-
+
- \ No newline at end of file diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.scss b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.scss index a03a11f07..c2229a5b7 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.scss +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/national-learning-week/national-learning/national-learning.component.scss @@ -23,4 +23,10 @@ margin-right: 15px!important; } } +} + +@media screen and (max-width: 768px) { + ::ng-deep.wow-contents .mat-tab-header { + padding-left: 20px; + } } \ No newline at end of file diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_services/insite-data.service.ts b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_services/insite-data.service.ts index 070d5da4c..8b7438f42 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_services/insite-data.service.ts +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_services/insite-data.service.ts @@ -6,7 +6,8 @@ const API_END_POINTS = { PROVIDER_INSIGHTS: `/apis/proxies/v8/microsite/read/insights`, TRAINING_DETAILS: `apis/proxies/v8/sunbirdigot/search`, ANNOUNCEMENTS_DETAILS: `apis/proxies/v8/announcements/v1/search`, - LEARNERS: `apis/proxies/v8/halloffame/top/learners` + LEARNERS: `apis/proxies/v8/halloffame/top/learners`, + LEADERBOARD: 'apis/proxies/v8/halloffame/v1/mdoleaderboard' } @Injectable({ @@ -34,4 +35,8 @@ export class InsiteDataService { return this.http.get(`${API_END_POINTS.LEARNERS}/${channelId}`) } + fetchLeaderboard() { + return this.http.get(`${API_END_POINTS.LEADERBOARD}`) + } + } diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/consumption.module.ts b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/consumption.module.ts index ea746e9a0..96a220ba3 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/consumption.module.ts +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/consumption.module.ts @@ -8,9 +8,6 @@ import { CommonStripModule } from './_common/common-strip/common-strip.module'; import { AnnouncementsModule } from './_common/announcements/announcements.module'; import { TopLearnersModule } from './_common/top-learners/top-learners.module'; import { CbpPlanModule } from './_common/cbp-plan/cbp-plan.module'; -import { KeyHighlightsModule } from './_common/key-highlights/key-highlights.module'; - - @NgModule({ declarations: [ConsumptionComponent,], diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/public-api.ts b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/public-api.ts index a81ec2716..5da18bcba 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/public-api.ts +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/public-api.ts @@ -29,7 +29,9 @@ export * from './lib/_services/widget-content.service' export * from './lib/_services/common-methods.service' export * from './lib/_common/top-learners/top-learners.module' export * from './lib/_common/cbp-plan/cbp-plan.module' +export * from './lib/_common/mdo-leaderboard/mdo-leaderboard.module' export * from './lib/_common/dialog-components/dialog-components.module' -export * from './lib/_common/key-highlights/key-highlights.module' \ No newline at end of file +export * from './lib/_common/key-highlights/key-highlights.module' +export * from './lib/_common/events/events.module' \ No newline at end of file From 2c4703f452c3e9b3c9628bb75dece94ec1d0821f Mon Sep 17 00:00:00 2001 From: Venkat Kandagaddala Date: Tue, 27 Aug 2024 11:37:03 +0530 Subject: [PATCH 14/67] API integration to get the MDO users --- .../mdo-leaderboard.component.html | 19 +- .../mdo-leaderboard.component.scss | 43 +- .../mdo-leaderboard.component.ts | 492 +++++++++++------- .../src/lib/_services/insite-data.service.ts | 7 +- 4 files changed, 349 insertions(+), 212 deletions(-) diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.html b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.html index c87839e3c..3ffd81545 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.html +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.html @@ -2,12 +2,15 @@ {{object?.mdoLeaderboard?.data?.title}} info
-
- Greater than 50K - 10K-50K - 1K-10K - 500 -
+
+
+ Greater than 50K + 10K-50K + 1K-10K + 500-1K + Less than 500 +
+
search @@ -23,7 +26,7 @@
-
{{user.org_name}} - {{user.org_name}}
+
{{user.org_name}}
{{user.total_points}} points
@@ -36,7 +39,7 @@
-
+
No data found!
diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.scss b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.scss index 80caf1ef3..6a2caebaa 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.scss +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.scss @@ -13,22 +13,35 @@ padding: 16px 16px 0 16px; } -.l-tabs { - justify-content: space-between; - border-bottom: 1px solid #c3c3c3; - .tab-title { - font-family: Lato; - font-size: 14px; - line-height: 16.8px; - text-align: left; - cursor: pointer; - } - .active { - font-weight: 700; - border-bottom: 2px solid #1b4ca1;; - padding-bottom: 8px; - } +.horizontal-scroll-container { + overflow-x: auto; + white-space: nowrap; + -ms-overflow-style: none; + scrollbar-width: none; + height: 32px; +} + .horizontal-scroll-container::-webkit-scrollbar { + display: none; + } + + .scroll-content { + display: inline-block; + } + .tab-title { + font-family: Lato; + font-size: 14px; + line-height: 16.8px; + text-align: left; + cursor: pointer; + padding: 0 15px; + border-bottom: 2px solid #c3c3c3; + padding-bottom: 8px; +} +.active { + font-weight: 700; + border-bottom: 2px solid #1b4ca1; } + .search-field { height: 34px; padding: 0px 16px 0px 40px; diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.ts b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.ts index da16154ee..629a6a936 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.ts +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/mdo-leaderboard/mdo-leaderboard.component.ts @@ -22,189 +22,195 @@ export class MdoLeaderboardComponent implements OnInit { getData() { - // this.insiteDataService.fetchLeaderboard().subscribe((res: any) => { - // this.result = res - // }, error => { - // console.log(error) - // }) - this.result = { - "mdoLeaderBoard": [ - { - "size": "L", - "last_credit_date": "2024-06-18 17:58:20+0530", - "org_id": "01376822290813747263", - "total_points": 53, - "row_num": 1, - "total_users": 3, - "org_name": "TarentoCBP" - }, - { - "size": "L", - "last_credit_date": "2024-06-24 15:59:59+0530", - "org_id": "0135071359030722569", - "total_points": 24, - "row_num": 2, - "total_users": 3, - "org_name": "Karmayogi Bharat" - }, - { - "size": "L", - "last_credit_date": "2024-06-26 15:58:26+0530", - "org_id": "01379305664500531251", - "total_points": 12, - "row_num": 3, - "total_users": 3, - "org_name": "Ministry for Testing" - }, - { - "size": "M", - "last_credit_date": "2024-06-25 19:37:13+0530", - "org_id": "013826080908025856107", - "total_points": 29, - "row_num": 1, - "total_users": 2, - "org_name": "Ministry of testing" - }, - { - "size": "M", - "last_credit_date": "2024-06-24 19:14:24+0530", - "org_id": "01390354700029132834", - "total_points": 19, - "row_num": 2, - "total_users": 2, - "org_name": "Agrinnovate India" - }, - { - "size": "S", - "last_credit_date": "2024-06-21 14:29:01+0530", - "org_id": "01376822910112563268", - "total_points": 129, - "row_num": 1, - "total_users": 1, - "org_name": "TarentoMDO" - }, - { - "size": "S", - "last_credit_date": "2024-06-26 11:09:09+0530", - "org_id": "01372729081852723241", - "total_points": 12, - "row_num": 2, - "total_users": 1, - "org_name": "Bharat Sanchar Nigam Limited Portal(BSNL)" - }, - { - "size": "S", - "last_credit_date": "2024-06-20 01:05:02+0530", - "org_id": "0132593267437813768", - "total_points": 10, - "row_num": 3, - "total_users": 1, - "org_name": "JPAL" - }, - { - "size": "S", - "last_credit_date": "2024-06-19 09:41:00+0530", - "org_id": "0140801732728668160", - "total_points": 5, - "row_num": 4, - "total_users": 1, - "org_name": "Commercial Taxes and Registration Department Tamil Nadu" - }, - { - "size": "S", - "last_credit_date": "2024-06-19 12:21:20+0530", - "org_id": "0140802491947827204", - "total_points": 5, - "row_num": 5, - "total_users": 1, - "org_name": "Information and Broadcasting Department Gujarat" - }, - { - "size": "S", - "last_credit_date": "2024-06-24 15:23:45+0530", - "org_id": "01381906916850892825", - "total_points": 5, - "row_num": 6, - "total_users": 1, - "org_name": "Ministry of Finance" - }, - { - "size": "S", - "last_credit_date": "2024-06-26 10:44:55+0530", - "org_id": "01359132123730739281", - "total_points": 5, - "row_num": 7, - "total_users": 1, - "org_name": "Ministry of Power" - }, - { - "size": "S", - "last_credit_date": "2024-06-19 20:08:32+0530", - "org_id": "0140788863598264326", - "total_points": 2, - "row_num": 8, - "total_users": 1, - "org_name": "Tarento CBP Provider" - }, - { - "size": "S", - "last_credit_date": "2024-06-19 09:41:00+0530", - "org_id": "0140801732728668160", - "total_points": 5, - "row_num": 9, - "total_users": 1, - "org_name": "Commercial Taxes and Registration Department Tamil Nadu" - }, - { - "size": "S", - "last_credit_date": "2024-06-19 12:21:20+0530", - "org_id": "0140802491947827204", - "total_points": 5, - "row_num": 10, - "total_users": 1, - "org_name": "Information and Broadcasting Department Gujarat" - }, - { - "size": "S", - "last_credit_date": "2024-06-24 15:23:45+0530", - "org_id": "01381906916850892825", - "total_points": 5, - "row_num": 11, - "total_users": 1, - "org_name": "Ministry of Finance" - }, - { - "size": "S", - "last_credit_date": "2024-06-26 10:44:55+0530", - "org_id": "01359132123730739281", - "total_points": 5, - "row_num": 12, - "total_users": 1, - "org_name": "Ministry of Power" - }, - { - "size": "S", - "last_credit_date": "2024-06-19 20:08:32+0530", - "org_id": "0140788863598264326", - "total_points": 2, - "row_num": 13, - "total_users": 1, - "org_name": "Tarento CBP Provider" - }, - { - "size": "XL", - "last_credit_date": "2024-07-01 18:27:40+0530", - "org_id": "0140788510336040962", - "total_points": 94, - "row_num": 1, - "total_users": 8, - "org_name": "Finance And Budget" - } - ] - } - this.filteredData = this.result.mdoLeaderBoard - .filter(user => user.size === this.currentTab) - .map(user => ({ ...user, children: [], selected: false })) + this.insiteDataService.fetchLeaderboard().subscribe((res: any) => { + if (res && res.result) { + this.result = res.result + this.filteredData = this.result.mdoLeaderBoard + .filter(user => user.size === this.currentTab) + .map(user => ({ ...user, children: [], selected: false })) + } + + }, error => { + console.log(error) + }) + // this.result = { + // "mdoLeaderBoard": [ + // { + // "size": "L", + // "last_credit_date": "2024-06-18 17:58:20+0530", + // "org_id": "01376822290813747263", + // "total_points": 53, + // "row_num": 1, + // "total_users": 3, + // "org_name": "TarentoCBP" + // }, + // { + // "size": "L", + // "last_credit_date": "2024-06-24 15:59:59+0530", + // "org_id": "0135071359030722569", + // "total_points": 24, + // "row_num": 2, + // "total_users": 3, + // "org_name": "Karmayogi Bharat" + // }, + // { + // "size": "L", + // "last_credit_date": "2024-06-26 15:58:26+0530", + // "org_id": "01379305664500531251", + // "total_points": 12, + // "row_num": 3, + // "total_users": 3, + // "org_name": "Ministry for Testing" + // }, + // { + // "size": "M", + // "last_credit_date": "2024-06-25 19:37:13+0530", + // "org_id": "013826080908025856107", + // "total_points": 29, + // "row_num": 1, + // "total_users": 2, + // "org_name": "Ministry of testing" + // }, + // { + // "size": "M", + // "last_credit_date": "2024-06-24 19:14:24+0530", + // "org_id": "01390354700029132834", + // "total_points": 19, + // "row_num": 2, + // "total_users": 2, + // "org_name": "Agrinnovate India" + // }, + // { + // "size": "S", + // "last_credit_date": "2024-06-21 14:29:01+0530", + // "org_id": "01376822910112563268", + // "total_points": 129, + // "row_num": 1, + // "total_users": 1, + // "org_name": "TarentoMDO" + // }, + // { + // "size": "S", + // "last_credit_date": "2024-06-26 11:09:09+0530", + // "org_id": "01372729081852723241", + // "total_points": 12, + // "row_num": 2, + // "total_users": 1, + // "org_name": "Bharat Sanchar Nigam Limited Portal(BSNL)" + // }, + // { + // "size": "S", + // "last_credit_date": "2024-06-20 01:05:02+0530", + // "org_id": "0132593267437813768", + // "total_points": 10, + // "row_num": 3, + // "total_users": 1, + // "org_name": "JPAL" + // }, + // { + // "size": "S", + // "last_credit_date": "2024-06-19 09:41:00+0530", + // "org_id": "0140801732728668160", + // "total_points": 5, + // "row_num": 4, + // "total_users": 1, + // "org_name": "Commercial Taxes and Registration Department Tamil Nadu" + // }, + // { + // "size": "S", + // "last_credit_date": "2024-06-19 12:21:20+0530", + // "org_id": "0140802491947827204", + // "total_points": 5, + // "row_num": 5, + // "total_users": 1, + // "org_name": "Information and Broadcasting Department Gujarat" + // }, + // { + // "size": "S", + // "last_credit_date": "2024-06-24 15:23:45+0530", + // "org_id": "01381906916850892825", + // "total_points": 5, + // "row_num": 6, + // "total_users": 1, + // "org_name": "Ministry of Finance" + // }, + // { + // "size": "S", + // "last_credit_date": "2024-06-26 10:44:55+0530", + // "org_id": "01359132123730739281", + // "total_points": 5, + // "row_num": 7, + // "total_users": 1, + // "org_name": "Ministry of Power" + // }, + // { + // "size": "S", + // "last_credit_date": "2024-06-19 20:08:32+0530", + // "org_id": "0140788863598264326", + // "total_points": 2, + // "row_num": 8, + // "total_users": 1, + // "org_name": "Tarento CBP Provider" + // }, + // { + // "size": "S", + // "last_credit_date": "2024-06-19 09:41:00+0530", + // "org_id": "0140801732728668160", + // "total_points": 5, + // "row_num": 9, + // "total_users": 1, + // "org_name": "Commercial Taxes and Registration Department Tamil Nadu" + // }, + // { + // "size": "S", + // "last_credit_date": "2024-06-19 12:21:20+0530", + // "org_id": "0140802491947827204", + // "total_points": 5, + // "row_num": 10, + // "total_users": 1, + // "org_name": "Information and Broadcasting Department Gujarat" + // }, + // { + // "size": "S", + // "last_credit_date": "2024-06-24 15:23:45+0530", + // "org_id": "01381906916850892825", + // "total_points": 5, + // "row_num": 11, + // "total_users": 1, + // "org_name": "Ministry of Finance" + // }, + // { + // "size": "S", + // "last_credit_date": "2024-06-26 10:44:55+0530", + // "org_id": "01359132123730739281", + // "total_points": 5, + // "row_num": 12, + // "total_users": 1, + // "org_name": "Ministry of Power" + // }, + // { + // "size": "S", + // "last_credit_date": "2024-06-19 20:08:32+0530", + // "org_id": "0140788863598264326", + // "total_points": 2, + // "row_num": 13, + // "total_users": 1, + // "org_name": "Tarento CBP Provider" + // }, + // { + // "size": "XL", + // "last_credit_date": "2024-07-01 18:27:40+0530", + // "org_id": "0140788510336040962", + // "total_points": 94, + // "row_num": 1, + // "total_users": 8, + // "org_name": "Finance And Budget" + // } + // ] + // } + // this.filteredData = this.result.mdoLeaderBoard + // .filter(user => user.size === this.currentTab) + // .map(user => ({ ...user, children: [], selected: false })) } getTabData(name: any) { @@ -230,19 +236,129 @@ export class MdoLeaderboardComponent implements OnInit { } getChildren(obj: any) { - this.filteredData = this.result.mdoLeaderBoard - .filter(user => user.size === this.currentTab) - .map(user => ({ ...user, children: [], selected: user.org_id === obj.org_id })) + // let children: any = { + // "result": { + // "userLeaderBoard": [ + // { + // "profile_image": null, + // "last_credit_date": "2024-06-27 16:32:23+0530", + // "org_id": "0140788510336040962", + // "total_points": 30, + // "rank": 1, + // "fullname": "dev fnb userone ", + // "designation": "CHIEF ASSISTANT", + // "row_num": 1, + // "userId": "a707c493-5d12-4ac5-ab61-228433be6edd" + // }, + // { + // "profile_image": null, + // "last_credit_date": "2024-06-26 15:12:13+0530", + // "org_id": "0140788510336040962", + // "total_points": 19, + // "rank": 2, + // "fullname": "UserFour create mdo ", + // "designation": "ADDITIONAL DEPUTY COMMISSIONER", + // "row_num": 2, + // "userId": "d87ed62b-6e43-46fd-a70f-dbede25fc86c" + // }, + // { + // "profile_image": "https://portal.dev.karmayogibharat.net/assets/public/profileImage/1721121524558_2023IMG5LandingPageGPtoBCAssessmentRequestSMALL.jpg", + // "last_credit_date": "2024-06-20 15:03:19+0530", + // "org_id": "0140788510336040962", + // "total_points": 12, + // "rank": 3, + // "fullname": "Dev FnB MDOADMIN ", + // "designation": "", + // "row_num": 3, + // "userId": "57fd815a-85eb-4354-aef5-d3642f90b876" + // }, + // { + // "profile_image": "https://portal.dev.karmayogibharat.net/assets/public/profileImage/1718615575605_2023IMG5LandingPageGPtoBCAssessmentRequestSMALL.jpg", + // "last_credit_date": "2024-06-24 17:45:20+0530", + // "org_id": "0140788510336040962", + // "total_points": 9, + // "rank": 4, + // "fullname": "Bulk Usertwo ", + // "designation": "ACCOUNTANT", + // "row_num": 4, + // "userId": "8178f6f7-ea96-420a-9a2f-57085f569a8d" + // }, + // { + // "profile_image": null, + // "last_credit_date": "2024-06-25 11:20:00+0530", + // "org_id": "0140788510336040962", + // "total_points": 7, + // "rank": 5, + // "fullname": "Dev FnB UserTwo ", + // "designation": "ACCOUNTANT", + // "row_num": 5, + // "userId": "64f070f0-90d9-4753-a6cc-a621e92634ad" + // }, + // { + // "profile_image": null, + // "last_credit_date": "2024-06-27 16:34:35+0530", + // "org_id": "0140788510336040962", + // "total_points": 7, + // "rank": 5, + // "fullname": "FnB Userone Maildrop ", + // "designation": null, + // "row_num": 6, + // "userId": "a545fa41-10f6-4357-afc3-75c99227e670" + // }, + // { + // "profile_image": null, + // "last_credit_date": "2024-06-19 11:33:23+0530", + // "org_id": "0140788510336040962", + // "total_points": 5, + // "rank": 6, + // "fullname": "FnB User Three ", + // "designation": "ACCOUNT SUPERINTENDENT", + // "row_num": 7, + // "userId": "49436ac4-2d85-4e87-8eac-e1f746fd6116" + // }, + // { + // "profile_image": null, + // "last_credit_date": "2024-07-01 18:27:40+0530", + // "org_id": "0140788510336040962", + // "total_points": 5, + // "rank": 6, + // "fullname": "Fnb User Reg N ", + // "designation": "ACCOUNTANT GENERAL", + // "row_num": 8, + // "userId": "6c74de1b-5c54-4c7a-a6fe-b07cf19f39cc" + // } + // ] + // } + // } + + let children = [] + + this.insiteDataService.fetchMdoUsers(obj.org_id).subscribe((res: any) => { + console.log(res) + if (res && res.result && res.result.userLeaderBoard) { + children = res.result.userLeaderBoard + this.filteredData = this.result.mdoLeaderBoard + .filter(user => user.size === this.currentTab) + .map(user => ({ ...user, children: user.org_id === obj.org_id ? children : [], selected: user.org_id === obj.org_id })) + console.log("filteredData ", this.filteredData) + } + }, error => { + console.log(error) + }) + + } handleSearchQuery(e: any) { if (e.target.value && e.target.value.length > 0) { this.searchTerm = e.target.value this.filteredData = this.result.mdoLeaderBoard - .filter(user => user.size === this.currentTab && user.org_name.toLowerCase().includes(e.target.value)) + .filter(user => user.size === this.currentTab && user.org_name.toLowerCase().includes(e.target.value)) + .map(user => ({ ...user, children: []})) } else { this.filteredData = this.result.mdoLeaderBoard - .filter(user => user.size === this.currentTab) + .filter(user => user.size === this.currentTab) + .map(user => ({ ...user, children: []})) } } diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_services/insite-data.service.ts b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_services/insite-data.service.ts index 8b7438f42..3b31679bc 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_services/insite-data.service.ts +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_services/insite-data.service.ts @@ -7,7 +7,8 @@ const API_END_POINTS = { TRAINING_DETAILS: `apis/proxies/v8/sunbirdigot/search`, ANNOUNCEMENTS_DETAILS: `apis/proxies/v8/announcements/v1/search`, LEARNERS: `apis/proxies/v8/halloffame/top/learners`, - LEADERBOARD: 'apis/proxies/v8/halloffame/v1/mdoleaderboard' + LEADERBOARD: 'apis/proxies/v8/halloffame/v1/mdoleaderboard', + LEADERBOARD_USERS: `apis/proxies/v8/halloffame/v1/userleaderboard` } @Injectable({ @@ -39,4 +40,8 @@ export class InsiteDataService { return this.http.get(`${API_END_POINTS.LEADERBOARD}`) } + fetchMdoUsers(orgId: any): Observable { + return this.http.get(`${API_END_POINTS.LEADERBOARD_USERS}/${orgId}`) + } + } From d411a3a13df245afcb9e7e2c0c74eed5bbd167c7 Mon Sep 17 00:00:00 2001 From: vishnubansaltarento Date: Tue, 27 Aug 2024 17:14:42 +0530 Subject: [PATCH 15/67] update for fitb --- .../library/sunbird-cb/assessment/package.json | 2 +- .../practice/components/question/fitb/fitb.component.html | 6 +++--- sb-cb-ui-assessment/package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sb-cb-ui-assessment/library/sunbird-cb/assessment/package.json b/sb-cb-ui-assessment/library/sunbird-cb/assessment/package.json index 1d386410b..21c35cc69 100644 --- a/sb-cb-ui-assessment/library/sunbird-cb/assessment/package.json +++ b/sb-cb-ui-assessment/library/sunbird-cb/assessment/package.json @@ -1,6 +1,6 @@ { "name": "@sunbird-cb/assessment", - "version": "0.0.7", + "version": "0.0.8", "main": "./src/public-api.ts", "peerDependencies": { "@angular/animations": "~8.2.1", diff --git a/sb-cb-ui-assessment/library/sunbird-cb/assessment/src/lib/practice/components/question/fitb/fitb.component.html b/sb-cb-ui-assessment/library/sunbird-cb/assessment/src/lib/practice/components/question/fitb/fitb.component.html index 60281ccd1..b498d80c1 100644 --- a/sb-cb-ui-assessment/library/sunbird-cb/assessment/src/lib/practice/components/question/fitb/fitb.component.html +++ b/sb-cb-ui-assessment/library/sunbird-cb/assessment/src/lib/practice/components/question/fitb/fitb.component.html @@ -1,7 +1,7 @@ - Instruction +

@@ -10,7 +10,7 @@

- +

Date: Fri, 30 Aug 2024 13:00:59 +0530 Subject: [PATCH 16/67] ati-cti changes --- .../sunbird-cb/consumption/package.json | 2 +- .../cards/card-user/card-user.component.scss | 4 +- .../competency-passbook.component.html | 4 +- .../competency-passbook.component.ts | 165 ++++++++++++++++-- .../data-points/data-points.component.html | 2 +- .../providers-v2/providers-v2.component.html | 8 +- .../providers-v2/providers-v2.component.scss | 11 +- .../_common/sliders/sliders.component.scss | 38 ++-- sb-cb-ui-consumption/package.json | 2 +- 9 files changed, 191 insertions(+), 45 deletions(-) diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/package.json b/sb-cb-ui-consumption/library/sunbird-cb/consumption/package.json index a430fcf3c..f8bff4ed2 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/package.json +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/package.json @@ -1,6 +1,6 @@ { "name": "@sunbird-cb/consumption", - "version": "0.0.75", + "version": "0.0.80", "peerDependencies": { "@angular/common": "^8.2.14", "@angular/core": "^8.2.14", diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/cards/card-user/card-user.component.scss b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/cards/card-user/card-user.component.scss index f5b62bd53..0c76c7e7b 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/cards/card-user/card-user.component.scss +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/cards/card-user/card-user.component.scss @@ -73,8 +73,8 @@ width: 282px; height: 158px; display: block; - -o-object-fit: cover; - object-fit: cover; + -o-object-fit: contain; + object-fit: contain; border-top-left-radius: 8px; border-top-right-radius: 8px; } diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/competency-passbook/competency-passbook.component.html b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/competency-passbook/competency-passbook.component.html index 7c1bf9f9b..8451a8508 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/competency-passbook/competency-passbook.component.html +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/competency-passbook/competency-passbook.component.html @@ -24,11 +24,11 @@
{{ allcompetencyTheme[obj.name]?.description }}
-
+
diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/competency-passbook/competency-passbook.component.ts b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/competency-passbook/competency-passbook.component.ts index 01a634aa8..e307f5da6 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/competency-passbook/competency-passbook.component.ts +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/competency-passbook/competency-passbook.component.ts @@ -91,18 +91,32 @@ export class CompetencyPassbookComponent implements OnInit { } try { + this.competencyStrength = 0 const response = await this.callCompetencySearch(request); if (response && response.results) { if(response.results.result.facets){ - this.competencyArea = response.results.result.facets[0].values - this.competencyStrength = this.competencyArea.reduce((partialSum: any, data: any) => partialSum + data.count, 0) + response.results.result.facets.forEach((fact: any) => { + if(fact.name === 'competencies_v5.competencyArea') { + this.competencyArea = fact.values + } + }); this.selectedValue = this.competencyArea[0].name.toLowerCase() - let addFilter = { - "createdFor": [ - this.providerId - ] - } - this.getcompetencyTheme(this.competencyArea[0].name, addFilter) + this.competencyArea.forEach(async (area: any, indexValue: any)=> { + let addFilter = { + "createdFor": [ + this.providerId + ] + } + let data = await this.getcompetencyThemeCount(area, addFilter) + area['themeData'] = data + area['count'] = data.length + + this.competencyStrength = this.competencyStrength + data.length + if(indexValue === 0) { + + this.getThemeDataByArea(area) + } + }) this.loadCompetencyArea = false } } @@ -140,7 +154,7 @@ export class CompetencyPassbookComponent implements OnInit { this.temeletryResponse.emit(e.name) - this.getcompetencyTheme(e.name, addfilter) + this.getThemeDataByArea(e) this.selectedValue = e.name } getAllCompetencies(){ @@ -214,6 +228,79 @@ export class CompetencyPassbookComponent implements OnInit { } } + getThemeDataByArea(areaData: any){ + let competencyThemeData : any = areaData.themeData + this.originalCompetencyArray.forEach((element: any) => { + if(element.name.toLowerCase() === areaData.name) { + this.competencyTheme = competencyThemeData.filter((ele1: any) => { + return element.children.find((ele2: any) => ele2.name.toLowerCase() === ele1.name.toLowerCase()) + }) + this.showAllTheme = [{name:'Show all', showAll: false}] + this.competencyThemeLength = 6 + } + }); + let addfilter: any = {} + if(this.providerId) { + addfilter = { + "createdFor": [ + this.providerId + ], + } + } + this.getcompetencySubTheme(areaData,addfilter) + } + + async getcompetencyThemeCount(area: any,addFilter?: any) { + let request = { + "request": { + "query": "", + "filters": { + "contentType":"Course", + ...addFilter, + "competencies_v5.competencyArea" : area.name, + "status": [ + "Live" + ] + }, + "sort_by": { + "lastUpdatedOn": "desc" + }, + "facets": [ + "competencies_v5.competencyTheme" + ], + "limit": 0, + "offset": 0, + "fields": [ + ] + } + } + + try { + let returnedData : any = + this.loadCometency = true + const response = await this.callCompetencySearch(request); + if (response && response.results) { + if(response.results.result.facets){ + let competencyThemeData : any = response.results.result.facets[0].values + this.originalCompetencyArray.forEach((element: any) => { + if(element.name.toLowerCase() === area.name) { + returnedData = competencyThemeData.filter((ele1: any) => { + return element.children.find((ele2: any) => ele2.name.toLowerCase() === ele1.name.toLowerCase()) + }) + this.showAllTheme = [{name:'Show all', showAll: false}] + this.competencyThemeLength = 6 + } + }); + } + this.loadCometency = false + return returnedData + } + } catch (error) { + // Handle errors + // console.error('Error:', error); + } + } + resetViewMore(){ Object.keys(this.allcompetencyTheme).forEach((comp: any) => { this.allcompetencyTheme[comp]['viewMore'] = false @@ -231,6 +318,64 @@ export class CompetencyPassbookComponent implements OnInit { } navigateToCompetency(compData: any){ - this.router.navigateByUrl(`app/learn/browse-by/competency/${compData.name}`) + this.router.navigateByUrl(`/app/learn/browse-by/competency/${compData.name}`) + } + + + async getcompetencySubTheme(compArea: any,addFilter?: any) { + let request = { + "request": { + "query": "", + "filters": { + "contentType":"Course", + ...addFilter, + "competencies_v5.competencyArea" : compArea.name, + "status": [ + "Live" + ] + }, + "sort_by": { + "lastUpdatedOn": "desc" + }, + "facets": [ + "competencies_v5.competencySubThemeId" + ], + "limit": 0, + "offset": 0, + "fields": [ + ] + } + } + + try { + this.loadCometency = true + const response = await this.callCompetencySearch(request); + if (response && response.results) { + if(response.results.result.facets){ + let competencySubThemeData : any = response.results.result.facets[0].values + this.competencyArea.forEach((areaEle: any) => { + if(areaEle.name === compArea.name) { + areaEle.themeData.forEach((themeEle) => { + if(this.allcompetencyTheme[themeEle.name.toLowerCase()] && + this.allcompetencyTheme[themeEle.name.toLowerCase()].children && + this.allcompetencyTheme[themeEle.name.toLowerCase()].children.length) { + let data = this.allcompetencyTheme[themeEle.name.toLowerCase()].children.filter(obj1 => + competencySubThemeData.some(obj2 => + Object.keys(obj1).every(key => obj1['id'] === Number(obj2['name'])) + ) + ); + + this.allcompetencyTheme[themeEle.name.toLowerCase()]['children'] = data + } + }); + } + }) + } + this.loadCometency = false + } + } catch (error) { + // Handle errors + // console.error('Error:', error); + } } } diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/data-points/data-points.component.html b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/data-points/data-points.component.html index cdfe2df58..1fb05e62b 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/data-points/data-points.component.html +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/data-points/data-points.component.html @@ -17,7 +17,7 @@
-
+
diff --git a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/providers/providers-v2/providers-v2.component.html b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/providers/providers-v2/providers-v2.component.html index 56de80121..8d1c5c52d 100644 --- a/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/providers/providers-v2/providers-v2.component.html +++ b/sb-cb-ui-consumption/library/sunbird-cb/consumption/src/lib/_common/microsites/providers/providers-v2/providers-v2.component.html @@ -53,10 +53,12 @@
-