diff --git a/project/ws/app/src/lib/routes/profile-v3/components/dialog-box/dialog-box.component.html b/project/ws/app/src/lib/routes/profile-v3/components/dialog-box/dialog-box.component.html
index 052c6365f..1c5ae7d42 100644
--- a/project/ws/app/src/lib/routes/profile-v3/components/dialog-box/dialog-box.component.html
+++ b/project/ws/app/src/lib/routes/profile-v3/components/dialog-box/dialog-box.component.html
@@ -33,9 +33,21 @@
3. Streamlining the recruitment process
Example:
- • Ensures inclusion and accuracy of facts in vigilance proposals.
- • Coordinates and manages relationships with various stakeholders
- • Manages grievance redressal mechanisms
+
+
+
+ 1. Competency Label: Noting and Drafting
+ Competency Type: Functional
+ Description: Drafts and analyses a note, in order, in order to move a proposal for
+ decision making on the availability of evidence and existing rules and precedents.
+ 2. Competency Label: Communication Skills
+ Competency Type: Behavioural
+ Description: Articulates information to others in a language that is clear, concise, and easy to understand. It also includes the ability to listen and understand the unspoken feelings and concerns of others.
+ 3. Competency Label: Regulatory and Legal Advisory
+ Competency Type: Domain
+ Description: Provides advice to business and management stakeholders on regulatory
+ compliance and legal matters related to support business decision making
@@ -54,9 +66,17 @@
3. Streamlining the recruitment process
Example:
- • Ensures inclusion and accuracy of facts in vigilance proposals.
- • Coordinates and manages relationships with various stakeholders
- • Manages grievance redressal mechanisms
+ 1. Competency Label: Noting and Drafting
+ Competency Type: Functional
+ Description: Drafts and analyses a note, in order, in order to move a proposal for
+ decision making on the availability of evidence and existing rules and precedents.
+ 2. Competency Label: Communication Skills
+ Competency Type: Behavioural
+ Description: Articulates information to others in a language that is clear, concise, and easy to understand. It also includes the ability to listen and understand the unspoken feelings and concerns of others.
+ 3. Competency Label: Regulatory and Legal Advisory
+ Competency Type: Domain
+ Description: Provides advice to business and management stakeholders on regulatory
+ compliance and legal matters related to support business decision making
diff --git a/project/ws/app/src/lib/routes/profile-v3/routes/roles-and-activities/roles-and-activities.component.html b/project/ws/app/src/lib/routes/profile-v3/routes/roles-and-activities/roles-and-activities.component.html
index 37e565c50..d3fc2e470 100644
--- a/project/ws/app/src/lib/routes/profile-v3/routes/roles-and-activities/roles-and-activities.component.html
+++ b/project/ws/app/src/lib/routes/profile-v3/routes/roles-and-activities/roles-and-activities.component.html
@@ -47,7 +47,7 @@
- Add activities you perform as part of this role.
+ Add activities you perform as part of this role
info_outlined What is an activity?
diff --git a/project/ws/viewer/src/lib/plugins/html/html.component.ts b/project/ws/viewer/src/lib/plugins/html/html.component.ts
index 671ffa0a5..a4f681d8a 100755
--- a/project/ws/viewer/src/lib/plugins/html/html.component.ts
+++ b/project/ws/viewer/src/lib/plugins/html/html.component.ts
@@ -164,8 +164,15 @@ export class HtmlComponent implements OnInit, OnChanges, OnDestroy {
// )
// }
if (this.htmlContent.streamingUrl && this.htmlContent.initFile) {
- this.iframeUrl = this.domSanitizer.bypassSecurityTrustResourceUrl(
+ if (this.htmlContent.streamingUrl.includes('latest')) {
+ this.iframeUrl = this.domSanitizer.bypassSecurityTrustResourceUrl(
+ // tslint:disable-next-line:max-line-length
+ `${environment.azureHost}/${environment.azureBucket}/content/html/${this.htmlContent.identifier}-latest/index.html?timestamp = '${new Date().getTime()}`
+ )
+ } else {
+ this.iframeUrl = this.domSanitizer.bypassSecurityTrustResourceUrl(
`${this.htmlContent.streamingUrl}/${this.htmlContent.initFile}?timestamp='${new Date().getTime()}`)
+ }
} else {
if (environment.production) {
this.iframeUrl = this.domSanitizer.bypassSecurityTrustResourceUrl(
diff --git a/src/app/component/root/root.component.ts b/src/app/component/root/root.component.ts
index f0653ba5c..7b45ca3ca 100755
--- a/src/app/component/root/root.component.ts
+++ b/src/app/component/root/root.component.ts
@@ -208,7 +208,9 @@ export class RootComponent implements OnInit, AfterViewInit {
this.showFooter = false
this.showNavbar = false
this.isNavBarRequired = false
- } else {
+ }
+
+ else {
this.showFooter = true
this.showNavbar = true
this.isNavBarRequired = true
diff --git a/src/app/routes/public/public-contacthome/public-contacthome.component.html b/src/app/routes/public/public-contacthome/public-contacthome.component.html
index afb41e398..0b13f4825 100644
--- a/src/app/routes/public/public-contacthome/public-contacthome.component.html
+++ b/src/app/routes/public/public-contacthome/public-contacthome.component.html
@@ -6,11 +6,12 @@
diff --git a/src/app/routes/public/public-contacthome/public-contacthome.component.scss b/src/app/routes/public/public-contacthome/public-contacthome.component.scss
index a13da256a..2326f8097 100644
--- a/src/app/routes/public/public-contacthome/public-contacthome.component.scss
+++ b/src/app/routes/public/public-contacthome/public-contacthome.component.scss
@@ -1,5 +1,6 @@
@import "ws-vars";
@import "ws-common";
+@import 'ws-mixins';
.container-balanced {
max-width: 1202px;
@@ -35,3 +36,11 @@ h2.main_title_text {
.flex-3 {
flex: 3;
}
+
+.custom-phone {
+ height: 16px;
+ width: 22px;
+ font-size: 20px;
+ line-height: 0.6 !important;
+ vertical-align: middle;
+}
diff --git a/src/app/routes/public/public-home/public-home.component.html b/src/app/routes/public/public-home/public-home.component.html
index 85c4709a3..63c440a2e 100644
--- a/src/app/routes/public/public-home/public-home.component.html
+++ b/src/app/routes/public/public-home/public-home.component.html
@@ -89,7 +89,7 @@ How does the platform enable you
-
+
diff --git a/src/app/routes/public/public-home/public-home.component.scss b/src/app/routes/public/public-home/public-home.component.scss
index 17e924f1c..07e33c64b 100644
--- a/src/app/routes/public/public-home/public-home.component.scss
+++ b/src/app/routes/public/public-home/public-home.component.scss
@@ -43,9 +43,9 @@
padding: 0;
margin: 0;
}
- a {
- color: #A221D8;
- }
+ // a {
+ // color: #A221D8;
+ // }
a:hover {
text-decoration: none;
@@ -575,3 +575,14 @@
// width: 90%;
// }
// }
+
+
+ ::ng-deep .app-footer {
+ display: none!important;
+ visibility: hidden!important;
+ }
+
+ ::ng-deep .top_footer_box {
+ display: none!important;
+ visibility: hidden!important;
+ }
diff --git a/src/app/routes/public/public-signup/public-signup.component.scss b/src/app/routes/public/public-signup/public-signup.component.scss
index 83e058c21..3f91f9e2d 100644
--- a/src/app/routes/public/public-signup/public-signup.component.scss
+++ b/src/app/routes/public/public-signup/public-signup.component.scss
@@ -392,9 +392,9 @@
}
}
- .mat-form-field-wrapper{
+ // .mat-form-field-wrapper{
- }
+ // }
.combined-field {
@@ -780,3 +780,4 @@
visibility: visible !important;
}
}
+
diff --git a/src/app/routes/public/public-signup/public-signup.component.ts b/src/app/routes/public/public-signup/public-signup.component.ts
index 59c2fbec2..2c068cb78 100644
--- a/src/app/routes/public/public-signup/public-signup.component.ts
+++ b/src/app/routes/public/public-signup/public-signup.component.ts
@@ -51,7 +51,7 @@ export function forbiddenNamesValidatorPosition(optionsArray: any): ValidatorFn
export class PublicSignupComponent implements OnInit, OnDestroy {
registrationForm!: FormGroup
namePatern = `^[a-zA-Z\\s\\']{1,32}$`
- // emailWhitelistPattern = `^[a-zA-Z0-9._-]{3,}\\b(@gov|@nic)\\b\.\\b(in)\\b$`
+ emailWhitelistPattern = `^[a-zA-Z0-9._-]{3,}\\b@\\b[a-zA-Z0-9]*|\\b(.gov|.nic)\b\\.\\b(in)\\b$`
departments!: any
masterDepartments!: Observable | undefined
masterDepartmentsOriginal!: []
@@ -79,7 +79,7 @@ export class PublicSignupComponent implements OnInit, OnDestroy {
firstname: new FormControl('', [Validators.required, Validators.pattern(this.namePatern)]),
lastname: new FormControl('', [Validators.required, Validators.pattern(this.namePatern)]),
position: new FormControl('', [Validators.required, forbiddenNamesValidatorPosition(this.masterPositions)]),
- email: new FormControl('', [Validators.required, Validators.email]),
+ email: new FormControl('', [Validators.required, Validators.pattern(this.emailWhitelistPattern)]),
department: new FormControl('', [Validators.required, forbiddenNamesValidator(this.masterDepartments)]),
confirmBox: new FormControl(false, [Validators.required]),
// recaptchaReactive: new FormControl(null, [Validators.required]),