Merge pull request #750 from MadhuMosip/develop

MOSIP-35240 taking initial location code from config file
mosip · Aug 22, 2024 · f097151 · f097151
2 parents bef0303 + 032d1f6
commit f097151
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.html b/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.html
@@ -662,16 +662,16 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
                                 </td>
                                 <td class="sub-table-row ele-for-lap-tab-card" width="3%"></td>
                                 <td class="sub-table-row each-Hierarchy-td width-of-input ele-for-lap-tab-card"
-                                  *ngIf="dynamicDropDown[field.name]">
+                                  *ngIf="dynamicDropDown[field.attributeName]">
                                   <span [ngClass]="item.language === 'ara' ? 'dir-rtl' :'dir-ltl'">
                                     <mat-select #matSelect [style.font-size]="fontSize.paragraph" disableOptionCentering
                                       placeholder="{{field.placeHolder[item.language]}}"
-                                      [ngClass]="dynamicDropDown[field.name]?.length === 0 ? 'disable-dropdown' : 'enable-dropdown'"
+                                      [ngClass]="dynamicDropDown[field.attributeName]?.length === 0 ? 'disable-dropdown' : 'enable-dropdown'"
                                       [(value)]="userInputValues[field.attributeName][item.language]"
                                       id="{{field.name}}{{item.language}}"
                                       (selectionChange)="loadLocationDataDynamically($event, field.locationHierarchyLevel,field.attributeName,typeOf(userInfo[field.attributeName]))"
                                       (click)="isUpdatedataInProgress(matSelect, 'dropDownField')">
-                                      <mat-option *ngFor="let data of dynamicDropDown[field.name][item.language]"
+                                      <mat-option *ngFor="let data of dynamicDropDown[field.attributeName][item.language]"
                                         [value]="data.code">
                                         {{ data.name }}
                                       </mat-option>
@@ -687,14 +687,14 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
                               </td>
                               <td class="sub-table-row ele-for-lap-tab-card" width="3%"></td>
                               <td class="sub-table-row each-Hierarchy-td width-of-input ele-for-lap-tab-card"
-                                *ngIf="dynamicDropDown[field.name]">
+                                *ngIf="dynamicDropDown[field.attributeName]">
                                 <mat-select #matSelect [style.font-size]="fontSize.paragraph" disableOptionCentering
                                   placeholder="{{langJson.select}} {{field.labelName[langCode][1]}}"
-                                  [ngClass]="dynamicDropDown[field.name]?.length === 0 ? 'disable-dropdown' : 'enable-dropdown'"
+                                  [ngClass]="dynamicDropDown[field.attributeName]?.length === 0 ? 'disable-dropdown' : 'enable-dropdown'"
                                   [(value)]="userInputValues[field.attributeName]" id="{{field.name}}"
                                   (selectionChange)="loadLocationDataDynamically($event, field.locationHierarchyLevel,field.attributeName,typeOf(userInfo[field.attributeName]))"
                                   (click)="isUpdatedataInProgress(matSelect, 'dropDownField')">
-                                  <mat-option *ngFor="let data of dynamicDropDown[field.name].eng" [value]="data.code">
+                                  <mat-option *ngFor="let data of dynamicDropDown[field.attributeName].eng" [value]="data.code">
                                     {{ data.name }}
                                   </mat-option>
                                 </mat-select>

diff --git a/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.ts b/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.ts
@@ -164,7 +164,7 @@ export class UpdatedemographicComponent implements OnInit, OnDestroy {
 
   async ngOnInit() {
     this.defaultJsonValue = { ...defaultJson }
-    this.initialLocationCode = "MOR";
+    this.initialLocationCode = this.appConfigService.getConfig()["resident.update-uin.machine-zone-code"];
     this.locCode = 5;
     this.translateService.use(localStorage.getItem("langCode"));
     this.supportedLanguages = ["eng"];
@@ -493,7 +493,8 @@ export class UpdatedemographicComponent implements OnInit, OnDestroy {
       let filedNameForuserInput = (item.charAt(0).toLocaleLowerCase() + item.slice(1)).replace(" ", "")
       if (typeof this.userInputValues[filedNameForuserInput] !== 'string') {
         this.getUserPerfLang.forEach(lang => {
-          this.userInputValues[filedNameForuserInput][lang] = ''
+          if(this.userInputValues[filedNameForuserInput])
+            this.userInputValues[filedNameForuserInput][lang] = ''
         })
       } else {
         this.userInputValues[filedNameForuserInput] = ''