diff --git a/.currentLang = 2 b/.currentLang = 2
new file mode 100644
index 00000000..c07548c0
--- /dev/null
+++ b/.currentLang = 2	
@@ -0,0 +1,224 @@
+
+                   SSUUMMMMAARRYY OOFF LLEESSSS CCOOMMMMAANNDDSS
+
+      Commands marked with * may be preceded by a number, _N.
+      Notes in parentheses indicate the behavior if _N is given.
+      A key preceded by a caret indicates the Ctrl key; thus ^K is ctrl-K.
+
+  h  H                 Display this help.
+  q  :q  Q  :Q  ZZ     Exit.
+ ---------------------------------------------------------------------------
+
+                           MMOOVVIINNGG
+
+  e  ^E  j  ^N  CR  *  Forward  one line   (or _N lines).
+  y  ^Y  k  ^K  ^P  *  Backward one line   (or _N lines).
+  f  ^F  ^V  SPACE  *  Forward  one window (or _N lines).
+  b  ^B  ESC-v      *  Backward one window (or _N lines).
+  z                 *  Forward  one window (and set window to _N).
+  w                 *  Backward one window (and set window to _N).
+  ESC-SPACE         *  Forward  one window, but don't stop at end-of-file.
+  d  ^D             *  Forward  one half-window (and set half-window to _N).
+  u  ^U             *  Backward one half-window (and set half-window to _N).
+  ESC-)  RightArrow *  Right one half screen width (or _N positions).
+  ESC-(  LeftArrow  *  Left  one half screen width (or _N positions).
+  ESC-}  ^RightArrow   Right to last column displayed.
+  ESC-{  ^LeftArrow    Left  to first column.
+  F                    Forward forever; like "tail -f".
+  ESC-F                Like F but stop when search pattern is found.
+  r  ^R  ^L            Repaint screen.
+  R                    Repaint screen, discarding buffered input.
+        ---------------------------------------------------
+        Default "window" is the screen height.
+        Default "half-window" is half of the screen height.
+ ---------------------------------------------------------------------------
+
+                          SSEEAARRCCHHIINNGG
+
+  /_p_a_t_t_e_r_n          *  Search forward for (_N-th) matching line.
+  ?_p_a_t_t_e_r_n          *  Search backward for (_N-th) matching line.
+  n                 *  Repeat previous search (for _N-th occurrence).
+  N                 *  Repeat previous search in reverse direction.
+  ESC-n             *  Repeat previous search, spanning files.
+  ESC-N             *  Repeat previous search, reverse dir. & spanning files.
+  ESC-u                Undo (toggle) search highlighting.
+  &_p_a_t_t_e_r_n          *  Display only matching lines
+        ---------------------------------------------------
+        A search pattern may begin with one or more of:
+        ^N or !  Search for NON-matching lines.
+        ^E or *  Search multiple files (pass thru END OF FILE).
+        ^F or @  Start search at FIRST file (for /) or last file (for ?).
+        ^K       Highlight matches, but don't move (KEEP position).
+        ^R       Don't use REGULAR EXPRESSIONS.
+ ---------------------------------------------------------------------------
+
+                           JJUUMMPPIINNGG
+
+  g  <  ESC-<       *  Go to first line in file (or line _N).
+  G  >  ESC->       *  Go to last line in file (or line _N).
+  p  %              *  Go to beginning of file (or _N percent into file).
+  t                 *  Go to the (_N-th) next tag.
+  T                 *  Go to the (_N-th) previous tag.
+  {  (  [           *  Find close bracket } ) ].
+  }  )  ]           *  Find open bracket { ( [.
+  ESC-^F _<_c_1_> _<_c_2_>  *  Find close bracket _<_c_2_>.
+  ESC-^B _<_c_1_> _<_c_2_>  *  Find open bracket _<_c_1_> 
+        ---------------------------------------------------
+        Each "find close bracket" command goes forward to the close bracket 
+          matching the (_N-th) open bracket in the top line.
+        Each "find open bracket" command goes backward to the open bracket 
+          matching the (_N-th) close bracket in the bottom line.
+
+  m_<_l_e_t_t_e_r_>            Mark the current top line with <letter>.
+  M_<_l_e_t_t_e_r_>            Mark the current bottom line with <letter>.
+  '_<_l_e_t_t_e_r_>            Go to a previously marked position.
+  ''                   Go to the previous position.
+  ^X^X                 Same as '.
+  ESC-M_<_l_e_t_t_e_r_>        Clear a mark.
+        ---------------------------------------------------
+        A mark is any upper-case or lower-case letter.
+        Certain marks are predefined:
+             ^  means  beginning of the file
+             $  means  end of the file
+ ---------------------------------------------------------------------------
+
+                        CCHHAANNGGIINNGG FFIILLEESS
+
+  :e [_f_i_l_e]            Examine a new file.
+  ^X^V                 Same as :e.
+  :n                *  Examine the (_N-th) next file from the command line.
+  :p                *  Examine the (_N-th) previous file from the command line.
+  :x                *  Examine the first (or _N-th) file from the command line.
+  :d                   Delete the current file from the command line list.
+  =  ^G  :f            Print current file name.
+ ---------------------------------------------------------------------------
+
+                    MMIISSCCEELLLLAANNEEOOUUSS CCOOMMMMAANNDDSS
+
+  -_<_f_l_a_g_>              Toggle a command line option [see OPTIONS below].
+  --_<_n_a_m_e_>             Toggle a command line option, by name.
+  __<_f_l_a_g_>              Display the setting of a command line option.
+  ___<_n_a_m_e_>             Display the setting of an option, by name.
+  +_c_m_d                 Execute the less cmd each time a new file is examined.
+
+  !_c_o_m_m_a_n_d             Execute the shell command with $SHELL.
+  |XX_c_o_m_m_a_n_d            Pipe file between current pos & mark XX to shell command.
+  s _f_i_l_e               Save input to a file.
+  v                    Edit the current file with $VISUAL or $EDITOR.
+  V                    Print version number of "less".
+ ---------------------------------------------------------------------------
+
+                           OOPPTTIIOONNSS
+
+        Most options may be changed either on the command line,
+        or from within less by using the - or -- command.
+        Options may be given in one of two forms: either a single
+        character preceded by a -, or a name preceded by --.
+
+  -?  ........  --help
+                  Display help (from command line).
+  -a  ........  --search-skip-screen
+                  Search skips current screen.
+  -A  ........  --SEARCH-SKIP-SCREEN
+                  Search starts just after target line.
+  -b [_N]  ....  --buffers=[_N]
+                  Number of buffers.
+  -B  ........  --auto-buffers
+                  Don't automatically allocate buffers for pipes.
+  -c  ........  --clear-screen
+                  Repaint by clearing rather than scrolling.
+  -d  ........  --dumb
+                  Dumb terminal.
+  -D [_x_n_._n]  .  --color=_x_n_._n
+                  Set screen colors. (MS-DOS only)
+  -e  -E  ....  --quit-at-eof  --QUIT-AT-EOF
+                  Quit at end of file.
+  -f  ........  --force
+                  Force open non-regular files.
+  -F  ........  --quit-if-one-screen
+                  Quit if entire file fits on first screen.
+  -g  ........  --hilite-search
+                  Highlight only last match for searches.
+  -G  ........  --HILITE-SEARCH
+                  Don't highlight any matches for searches.
+  -h [_N]  ....  --max-back-scroll=[_N]
+                  Backward scroll limit.
+  -i  ........  --ignore-case
+                  Ignore case in searches that do not contain uppercase.
+  -I  ........  --IGNORE-CASE
+                  Ignore case in all searches.
+  -j [_N]  ....  --jump-target=[_N]
+                  Screen position of target lines.
+  -J  ........  --status-column
+                  Display a status column at left edge of screen.
+  -k [_f_i_l_e]  .  --lesskey-file=[_f_i_l_e]
+                  Use a lesskey file.
+  -K  ........  --quit-on-intr
+                  Exit less in response to ctrl-C.
+  -L  ........  --no-lessopen
+                  Ignore the LESSOPEN environment variable.
+  -m  -M  ....  --long-prompt  --LONG-PROMPT
+                  Set prompt style.
+  -n  -N  ....  --line-numbers  --LINE-NUMBERS
+                  Don't use line numbers.
+  -o [_f_i_l_e]  .  --log-file=[_f_i_l_e]
+                  Copy to log file (standard input only).
+  -O [_f_i_l_e]  .  --LOG-FILE=[_f_i_l_e]
+                  Copy to log file (unconditionally overwrite).
+  -p [_p_a_t_t_e_r_n]  --pattern=[_p_a_t_t_e_r_n]
+                  Start at pattern (from command line).
+  -P [_p_r_o_m_p_t]   --prompt=[_p_r_o_m_p_t]
+                  Define new prompt.
+  -q  -Q  ....  --quiet  --QUIET  --silent --SILENT
+                  Quiet the terminal bell.
+  -r  -R  ....  --raw-control-chars  --RAW-CONTROL-CHARS
+                  Output "raw" control characters.
+  -s  ........  --squeeze-blank-lines
+                  Squeeze multiple blank lines.
+  -S  ........  --chop-long-lines
+                  Chop (truncate) long lines rather than wrapping.
+  -t [_t_a_g]  ..  --tag=[_t_a_g]
+                  Find a tag.
+  -T [_t_a_g_s_f_i_l_e] --tag-file=[_t_a_g_s_f_i_l_e]
+                  Use an alternate tags file.
+  -u  -U  ....  --underline-special  --UNDERLINE-SPECIAL
+                  Change handling of backspaces.
+  -V  ........  --version
+                  Display the version number of "less".
+  -w  ........  --hilite-unread
+                  Highlight first new line after forward-screen.
+  -W  ........  --HILITE-UNREAD
+                  Highlight first new line after any forward movement.
+  -x [_N[,...]]  --tabs=[_N[,...]]
+                  Set tab stops.
+  -X  ........  --no-init
+                  Don't use termcap init/deinit strings.
+  -y [_N]  ....  --max-forw-scroll=[_N]
+                  Forward scroll limit.
+  -z [_N]  ....  --window=[_N]
+                  Set size of window.
+  -" [_c[_c]]  .  --quotes=[_c[_c]]
+                  Set shell quote characters.
+  -~  ........  --tilde
+                  Don't display tildes after end of file.
+  -# [_N]  ....  --shift=[_N]
+                  Horizontal scroll amount (0 = one half screen width)
+                --follow-name
+                  The F command changes files if the input file is renamed.
+                --mouse
+                  Enable mouse input.
+                --no-keypad
+                  Don't send termcap keypad init/deinit strings.
+                --no-histdups
+                  Remove duplicates from command history.
+                --rscroll=C
+                  Set the character used to mark truncated lines.
+                --save-marks
+                  Retain marks across invocations of less.
+                --use-backslash
+                  Subsequent options use backslash as escape char.
+                --wheel-lines=N
+                  Each click of the mouse wheel moves N lines.
+
+
+ ---------------------------------------------------------------------------
diff --git a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.scss b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.scss
index bdae8c76..269ef263 100644
--- a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.scss
+++ b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.scss
@@ -88,9 +88,9 @@ button.item-button.button.button-md.button-clear.button-clear-md {
   // padding-left: 10px !important;
   border: solid var(--gray) 1px;
   border-radius: 21px;
-  padding-left: 145px !important;
+  // padding-left: 145px !important;
   margin-left: 86px;
-  padding-right: 129px;
+  // padding-right: 129px;
   margin-right: -143px;
 }
   // {padding-left: unset;
diff --git a/Mohem/src/app/absence/home/home.component.html b/Mohem/src/app/absence/home/home.component.html
index 39a21384..465917b2 100644
--- a/Mohem/src/app/absence/home/home.component.html
+++ b/Mohem/src/app/absence/home/home.component.html
@@ -61,10 +61,7 @@
           <div class="result-text-container">
   
             <!-- <h2>{{totalnumber}}</h2>  -->
-
                 <!-- <h2>{{accrualNet + accrualUsed + accrualYearly}}</h2> -->
-               
-    
               <!-- <span>{{ts.trPK('absenceList','totalNumber')}}</span> -->
             
           </div>
@@ -76,7 +73,7 @@
                   <div [ngClass]=" direction == 'ltr' ?  'div-green' : 'div-green-ar'">
                   <ion-col>
                       <ion-row>
-                        <label class="green-label">{{ts.trPK('absenceList','accrualNet')}}</label>
+                        <label class="green-label">{{ts.trPK('absenceList','currentBalance')}}</label>
                       </ion-row>
                       <ion-row>
                         <label class="green-amount">{{accrualNet}}</label>
@@ -86,7 +83,7 @@
                   <div [ngClass]=" direction == 'ltr' ?  'div-red' : 'div-red-ar'">
                     <ion-col>
                         <ion-row>
-                          <label class="red-label">{{ts.trPK('absenceList','accrualUsed')}}</label>
+                          <label class="red-label">{{ts.trPK('absenceList','usedBalance')}}</label>
                         </ion-row>
                         <ion-row>
                        
@@ -97,7 +94,7 @@
                   <div [ngClass]=" direction == 'ltr' ?  'div-orng' : 'div-orng-ar'">
                     <ion-col>
                         <ion-row>
-                          <label class="orng-label">{{ts.trPK('absenceList','accrualYearly')}}</label>
+                          <label class="orng-label">{{ts.trPK('absenceList','annualBalance')}}</label>
                         </ion-row>
                         <ion-row>
                         
diff --git a/Mohem/src/app/absence/home/home.component.scss b/Mohem/src/app/absence/home/home.component.scss
index 28c65f00..0cbd6a21 100644
--- a/Mohem/src/app/absence/home/home.component.scss
+++ b/Mohem/src/app/absence/home/home.component.scss
@@ -213,6 +213,7 @@ margin-top: -13px;
   margin-top: 0px;
 }
 
+
 .red-label{
   font-size: 12px;
   margin-top: -13px;
@@ -224,16 +225,20 @@ margin-top: -13px;
     margin-top: 0px;
   }
 
+ 
+
   .orng-label{
     font-size: 12px;
     margin-top: -13px;
     }
     
+   
     .orng-amount{
       font-size: 15px;
       font-family: WorkSans-Bold;
       margin-top: 0px;
     }
+  
   .contentEit:before {
     position: absolute;
   content: "";
@@ -247,17 +252,18 @@ margin-top: -13px;
  .div-green{
   position: relative;
   left: 82%;
-  bottom: 128px;
+  bottom: 141px;
   color: black;
   background-color: #1FA269;
   width: 11%;
   height: 6px;
  }
- .div-green-ar{
+ .div-orng-ar{
   position: relative;
   bottom: 59px;
   color: black;
-  background-color: #1FA269;
+  background-color: #DDB017;
+  // background-color: #1FA269;
   width: 11%;
   height: 6px;
   right: 9px;
@@ -270,12 +276,12 @@ margin-top: -13px;
   background-color: #CB3232;
   width: 11%;
   height: 6px;
-  right: 102px;
+  right: 92px;
  }
  .div-red{
   position: relative;
   left: 59%;
-  bottom: 131px;
+  bottom: 146px;
   color: black;
   background-color: #CB3232;
   // background-color: #094875;
@@ -293,12 +299,12 @@ margin-top: -13px;
   width: 11%;
   height: 6px;
  }
- .div-orng-ar{
+ .div-green-ar{
   position: relative;
-  bottom: 139px;
+  bottom: 124px;
   color: black;
-  // background-color: #CB3232;
-  background-color: #DDB017;
+  // background-color: #DDB017;
+  background-color: #1FA269;
   width: 11%;
   height: 6px;
   right: 10px;
diff --git a/Mohem/src/app/absence/home/home.component.ts b/Mohem/src/app/absence/home/home.component.ts
index 0ca580f6..66ddd847 100644
--- a/Mohem/src/app/absence/home/home.component.ts
+++ b/Mohem/src/app/absence/home/home.component.ts
@@ -251,6 +251,7 @@ createAbsence() {
         });
     }
   }
+  
   handleAccrualResult(result) {
     if (this.common.validResponse(result)) {
       this.balance = result.GetAccrualBalancesList;
diff --git a/Mohem/src/app/accrual-balances/home/home.component.html b/Mohem/src/app/accrual-balances/home/home.component.html
index c2304685..25354335 100644
--- a/Mohem/src/app/accrual-balances/home/home.component.html
+++ b/Mohem/src/app/accrual-balances/home/home.component.html
@@ -12,7 +12,7 @@
         <ion-label>{{ts.trPK('accrualBalances','selectDate')}}</ion-label>
         <ion-datetime [(ngModel)]="Sdate" min="1900" max="2100" displayFormat="MMM/DD/YYYY " placeholder="MM/DD/YYYY"
           (ionChange)="getAccrualBalance()"></ion-datetime>
-       
+        
       </ion-item>
 
       <ul>
diff --git a/Mohem/src/app/accrual-balances/home/home.component.ts b/Mohem/src/app/accrual-balances/home/home.component.ts
index 1171adb0..7739075c 100644
--- a/Mohem/src/app/accrual-balances/home/home.component.ts
+++ b/Mohem/src/app/accrual-balances/home/home.component.ts
@@ -9,6 +9,7 @@ import { AuthenticatedUser } from 'src/app/hmg-common/services/authentication/mo
   templateUrl: './home.component.html',
   styleUrls: ['./home.component.scss']
 })
+
 export class HomeComponent implements OnInit {
   Sdate: any;
   emp_no: any;
@@ -57,4 +58,5 @@ export class HomeComponent implements OnInit {
       this.balance=result.GetAccrualBalancesList;
       }
   }
+  
 }
diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html
index 9a5d540e..d6f5ccd7 100644
--- a/Mohem/src/app/app.component.html
+++ b/Mohem/src/app/app.component.html
@@ -64,7 +64,12 @@
             <p class="companyTxt">{{companyDesc}}</p>
           </div>
           <div class="menuFooter">
+<<<<<<< HEAD
+            <!-- <div> <img src="../assets/imgs/CS.png" class="CompanyImg"></div> -->
+            <!-- <p class="companyTxt">{{companyDesc}}</p> -->
+=======
             <p class="companyTxt">{{companyDesc}}</p>
+>>>>>>> 25ada829dfd1fa6b65bb611ae62c30323e18f3f7
           </div>
         </ion-content>
       </ion-menu>
@@ -112,6 +117,55 @@
               </ion-label>
             </ion-item>
             <ion-item (click)="openChangePassword()"> 
+<<<<<<< HEAD
+            <ion-thumbnail slot="start" class="menu-thumb">
+              <img style= "height: 25px !important;" src="../assets/imgs/lock_icon.png" item-left>
+            </ion-thumbnail>
+            <ion-label class="changepassword" >
+              {{ts.trPK('login','changepassword')}}
+
+              <ion-badge  [ngClass]=" direction === 'rtl' ?  'end-badge' : 'start-badge'" slot="end" color="danger" class="main-badge">{{notBadge}}</ion-badge>
+            </ion-label>
+            <!-- <button class="menu-item" ion-item  menuClose ion-item  (click)="goToWorkListPage()" >
+               
+               
+            
+            </button> -->
+          </ion-item>
+
+         
+          <!-- <ion-item (click)="profile()">
+            <ion-thumbnail slot="start" class="menu-thumb">
+              <img width="30" src="../assets/imgs/profile_icon.png" item-left>
+            </ion-thumbnail>
+            <ion-label>
+              {{ts.trPK('userProfile','title')}}
+            </ion-label>
+          </ion-item> -->
+          <!-- <ion-item (click)="logout();">
+
+
+            <ion-thumbnail slot="start" class="menu-thumb">
+              <img width="30" src="../assets/imgs/signout.png" item-left>
+            </ion-thumbnail>
+            <ion-label>
+              {{ts.trPK('home','logout')}}
+            </ion-label>
+
+          </ion-item> -->
+        </ion-list>
+
+        <div class="" style="text-align:center">
+           <img src="{{companyUrl}}" class="CompanyImg logoImg">
+          <p class="companyTxt">{{companyDesc}}</p>
+        </div>
+        <div class="menuFooter">
+          <!-- <div> <img src="../assets/imgs/CS.png" class="CompanyImg"></div> -->
+          <!-- <p class="companyTxt">{{companyDesc}}</p> -->
+        </div>
+      </ion-content>
+    </ion-menu>
+=======
               <ion-thumbnail slot="start" class="menu-thumb">
                 <img style= "height: 25px !important;" src="../assets/imgs/lock_icon.png" item-left>
               </ion-thumbnail>
@@ -121,6 +175,7 @@
               </ion-label>
             </ion-item>
           </ion-list>
+>>>>>>> 25ada829dfd1fa6b65bb611ae62c30323e18f3f7
 
           <div class="" style="text-align:center">
             <img src="{{companyUrl}}" class="CompanyImg logoImg">
diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts
index 08179d5e..5d486395 100644
--- a/Mohem/src/app/authentication/login/login.component.ts
+++ b/Mohem/src/app/authentication/login/login.component.ts
@@ -140,8 +140,8 @@ export class LoginComponent implements OnInit, OnDestroy {
         const remember = localStorage.getItem('remember'); // ****//
         this.empname =  localStorage.getItem('emp-name');
         this.logintype = localStorage.getItem('login-type');
-      // tslint:disable-next-line: triple-equals
-        if (remember == 'true') { this.remeberMe = true; } else { this.remeberMe = false; }
+        // tslint:disable-next-line: triple-equals
+        if (remember == 'true') { this.remeberMe = true ; } else { this.remeberMe = false; }
     }
 
     ngOnDestroy(): void {
@@ -353,6 +353,11 @@ export class LoginComponent implements OnInit, OnDestroy {
     }
 
     login() {
+        let anotherUser = this.sharedData.getSharedData('anotherUser');
+        if(anotherUser){
+            this.username = '';
+            this.password = '';
+        }
         console.log('login emit');
         console.log('login');
        // this.checkUserAuthentication();
diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.html b/Mohem/src/app/eit/eit-list/eit-list.component.html
index 8855aa28..64c9c34f 100644
--- a/Mohem/src/app/eit/eit-list/eit-list.component.html
+++ b/Mohem/src/app/eit/eit-list/eit-list.component.html
@@ -3,8 +3,6 @@
   [headerText]="headerTitle">
 </app-generic-header>
 
-
-
 <ion-content>
   <div class="">
     <!-- class="colorBG" -->
@@ -16,6 +14,17 @@
       <div style="color: black;"> 
       
        <div class="result-graph">
+
+        <div >
+          <ion-datetime [(ngModel)]="Sdate" class="datetime" displayFormat="DD MMMM YYYY" placeholder="DD MMMM YYYY"
+           (ionChange)="getAccrualBalance()"></ion-datetime>
+          <ion-icon class="iconCalendar" ios="ios-calendar" md="md-calendar"></ion-icon>
+        </div>
+        <div style=" border-bottom: 1px solid #a7a4a4; margin-bottom: 12px;
+        margin-top: -10px; margin-right: -9px;"></div>
+        
+              <!-- <div class="result-text-container"> 
+              </div> -->
      
 <p-chart #chart class="today-graph" type="doughnut" [data]="data" [options]="options"></p-chart>
 
diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.scss b/Mohem/src/app/eit/eit-list/eit-list.component.scss
index 2dfdf5be..25220405 100644
--- a/Mohem/src/app/eit/eit-list/eit-list.component.scss
+++ b/Mohem/src/app/eit/eit-list/eit-list.component.scss
@@ -4,6 +4,26 @@
   min-height: 45px;
   min-width: 200px;
 }
+
+.datetime{
+  // text-align: center;
+  // font-family: WorkSans-Bold;
+  // margin-left: 111px;
+  text-align: center;
+  font-family: WorkSans-Bold;
+  margin-left: 47px;
+  margin-top: -19px;
+
+ } 
+.iconCalendar{
+  // margin-left: -241px;
+  // margin-top: 5px;
+  margin-left: 30px !important;
+  width: 22% !important;
+  height: 26px !important;
+  margin-top: -69px !important;
+  margin-bottom: 20px !important;
+ } 
 h4 {
   font-size: 2.2rem;
   text-align: center;
diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.ts b/Mohem/src/app/eit/eit-list/eit-list.component.ts
index 5b43290c..144955aa 100644
--- a/Mohem/src/app/eit/eit-list/eit-list.component.ts
+++ b/Mohem/src/app/eit/eit-list/eit-list.component.ts
@@ -9,6 +9,9 @@ import { EitService } from '../services/eit.service';
 import { EIT_ACTION } from '../models/submit.eit.action';
 import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
 import { AddEitResponse } from '../models/add.eit.response';
+import { AccrualService } from 'src/app/accrual-balances/services/accrual.service';
+import { AuthenticationService } from 'src/app/hmg-common/services/authentication/authentication.service';
+import { AuthenticatedUser } from 'src/app/hmg-common/services/authentication/models/authenticated-user';
 
 @Component({
   selector: 'app-eit-list',
@@ -16,7 +19,10 @@ import { AddEitResponse } from '../models/add.eit.response';
   styleUrls: ['./eit-list.component.scss'],
 })
 export class EitListComponent implements OnInit {
-
+  Sdate: any;
+  emp_no: any;
+  balance:any;
+  //////////////up
   P_PAGE_NUM: number;
   P_PAGE_LIMIT: number;
   IsReachEnd = false;
@@ -56,7 +62,8 @@ export class EitListComponent implements OnInit {
     // gaugeLabel = "";
 
   // tslint:disable-next-line: max-line-length
-  constructor(private cs: CommonService, private EITService: EitService, public ts: TranslatorService, private modalCtrl: ModalController) {
+  constructor(private cs: CommonService, private EITService: EitService, public ts: TranslatorService, 
+    private modalCtrl: ModalController, public accrualService: AccrualService, public authService:AuthenticationService,) {
     this.direction = TranslatorService.getCurrentLanguageName();
     this.selMenu = this.cs.sharedService.getSharedData(MenuResponse.SHARED_DATA, false);
     this.selEmp = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_EMP, false);
@@ -72,6 +79,10 @@ export class EitListComponent implements OnInit {
   }
 
   ngOnInit() {
+    /////////////
+    this.Sdate = new Date().toISOString();
+    this.getUserDetails();
+    ////////////////up
     this.getEITTransactions();
 
     this.accrualBalancesList = this.cs.sharedService.getSharedData('tickitsbalance', false);
@@ -96,8 +107,44 @@ export class EitListComponent implements OnInit {
       };
   }
 
+  getUserDetails(){
+    this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => {
+        if (user) {
+          this.emp_no=user.EMPLOYEE_NUMBER;
+       
+        }
+      });
+  }
+  public getAccrualBalance() {
+    if (this.Sdate) {
+      let today = new Date(this.Sdate);
+      let day = today.getDate();
+      let month = today.getMonth() + 1;
+      let year = today.getFullYear();
+      let todayDate = month + '/' + day + '/' + year;
+      let effectiveDate = todayDate;
+      const request = {
+        P_SELECTED_EMPLOYEE_NUMBER: this.emp_no,
+        P_EFFECTIVE_DATE: effectiveDate
+      };
+      this.accrualService
+        .getAccrualBalances(request)
+        .subscribe((result: any) => {
+          this.handleAccrualResult(result);
+        });
+    }
+  }
+  handleAccrualResult(result) {
+    if (this.cs.validResponse(result)) {
+      this.balance=result.GetAccrualBalancesList;
+      this.accrualNetAdult = this.balance[1].ACCRUAL_NET_ENTITLEMENT;
+      this.accrualUNetChild = this.balance[2].ACCRUAL_NET_ENTITLEMENT;
+      this. accrualNetInfants = this.balance[3].ACCRUAL_NET_ENTITLEMENT;
+      }
+  }
+  ///////////////////////////////////
+
   getEITTransactions() {
-    console.log('jkfdjkdfsffjhfsdahffg');
     this.IsReachEnd = false;
     this.EITTransactionsListObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT;
     this.EITTransactionsListObj.P_PAGE_NUM = this.P_PAGE_NUM;
@@ -520,5 +567,42 @@ export class EitListComponent implements OnInit {
     this.removeItems(item.Collection_Transaction[0].TRANSACTION_NUMBER);
   }
 
-
+ 
+//////////////////////////
+// getUserDetails(){
+//   this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => {
+//       if (user) {
+//         this.emp_no=user.EMPLOYEE_NUMBER;
+     
+//       }
+//     });
+// }
+// public getAccrualBalance() {
+//   if (this.Sdate) {
+//     let today = new Date(this.Sdate);
+//     let day = today.getDate();
+//     let month = today.getMonth() + 1;
+//     let year = today.getFullYear();
+//     let todayDate = month + '/' + day + '/' + year;
+//     let effectiveDate = todayDate;
+//     const request = {
+//       P_SELECTED_EMPLOYEE_NUMBER: this.emp_no,
+//       P_EFFECTIVE_DATE: effectiveDate
+//     };
+//     this.accrualService
+//       .getAccrualBalances(request)
+//       .subscribe((result: any) => {
+//         this.handleAccrualResult(result);
+//       });
+//   }
+// }
+// handleAccrualResult(result) {
+//   if (this.cs.validResponse(result)) {
+//     this.balance=result.GetAccrualBalancesList;
+//     }
+// }
 }
+////////////////////////////////up
+
+
+
diff --git a/Mohem/src/app/hmg-common/ui/fab-button/fab-button.component.html b/Mohem/src/app/hmg-common/ui/fab-button/fab-button.component.html
index 18d70a13..0cd4bf1f 100644
--- a/Mohem/src/app/hmg-common/ui/fab-button/fab-button.component.html
+++ b/Mohem/src/app/hmg-common/ui/fab-button/fab-button.component.html
@@ -2,7 +2,6 @@
   <div class="circle pulse"></div>
   <div class="circle">
       <ion-fab class="fab-i ">
-
           <ion-fab-button [ngClass]="type === 'add' ? 'addnon' : 'cbookApointmentBtn' " (click)="onClick()"  >
               <!-- <img style="width: 39%; margin-top: -29%;" src="assets/icon/booking.png" /> -->
              <div *ngIf="type != 'add' "> 
@@ -14,7 +13,6 @@
                     <!-- <ion-icon name="add-outline"></ion-icon> -->
             </div>
           </ion-fab-button>
-
       </ion-fab>
   </div>
 </div>
\ No newline at end of file
diff --git a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.html b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.html
index 554414ee..9f4f7175 100644
--- a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.html
+++ b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.html
@@ -1,4 +1,4 @@
-<div feedback class="custom-button">
+<div feedback class="custom-button" *ngIf='show'>
   <div class="iconBox">
     <img [src]="icon" class="icon">
   </div>
diff --git a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.ts b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.ts
index b204d12d..65bc8ecc 100644
--- a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.ts
+++ b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.ts
@@ -16,6 +16,7 @@ export class StatsButtonComponent implements OnInit {
   @Output() trigger = new EventEmitter();
   @Input() focusicon: string;
   @Input() disabled = false;
+  @Input() show: boolean ;
   public direction: string;
   public style: any;
   constructor(
diff --git a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts
index e7285713..39703cbe 100644
--- a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts
+++ b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts
@@ -15,6 +15,7 @@ import { ConfirmLoginComponent } from 'src/app/authentication/confirm-login/conf
 import * as moment from 'moment'
 import { ButtonSettings } from '../button/models/button-settingsl';
 import { Events } from '@ionic/angular';
+import { SharedDataService } from '../../services/shared-data-service/shared-data.service';
 
 @Component({
   selector: "welcome-login",
@@ -76,7 +77,8 @@ export class WelcomeComponent implements OnInit, AfterViewInit, OnDestroy {
     public ts: TranslatorService,
     public cs: CommonService,
     public authservice: AuthenticationService,
-    public events: Events
+    public events: Events,
+    public sharedData: SharedDataService,
   ) { }
 
   ngOnInit() {
@@ -211,6 +213,7 @@ export class WelcomeComponent implements OnInit, AfterViewInit, OnDestroy {
 
  
   login() {
+    this.sharedData.setSharedData(true, "anotherUser")
     this.onLogin.emit();
   }
   loginwithuser() {
diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html
index 1466b033..dc681d97 100644
--- a/Mohem/src/app/home/home.page.html
+++ b/Mohem/src/app/home/home.page.html
@@ -14,6 +14,7 @@
                 [title]="button.title"
                 [statsValue]="button.statsValue"
                 [icon]="button.icon"
+                [show]="button.show"
                 (click)="openStatsButton(button.link)">
               </app-stats-button>
         </ion-slide>
@@ -21,7 +22,6 @@
     </ion-row>
 
     <ion-row *ngFor="let menuItem of menuEntries;  let i=index">
-
       <ion-row class="attendance-module" *ngIf="i == 1">
           <ion-col [size]="8">
               <h3>{{'home,monthly-attendance' | translate}}</h3>
@@ -46,7 +46,7 @@
                 [icon]="subMenu.ICON">
             </app-services-button>
         </ion-slide>
-        <ion-slide *ngIf="i == 0"> 
+        <ion-slide *ngIf="i == 0 && showVcationRule"> 
           <app-services-button
               (click)="Vacation_Rule()"
               [title]="vacationRuleTitle"
diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts
index 46192dcd..32e8a558 100644
--- a/Mohem/src/app/home/home.page.ts
+++ b/Mohem/src/app/home/home.page.ts
@@ -34,6 +34,7 @@ import { GetSubordinatesLeavesResponse } from '../hmg-common/services/dashbored/
 import { AccrualService } from '../accrual-balances/services/accrual.service';
 import { TimeCardService } from '../time-card/service/time-card.service';
 import { WorklistMainService } from '../notification/service/work-list.main.service';
+import { isThisISOWeek } from 'date-fns';
 
 @Component({
   selector: 'app-home',
@@ -57,12 +58,15 @@ export class HomePage implements OnInit {
   ticketRequestObject: any;
   leaveRequestObject: any;
   missingSwipeRequestObject: any;
+  public isShow = false;
+  public showVcationRule = false;
   public statsButtons = [
     {
       title: this.ts.trPK('home','worklist'),
       statsValue: 0,
       icon: 'assets/icon/new-design/work_list.png',
-      link: '1'
+      link: '1',
+      show: true
     },
     // {
     //   title: 'Pending Request',
@@ -74,19 +78,22 @@ export class HomePage implements OnInit {
       title: this.ts.trPK('home','missing-swipes'),
       statsValue: 0,
       icon: 'assets/icon/new-design/missing_swipe.png',
-      link: '2'
+      link: '2',
+      show:true
     },
     {
       title: this.ts.trPK('home','leave-balance'),
       statsValue: 0,
       icon: 'assets/icon/new-design/leave_balance.png',
-      link: '3'
+      link: '3',
+      show: this.isShow,
     },
     {
       title: this.ts.trPK('absenceList','tickets-balance'),
       statsValue: 0,
       icon: 'assets/icon/new-design/ticket_balance.png',
-      link: '4'
+      link: '4',
+      show: this.isShow
     }
   ];
 
@@ -256,11 +263,22 @@ export class HomePage implements OnInit {
   setServicesPrivilage() {
     for (const servicePrivilage of AuthenticationService.servicePrivilage) {
       if (servicePrivilage.Previlege === false) {
-        document
-          .getElementById(servicePrivilage.ServiceName)
-          .setAttribute('disabled', 'disabled');
-        document.getElementById(servicePrivilage.ServiceName).style.filter =
-          'grayscale(1)';
+        if(servicePrivilage.ServiceName === 'accrualBalance'){
+          this.statsButtons[2].show = false;
+          this.statsButtons[3].show = false;
+        }
+        if(servicePrivilage.ServiceName === 'vacationRule'){
+          this.showVcationRule = false;
+        }
+        // document
+        //   .getElementById(servicePrivilage.ServiceName)
+        //   .setAttribute('disabled', 'disabled');
+        // document.getElementById(servicePrivilage.ServiceName).style.filter =
+        //   'grayscale(1)';
+      }else{
+        this.statsButtons[2].show = true;
+        this.statsButtons[3].show = true;
+        this.showVcationRule = true;
       }
     }
   }
diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss
index 5bcfe464..8266747c 100644
--- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss
+++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss
@@ -87,7 +87,7 @@ button.item-button.button.button-md.button-clear.button-clear-md {
   // padding-left: 10px !important;
   border: solid var(--gray) 1px;
   border-radius: 21px;
-  padding-left: 145px !important;
+  // padding-left: 145px !important;
   margin-left: 86px;
   padding-right: 129px;
   margin-right: -143px;
diff --git a/Mohem/src/app/payslip/home/home.component.html b/Mohem/src/app/payslip/home/home.component.html
index 20d46def..d32e9a56 100644
--- a/Mohem/src/app/payslip/home/home.component.html
+++ b/Mohem/src/app/payslip/home/home.component.html
@@ -48,7 +48,8 @@
           </button>
       </ion-col>
        <ion-col>
-        <p class="label"><b style="font-family: WorkSans-Bold;">{{ (showPaySlip.PAYSLIP_CHOICE)?.substring(15,23) }}</b></p>
+        <p class="label" *ngIf="direction==='en'"><b style="font-family: WorkSans-Bold;">{{ (showPaySlip.PAYSLIP_CHOICE)?.substring(15,23) }}</b></p>
+        <p class="label" *ngIf="direction==='ar'"><b style="font-family: WorkSans-Bold;">{{ (showPaySlip.PAYSLIP_CHOICE)?.substring(23,17) }}</b></p>
           </ion-col>
       <ion-col>
            <button ion-button icon-end  class="slidbtn" (click)="slideNext(sliderOne,slideWithNav)">
@@ -65,7 +66,7 @@
     </ion-icon>
 
     <!-- <ion-icon [ngClass]="{'disabledArrow' : payslipIndex === 0 , 'activeArrow' : payslipIndex != 0 , 'disabledArrow-ar' : direction != 'en' ,'disabledArrow' : direction == 'en'}" ios="ios-arrow-dropright-circle" md="md-arrow-dropright-circle">
-        
+  
     </ion-icon> -->
               </button>
           </ion-col>
@@ -120,7 +121,7 @@
               <!-- <span>TOTAL <br> OPEN REQUEST</span> -->
               <span>{{ts.trPK('payslip','total')}} <br> {{ts.trPK('payslip','salary')}}</span>
           </div>
-          <p-chart #chart class="today-graph" type="doughnut" [data]="data" [options]="options"></p-chart>
+          <p-chart #chart [ngClass]="direction == 'en'? 'today-graph':'today-graph-ar'" type="doughnut" [data]="data" [options]="options"></p-chart>
     
         </div>
                   <div [ngClass]=" direction == 'en' ? 'div-green':'div-green-ar'">
diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss
index 46a732d0..4d072688 100644
--- a/Mohem/src/app/payslip/home/home.component.scss
+++ b/Mohem/src/app/payslip/home/home.component.scss
@@ -159,6 +159,21 @@
     -o-transform: scaleX(-1);
     transform: scaleX(-1);  
    }
+   .today-graph{
+    display: block !important;
+    height: 162px;
+    width: 335px;
+    /* padding-left: 51px; */
+    margin-left: 3px !important;
+  }
+
+  .today-graph-ar{
+    display: block !important;
+    height: 162px;
+    width: 335px;
+    margin-right: 45px;
+    margin-left: -25px !important;
+}
 
    .result-graph{
     font-size: 14px;
@@ -191,7 +206,8 @@
     padding: 0;
     margin: 0;
     position: absolute;
-    left: 54%;
+    // left: 54%;
+    left: 45%;
     top: 50%;
     display: block;
     text-align: center;
@@ -199,7 +215,7 @@
 
     h2 {
 
-        font-size: 25px;
+        font-size: 23px;
         font-family: WorkSans-Bold;
         margin: 0 auto;
         line-height: 36px;
@@ -211,7 +227,7 @@
         width: 125px;
         display: block;
         margin: 0 auto;
-        font-size: 15px;
+        font-size: 14px;
         font-family: workSans-Regular;
     }
   }
@@ -221,7 +237,7 @@
     padding: 0;
     margin: 0;
     position: absolute;
-    left: 42%;
+    left: 40%;
     top: 50%;
     display: block;
     text-align: center;
@@ -251,7 +267,7 @@
 }
 
 .green-amount{
-  font-size: 14px;
+  font-size: 13px;
   font-family: WorkSans-Bold;
   margin-top: -3px;
 }
@@ -262,7 +278,7 @@
   }
   
   .blue-amount{
-    font-size: 14px;
+    font-size: 13px;
     font-family: WorkSans-Bold;
     margin-top: -4px;
   }
diff --git a/Mohem/src/app/payslip/home/home.component.ts b/Mohem/src/app/payslip/home/home.component.ts
index b43a3bc6..9943440a 100644
--- a/Mohem/src/app/payslip/home/home.component.ts
+++ b/Mohem/src/app/payslip/home/home.component.ts
@@ -54,7 +54,7 @@ export class HomeComponent implements OnInit {
 
   @ViewChild(IonInfiniteScroll) infiniteScroll: IonInfiniteScroll;
  public options = {
-        cutoutPercentage: 80,
+        cutoutPercentage: 85,
         tooltips: { enabled: false },
         legend: { display: false }};
         gaugeType = "full";
diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss
index 9edffc6c..202c73a9 100644
--- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss
+++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss
@@ -147,11 +147,10 @@
 
 }
 .labelvalue-ar{
-  
+  // margin-right: 19px !important;
   font-size: 24px !important;
   font-weight: bold !important;
-  /* margin-top: 7px !important; */
-  margin-right: 19px !important;
+  margin-right: 25px !important;
 }
 
 
@@ -162,8 +161,9 @@
 
 }
 .percentage-ar{
+  // margin-right: -54px;
   font-size: 19px !important;
-  margin-right: -54px;
+    margin-right: -51px;
 }
 
 .gauge{
diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss
index f24f0ebd..602cf3e7 100644
--- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss
+++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss
@@ -111,9 +111,9 @@ button.item-button.button.button-md.button-clear.button-clear-md {
 .filterInput-ar{
   border: solid var(--gray) 1px;
   border-radius: 21px;
-  padding-left: 100px !important;
+  // padding-left: 100px !important;
   margin-left: 86px;
-  padding-right: 129px;
+  // padding-right: 129px;
   margin-right: -139px;
   
 }
diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json
index db19a1d6..8977dc37 100644
--- a/Mohem/src/assets/localization/i18n.json
+++ b/Mohem/src/assets/localization/i18n.json
@@ -163,8 +163,8 @@
             "ar":"Verify its you"
         },
         "check-user-text1":{
-            "en":"Please Enter your Employee ID, A ",
-            "ar":"يرجى ادخال رقم الموظف "
+            "en":"Employee ID",
+            "ar":"رقم الموظف "
         },
         "check-user-text2":{
             "en":"login Code ",
@@ -1385,17 +1385,17 @@
             "en": "Accrual Balances",
             "ar": "رصيد حساب المستحقات"
         },
-        "accrualNet": {
-            "en": "Accrual Net",
-            "ar": "صافي الاستحقاق"
+        "currentBalance": {
+            "en": "Current Balance",
+            "ar": " الرصيد الحالي"
         },
-        "accrualUsed": {
-            "en": "Accrual Used",
-            "ar": "الاستحقاق المستخدم"
+        "usedBalance": {
+            "en": "Used Balance",
+            "ar": "الرصيد المستخدم"
         },
-        "accrualYearly": {
-            "en": "Accrual Yearly",
-            "ar": "الاستحقاق السنوي"
+        "annualBalance": {
+            "en": "Annual Balance",
+            "ar": "الرصيد السنوي"
         },
         "totalNumber": {
             "en": "TOTAL NUMBERS",
