Merge pull request #484 from sunbird-cb/scrom-url

Scrom url

project/ws/app/src/lib/routes/profile-v3/components/dialog-box/dialog-box.component.html

@@ -33,9 +33,21 @@
     <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom">3. &nbsp; Streamlining the recruitment process</p>
 
      <p  class="mat-subheading-2 margin-bottom-xs margin-top-l">Example:</p>
-     <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom">• &nbsp;  Ensures inclusion and accuracy of facts in vigilance proposals.</p>
-      <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom">  • &nbsp;  Coordinates and manages relationships with various stakeholders</p>
-      <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom"> • &nbsp;  Manages grievance redressal mechanisms</p>
+     <!-- <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom">• &nbsp;  Ensures inclusion and accuracy of facts in vigilance proposals.</p> -->
+      <!-- <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom">  • &nbsp;  Coordinates and manages relationships with various stakeholders</p>
+      <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom"> • &nbsp;  Manages grievance redressal mechanisms</p> -->
+
+      <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom">1. &nbsp;  Competency Label: Noting and Drafting</p>
+      <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom"> Competency Type: Functional </p>
+    <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom"> Description: Drafts and analyses a note, in order, in order to move a proposal for </p>
+    <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom">  decision making on the availability of evidence and existing rules and precedents. </p>
+    <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom"> 2. &nbsp;  Competency Label: Communication Skills </p>
+    <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom">Competency Type: Behavioural </p>
+    <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom">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. </p>
+    <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom">3. &nbsp;  Competency Label: Regulatory and Legal Advisory </p>
+    <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom">Competency Type: Domain </p>
+    <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom">Description: Provides advice to business and management stakeholders on regulatory
+    compliance and legal matters related to support business decision making </p>
 </ng-template>
 
 
@@ -54,9 +66,17 @@
     <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom">3. &nbsp; Streamlining the recruitment process</p>
 
      <p  class="mat-subheading-2 margin-bottom-xs margin-top-l">Example:</p>
-     <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom">• &nbsp;  Ensures inclusion and accuracy of facts in vigilance proposals.</p>
-      <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom">  • &nbsp;  Coordinates and manages relationships with various stakeholders</p>
-      <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom"> • &nbsp;  Manages grievance redressal mechanisms</p>
+     <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom">1. &nbsp;  Competency Label: Noting and Drafting</p>
+     <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom"> Competency Type: Functional </p>
+   <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom"> Description: Drafts and analyses a note, in order, in order to move a proposal for </p>
+   <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom">  decision making on the availability of evidence and existing rules and precedents. </p>
+   <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom"> 2. &nbsp;  Competency Label: Communication Skills </p>
+   <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom">Competency Type: Behavioural </p>
+   <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom">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. </p>
+   <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom">3. &nbsp;  Competency Label: Regulatory and Legal Advisory </p>
+   <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom">Competency Type: Domain </p>
+   <p class="mat-body-2 ws-mat-black60-text margin-remove-bottom">Description: Provides advice to business and management stakeholders on regulatory
+   compliance and legal matters related to support business decision making </p>
 </ng-template>
 
 <ng-template #roles>

project/ws/app/src/lib/routes/profile-v3/routes/roles-and-activities/roles-and-activities.component.html

@@ -47,7 +47,7 @@
                         <label for="roleName" class="margin-remove-bottom form-label required flex mat-subheading-2"
                             i18n="activity label|Label which explains the user to enter activity" i18n-aria-label
                             aria-label="activity label">
-                            Add activities you perform as part of this role.
+                            Add activities you perform as part of this role
                         </label>
                         <a class="mat-subheading-2 hint_span margin-remove-bottom" (click)="openActivityDialog()">
                             <mat-icon class="mat-icon margin-right-xs">info_outlined</mat-icon> What is an activity?

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(

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

src/app/routes/public/public-contacthome/public-contacthome.component.html

@@ -6,11 +6,12 @@
     <div class="flex flex-1 custom faq_main_box">
         <div class="flex-3">
             <mat-card class="padding-xl">
-                <h2 class="flex mat-display-1 main_title_text margin-bottom-xl">Contact Us</h2>
-                <!-- <h5 class="flex mat-display-1  margin-top-xl margin-bottom-xl">We would love to hear from you!</h5> -->
-                <p>Send us a mail to <a href="mailto:mission.karmayogi@gov.in"><b>mission.karmayogi@gov.in</b></a>. Our representatives will reach out to you at the earliest.</p>
-                <p>You may contact us on <b>1800 111 555</b> or visit our <a href="https://servicedesk.nic.in/" target="blank">service desk</a> for more details.</p>
-                <p class="margin-top-xl margin-bottom-m">To know more click <a href="https://dopttrg.nic.in/igotmk/">here.</a></p>
+                <!-- <h2 class="flex mat-display-1 main_title_text margin-bottom-xl">Contact Us</h2> -->
+                <p class="mat-title">For any technical issues please contact,</p>
+                <p class="mat-body-1">Email: <a href="mailto:mission.karmayogi@gov.in"><b>mission.karmayogi@gov.in</b></a></p>
+                <p>Helpdesk: <a href="https://servicedesk.nic.in/" target="blank"><b>servicedesk.nic.in</b></a></p>
+                <p class="mat-body-1 margin-bottom-m">Call: <mat-icon class="custom-phone">phone</mat-icon><b> 1800 111 555</b></p>
+                <p class="mat-body-1 margin-top-xl margin-bottom-m">To know more click <a href="https://dopttrg.nic.in/igotmk/">here.</a></p>
             </mat-card>
         </div>
     </div>

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;
+}

src/app/routes/public/public-home/public-home.component.html

@@ -89,7 +89,7 @@ <h1 class="text-white text-center mt-12 pt-12">How does the platform enable you
                 <div class="flex flex-1">
                   <div class="exCivilVideo">
                     <!-- <img src="/assets/instances/eagle/landing-img/video1.png" alt="video presentation"> -->
-                    <video width="100%" height="auto" controls poster="/assets/instances/eagle/landing-img/video12.png">
+                    <video width="100%" height="auto" controls poster="/assets/instances/eagle/landing-img/video1.png">
                       <source src="https://igot.blob.core.windows.net/public/Sanjeev-final.mp4" type="video/mp4">
                     </video>
 

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;
+  }

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;
   }
 }
+

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<any> | 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]),