Merge branch 'master-newdesign' into umar-issues

Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html

@@ -25,7 +25,7 @@
             <label *ngIf="dataContant.Value && dataContant.Type != 'table'">{{dataContant.Value}}</label>
             
             <div *ngIf="dataContant.MultipleValue && dataContant.Type == 'list'">
-              <label *ngFor="let data of dataContant.MultipleValue">{{data}}</label>
+              <label *ngFor="let data of dataContant.MultipleValue">{{data}}<br/></label>
             </div>
             
             <div *ngIf="dataContant.Value && dataContant.Type =='table'">
@@ -166,17 +166,17 @@
     <ion-tab-bar class="tabBar" slot="bottom" style="overflow-x: scroll;">
 
       <!-- <ion-tab-button *ngFor='let action of actionBTN' [hidden]="action.isAvailable" > -->
-      <ion-tab-button style="max-width: 20%;" *ngFor='let action of actionBTN;  let i=index' [hidden]='!action.isAvailable'
-        (click)="selectAtion(action.name)">
+      <ion-tab-button *ngFor='let action of actionBTN;  let i=index' [hidden]='!action.isAvailable'
+        (click)="selectAtion(action.name)" [ngClass]="i === 0 ? 'tabs-margin' : ''">
 
         <img [src]="action.image">
-        <ion-label style="font-size: 11px;">{{action.name}}</ion-label>
+        <ion-label style="font-size: 12px;">{{action.name}}</ion-label>
 
       </ion-tab-button>
 
-      <ion-tab-button (click)="skip()" style="max-width: 20%;">
+      <ion-tab-button (click)="skip()">
         <img src="../assets/imgs/action-skip.png">
-        <ion-label style="font-size: 11px;">Skip</ion-label>
+        <ion-label style="font-size: 12px;">Skip</ion-label>
       </ion-tab-button>
 
     </ion-tab-bar>

Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts

@@ -244,7 +244,7 @@ export class WorkListMainItgComponent implements OnInit {
               console.log("hello action 1");
               this.common.sharedService.setSharedData(true, 'loadWorkList');
               this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ'));
-
+              this.common.sharedService.setSharedData(true, 'loadWorkList');
             
               this.confirmMsg(1)
               // this.common.openNotificationPage();
@@ -263,7 +263,7 @@ export class WorkListMainItgComponent implements OnInit {
             } else if (result.MessageStatus == 1) {
               this.common.sharedService.setSharedData(true, 'loadWorkList');
               this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ'));
-
+              this.common.sharedService.setSharedData(true, 'loadWorkList');
               this.confirmMsg(2)
               // this.common.openNotificationPage();
               this.skip();
@@ -288,7 +288,7 @@ export class WorkListMainItgComponent implements OnInit {
                   if (result.MessageStatus == 1) {
                     this.common.sharedService.setSharedData(true, 'loadWorkList');
                     this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ'));
-
+                    this.common.sharedService.setSharedData(true, 'loadWorkList');
                     this.confirmMsg(3)
                 //  this.common.openNotificationPage();
                 this.skip();
@@ -308,7 +308,7 @@ export class WorkListMainItgComponent implements OnInit {
             } else if (result.MessageStatus == 1) {
               this.common.sharedService.setSharedData(true, 'loadWorkList');
               this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ'));
-
+              this.common.sharedService.setSharedData(true, 'loadWorkList');
               this.confirmMsg(4)
               // this.common.openNotificationPage();
               this.skip();
@@ -329,7 +329,7 @@ export class WorkListMainItgComponent implements OnInit {
               } else if (result.MessageStatus == 1) {
                 this.common.sharedService.setSharedData(true, 'loadWorkList');
                 this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ'));
-
+                this.common.sharedService.setSharedData(true, 'loadWorkList');
                 this.confirmMsg(5)
                 // this.common.openNotificationPage();
                 this.skip();
@@ -353,7 +353,7 @@ export class WorkListMainItgComponent implements OnInit {
                 } else if (result.MessageStatus == 1) {
                   this.common.sharedService.setSharedData(true, 'loadWorkList');
                   this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ'));
-
+                  this.common.sharedService.setSharedData(true, 'loadWorkList');
                   this.confirmMsg(6)
                   // this.common.openNotificationPage();
                   this.skip();

Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html

@@ -1,5 +1,5 @@
 <ion-header>
-    <ion-toolbar class="header-toolbar">
+    <ion-toolbar  style="--background: #22c6b3;">
       <!-- <nav-buttons></nav-buttons> -->
       <ion-title color="light">{{ 'vacation-rule, search-employee' | translate}}</ion-title>
       <ion-buttons slot="primary">