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

removed transform property from body. #543

Merged
merged 3 commits into from
Oct 25, 2023
Merged

removed transform property from body. #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2448760
removed transform propertys from body
Madhuravas Oct 25, 2023
d5e67cb
MOSIP-29925 handling undefind values gracefully
Madhuravas Oct 25, 2023
4187971
fixed mat-menu alignments
Madhuravas Oct 25, 2023
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
27 changes: 15 additions & 12 deletions resident-ui/src/app/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,12 @@ export class AppComponent {
document.body.style["margin-top"] = "-2.5%";
}else{
document.body.style["zoom"] = "90%";
document.body.style["transform"] = "scale(1, 1)";
document.body.style["transformOrigin "] = "0 0";
document.body.style["margin-top"] = "0";
document.body.style.removeProperty('transform');
document.body.style.removeProperty('transformOrigin');
document.body.style.removeProperty('margin-top');
// document.body.style["transform"] = "scale(1, 1)";
// document.body.style["transformOrigin "] = "0 0";
// document.body.style["margin-top"] = "0";
}
}else if(localStorage.getItem("selectedfontsize") === "14"){
if(this.agent.indexOf('firefox') > -1 || (this.currentRoute === "/getuin" || this.currentRoute === "/verify")){
Expand All @@ -84,9 +87,9 @@ export class AppComponent {
document.body.style["margin-top"] = "0%";
}else{
document.body.style["zoom"] = "100%";
document.body.style["transform"] = "scale(1, 1)";
document.body.style["transformOrigin "] = "0 0";
document.body.style["margin-top"] = "0";
document.body.style.removeProperty('transform');
document.body.style.removeProperty('transformOrigin');
document.body.style.removeProperty('margin-top');
}
}else if(localStorage.getItem("selectedfontsize") === "16"){
if(this.agent.indexOf('firefox') > -1 || (this.currentRoute === "/getuin" || this.currentRoute === "/verify")){
Expand All @@ -96,9 +99,9 @@ export class AppComponent {
document.body.style["margin-top"] = "2.1%";
}else{
document.body.style["zoom"] = "110%";
document.body.style["transform"] = "scale(1, 1)";
document.body.style["transformOrigin "] = "0 0";
document.body.style["margin-top"] = "0";
document.body.style.removeProperty('transform');
document.body.style.removeProperty('transformOrigin');
document.body.style.removeProperty('margin-top');
}
}else if(localStorage.getItem("selectedfontsize") === "18"){
if(this.agent.indexOf('firefox') > -1 || (this.currentRoute === "/getuin" || this.currentRoute === "/verify")){
Expand All @@ -108,9 +111,9 @@ export class AppComponent {
document.body.style["margin-top"] = "4.5%";
}else{
document.body.style["zoom"] = "120%";
document.body.style["transform"] = "scale(1, 1)";
document.body.style["transformOrigin "] = "0 0";
document.body.style["margin-top"] = "0";
document.body.style.removeProperty('transform');
document.body.style.removeProperty('transformOrigin');
document.body.style.removeProperty('margin-top');
}
}
}
Expand Down
12 changes: 6 additions & 6 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 @@ -24,7 +24,7 @@ <h3 class="tab-headings">{{'updatedemographic.identityHeading' | translate}}</h3
<div layout="row" *ngIf="field.tabgroup === 'identity'">
<table width="100%">
<tr *ngIf="field.controlType === 'calendar'">
<td width="100%" class="main-table-data">
<td width="100%" class="main-table-data" *ngIf="userInfo[field.attributeName]">
<table width="100%">
<!-- number of attems mobile and tab code -->
<tr class="number-of-attems-mobile-card">
Expand Down Expand Up @@ -134,7 +134,7 @@ <h3 class="tab-headings">{{'updatedemographic.identityHeading' | translate}}</h3
</td>
</tr>
<tr *ngIf="field.controlType === 'textbox'">
<td class="main-table-data" width="100%">
<td class="main-table-data" width="100%" *ngIf="userInfo[field.attributeName]">
<table width="100%" *ngFor="let language of supportedLanguages;">
<!-- number of attems mobile and tab code -->
<tr class="number-of-attems-mobile-card">
Expand Down Expand Up @@ -254,7 +254,7 @@ <h3 class="tab-headings">{{'updatedemographic.identityHeading' | translate}}</h3
</td>
</tr>
<tr *ngIf="field.controlType === 'dropdown'">
<td class="main-table-data" width="100%">
<td class="main-table-data" width="100%" *ngIf="userInfo[field.attributeName]">
<table width="100%">
<!-- number of attems mobile and tab code -->
<tr class="number-of-attems-mobile-card">
Expand Down Expand Up @@ -532,8 +532,8 @@ <h3 class="tab-headings">{{'updatedemographic.addressHeading' | translate}}</h3>
<div layout="row" *ngIf="field.tabgroup === 'address'">
<table width="100%">
<tr *ngIf="field.controlType === 'textbox'">
<td class="main-table-data" width="100%">
<table width="100%" *ngFor="let language of supportedLanguages;">
<td class="main-table-data" width="100%" *ngIf="userInfo[field.attributeName]">
<table width="100%">
<tr>
<td class="width-of-input">
<span *ngFor="let eachLang of getUserPerfLang; let langI = index">
Expand Down Expand Up @@ -613,7 +613,7 @@ <h3 class="tab-headings">{{'updatedemographic.addressHeading' | translate}}</h3>
</td>
</tr>
<tr *ngIf="field.controlType === 'dropdown'">
<td class="main-table-data" width="100%">
<td class="main-table-data" width="100%" *ngIf="userInfo[field.attributeName]">
<table width="100%">
<tr *ngIf="typeOf(userInfo[field.attributeName]) !== 'string'">
<td class="width-of-input" >
Expand Down
26 changes: 14 additions & 12 deletions resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ export class UpdatedemographicComponent implements OnInit, OnDestroy {
.getUserInfo('update-demographics')
.subscribe((response) => {
if (response["response"]) {
this.userInfo = response["response"];
this.userInfo = response["response"]['identity'];
this.userInfo['fullName'].forEach(item=>{
this.getUserPerfLang.indexOf(item.language) === -1 ? this.getUserPerfLang.push(item.language) : ''
})
Expand Down Expand Up @@ -277,17 +277,19 @@ export class UpdatedemographicComponent implements OnInit, OnDestroy {
count++
}else{
this.userInputValues[schema.attributeName] = {};
this.buildJSONData[schema.attributeName] = self.userInfo[schema.attributeName].map(item =>{
item.index = count
count++
this.userInputValues[schema.attributeName][item.language] = '';
return item
})
this.buildJSONData[schema.attributeName] = self.userInfo[schema.attributeName].map(item =>{
item.mobileIndex = count
count++
return item
})
if(this.userInfo[schema.attributeName]){
this.buildJSONData[schema.attributeName] = self.userInfo[schema.attributeName].map(item =>{
item.index = count
count++
this.userInputValues[schema.attributeName][item.language] = '';
return item
})
this.buildJSONData[schema.attributeName] = self.userInfo[schema.attributeName].map(item =>{
item.mobileIndex = count
count++
return item
})
}
}
}else{
this.buildJSONData[schema.attributeName] = count
Expand Down
4 changes: 4 additions & 0 deletions resident-ui/src/app/feature/uinservices/viewhistory/viewhistory.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,10 @@ input[dir=rtl]::placeholder {
}
}

::ng-deep .viewHistory+.cdk-overlay-connected-position-bounding-box{
width:auto !important;
}

.mat-expansion-panel-header{
padding: 0 10px;
}
Expand Down
4 changes: 2 additions & 2 deletions resident-ui/src/app/feature/uinservices/viewhistory/viewhistory.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h3 class="main-heading">{{'viewhistory.title' | translate}}</h3>
<mat-card-header><span class="label">{{'viewhistory.inputHistory' |translate}}</span></mat-card-header>
<span class="input">
<button id="historyTypeBtn" class="dropdown-btn" [matMenuTriggerFor]="basic">{{serviceHistorySelectedValue}}<mat-icon class="dropdown-arrow">keyboard_arrow_down</mat-icon></button>
<mat-menu #basic="matMenu">
<mat-menu #basic="matMenu" [backdropClass]="'viewHistory'" xPosition="before">
<ng-container *ngFor="let serviceType of serviceTypeFilter">
<button mat-menu-item >
<div (click)="captureValue($event,serviceType.value, 'serviceType', 'dropdown')" class="check-box-card">
Expand Down Expand Up @@ -66,7 +66,7 @@ <h3 class="main-heading">{{'viewhistory.title' | translate}}</h3>
<!-- <mat-card-subtitle style="display: flex;"> -->
<span class="input">
<button class="dropdown-btn" id="statusTypeBtn" [matMenuTriggerFor]="basic2">{{statusHistorySelectedValue}}<mat-icon class="dropdown-arrow">keyboard_arrow_down</mat-icon></button>
<mat-menu #basic2="matMenu">
<mat-menu #basic2="matMenu" [backdropClass]="'viewHistory'" xPosition="before">
<ng-container *ngFor="let status of statusTypeFilter">
<button mat-menu-item>
<div (click)="captureValue($event, status.value, 'statusFilter', 'dropdown')" class="check-box-card">
Expand Down
12 changes: 9 additions & 3 deletions resident-ui/src/app/shared/header/header.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,22 @@

::ng-deep .mat-menu-panel.myMenu {
height: 80%;
min-width: 303px!important;
min-width: 303px !important;
border-radius: 0% !important;
background-color: white;
font-size: 13px;
padding-bottom: 12px;
overflow-y: scroll;
overflow-x: hidden;
}
::ng-deep .cdk-overlay-connected-position-bounding-box{

::ng-deep .first+.cdk-overlay-connected-position-bounding-box{
right: 5px !important;
width:auto !important;
}

::ng-deep .zoom+.cdk-overlay-connected-position-bounding-box{
width:auto !important;
}

::ng-deep .mat-menu-panel.myMenu > .mat-menu-content {
Expand All @@ -123,7 +129,7 @@

::ng-deep .mat-menu-panel.language-menu{
min-width: auto;
margin-left: 1rem;
margin-left: 0.5rem;
}

::ng-deep .mat-menu-panel.zoommenu{
Expand Down
8 changes: 4 additions & 4 deletions resident-ui/src/app/shared/header/header.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<button mat-button [matMenuTriggerFor]="zoomItem"> <span
class="mat-button-wrapper">Aa<mat-icon>keyboard_arrow_down</mat-icon></span></button>
</mat-list-item>
<mat-menu class="zoommenu" #zoomItem="matMenu" [overlapTrigger]="false" id="zoomItem">
<mat-menu class="zoommenu" [backdropClass]="'zoom'" #zoomItem="matMenu" [overlapTrigger]="false" id="zoomItem">
<button mat-menu-item (click)="zoom(item)" *ngFor="let item of zoomLevel"><span
[style.font-size.px]="item.fontSize">{{item.label}}</span></button>
</mat-menu>
Expand All @@ -25,7 +25,7 @@
<span class="selected-lang">{{selectedLanguage}}</span> <mat-icon>keyboard_arrow_down</mat-icon></span></button>
</mat-list-item>

<mat-menu class="language-menu" #languages="matMenu" [overlapTrigger]="false" id="languages">
<mat-menu class="language-menu" [backdropClass]="'zoom'" #languages="matMenu" [overlapTrigger]="false" id="languages">
<button mat-menu-item (click)="onlanguagechange(item)"
*ngFor="let item of selectLanguagesArr" >{{item.value}}</button>
</mat-menu>
Expand All @@ -39,7 +39,7 @@
</button>
</mat-list-item>&nbsp;&nbsp;&nbsp;

<mat-menu class="myMenu" #notificationMenu="matMenu" [overlapTrigger]="false" xPosition="before" id="notificationMenu">
<mat-menu class="myMenu" [backdropClass]="'first'" #notificationMenu="matMenu" [overlapTrigger]="false" xPosition="before" id="notificationMenu">
<div *ngIf="!notificationList" style="height:100px">
<mat-spinner style="margin:0 auto;margin-top: 10px;" [diameter]="50"></mat-spinner>
</div>
Expand Down Expand Up @@ -77,7 +77,7 @@
style="border: 1px solid white;border-radius: 5px;padding: 0px 8px;line-height: 36px;height: 36px;background-color: white;"><mat-icon
style="margin: 0px;color: green;">person</mat-icon></button>
</mat-list-item>
<mat-menu class="profile-menu" #profilemenu="matMenu" [overlapTrigger]="false" xPosition="before" id="profileMenu">
<mat-menu class="profile-menu" [backdropClass]="'first'" #profilemenu="matMenu" [overlapTrigger]="false" xPosition="before" id="profileMenu">
<div style="padding: 15px 20px;background: #03A64A;display: flex;align-items: center; overflow-wrap: break-word;"><img
[src]="userImage" alt=""
style="width:50px;height: 50px;border-radius: 50px;border: 2px solid white;" />&nbsp;&nbsp;&nbsp;<span
Expand Down
15 changes: 12 additions & 3 deletions resident-ui/src/app/shared/header/header.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,9 @@ export class HeaderComponent implements OnInit, OnDestroy {
document.body.style["margin-top"] = "-2.5%";
}else{
document.body.style["zoom"]= "90%";
document.body.style["transform"] = "scale(1, 1)";
document.body.style["transformOrigin "] = "0 0";
document.body.style["margin-top"] = "0";
document.body.style.removeProperty('transform');
document.body.style.removeProperty('transformOrigin');
document.body.style.removeProperty('margin-top');
}
}else if(item.fontSize === "14"){
if(this.agent.indexOf('firefox') > -1 || (this.router.url === "/getuin" || this.router.url === "/verify")){
Expand All @@ -216,6 +216,9 @@ export class HeaderComponent implements OnInit, OnDestroy {
document.body.style["margin-top"] = "0%";
}else{
document.body.style["zoom"]= "100%";
document.body.style.removeProperty('transform');
document.body.style.removeProperty('transformOrigin');
document.body.style.removeProperty('margin-top');
}
}else if(item.fontSize === "16"){
if(this.agent.indexOf('firefox') > -1 || (this.router.url === "/getuin" || this.router.url === "/verify")){
Expand All @@ -225,6 +228,9 @@ export class HeaderComponent implements OnInit, OnDestroy {
document.body.style["margin-top"] = "2.1%";
}else{
document.body.style["zoom"]= "110%";
document.body.style.removeProperty('transform');
document.body.style.removeProperty('transformOrigin');
document.body.style.removeProperty('margin-top');
}
}else if(item.fontSize === "18"){
if(this.agent.indexOf('firefox') > -1 || (this.router.url === "/getuin" || this.router.url === "/verify")){
Expand All @@ -234,6 +240,9 @@ export class HeaderComponent implements OnInit, OnDestroy {
document.body.style["margin-top"] = "4.5%";
}else{
document.body.style["zoom"]= "120%";
document.body.style.removeProperty('transform');
document.body.style.removeProperty('transformOrigin');
document.body.style.removeProperty('margin-top');
}
}
}
Expand Down