Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MOSIP-35509 Resolved address fields hierarchy level issue #756

Merged
merged 3 commits into from
Sep 4, 2024
Merged

MOSIP-35509 Resolved address fields hierarchy level issue #756

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4768aab
MOSIP-35509 Resolved address fields hierarchy issue
MadhuMosip Sep 3, 2024
45f57d0
Merge pull request #755 from MadhuMosip/develop
aranaravi Sep 3, 2024
b841dbc
MOSIP-35509 Resolved address fields hierarchy level issue
MadhuMosip Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 61 additions & 4 deletions resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,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 @@ -700,6 +717,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 @@ -728,8 +758,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 @@ -743,6 +773,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 @@ -752,8 +796,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 @@ -764,6 +808,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
Loading