Skip to content

Commit

Permalink
Merge pull request #177 from aihamh/release-1.2.0.1
Browse files Browse the repository at this point in the history
[MOSIP-25201,MOSIP-24222] Resolved Sonar bugs, hotspots
  • Loading branch information
mayuradesh authored Jan 24, 2024
2 parents 1c2d69a + dde3aa6 commit f7b457e
Show file tree
Hide file tree
Showing 24 changed files with 70 additions and 45 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@
</mat-panel-title>
</mat-expansion-panel-header>
<table>
<caption>{{'quick_guide.status.tablename' | translate}}</caption>
<tr>
<th>{{'quick_guide.status.headers.status' | translate}}</th>
<th>{{'quick_guide.status.headers.explanation' | translate}}</th>
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<p>Refer <a href="https://www.mosip.io/contact.php" target="_blank">https://www.mosip.io/contact.php</a></p>
<p>Refer <a href="https://www.mosip.io/contact.php" target="_blank" rel="noopener">https://www.mosip.io/contact.php</a></p>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.main-footer {
display: flex;
justify-content: center;
font-family: Roboto;
font-family: Roboto, sans-serif;
font-size: 12px;
padding-top: 10px;
padding-bottom: 0px;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="main-footer">
<p>
<img src="assets\logo-final.png" style="height:20px; vertical-align: middle;" /> <strong>&nbsp;&nbsp;Mosip.io</strong>
<img src="assets\logo-final.png" alt="MOSIP logo" style="height:20px; vertical-align: middle;" /> <strong>&nbsp;&nbsp;Mosip.io</strong>
<span class="version-txt"><strong>Pre-registration UI verison: {{appVersion}}</strong></span>
</p>
</div>
4 changes: 2 additions & 2 deletions pre-registration-ui/src/app/core/header/header.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
<button mat-icon-button (click)="sidenav.toggle()"><mat-icon>menu</mat-icon></button>
</div>
<a *ngIf="!authService.isAuthenticated()" href="./" mat-list-item>
<img src="assets\logo-final.png" class="header--logo" style="max-height: 40px"/>
<img src="assets\logo-final.png" alt="MOSIP logo" class="header--logo" style="max-height: 40px"/>
</a>
<a *ngIf="authService.isAuthenticated()" (click)="onLogoClick()" mat-list-item>
<img src="assets\logo-final.png" class="header--logo" style="max-height: 40px"/>
<img src="assets\logo-final.png" alt="MOSIP logo" class="header--logo" style="max-height: 40px"/>
</a>
<!-- <div style="margin-left:5px;"><a routerLink="/" class="logo">logo</a></div> -->
<mat-nav-list class="list-item">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,15 @@ input[type="radio"] {
.center_selection-center_recommendation-display {
color: #30badd;
opacity: 100%;
font-family: Roboto;
font-family: Roboto, sans-serif;
white-space: nowrap;
cursor: pointer;
display: inline-flex;
font-size: 12px;
}
.center_selection-nearby-btn {
color: #6e6e6e;
font-family: Roboto;
font-family: Roboto, sans-serif;
opacity: 100%;
margin-left: 30px;
margin-right: 5px;
Expand All @@ -173,7 +173,7 @@ input[type="radio"] {
.center_selection-center-available-text {
color: #6e6e6e;
opacity: 100%;
font-family: Roboto;
font-family: Roboto, sans-serif;
font-size: 10px;
}
.search-btn img {
Expand Down Expand Up @@ -213,15 +213,15 @@ input[type="radio"] {
padding: 10px;
outline: none;
color: #707070;
font-family: Roboto;
font-family: Roboto, sans-serif;
opacity: 100%;
background-color: white;
border: none;
width: 85%;
}
.select-input {
outline: none;
font-family: Roboto;
font-family: Roboto, sans-serif;
color: #000000;
opacity: 100%;
padding: 10px;
Expand All @@ -244,7 +244,7 @@ input[type="radio"] {
}
.search-text {
display: flex;
font-family: Roboto;
font-family: Roboto, sans-serif;
font-size: 14px;
color: #707070;
width: 100%;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
class="search-btn"
(click)="setSearchClick(false)"
>
<img src="assets\search.png" />
<img src="assets\search.png" alt="Search"/>
</button>
</div>

Expand Down Expand Up @@ -90,10 +90,10 @@
type="submit"
(click)="showResults()"
>
<img src="assets\search_grey.png" />
<img src="assets\search_grey.png" alt="Search"/>
</button>
<button mat-icon-button class="search-cancel-btn" type="button" (click)="setSearchClick(true);resetPagination();">
<img src="assets\close.png" />
<img src="assets\close.png" alt="Close"/>
</button>
</mat-card>
</form>
Expand Down Expand Up @@ -130,7 +130,7 @@
/>
<div>
<div class="inline-flex" [dir]="textDir">
<div><img src="assets\address.png" /></div>
<div><img src="assets\address.png" alt="Address"/></div>
<div>
<strong>{{center.name}}</strong>
<strong *ngIf="center.addressLine1 != null && center.addressLine1 != ''">
Expand All @@ -145,7 +145,7 @@
</div>
</div>
<div>
<span><img src="assets\contact number.png"/></span>
<span><img src="assets\contact number.png" alt="Contact Number"/></span>
<span *ngIf="center.contactPerson !== ''">
{{ center.contactPerson}}
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ export class MapComponent implements OnInit {
markers = [];

googleMapsUrl =
'http://maps.google.com/maps/vt?pb=!1m5!1m4!1i{z}!2i{x}!3i{y}!4i256!2m3!1e0!2sm!3i375060738!3m9!2spl!3sUS!5e18!12m1!1e47!12m3!1e37!2m1!1ssmartmaps!4e0';
'https://maps.google.com/maps/vt?pb=!1m5!1m4!1i{z}!2i{x}!3i{y}!4i256!2m3!1e0!2sm!3i375060738!3m9!2spl!3sUS!5e18!12m1!1e47!12m3!1e37!2m1!1ssmartmaps!4e0';

OSM_URL = 'http://tile.osm.org/{z}/{x}/{y}.png';
OSM_URL = 'https://tile.osm.org/{z}/{x}/{y}.png';

constructor(private service: BookingService) {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@

.time-selection__arrow-text {
margin: auto;
color: #ccc;
cursor: pointer;
color: #ff4081;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</p>
</div>
<div class="left-button">
<a (click)="scrollLeft()"><img src="assets/left.png" /></a>
<a (click)="scrollLeft()"><img src="assets/left.png" alt="Left"/></a>
</div>
<div #widgetsContent class="middle">
<mat-card
Expand Down Expand Up @@ -62,7 +62,7 @@
</mat-card>
</div>
<div class="right-button">
<a (click)="scrollRight()"><img src="assets/right.png" /></a>
<a (click)="scrollRight()"><img src="assets/right.png" alt="Right"/></a>
</div>
<div class="time-selection__arrow-text">
<p (click)="scrollRight()">
Expand Down Expand Up @@ -142,7 +142,7 @@
}}<img
src="assets/slots.png"
height="15px"
width="15px" /></span>
width="15px" alt="Slots"/></span>
</p>
</mat-card-content>
</mat-card>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
flex-wrap: wrap;
}
.heading {
font-family: 'Roboto';
font-family: 'Roboto', sans-serif;
font-size: 20px;
color: #fd518c;
opacity: 100%;
Expand All @@ -40,7 +40,7 @@ img {
border-radius: 0px;
margin-left: 15px !important;
margin-top: 30px;
font-family: 'Roboto';
font-family: 'Roboto', sans-serif;
font-size: 11px !important;
}
.modify-app-btn {
Expand All @@ -49,12 +49,12 @@ img {
border-radius: 0px;
margin-left: 12px;
margin-top: 30px;
font-family: 'Roboto';
font-family: 'Roboto', sans-serif;
font-size: 11px !important;
}
.create-app-btn {
color: #ffffff;
font-family: 'Roboto';
font-family: 'Roboto', sans-serif;
background-color: #ff4081;
opacity: 90%;
margin-left: 12px;
Expand All @@ -74,7 +74,7 @@ img {
padding-right: 45px;
}
.card-header {
font-family: 'Roboto';
font-family: 'Roboto', sans-serif;
font-size: 0.75rem;
opacity: 100%;
display: flex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@
<img
src="assets\Book_Modify Appointment.png"
class="modify-app-img"
alt="Modify appointment"
/>
{{ "dashboard.action_modify_appointment" | translate }}
</button></span
>
<span>
<!-- class="create-app-btn" -->
<button class="btn_axn-pri page_btn" (click)="onNewApplication()">
<img src="assets\Create new application.png" class="create-app-img" />
<img src="assets\Create new application.png" alt="New application" class="create-app-img" />
{{ "dashboard.action_cre_application" | translate }}
</button></span
>
Expand Down Expand Up @@ -73,6 +74,7 @@
[matTooltipDisabled]="false"
src="assets\lock.png"
class="lock-img"
alt="Lock"
/></span>
<button
(click)="onDelete(user)"
Expand All @@ -84,12 +86,14 @@
[matTooltipDisabled]="false"
src="assets\delete.png"
class="delete-img"
alt="Delete"
/>
</button>
</div>
<mat-card-content [ngStyle]="{ marginTop: getMargin(user.name) }">
<div class="card-content">
<table>
<caption>{{'dashboard.name' | translate}}</caption>
<tr>
<td class="column1">{{ "dashboard.card.text_name" | translate }}</td>
<td
Expand Down Expand Up @@ -168,6 +172,7 @@
<img
src="assets\Modify information_grey.png"
class="modifyinfo-btn-img"
alt="Modify information"
/>&nbsp;{{ "dashboard.card.action_modify_information" | translate }}
</button>
<!-- (click)="onSelectUser(user)" -->
Expand All @@ -183,6 +188,7 @@
<img
src="assets\Modify information_grey.png"
class="modifyinfo-btn-img"
alt="Modify information"
/>&nbsp;{{ "dashboard.card.action_view_information" | translate }}
</button>
<span class="spacer"></span>
Expand All @@ -197,7 +203,7 @@
user.status === appStatusCodes.prefetched
"
>
<img src="assets\view.png" class="modifyapp-btn-img" />&nbsp;{{
<img src="assets\view.png" alt="View" class="modifyapp-btn-img" />&nbsp;{{
"dashboard.card.action_view_acknowledgement" | translate
}}
</button>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<img src="assets/ajax-loader.gif" *ngIf="" class="loader" />
<img src="assets/ajax-loader.gif" alt="Loader" *ngIf="" class="loader" />
<div class="spinner" *ngIf="!dataLoaded">
<mat-spinner></mat-spinner>
</div>
Expand Down Expand Up @@ -101,10 +101,10 @@
<span class="spacer"></span>
<span *ngIf="!readOnlyMode" class="file-uplaoad__body__document-name__delete"
(click)="deleteUploadedFile(file)">
<img src="assets\delete.png" class="delete-img" />
<img src="assets\delete.png" alt="Delete" class="delete-img" />
</span>
<span class="file-uplaoad__body__document-name__view" (click)="viewFile(file)">
<img src="assets\view.png" class="view-img" />
<img src="assets\view.png" alt="View" class="view-img" />
</span>
</span>
</span>
Expand Down Expand Up @@ -133,12 +133,12 @@
</div>
<div class="file-buttons" *ngIf="fileIndex >= 0">
<button class="previousFile" [disabled]="fileIndex <= 0 ? true : false" (click)="previousFile(fileIndex)">
<img src="assets/left.png" />
<img src="assets/left.png" alt="Left"/>
</button>
<p *ngIf="fileIndex >= 0">{{ fileIndex + 1 }} - {{ users[0].files.documentsMetaData.length }}</p>
<button class="nextFile" [disabled]="fileIndex == users[0].files.documentsMetaData.length - 1 ? true : false"
(click)="nextFile(fileIndex)">
<img src="assets/right.png" />
<img src="assets/right.png" alt="Right"/>
</button>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@
<div class="print-section-inner-div" >
<div [id]="message-container" class="ack__message-container">
<p *ngFor="let ackMessage of ackData.messages">
<img style="vertical-align: middle;" src="assets/img/done.png" />&nbsp;&nbsp;{{ackMessage.preRegId}} :
<img style="vertical-align: middle;" src="assets/img/done.png" alt="Done"/>&nbsp;&nbsp;{{ackMessage.preRegId}} :
{{ackMessage.message}}
</p>
</div>
<div class="ack__header-container" [dir]="ackData.appLangCodeDir">
<table>
<caption>{{'quick_guide.Acknowledgement.tablename' | translate}}</caption>
<tr>
<td>{{ ackData.preRegIdLabels}} : </td>
<td><b>{{ ackData.preRegId}}</b></td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</span>)</span>
<span [ngStyle]="userPrefLanguageDir == 'ltr'? {'float': 'right'} : {'float': 'left'}">
<span *ngIf="!readOnlyMode" (click)="modifyDemographic()" class="preview__modify-file"
matTooltip="{{ helpText.modify_at_DemoPreview }}"><img src="assets/edit.png" /> {{
matTooltip="{{ helpText.modify_at_DemoPreview }}"><img src="assets/edit.png" alt="Edit"/> {{
previewLabels.action_modify }}</span>
</span>
</div>
Expand Down Expand Up @@ -68,7 +68,7 @@
<span>{{ previewLabels.title_document }}</span>
<span [ngStyle]="userPrefLanguageDir == 'ltr'? {'float': 'right'} : {'float': 'left'}">
<span *ngIf="!readOnlyMode" (click)="modifyDocument()" class="preview__modify-file"
matTooltip="{{ helpText.modify_at_DocumentPreview }}"><img src="assets/edit.png" /> {{
matTooltip="{{ helpText.modify_at_DocumentPreview }}"><img src="assets/edit.png" alt="Edit"/> {{
previewLabels.action_modify }}</span>
</span>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
::ng-deep.mat-dialog-container {
display: block;
font-family: 'Roboto';
font-family: 'Roboto', sans-serif;
border-radius: 2px;
border-color: 1px solid #fd518c;
box-sizing: border-box;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div class="container">
<div><p [ngClass]="classes.step1.p"><img src="assets/demographic_details.png" [ngClass]="classes.step1.icon"/>&nbsp; {{'stepper.link_demographic'| translate}} </p></div>
<div><p [ngClass]="classes.step1.p"><img src="assets/demographic_details.png" alt="Demographic details" [ngClass]="classes.step1.icon"/>&nbsp; {{'stepper.link_demographic'| translate}} </p></div>
<div><hr [ngClass]="classes.step1.line"/></div>
<div><p [ngClass]="classes.step2.p"><img src="assets/upload_document.png" [ngClass]="classes.step2.icon" />&nbsp; {{'stepper.link_upload_doc'| translate}}</p></div>
<div><p [ngClass]="classes.step2.p"><img src="assets/upload_document.png" alt="Upload document" [ngClass]="classes.step2.icon" />&nbsp; {{'stepper.link_upload_doc'| translate}}</p></div>
<div><hr [ngClass]="classes.step2.line"/></div>
<div><p [ngClass]="classes.step3.p"><img src="assets/book_appointment.png" [ngClass]="classes.step3.icon"/>&nbsp; {{'stepper.link_book'| translate}} </p></div>
<div><p [ngClass]="classes.step3.p"><img src="assets/book_appointment.png" alt="Book appointment" [ngClass]="classes.step3.icon"/>&nbsp; {{'stepper.link_book'| translate}} </p></div>
<div><hr [ngClass]="classes.step3.line"/></div>
<div><p [ngClass]="classes.step4.p"><img src="assets/confirmation.png" [ngClass]="classes.step4.icon" />&nbsp; {{'stepper.link_confirm'| translate}}</p></div>
<div><p [ngClass]="classes.step4.p"><img src="assets/confirmation.png" alt="Confirmation" [ngClass]="classes.step4.icon" />&nbsp; {{'stepper.link_confirm'| translate}}</p></div>
</div>
Loading

0 comments on commit f7b457e

Please sign in to comment.