Skip to content

Commit

Permalink
MOSIP-29352 showing and passing api request all user input address da…
Browse files Browse the repository at this point in the history 
…ta with multi langauge
  • Loading branch information
@Madhuravas
Madhuravas committed Sep 29, 2023
1 parent 4bf8193 commit c1b00ad
Show file tree
Hide file tree
Showing 10 changed files with 100 additions and 80 deletions.
3 changes: 2 additions & 1 deletion resident-ui/src/app/core/services/data-storage.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,8 @@ export class DataStorageService {
}

getImmediateChildren(locationCode: string, langCode: string) {
return this.httpClient.get(this.BASE_URL + '/proxy/masterdata/locations/immediatechildren/' + locationCode + '/' + langCode);
// return this.httpClient.get(this.BASE_URL + '/proxy/masterdata/locations/immediatechildren/' + locationCode + '/' + langCode);
return this.httpClient.get(this.BASE_URL + '/auth-proxy/masterdata/locations/immediatechildren/' + locationCode + '?languageCodes=' + langCode)
}


Expand Down
49 changes: 25 additions & 24 deletions resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,10 @@ <h3 class="tab-headings">{{'updatedemographic.identityHeading' | translate}}</h3
<mat-select disableOptionCentering class="enable-dropdown" id="{{field.attributeName}}"
placeholder="{{field.placeHolder[item.language]}}"
[(value)]="userInputValues[field.attributeName][item.language]"
[disabled]="attributeUpdateCountRemainLimit[field.attributeName] === 0">
[disabled]="attributeUpdateCountRemainLimit[field.attributeName] === 0"
(selectionChange)="captureDropDownValue($event, field.attributeName, item.language)">
<mat-option *ngFor="let data of dropDownValues[field.attributeName][item.language]"
(onSelectionChange)="captureDropDownValue($event, field.attributeName, item.language, data.code, buildJSONData[field.attributeName][langCode])"
[value]="data.value">{{ data.value }}</mat-option>
[value]="data.code">{{ data.value }}</mat-option>
</mat-select>
</span>
<span
Expand Down Expand Up @@ -182,7 +182,7 @@ <h3 class="tab-headings">{{'updatedemographic.identityHeading' | translate}}</h3
id="{{field.attributeName}}">
<mat-option style="min-width: 25.2rem;"
*ngFor="let data of dropDownValues[field.attributeName]"
(onSelectionChange)="captureDropDownValue($event, field.attributeName, supportedLanguages[0], field.dataType, '')"
(onSelectionChange)="captureDropDownValue($event, field.attributeName, supportedLanguages[0], field.dataType)"
[value]="data.code">{{ data.name }}</mat-option>
</mat-select>
</td>
Expand Down Expand Up @@ -332,7 +332,7 @@ <h3 class="tab-headings">{{'updatedemographic.addressHeading' | translate}}</h3>
<div class="search-input-card">
<input class="input" matInput #{{field.attributeName}}
id="{{field.attributeName}}{{item.language}}"
(blur)="captureAddressValue($event, field.attributeName, item.language, item.value)"
(blur)="captureAddressValue($event, field.attributeName, item.language)"
[(value)]="userInputValues[field.attributeName][item.language]"
[placeholder]="field.placeHolder[item.language]"
(focus)="captureVirtualKeyboard(field.attributeName+item.language, item.index)"
Expand All @@ -353,34 +353,35 @@ <h3 class="tab-headings">{{'updatedemographic.addressHeading' | translate}}</h3>
<td width="3%"></td>
<td class="width-of-input"><label>{{field.labelName[langCode][1]}}</label></td>
</tr>
<ng-container *ngIf="field.attributeName !== 'postalCode'">
<ng-container *ngIf="typeOf(userInfo[field.attributeName]) !== 'string'">
<tr *ngFor="let item of buildJSONData[field.attributeName], let i = index">
<td class="sub-table-row each-Hierarchy-td width-of-input">
<input *ngIf="buildJSONData[field.attributeName] " type="text" class="readonly"
<input *ngIf="buildJSONData[field.attributeName]" type="text" class="readonly"
readonly="true" disabled="true" [value]="item.value">
</td>
<td class="sub-table-row" width="3%"></td>
<td class="sub-table-row each-Hierarchy-td width-of-input"
*ngIf="dynamicDropDown[field.name]">
<td class="sub-table-row each-Hierarchy-td width-of-input"
*ngIf="dynamicDropDown[field.name]">
<span [ngClass]="item.language === 'ara' ? 'dir-rtl' :'dir-ltl'">
<mat-select disableOptionCentering
placeholder="{{langJson.select}} {{field.labelName[langCode][1]}}"
placeholder="{{field.placeHolder[item.language]}}"
[ngClass]="dynamicDropDown[field.name]?.length === 0 ? 'disable-dropdown' : 'enable-dropdown'"
[(value)]="userInputValues[field.attributeName][item.value]"
[(value)]="userInputValues[field.attributeName][item.language]"
id="{{field.name}}{{item.language}}"
(selectionChange)="loadLocationDataDynamically($event, field.locationHierarchyLevel,field.attributeName,item.language);">
<mat-option *ngFor="let data of dynamicDropDown[field.name]" [value]="data">
(selectionChange)="loadLocationDataDynamically($event, field.locationHierarchyLevel,field.attributeName,typeOf(userInfo[field.attributeName]))">
<mat-option *ngFor="let data of dynamicDropDown[field.name][item.language]" [value]="data.code">
{{ data.name }}
</mat-option>
</mat-select>
<span
*ngIf="dynamicDropDown[field.name][0] && i === (buildJSONData[field.attributeName]?.length -1)">
<p *ngIf="dynamicDropDown[field.name][0].hierarchyName === fieldName"
</span>
<span *ngIf="locationFieldNameList?.length">
<p *ngIf="locationFieldNameList[field.locationHierarchyLevel-1] === fieldName && i === (buildJSONData[field.attributeName]?.length -1)"
class="warning-message">{{langJson.EnterAllAddress}} {{fieldName}}</p>
</span>
</td>
</tr>
</ng-container>
<tr *ngIf="field.attributeName === 'postalCode'">
<tr *ngIf="typeOf(userInfo[field.attributeName]) === 'string'">
<td *ngIf="buildJSONData[field.attributeName]" class="width-of-input">
<input type="text" class="readonly" readonly="true" disabled="true"
[value]="buildJSONData[field.attributeName].value">
Expand All @@ -392,13 +393,13 @@ <h3 class="tab-headings">{{'updatedemographic.addressHeading' | translate}}</h3>
placeholder="{{langJson.select}} {{field.labelName[langCode][1]}}"
[ngClass]="dynamicDropDown[field.name]?.length === 0 ? 'disable-dropdown' : 'enable-dropdown'"
[(value)]="userInputValues[field.attributeName]" id="{{field.name}}"
(selectionChange)="loadLocationDataDynamically($event, field.locationHierarchyLevel,field.attributeName,'')">
<mat-option *ngFor="let data of dynamicDropDown[field.name]" [value]="data">
(selectionChange)="loadLocationDataDynamically($event, field.locationHierarchyLevel,field.attributeName,typeOf(userInfo[field.attributeName]))">
<mat-option *ngFor="let data of dynamicDropDown[field.name].eng" [value]="data.code">
{{ data.name }}
</mat-option>
</mat-select>
<span *ngIf="dynamicDropDown[field.name][0]">
<p *ngIf="dynamicDropDown[field.name][0].hierarchyName === fieldName"
<span *ngIf="locationFieldNameList?.length">
<p *ngIf="locationFieldNameList[field.locationHierarchyLevel-1] === fieldName"
class="warning-message">{{langJson.EnterAllAddress}} {{fieldName}}</p>
</span>
</td>
Expand All @@ -425,7 +426,7 @@ <h3 class="tab-headings">{{'updatedemographic.addressHeading' | translate}}</h3>
id="{{field.attributeName}}">
<mat-option style="min-width: 25.2rem;"
*ngFor="let data of dropDownValues[field.attributeName]"
(onSelectionChange)="captureAddressDropDownValue($event, field.attributeName, langCode, field.dataType, '')"
(onSelectionChange)="captureAddressDropDownValue($event, field.attributeName)"
[value]="data.code">{{
data.name }}</mat-option>
</mat-select>
Expand All @@ -436,7 +437,7 @@ <h3 class="tab-headings">{{'updatedemographic.addressHeading' | translate}}</h3>
<input class="input"
[value]="proofOfAddress['documentreferenceId'] ? proofOfAddress['documentreferenceId'] : '' "
matInput #{{field.attributeName}} id="{{field.attributeName}}value"
(blur)="captureAddressValue($event, field.attributeName, '', '')"
(blur)="captureAddressValue($event, field.attributeName, '')"
(focus)="captureVirtualKeyboard(field.attributeName, buildJSONData.proofOfAddress)"
#keyboardRef />
<i matSuffix class="material-icons mat-keyboard-icon"
Expand Down Expand Up @@ -651,7 +652,7 @@ <h3 class="tab-headings">{{'updatedemographic.languageHeading' | translate}}</h3
<mat-select [placeholder]="field.placeHolder[langCode]" disableOptionCentering class="enable-dropdown"
[(ngModel)]="selected2" id="{{field.attributeName}}">
<mat-option *ngFor="let data of newNotificationLanguages"
(onSelectionChange)="capturePerfLang($event, field.attributeName, langCode, field.dataType)"
(onSelectionChange)="capturePerfLang($event, field.attributeName)"
[value]="data.code">{{ data.name }}</mat-option>
</mat-select>
</div>
Expand Down
Loading

0 comments on commit c1b00ad

Please sign in to comment.