diff --git a/project/ws/app/src/lib/routes/home/routes/onboarding/custom-self-registration/custom-self-registration.component.html b/project/ws/app/src/lib/routes/home/routes/onboarding/custom-self-registration/custom-self-registration.component.html index 31e0716e..22f3adf9 100644 --- a/project/ws/app/src/lib/routes/home/routes/onboarding/custom-self-registration/custom-self-registration.component.html +++ b/project/ws/app/src/lib/routes/home/routes/onboarding/custom-self-registration/custom-self-registration.component.html @@ -1,7 +1,7 @@
- +
icon @@ -15,41 +15,40 @@
-
+
Link Status -
- {{checkRegistrationStatus(configSvc.orgReadData.enddateregistration) ? + [ngClass]="latestRegisteredData.status && latestRegisteredData.status === 'active' ? 'active':'in-active'"> + {{latestRegisteredData.status && latestRegisteredData.status === 'active' ? 'Active': 'None'}}
- -
@@ -86,20 +85,17 @@
- + -
@@ -111,30 +107,28 @@
- -
-
+
users - Number of Users Onboarded: 2,231 + Number of Users Onboarded: {{numberOfUsersOnboarded}}
diff --git a/project/ws/app/src/lib/routes/home/routes/onboarding/custom-self-registration/custom-self-registration.component.scss b/project/ws/app/src/lib/routes/home/routes/onboarding/custom-self-registration/custom-self-registration.component.scss index 82641018..f6a65017 100644 --- a/project/ws/app/src/lib/routes/home/routes/onboarding/custom-self-registration/custom-self-registration.component.scss +++ b/project/ws/app/src/lib/routes/home/routes/onboarding/custom-self-registration/custom-self-registration.component.scss @@ -33,3 +33,22 @@ .bg-inherit { background: inherit !important; } + +:host ::ng-deep .mat-btn-outline:hover { + background-color: #1b4ca1 !important; + color: #fff !important; + + mat-icon, + span { + color: #fff !important; + } + + img { + filter: brightness(0) invert(1); + } +} + +:host ::ng-deep .mdc-button__label { + display: flex; + align-items: center; +} \ No newline at end of file diff --git a/project/ws/app/src/lib/routes/home/routes/onboarding/custom-self-registration/custom-self-registration.component.ts b/project/ws/app/src/lib/routes/home/routes/onboarding/custom-self-registration/custom-self-registration.component.ts index 1ab987ea..5a52624d 100644 --- a/project/ws/app/src/lib/routes/home/routes/onboarding/custom-self-registration/custom-self-registration.component.ts +++ b/project/ws/app/src/lib/routes/home/routes/onboarding/custom-self-registration/custom-self-registration.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit } from '@angular/core' import { MatDialog } from '@angular/material/dialog' import { ActivatedRoute, Router } from '@angular/router' -import { ICustomRegistrationQRCodeResponse, IOnBoardingConfig } from '../interface/onboarding.interface' -import { FormBuilder, FormGroup } from '@angular/forms' +import { ICustomRegistrationQRCodeResponse, IOnBoardingConfig, IRegisteredLinksList } from '../interface/onboarding.interface' +import { FormBuilder, FormGroup, Validators } from '@angular/forms' import { MatSnackBar } from '@angular/material/snack-bar' import { Clipboard } from '@angular/cdk/clipboard' import { LoadingPopupComponent } from '../loading-popup/loading-popup.component' @@ -21,8 +21,9 @@ export class CustomSelfRegistrationComponent implements OnInit { rootOrdId = '' framewordId = '' todayDate = new Date() - selectedButton = '' - + registeredLinksList: IRegisteredLinksList[] = [] + numberOfUsersOnboarded = 0 + latestRegisteredData: IRegisteredLinksList | any = {} constructor( public dialog: MatDialog, private activatedRoute: ActivatedRoute, @@ -40,37 +41,48 @@ export class CustomSelfRegistrationComponent implements OnInit { this.framewordId = this.configSvc.orgReadData.frameworkid this.initializeForm() - if ( - this.framewordId && - this.configSvc.orgReadData && - this.configSvc?.orgReadData?.registrationlink - ) { - // this.selfRegistrationForm.get('startDate')?.setValue(new Date(this.configSvc.orgReadData.startdateregistration)) - // this.selfRegistrationForm.get('endDate')?.setValue(new Date(this.configSvc.orgReadData.enddateregistration)) - const links = { - registrationLink: this.configSvc.orgReadData.registrationlink, - qrRegistrationLink: this.configSvc.orgReadData.qrregistrationlink, - } - this.customRegistrationLinks = links - } else { - this.customRegistrationLinks = undefined + if (this.framewordId && this.configSvc.orgReadData) { + this.getlistOfRegisterationLinks() } } + getlistOfRegisterationLinks() { + this.onboardingService.getListOfRegisteedLinks({ orgId: this.rootOrdId }).subscribe({ + next: (response: any) => { + if (response.result && response.result.qrCodeDataForOrg.length) { + this.registeredLinksList = response.result.qrCodeDataForOrg + this.latestRegisteredData = this.registeredLinksList[this.registeredLinksList.length - 1] + this.selfRegistrationForm.get('startDate')?.setValue(new Date(this.latestRegisteredData.startDate)) + this.selfRegistrationForm.get('endDate')?.setValue(new Date(this.latestRegisteredData.endDate)) + this.customRegistrationLinks = { + registrationLink: this.latestRegisteredData.url, + qrRegistrationLink: this.latestRegisteredData.qrCodeImagePath, + } + this.numberOfUsersOnboarded = this.latestRegisteredData.numberOfUsersOnboarded + } else { + this.customRegistrationLinks = undefined + } + }, + error: () => { + + }, + }) + } + navigateTo(route: string): void { this.router.navigate([route]) } initializeForm(): void { this.selfRegistrationForm = this.formBuilder.group({ - startDate: [''], - endDate: [''], + startDate: ['', [Validators.required]], + endDate: ['', [Validators.required]], }) } copyLinkToClipboard(link: string): void { this.clipboard.copy(link) - this.snackbar.open('Copied!') + this.snackbar.open('Copied!', '', { panelClass: ['success'] }) } downloadQRCode(qrLink: string) { @@ -96,18 +108,18 @@ export class CustomSelfRegistrationComponent implements OnInit { sendViaEmail(link: string): void { if (!link) { return } - const message = `Register for ${this.configSvc.orgReadData.orgName} by clicking below ${link} ` + const message = `Register for ${this.configSvc.orgReadData.orgName} by clicking the link below:\n\n${link + ' '}` const subject = encodeURIComponent('Self Registration Link') - const body = encodeURIComponent(`Self Registration Link: ${message}`) + const body = encodeURIComponent(message) const mailtoLink = `mailto:?subject=${subject}&body=${body}` window.open(mailtoLink, '_self') } sendViaWhatsApp(link: string): void { - if (!link) { return } - const message = `Register for ${this.configSvc.orgReadData.orgName} by clicking below ${link} ` + const message = `Register for ${this.configSvc.orgReadData.orgName} by clicking the link below:\n\n${link + ' '}` + const encodedLink = encodeURIComponent(message) - const whatsappUrl = `https://api.whatsapp.com/send?text=${encodedLink}` + const whatsappUrl = `https://api.whatsapp.com/send?text=${encodedLink} ` window.open(whatsappUrl, '_blank') } @@ -122,24 +134,25 @@ export class CustomSelfRegistrationComponent implements OnInit { }) const payload = { - // registrationStartDate: (Math.floor(this.selfRegistrationForm.controls['startDate'].value.getTime())), - // registrationEndDate: (Math.floor(this.selfRegistrationForm.controls['endDate'].value.getTime())), + registrationStartDate: (Math.floor(this.selfRegistrationForm.controls['startDate'].value.getTime())), + registrationEndDate: (Math.floor(this.selfRegistrationForm.controls['endDate'].value.getTime())), orgId: this.rootOrdId, } this.onboardingService.generateSelfRegistrationQRCode(payload).subscribe({ next: (response: any) => { if (response.result && Object.keys(response.result).length > 0 && response.responseCode === 'OK') { this.customRegistrationLinks = response.result - // this.configSvc.orgReadData.enddateregistration = new Date(this.selfRegistrationForm.controls['endDate'].value) - // this.configSvc.orgReadData.startdateregistration = new Date(this.selfRegistrationForm.controls['startDate'].value) + this.latestRegisteredData.endDate = new Date(this.selfRegistrationForm.controls['endDate'].value) + this.latestRegisteredData.startDate = new Date(this.selfRegistrationForm.controls['startDate'].value) + this.latestRegisteredData.status = 'active' dialogRef.close() } else if (response?.params?.errmsg) { - this.snackbar.open(response?.params?.errmsg, '', { duration: 3000 }) + this.snackbar.open(response?.params?.errmsg, 'X', { duration: 3000, panelClass: ['error'] }) dialogRef.close() } else { - this.snackbar.open('Oops! We couldn\'t generate the link or QR code.Please try again', '', { duration: 3000 }) + this.snackbar.open('Oops! We couldn\'t generate the link or QR code.Please try again', 'X', { duration: 3000, panelClass: ['error'] }) dialogRef.close() } }, @@ -149,17 +162,12 @@ export class CustomSelfRegistrationComponent implements OnInit { }) } - checkRegistrationStatus(_endDateRegistration: string): boolean { - // if (!endDateRegistration) { return false } - - // const endDate = new Date(endDateRegistration) - // const today = new Date() - // return today <= endDate - return true - } + checkRegistrationStatus(endDateRegistration: string): boolean { + if (!endDateRegistration) { return false } - selectedButtonCode(type: string) { - this.selectedButton = type + const endDate = new Date(endDateRegistration) + const today = new Date() + return today <= endDate } } diff --git a/project/ws/app/src/lib/routes/home/routes/onboarding/interface/onboarding.interface.ts b/project/ws/app/src/lib/routes/home/routes/onboarding/interface/onboarding.interface.ts index 28235870..8c31d4ef 100644 --- a/project/ws/app/src/lib/routes/home/routes/onboarding/interface/onboarding.interface.ts +++ b/project/ws/app/src/lib/routes/home/routes/onboarding/interface/onboarding.interface.ts @@ -9,3 +9,16 @@ export interface ICustomRegistrationQRCodeResponse { registrationLink: string, qrRegistrationLink: string } + +export interface IRegisteredLinksList { + orgId: string + id: string + status: string + url: string + startDate: string + endDate: string + createdBy: string + createdDateTime: string + numberOfUsersOnboarded: number + qrCodeImagePath: string +} diff --git a/project/ws/app/src/lib/routes/home/routes/onboarding/loading-popup/loading-popup.component.html b/project/ws/app/src/lib/routes/home/routes/onboarding/loading-popup/loading-popup.component.html index 4b02238b..48c0961d 100644 --- a/project/ws/app/src/lib/routes/home/routes/onboarding/loading-popup/loading-popup.component.html +++ b/project/ws/app/src/lib/routes/home/routes/onboarding/loading-popup/loading-popup.component.html @@ -1,4 +1,4 @@ -
+
Generating Link
diff --git a/project/ws/app/src/lib/routes/home/services/onboarding.service.ts b/project/ws/app/src/lib/routes/home/services/onboarding.service.ts index b6ac3baf..44e7c5e9 100644 --- a/project/ws/app/src/lib/routes/home/services/onboarding.service.ts +++ b/project/ws/app/src/lib/routes/home/services/onboarding.service.ts @@ -4,6 +4,7 @@ import { Observable } from 'rxjs' const API_END_POINTS = { CUSTOM_SELF_REGISTRATION_QR: '/apis/proxies/v8/customselfregistration', + REGISTERED_LINKS_LIST: '/apis/proxies/v8/customselfregistration/listallqrs', } @Injectable({ @@ -16,4 +17,8 @@ export class OnboardingService { generateSelfRegistrationQRCode(request: any): Observable { return this.http.post(`${API_END_POINTS.CUSTOM_SELF_REGISTRATION_QR}`, request) } + + getListOfRegisteedLinks(request: any) { + return this.http.post(`${API_END_POINTS.REGISTERED_LINKS_LIST}`, request) + } } diff --git a/src/styles/styles.scss b/src/styles/styles.scss index 741d65f2..cbcf300f 100644 --- a/src/styles/styles.scss +++ b/src/styles/styles.scss @@ -841,3 +841,7 @@ h3.shepherd-title { .active-radio-button .mat-radio-button .mat-radio-container .mat-radio-outer-circle { border-color: #1b4ca1 !important; } + +.mat-mdc-dialog-container { + --mdc-dialog-container-shape: 8px +} \ No newline at end of file