Skip to content

Commit

Permalink
Merge pull request #745 from MadhuMosip/release-0.9.x
Browse files Browse the repository at this point in the history 
MOSIP-34584 Resolved sonar bugs in release-0.9.x branch
  • Loading branch information
@ckm007
ckm007 authored Aug 1, 2024
2 parents c558dfe + ac3f50d commit 9c5eeed
Show file tree
Hide file tree
Showing 24 changed files with 55 additions and 65 deletions.
3 changes: 0 additions & 3 deletions resident-ui/src/app/app.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,6 @@ export class AppComponent {

preventBack() {
window.history.forward();
window.onunload = function() {
null;
};
}

@HostListener('document:keydown.escape', ['$event']) onKeydownHandler(event: KeyboardEvent) {
Expand Down
3 changes: 1 addition & 2 deletions resident-ui/src/app/feature/booking/center-selection/center-selection.component.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,6 @@ input[type="radio"] {
box-shadow: 4px black;
border-radius: 4px !important;
display: inline-flex;
display: inline-flex;
padding: 7px;
border: 2px solid #909090;
}
Expand Down Expand Up @@ -422,7 +421,7 @@ input[type="radio"] {
font-size: var(--fs) !important;
}

@media screen and ((min-width:601px) and (max-width: 780px)){
@media screen and (min-width:601px) and (max-width: 780px){
.map{
width: 100%;
}
Expand Down
4 changes: 2 additions & 2 deletions resident-ui/src/app/feature/booking/center-selection/center-selection.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
placeholder="{{ 'centerSelection.text_search' | translate }}" name="search" class="search-input"
[(ngModel)]="searchText" (input)="searchInput()" (blur)="captureValue($event)"
(focus)="captureVirtualKeyboard(search, 0)" id="searchLocationBox" #keyboardRef />
<i *ngIf="locationType" style="float: right; color: grey; cursor: pointer;" matSuffix
class="material-icons" (click)="openKeyboard('searchLocationBox')">keyboard</i>
<em *ngIf="locationType" style="float: right; color: grey; cursor: pointer;" matSuffix
class="material-icons" (click)="openKeyboard('searchLocationBox')">keyboard</em>
</mat-card>
</div>
<div class="manual-loc-search-btns" >
Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/booking/map/map.component.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
height: 90%;
}

@media screen and ((min-width:601px) and (max-width: 780px)){
@media screen and (min-width:601px) and (max-width: 780px){
.map {
height: 84%;
}
Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/dashboard/dashboard/dashboard.component.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ div.item-card:hover{
border-radius: 25px !important;
}

@media screen and ((min-width:900px) and (max-width:1250px)){
@media screen and (min-width:900px) and (max-width:1250px){
.main-div{
grid-template-columns: 1fr 1fr;
grid-template-rows: 1fr 1fr;
Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/downloaduin/downloaduin/downloaduin.component.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ label {
color: #ffffff;
}

@media screen and ((min-width:530px) and (max-width:755px)){
@media screen and (min-width:530px) and (max-width:755px){
.main-container{
padding: 0 3rem 0 3rem;
}
Expand Down
4 changes: 2 additions & 2 deletions resident-ui/src/app/feature/getuin/getuin/getuin.component.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,15 +330,15 @@ ul li:last-child hr{
}


@media screen and ((min-width:1000px) and (max-width:1450px)){
@media screen and (min-width:1000px) and (max-width:1450px){
ul li:last-child hr{
width: 88%;
left: -40%;
border-radius: 10px;
}
}

@media screen and ((min-width:680px) and (max-width:999px)){
@media screen and (min-width:680px) and (max-width:999px){
ul li:last-child hr{
width: 88%;
left: -34%;
Expand Down
4 changes: 2 additions & 2 deletions resident-ui/src/app/feature/uinservices/dashboard/dashboard.component.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ mat-card-title {
width: 24.5%;
}

@media screen and ((min-width:1230px) and (max-width:1900px)){
@media screen and (min-width:1230px) and (max-width:1900px){
.each-service-card{
width: 32.5%;
}
}

@media screen and ((min-width:900px) and (max-width:1229px)) {
@media screen and (min-width:900px) and (max-width:1229px) {
.each-service-card{
width: 48.5%;
}
Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/uinservices/dashboard/dashboard.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h2 [style.font-size]="fontSize.heading" class="uin-heading">{{'dashboard.uinser
<div *ngIf="menuItems" class="uin-service-card">
<div class="each-service-card" *ngFor="let item of menuItems[0].subMenus">
<mat-card class="mini-card" (click)="onItemSelected(item.route)" [id]="item.route">
<span><img mat-card-xs-image [src]=item.icon /></span>
<span><img mat-card-xs-image [src]=item.icon alt=""/></span>
<mat-card-title class="uin-services-heading" [style.font-size]="fontSize.headingForUIN">{{item.displayName}}</mat-card-title>
<mat-card-subtitle [style.font-size]="fontSize.paragraph"
class="services-description">{{item.description}}</mat-card-subtitle>
Expand Down
6 changes: 3 additions & 3 deletions resident-ui/src/app/feature/uinservices/grievance/grievance.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<label class="label">{{grievanceData.alternateemailidlabel}}</label>
<div class="input-card">
<input [style.font-size]="fontSize.lableText" id="alternateEmailID" [attr.maxLength]="emailCharLimit" placeholder="{{grievanceData.alternateEmailPlaceholder}}" type="text" name="alternateEmailId" (blur)="captureValue($event, 'alternateEmailId')" (focus)="captureVirtualKeyboard(search, 0)" #keyboardRef/>
<i matSuffix class="material-icons mat-keyboard-icon" (click)="openKeyboard('alternateEmailID')">keyboard</i>
<em matSuffix class="material-icons mat-keyboard-icon" (click)="openKeyboard('alternateEmailID')">keyboard</em>
</div>
</div>
<div class="each-property-card">
Expand All @@ -34,7 +34,7 @@
<label class="label">{{grievanceData.alternatephonenumberlabel}}</label>
<div class="input-card">
<input [style.font-size]="fontSize.lableText" id="alternatePhoneNumber" [attr.maxLength]="phoneCharLimit" placeholder={{grievanceData.alternatePhoneNoPlaceholder}} type="text" name="alternatePhoneNo" (blur)="captureValue($event, 'alternatePhoneNumber')" (focus)="captureVirtualKeyboard(search, 1)" #keyboardRef/>
<i matSuffix class="material-icons mat-keyboard-icon" (click)="openKeyboard('alternatePhoneNumber')">keyboard</i>
<em matSuffix class="material-icons mat-keyboard-icon" (click)="openKeyboard('alternatePhoneNumber')">keyboard</em>
</div>
</div >
<div class="each-property-card">
Expand All @@ -46,7 +46,7 @@
<div class="message-input-card">
<div class="comment-input-sub-card">
<textarea [style.font-size]="fontSize.lableText" id="userComment" [attr.maxLength]="totalCommentCount" (input)="countCharacters($event, 'message')" (blur)="countCharacters($event,'message')" (focus)="captureVirtualKeyboard(search, 2)" #keyboardRef placeholder={{grievanceData.EnterMsgPlaceholder}} rows="4" cols="60" name="message" ></textarea>
<i matSuffix class="material-icons mat-keyboard-icon" (click)="openKeyboard('userComment')">keyboard</i>
<em matSuffix class="material-icons mat-keyboard-icon" (click)="openKeyboard('userComment')">keyboard</em>
</div>
<span [style.font-size]="fontSize.breadcrumb" class="input-count" >{{grievanceData.TotalCharacters}}: {{totalCommentCount}}</span>
<span [style.font-size]="fontSize.breadcrumb" class="input-count" >{{grievanceData.remainingCharacters}}: {{remainingChars}}</span>
Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/uinservices/lockunlockauth/lockunlockauth.component.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ mat-card-header,
margin-bottom: 0px;
}

@media screen and ((min-width:600px) and (max-width:1500px)){
@media screen and (min-width:600px) and (max-width:1500px){
.mini-card {
width: 98%;
height: 180px;
Expand Down
8 changes: 4 additions & 4 deletions resident-ui/src/app/feature/uinservices/lockunlockauth/lockunlockauth.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,15 +130,15 @@ export class LockunlockauthComponent implements OnInit, OnDestroy {
authTypesJSON["authSubType"] = authTypes[i].split('-')[1];

if(authTypes[i].split('-')[1]){
newAuthlist.find(el => {
newAuthlist.forEach(el => {
if(el.authSubType === authTypes[i].split('-')[1]){
return authTypesJSON["locked"] = el.locked;
authTypesJSON["locked"] = el.locked;
}
})
}else{
newAuthlist.find(el => {
newAuthlist.forEach(el => {
if(el.authType === authTypes[i]){
return authTypesJSON["locked"] = el.locked;
authTypesJSON["locked"] = el.locked;
}
})
}
Expand Down
1 change: 0 additions & 1 deletion resident-ui/src/app/feature/uinservices/personalisedcard/personalisedcard.component.css
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.intro-description {
font: normal normal medium 16px/22px Montserrat Medium;
letter-spacing: 0px;
color: #505050;
}
Expand Down
4 changes: 2 additions & 2 deletions resident-ui/src/app/feature/uinservices/personalisedcard/personalisedcard.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,9 @@ export class PersonalisedcardComponent implements OnInit, OnDestroy {
if (data['attributeName'] === item['attributeName']) {
item['formatOption'][this.langCode].forEach(eachItem => {
if (eachItem.value === type['value']) {
return eachItem['checked'] = !eachItem['checked']
return eachItem['checked'] = !eachItem['checked'];
} else {
return eachItem['checked'] = eachItem['checked']
return eachItem['checked'];
}
})
}
Expand Down
1 change: 0 additions & 1 deletion resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ ul, li{
background: #FAF8F8 0% 0% no-repeat padding-box;
box-shadow: none;
border: 1px solid silver;
background: #FAF8F8 0% 0% no-repeat padding-box;
}
.mat-card-header-text{
display: flex;
Expand Down
4 changes: 2 additions & 2 deletions resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ <h4 [style.font-size]="fontSize.subHeading" style="color: #000000;">{{langJSON[p
</tr>
<tr>
<td colspan="2" >
<span [style.font-size]="fontSize.paragraph" class="mat-card-header-text" *ngIf=list.showvid><span style="width: 11rem;">{{list.vid}}</span>&nbsp;&nbsp;&nbsp;<span style="cursor:pointer;" (click)="displayVid(finalTypeList, policy.vidType, list, false)"><img src="assets\eye_slash.png" style="color: green;width: 18px;"></span></span>
<span [style.font-size]="fontSize.paragraph" class="mat-card-header-text" *ngIf=list.showvid><span style="width: 11rem;">{{list.vid}}</span>&nbsp;&nbsp;&nbsp;<span style="cursor:pointer;" (click)="displayVid(finalTypeList, policy.vidType, list, false)"><img src="assets\eye_slash.png" style="color: green;width: 18px;" alt=""></span></span>
<span [style.font-size]="fontSize.paragraph" class="mat-card-header-text" *ngIf=!list.showvid><span style="width: 11rem;">{{list.maskedVid}}</span>&nbsp;&nbsp;&nbsp;<mat-icon style="color: green;font-size: 18px;cursor:pointer;" (click)="displayVid(finalTypeList, policy.vidType, list, true)">remove_red_eye</mat-icon></span>
</td>
</tr>
Expand Down Expand Up @@ -61,7 +61,7 @@ <h4 [style.font-size]="fontSize.subHeading" style="color: #000000;">{{langJSON[p
<span [style.font-size]="fontSize.paragraph" *ngIf="!list.transactionsLeftCount">NA</span>
</td>
<td style="width:50%;float: right;">
<span (click)="downloadVIDBtn(list.vid,policy.vidType)" style="color: green;font-size: 24px;cursor:pointer;"><img id="download{{i}}" src="assets\download.png"></span>&nbsp;&nbsp;&nbsp;
<span (click)="downloadVIDBtn(list.vid,policy.vidType)" style="color: green;font-size: 24px;cursor:pointer;"><img id="download{{i}}" src="assets\download.png" alt=""></span>&nbsp;&nbsp;&nbsp;
<mat-icon id="delete{{i}}" style="color: #DB4F4F;font-size: 24px;cursor:pointer;" (click)="revokeVIDBtn(list.vid,policy.vidType)">delete</mat-icon>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ export class RevokevidComponent implements OnInit, OnDestroy {
revokeVIDBtn(vidValue: any,vidType:any){
this.showDeleteMessage(vidType)
this.newVidValue = vidValue
this.newVidType - vidType
this.newVidType = vidType
}

revokeVID(vidValue: any) {
Expand Down
2 changes: 0 additions & 2 deletions resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@

.success-msg-description {
text-align: left;
font: normal normal medium 14px/22px Poppins;
letter-spacing: 0px;
color: #505050;
margin-left: 1.5rem;
Expand All @@ -43,7 +42,6 @@
}

.success-msg-text {
font: normal normal medium 20px/20px Poppins;
letter-spacing: 0px;
color: #03A64A;
font-size: 21px;
Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ <h3 [style.font-size]="fontSize.headingForUIN" style="color: #050505;">{{'sharew
(input)="getpurpose($event)"
(blur)="getpurpose($event)"
(focus)="captureVirtualKeyboard(search, 0)" #keyboardRef></textarea>
<i style="float: right; color: grey; cursor: pointer;" matSuffix class="material-icons" (click)="openKeyboard()">keyboard</i>
<em style="float: right; color: grey; cursor: pointer;" matSuffix class="material-icons" (click)="openKeyboard()">keyboard</em>
</span>
<span [style.fontSize]="fontSize.breadcrumb"
style="color:red; display: block;">{{'sharewithpartner.TotalCharacters'
Expand Down
4 changes: 2 additions & 2 deletions resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,9 +316,9 @@ export class SharewithpartnerComponent implements OnInit, OnDestroy {
if (data['attributeName'] === eachItem['attributeName']) {
eachItem['formatOption'][this.langCode].forEach(item => {
if (item.value === type['value']) {
return item['checked'] = !item['checked']
return item['checked'] = !item['checked'];
} else {
return item['checked'] = item['checked']
return item['checked'];
}
})
}
Expand Down
14 changes: 7 additions & 7 deletions ...ent-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#keyboardRef
type="number"
placeholder="{{'trackservicerequest.searchPlaceholder' | translate}}" />
<i style="float: right; color: grey; cursor: pointer;" matSuffix class="material-icons" (click)="openKeyboard()">keyboard</i>
<em style="float: right; color: grey; cursor: pointer;" matSuffix class="material-icons" (click)="openKeyboard()">keyboard</em>
</span>
&nbsp;&nbsp;&nbsp;&nbsp;
<button [style.font-size]="fontSize.paragraph" [disabled]="disableTrackBtn" id="getEIDStatusbtn" mat-raised-button class="track-btn"
Expand Down Expand Up @@ -85,7 +85,7 @@
</tr>
<!-- Authentication Request -->
<tr [style.font-size]="fontSize.breadcrumb" *ngIf="eidStatus.info.eventTypeEnum === 'AUTHENTICATION_REQUEST' "
style="padding:10px; padding:10px; border-top: 1px solid silver;">
style="padding:10px; border-top: 1px solid silver;">
<td><label>{{'trackservicerequest.partnerLogo' | translate}} </label></td>
<td><label>{{'trackservicerequest.partnerName' | translate}} </label></td>
</tr>
Expand All @@ -95,7 +95,7 @@
</tr>
<!-- Manage my VID -->
<tr [style.font-size]="fontSize.breadcrumb" *ngIf="eidStatus.info.eventTypeEnum === 'GENERATE_VID' "
style="padding:10px; padding:10px; border-top: 1px solid silver;">
style="padding:10px; border-top: 1px solid silver;">
<td><label>{{'trackservicerequest.vidType' | translate}} </label></td>
<td><label>{{'trackservicerequest.vid' | translate}} </label></td>
</tr>
Expand All @@ -105,7 +105,7 @@
</tr>
<!-- Share credential with partner -->
<tr [style.font-size]="fontSize.breadcrumb" *ngIf="eidStatus.info.eventTypeEnum === 'SHARE_CRED_WITH_PARTNER' "
style="padding:10px; padding:10px; border-top: 1px solid silver;">
style="padding:10px; border-top: 1px solid silver;">
<td style="width:25%"><label>{{'trackservicerequest.partnerLogo' | translate}} </label></td>
<td style="width:25%"><label>{{'trackservicerequest.partnerName' | translate}} </label></td>
<td style="width:25%"><label>{{'trackservicerequest.attributeList' | translate}} </label></td>
Expand All @@ -128,7 +128,7 @@
</div>
<button [style.font-size]="fontSize.paragraph" id="downloadAcknowledgementbtn" style="cursor: pointer;" class="download-btn"
(click)="downloadAcknowledgement()"><img class="save-icon"
src="./assets/images/save.png" />{{'trackservicerequest.downloadbuttonLabel' |
src="./assets/images/save.png" alt=""/>{{'trackservicerequest.downloadbuttonLabel' |
translate}}</button>
</div>
<div *ngIf="eidStatus.info.eventTypeEnum === 'VID_CARD_DOWNLOAD' "
Expand All @@ -141,14 +141,14 @@
</div>
<button [style.font-size]="fontSize.paragraph" id="downloadAcknowledgementbtn" style="cursor: pointer;" class="download-btn"
(click)="downloadAcknowledgement()"><img class="save-icon"
src="./assets/images/save.png" />{{'trackservicerequest.downloadbuttonLabel' |
src="./assets/images/save.png" alt=""/>{{'trackservicerequest.downloadbuttonLabel' |
translate}}</button>
</div>
<div *ngIf="eidStatus.info.eventTypeEnum !== 'UPDATE_MY_UIN' && eidStatus.info.eventTypeEnum !== 'VID_CARD_DOWNLOAD' "
style="display: flex; justify-content: flex-end; width: 100%; margin-top: 1rem;">
<button [style.font-size]="fontSize.paragraph" id="downloadAcknowledgementbtn" style="cursor: pointer;" class="download-btn"
(click)="downloadAcknowledgement()"><img class="save-icon"
src="./assets/images/save.png" />{{'trackservicerequest.downloadbuttonLabel' |
src="./assets/images/save.png" alt=""/>{{'trackservicerequest.downloadbuttonLabel' |
translate}}</button>
</div>

Expand Down
10 changes: 4 additions & 6 deletions resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ input.readonly{
align-items: center;
border: dashed 1px #03A64A;
margin-bottom: 1rem;
display: flex;
flex-grow: 1;
}
.files-list .single-file .preview {
Expand Down Expand Up @@ -175,7 +174,6 @@ input.readonly{
align-items: center;
border: solid 1px #000000;
margin-bottom: 1rem;
display: flex;
flex-grow: 1;
border-radius: 4px;
}
Expand Down Expand Up @@ -536,7 +534,7 @@ input.readonly{
font-size: var(--fs) !important;
}

@media screen and ((min-width:950px) and (max-width:1300px)){
@media screen and (min-width:950px) and (max-width:1300px){
.number-of-attems-main-card{
width: 80%;
}
Expand All @@ -551,7 +549,7 @@ input.readonly{
}
}

@media screen and ((min-width:824px) and (max-width:959px)) {
@media screen and (min-width:824px) and (max-width:959px) {
.main-contianer{
padding: 0.5rem 3rem 0 3rem;
}
Expand Down Expand Up @@ -579,7 +577,7 @@ input.readonly{
}
}

@media screen and ((min-width:550px) and (max-width:820px)) {
@media screen and (min-width:550px) and (max-width:820px) {
.contact-update-card{
flex-direction: column;
}
Expand Down Expand Up @@ -624,7 +622,7 @@ input.readonly{

}

@media screen and ((min-width:550px) and (max-width:749px)) {
@media screen and (min-width:550px) and (max-width:749px) {
.width-of-input{
width: 36%;
}
Expand Down
Loading

0 comments on commit 9c5eeed

Please sign in to comment.