diff --git a/project/ws/app/src/lib/head/left-menu/left-menu.component.html b/project/ws/app/src/lib/head/left-menu/left-menu.component.html index 338f6af2..1fb2d3d5 100644 --- a/project/ws/app/src/lib/head/left-menu/left-menu.component.html +++ b/project/ws/app/src/lib/head/left-menu/left-menu.component.html @@ -17,7 +17,8 @@ - + diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts index 9175dd0a..e6255288 100644 --- a/project/ws/app/src/lib/routes/home/home.module.ts +++ b/project/ws/app/src/lib/routes/home/home.module.ts @@ -101,6 +101,7 @@ import { SurveyFormComponent } from './components/app-survey/survey-form/survey- import { CapitalizePipe } from './pipe/capitalize.pipe' import { BulkUploadOdcsComponent } from './routes/odcs-mapping/bulk-upload-odcs/bulk-upload-odcs.component' import { GroupsGradeComponent } from './components/groups-grade/groups-grade.component' +import { MAT_DATE_LOCALE } from '@angular/material/core' @NgModule({ declarations: [ @@ -220,8 +221,10 @@ import { GroupsGradeComponent } from './components/groups-grade/groups-grade.com UploadService, TrainingPlanDashboardService, UsersService, + { provide: MAT_DATE_LOCALE, useValue: 'en-GB' } ], schemas: [CUSTOM_ELEMENTS_SCHEMA] + }) export class HomeModule { 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 22f3adf9..92607bb0 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 @@ -2,68 +2,76 @@
-
- - icon -
-
- icon - No designation has been imported from iGOT master. - -
-
- - -
-
-
- - Link Status - -
- {{latestRegisteredData.status && latestRegisteredData.status === 'active' ? - 'Active': 'None'}}
- + +
+ + icon +
+
+ icon + No designation has been imported from iGOT master. +
+
+ + + +
+
+ + Link Status - +
+ {{latestRegisteredData?.status && latestRegisteredData?.status === 'active' ? + 'Active': 'None'}}
+ +
-
-
- Start Date +
+
+ Start Date +
+ + + + +
- - - - - -
-
-
- End Date +
+
+ End Date +
+ + + + +
- - - - -
-
-
- - - - - - -
- - -
+
+ + + + + + +
+ + +
+ + + +
+ +
+
@@ -77,7 +85,7 @@
link - {{customRegistrationLinks?.registrationLink}}
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 f6a65017..d142e439 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 @@ -14,6 +14,7 @@ color: #1d8923; background: #1d892329; } + &.in-active { color: #00000099; background: #00000029; @@ -51,4 +52,9 @@ :host ::ng-deep .mdc-button__label { display: flex; align-items: center; +} + +.break-word-link { + max-width: 470px; + word-wrap: break-word; } \ 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 5a52624d..f2a09440 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 @@ -7,6 +7,8 @@ import { MatSnackBar } from '@angular/material/snack-bar' import { Clipboard } from '@angular/cdk/clipboard' import { LoadingPopupComponent } from '../loading-popup/loading-popup.component' import { OnboardingService } from '../../../services/onboarding.service' +import { DesignationsService } from '../../designation/services/designations.service' +import _ from 'lodash' @Component({ selector: 'ws-app-custom-self-registration', @@ -24,6 +26,8 @@ export class CustomSelfRegistrationComponent implements OnInit { registeredLinksList: IRegisteredLinksList[] = [] numberOfUsersOnboarded = 0 latestRegisteredData: IRegisteredLinksList | any = {} + designationsList: any[] = [] + isLoading = false constructor( public dialog: MatDialog, private activatedRoute: ActivatedRoute, @@ -32,6 +36,8 @@ export class CustomSelfRegistrationComponent implements OnInit { private snackbar: MatSnackBar, private clipboard: Clipboard, private onboardingService: OnboardingService, + private designationsService: DesignationsService, + ) { } ngOnInit(): void { @@ -42,7 +48,7 @@ export class CustomSelfRegistrationComponent implements OnInit { this.initializeForm() if (this.framewordId && this.configSvc.orgReadData) { - this.getlistOfRegisterationLinks() + this.getFrameworkInfo(this.framewordId) } } @@ -62,6 +68,7 @@ export class CustomSelfRegistrationComponent implements OnInit { } else { this.customRegistrationLinks = undefined } + this.isLoading = false }, error: () => { @@ -170,4 +177,28 @@ export class CustomSelfRegistrationComponent implements OnInit { return today <= endDate } + getFrameworkInfo(frameworkid: string) { + this.isLoading = true + this.designationsService.getFrameworkInfo(frameworkid) + .subscribe({ + next: (frameworkResponse) => { + const frameworkDetails = _.get(frameworkResponse, 'result.framework') + const categoriesOfFramework = _.get(frameworkDetails, 'categories', []) + const organisationsList = this.getTermsByCode(categoriesOfFramework, 'org') + this.designationsList = _.get(organisationsList, '[0].children', []) + if (this.designationsList?.length && this.designationsList?.length > 0) { + this.getlistOfRegisterationLinks() + } else { + this.isLoading = false + } + } + }) + } + + private getTermsByCode(categories: any[], code: string) { + const selectedCategory = categories.filter( + (category: any) => category.code === code + ) + return _.get(selectedCategory, '[0].terms', []) + } } diff --git a/project/ws/app/src/lib/routes/home/routes/onboarding/onboarding.module.ts b/project/ws/app/src/lib/routes/home/routes/onboarding/onboarding.module.ts index 221d1327..340bb9a7 100644 --- a/project/ws/app/src/lib/routes/home/routes/onboarding/onboarding.module.ts +++ b/project/ws/app/src/lib/routes/home/routes/onboarding/onboarding.module.ts @@ -19,6 +19,7 @@ import { SingleUserCreationComponent } from '../users-view/single-user-creation/ import { MatExpansionModule } from '@angular/material/expansion' import { MatDialogModule } from '@angular/material/dialog' import { MatSnackBarModule } from '@angular/material/snack-bar' +import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner' const routes: Routes = [ { @@ -100,7 +101,8 @@ const routes: Routes = [ MatInputModule, MatExpansionModule, MatDialogModule, - MatSnackBarModule + MatSnackBarModule, + MatProgressSpinnerModule ], providers: [MatDialogModule]