Merge pull request #556 from Madhuravas/develop

MOSIP-27163 changed checkbox position.
mosip · Oct 30, 2023 · c84c821 · c84c821
2 parents 1315239 + 76e8ac2
commit c84c821
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/resident-ui/src/app/core/services/httpinterceptor.ts b/resident-ui/src/app/core/services/httpinterceptor.ts
@@ -96,6 +96,9 @@ export class AuthInterceptor implements HttpInterceptor {
           if (err instanceof HttpErrorResponse) {
             if (err.status === 401 && err.statusText === "Unauthorized") {
              this.router.navigate(['dashboard']);
+             if (window.location.href.includes('uinservices')) {
+               window.location.reload();
+             }
             }else if (err.status === 403 && err.statusText === "Forbidden") {
               this.showMessage()
             } else if (err.status === 413) {

diff --git a/resident-ui/src/app/feature/uinservices/personalisedcard/personalisedcard.component.html b/resident-ui/src/app/feature/uinservices/personalisedcard/personalisedcard.component.html
@@ -10,7 +10,7 @@
 		<h3 style="color: #505050;">{{'personalisedcard.title' | translate}}</h3>
 		<p class="intro-description">{{'personalisedcard.introDescription' | translate}}</p>
 		<p class="intro-description">{{'personalisedcard.mainlabel' | translate}}</p>
-		<table style="width:100%;">
+		<table style="width:100%;" dir="{{sitealignment}}">
 			<tr><mat-grid-list [cols]="cols" rowHeight="9rem" gutterSize="10px">
 			  <mat-grid-tile [colspan]="dataCols" [rowspan]="3">
 				<td [style.width] = "width">

diff --git a/resident-ui/src/app/feature/uinservices/personalisedcard/personalisedcard.component.ts b/resident-ui/src/app/feature/uinservices/personalisedcard/personalisedcard.component.ts
@@ -47,6 +47,7 @@ export class PersonalisedcardComponent implements OnInit, OnDestroy {
   formatCheckBoxClicked: boolean = false;
   isLoading: boolean = true;
   selectedOprionsFormOptions: object = {};
+  sitealignment:string = localStorage.getItem('direction');
 
   constructor(private autoLogout: AutoLogoutService, private interactionService: InteractionService,
     private dialog: MatDialog, private appConfigService: AppConfigService, private dataStorageService: DataStorageService, private translateService: TranslateService, private router: Router,

diff --git a/resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.html b/resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.html
@@ -13,7 +13,7 @@ <h3 style="color: #050505;">{{'sharewithpartner.title' | translate}}</h3>
 		<p class="intro-description">{{'sharewithpartner.introDescription' | translate}}</p>
 		<label class="main-label">{{'sharewithpartner.mainlabel' |
 			translate}}</label>
-		<table style="width:100%;">
+		<table style="width:100%;" dir="{{sitealignment}}">
 			<tr><mat-grid-list [cols]="cols" rowHeight="10rem" gutterSize="10px">
 				<mat-grid-tile [colspan]="dataCols" [rowspan]="dataRow">
 						<td >
@@ -94,9 +94,9 @@ <h3 style="color: #050505;">{{'sharewithpartner.title' | translate}}</h3>
 								</tr>
 								<tr>
 									<td>
-										<mat-select class="enable-dropdown" id="partnerDetails">
-											<mat-option (onSelectionChange)="captureDropDownValue($event)"
-												*ngFor="let partnerDetail of partnerDetails"
+										<mat-select (selectionChange)="captureDropDownValue($event)" class="enable-dropdown" id="partnerDetails">
+											<mat-option 
+											    *ngFor="let partnerDetail of partnerDetails"
 												[id]="partnerDetail.organizationName" [value]="partnerDetail.partnerID">
 												{{partnerDetail.organizationName}}</mat-option>
 										</mat-select>

diff --git a/resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.ts b/resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.ts
@@ -59,6 +59,7 @@ export class SharewithpartnerComponent implements OnInit, OnDestroy {
   formatLabels: any;
   isLoading: boolean = true;
   selectedOprionsFormOptions: object = {};
+  sitealignment:string = localStorage.getItem('direction');
 
   private keyboardRef: MatKeyboardRef<MatKeyboardComponent>;
   @ViewChildren('keyboardRef', { read: ElementRef })
@@ -438,6 +439,7 @@ export class SharewithpartnerComponent implements OnInit, OnDestroy {
   }
 
   captureDropDownValue(event: any) {
+    console.log(event.source.value)
     if (event.source.selected) {
       this.partnerId = event.source.value;
     }

diff --git a/resident-ui/src/app/shared/dialog/dialog.component.css b/resident-ui/src/app/shared/dialog/dialog.component.css
@@ -288,7 +288,7 @@ p{
 
 .agree-test-card{
   display: flex;
-  align-items: center;
+  align-items: flex-start;
 }
 
 .agree-card {
@@ -330,6 +330,7 @@ p{
   height: 20px !important;
   width: 20px !important;
   cursor: pointer;
+  margin-top: 0;
 }
 
 .otp-time-heading {