Skip to content

Commit

Permalink
Merge pull request #755 from MadhuMosip/develop
Browse files Browse the repository at this point in the history 
MOSIP-35509 Resolved address fields hierarchy issue
  • Loading branch information
@aranaravi
aranaravi authored Sep 3, 2024
2 parents 08ece7e + 4768aab commit 45f57d0
Showing 1 changed file with 61 additions and 4 deletions.
65 changes: 61 additions & 4 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 @@ -678,6 +678,23 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
</mat-select>
</span>
</td>
<td class="sub-table-row each-Hierarchy-td width-of-input ele-for-lap-tab-card"
*ngIf="dynamicDropDown[field.name]">
<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'"
[(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]"
[value]="data.code">
{{ data.name }}
</mat-option>
</mat-select>
</span>
</td>
</tr>
</ng-container>
<tr *ngIf="typeOf(userInfo[field.attributeName]) === 'string'">
Expand All @@ -699,6 +716,19 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
</mat-option>
</mat-select>
</td>
<td class="sub-table-row each-Hierarchy-td width-of-input ele-for-lap-tab-card"
*ngIf="dynamicDropDown[field.name]">
<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'"
[(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">
{{ data.name }}
</mat-option>
</mat-select>
</td>
</tr>
<tr class="ele-for-lap-tab-card">
<td></td>
Expand Down Expand Up @@ -727,8 +757,8 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
<tr *ngIf="typeOf(userInfo[field.attributeName]) !== 'string'">
<td class="ele-for-mob-card"
*ngFor="let item of buildJSONData[field.attributeName], let i = index">
<span class="sub-table-row each-Hierarchy-td" *ngIf="dynamicDropDown[field.name]">
<span [ngClass]="item.language === 'ara' ? 'dir-rtl' :'dir-ltl'">
<span class="sub-table-row each-Hierarchy-td">
<span [ngClass]="item.language === 'ara' ? 'dir-rtl' :'dir-ltl'" *ngIf="dynamicDropDown[field.name]">
<mat-select #matSelect [style.font-size]="fontSize.paragraph" disableOptionCentering
placeholder="{{field.placeHolder[item.language]}}"
[ngClass]="dynamicDropDown[field.name]?.length === 0 ? 'disable-dropdown' : 'enable-dropdown'"
Expand All @@ -742,6 +772,20 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
</mat-option>
</mat-select>
</span>
<span [ngClass]="item.language === 'ara' ? 'dir-rtl' :'dir-ltl'" *ngIf="dynamicDropDown[field.attributeName]">
<mat-select #matSelect [style.font-size]="fontSize.paragraph" disableOptionCentering
placeholder="{{field.placeHolder[item.language]}}"
[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.attributeName][item.language]"
[value]="data.code">
{{ data.name }}
</mat-option>
</mat-select>
</span>
<span *ngIf="locationFieldNameList?.length">
<p [style.font-size]="fontSize.warningMessages" *ngIf="locationFieldNameList[field.locationHierarchyLevel-1] === fieldName && i === (buildJSONData[field.attributeName]?.length -1) && field.locationHierarchyLevel > 1"
class="warning-message">{{langJson.EnterAllAddress}}
Expand All @@ -751,8 +795,8 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
</td>
</tr>
<tr *ngIf="typeOf(userInfo[field.attributeName]) === 'string'">
<td class="sub-table-row each-Hierarchy-td ele-for-mob-card"
*ngIf="dynamicDropDown[field.name]">
<td class="sub-table-row each-Hierarchy-td ele-for-mob-card">
<span *ngIf="dynamicDropDown[field.name]">
<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'"
Expand All @@ -763,6 +807,19 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
{{ data.name }}
</mat-option>
</mat-select>
</span>
<span *ngIf="dynamicDropDown[field.attributeName]">
<mat-select #matSelect [style.font-size]="fontSize.paragraph" disableOptionCentering
placeholder="{{langJson.select}} {{field.labelName[langCode][1]}}"
[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.attributeName].eng" [value]="data.code">
{{ data.name }}
</mat-option>
</mat-select>
</span>
<span *ngIf="locationFieldNameList?.length">
<p [style.font-size]="fontSize.warningMessages" *ngIf="locationFieldNameList[field.locationHierarchyLevel-1] === fieldName"
class="warning-message">{{langJson.EnterAllAddress}} {{field.placeHolder[langCode]}}
Expand Down

0 comments on commit 45f57d0

Please sign in to comment.