Merge pull request #492 from sunbird-cb/signout

Signout
sunbird-cb · Jul 6, 2022 · e5e7105 · e5e7105
2 parents a4740d2 + e449251
commit e5e7105
Show file tree

Hide file tree

Showing 6 changed files with 335 additions and 59 deletions.
diff --git a/...src/lib/routes/profile-v3/routes/roles-and-activities/roles-and-activities.component.html b/...src/lib/routes/profile-v3/routes/roles-and-activities/roles-and-activities.component.html
@@ -141,5 +141,5 @@
 </div>
 
 
-<input #deleteTitleRef type="hidden" i18n-value value="Role delete!" />
+<input #deleteTitleRef type="hidden" i18n-value value="Confirmation Needed" />
 <input #deleteBodyRef type="hidden" i18n-value value="Do you want to delete the role and associated activities?" />
diff --git a/...p/src/lib/routes/profile-v3/routes/roles-and-activities/roles-and-activities.component.ts b/...p/src/lib/routes/profile-v3/routes/roles-and-activities/roles-and-activities.component.ts
@@ -72,7 +72,7 @@ export class RolesAndActivitiesComponent implements OnInit, OnDestroy {
                 }
                 this.rolesAndActivityService.createRoles(reqObj).subscribe(res => {
                     if (res) {
-                        this.snackBar.open('updated Successfully!!')
+                        this.snackBar.open('Updated successfully')
                         this.userRoles.push({
                             id: role.value,
                             description: role.value,
@@ -121,7 +121,7 @@ export class RolesAndActivitiesComponent implements OnInit, OnDestroy {
     updateDeleteRoles(reqObj: any) {
         this.rolesAndActivityService.createRoles(reqObj).subscribe(res => {
             if (res) {
-                this.snackBar.open('updated Successfully!!')
+                this.snackBar.open('Updated successfully')
                 this.createRole.reset()
                 this.selectedActivity = []
                 this.configSvc.updateGlobalProfile(true)

diff --git a/src/app/routes/public/public-signup/public-signup.component.html b/src/app/routes/public/public-signup/public-signup.component.html
@@ -166,6 +166,116 @@ <h1 class="mat-h1 margin-remove inline-block ng-star-inserted">
                 </mat-form-field>
               </div>
               <div class="input-wrapper margin-top-s">
+                <label for="type" class=" margin-remove-bottom form-label required"
+                  i18n="Department|Label which explains the user to enter Department" i18n-aria-label
+                  aria-label="Department Field label">
+                  Center/State
+                </label>
+                <mat-radio-group #type class="margin-top-s"
+                    formControlName="type" i18n-aria-label
+                    aria-label="Signup as">
+                    <mat-radio-button class="mat-radio-button radio-select"
+                        [value]="'ministry'">
+                        Center
+                    </mat-radio-button>
+                    <mat-radio-button class="mat-radio-button radio-unselect  margin-left-s"
+                          [value]="'state'">
+                        State
+                    </mat-radio-button>
+                </mat-radio-group>
+              </div>
+              <div class="input-wrapper margin-top-s">
+                <label for="Ministry" class=" margin-remove-bottom form-label required"
+                  i18n="Ministry|Label which explains the user to enter Ministry" i18n-aria-label
+                  aria-label="Ministry Field label">
+                  {{typeValueStartCase}}
+                </label>
+                <mat-form-field appearance="outline" class="margin-top-s w-full">
+                  <input id="ministry" matInput tab-directive type="text" placeholder="Select your {{typeValue}}"
+                    i18n-placeholder="Ministry" formControlName="ministry" [matAutocomplete]="ministryAutocomplete"
+                    i18n-aria-label aria-label="Ministry" #ministry i18n-aria-label
+                    aria-label="Ministry Field input" />
+                  <mat-error [hidden]="false" i18n="Ministry Error|Explains Ministry is required"
+                    *ngIf="registrationForm?.controls['ministry'].errors?.required" i18n-aria-label
+                    aria-label="Ministry is mandatory">
+                    {{typeValueStartCase}} is mandatory
+                  </mat-error>
+                  <mat-error *ngIf="registrationForm?.controls['ministry'].errors?.forbiddenNames" i18n-aria-label
+                    aria-label="You must enter value from suggested list only.">
+                    You must enter value from suggested list only.
+                  </mat-error>
+                </mat-form-field>
+                <mat-autocomplete #ministryAutocomplete="matAutocomplete" autoActiveFirstOption="true"
+                  i18n-aria-label aria-label="Ministry list masterMinistry" [displayWith]="displayFnState"
+                  (optionSelected)="ministrySelected($event.option.value)">
+                  <mat-option *ngFor="let option of masterMinisteries| async" [value]="option" i18n-aria-label
+                    aria-label="Ministry list autocomplete option">
+                    {{ option.orgname }}
+                  </mat-option>
+                </mat-autocomplete>
+              </div>
+
+              <div class="input-wrapper margin-top-s">
+                <label for="Department" class=" margin-remove-bottom form-label"
+                  i18n="Department|Label which explains the user to enter Department" i18n-aria-label
+                  aria-label="Department Field label">
+                  Department
+                </label>
+                <mat-form-field appearance="outline" class="margin-top-s w-full">
+                  <input id="department" matInput tab-directive type="text" placeholder="Select your department"
+                    i18n-placeholder="department" formControlName="department"
+                    [matAutocomplete]="departmentAutocomplete" i18n-aria-label aria-label="Department" #department
+                    i18n-aria-label aria-label="Department Field input" />
+                  <mat-error [hidden]="false" i18n="Department Error|Explains Department is required"
+                    *ngIf="registrationForm?.controls['department'].errors?.required" i18n-aria-label
+                    aria-label="Department is mandatory">
+                    Department is mandatory
+                  </mat-error>
+                  <mat-error *ngIf="registrationForm?.controls['department'].errors?.forbiddenNames" i18n-aria-label
+                    aria-label="You must enter value from suggested list only.">
+                    You must enter value from suggested list only.
+                  </mat-error>
+                </mat-form-field>
+                <mat-autocomplete #departmentAutocomplete="matAutocomplete" autoActiveFirstOption="true"
+                  i18n-aria-label aria-label="Department list masterDepartments" [displayWith]="displayFnState"
+                  (optionSelected)="departmentSelected($event.option.value)">
+                  <mat-option *ngFor="let option of masterDepartments | async" [value]="option" i18n-aria-label
+                    aria-label="Department list autocomplete option">
+                    {{ option.orgname }}
+                  </mat-option>
+                </mat-autocomplete>
+              </div>
+
+              <div class="input-wrapper margin-top-s">
+                <label for="Organisation" class=" margin-remove-bottom form-label"
+                  i18n="Organisation|Label which explains the user to enter Organisation" i18n-aria-label
+                  aria-label="Organisation Field label">
+                  Organisation
+                </label>
+                <mat-form-field appearance="outline" class="margin-top-s w-full">
+                  <input id="Organisation" matInput tab-directive type="text" placeholder="Select your organisation"
+                    i18n-placeholder="Organisation" formControlName="organisation"
+                    [matAutocomplete]="organisationAutocomplete" i18n-aria-label aria-label="Organisation"
+                    #organisation i18n-aria-label aria-label="Organisation Field input" />
+                  <mat-error [hidden]="false" i18n="Organisation Error|Explains Organisation is required"
+                    *ngIf="registrationForm?.controls['organisation'].errors?.required" i18n-aria-label
+                    aria-label="Organisation is mandatory">
+                    Organisation is mandatory
+                  </mat-error>
+                  <mat-error *ngIf="registrationForm?.controls['organisation'].errors?.forbiddenNames" i18n-aria-label
+                    aria-label="You must enter value from suggested list only.">
+                    You must enter value from suggested list only.
+                  </mat-error>
+                </mat-form-field>
+                <mat-autocomplete #organisationAutocomplete="matAutocomplete" autoActiveFirstOption="true"
+                  i18n-aria-label aria-label="Organisation list masterStates" [displayWith]="displayFnState">
+                  <mat-option *ngFor="let option of masterOrgs | async" [value]="option" i18n-aria-label
+                    aria-label="Organisation list autocomplete option">
+                    {{ option.orgname }}
+                  </mat-option>
+                </mat-autocomplete>
+              </div>
+              <!-- <div class="input-wrapper margin-top-s">
                 <label for="department" class=" margin-remove-bottom form-label required"
                   i18n="Department|Label which explains the user to enter Department" i18n-aria-label
                   aria-label="Department Field label">
@@ -193,7 +303,7 @@ <h1 class="mat-h1 margin-remove inline-block ng-star-inserted">
                     {{ option.channel }}
                   </mat-option>
                 </mat-autocomplete>
-              </div>
+              </div> -->
               <div class="input-wrapper margin-top-s">
                 <div class="flex flex-middle">
                   <mat-checkbox aria-label="I confirm that the above provided information are accurate." id="confirm"

diff --git a/src/app/routes/public/public-signup/public-signup.component.scss b/src/app/routes/public/public-signup/public-signup.component.scss
@@ -790,4 +790,3 @@
     visibility: visible !important;
   }
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -790,4 +790,3 @@
		visibility: visible !important;
		}
		}