fixed moe issues

MOE_MAIN-COLOR_CHANGES
umasoodch 3 years ago
parent 5c3ac9be4d
commit 96630d6606

@ -1,27 +1,27 @@
<ion-header> <app-generic-header
<ion-toolbar class="header-toolbar-new"> showBack="true"
<nav-buttons></nav-buttons> [headerText]="'eit, update-title' | translate">
<ion-title color="light">{{'eit, update-title' | translate}}</ion-title> </app-generic-header>
</ion-toolbar>
</ion-header>
<ion-content padding> <ion-content padding>
<!-- <button ion-button (click)="resubmitEit()">next</button> --> <!-- <button ion-button (click)="resubmitEit()">next</button> -->
<div *ngIf="notificationBodyRes?.length > 0 "> <div *ngIf="notificationBodyRes?.length > 0 ">
<ion-card *ngFor="let item of notificationBodyRes; let i=index "> <ion-card *ngFor="let item of notificationBodyRes; let i=index ">
<ion-card-header class="hrTitle"> <ion-card-header class="hrTitle" style="background: #024d71;">
<div class="hrTitle">{{'worklistMain, notfDetails' | translate}} </div> <div class="hrTitle">{{'worklistMain, notfDetails' | translate}} </div>
<!-- <button ion-button icon-only *ngIf="item.Collection_Notification[0].ACTION!='DELETE_ROW'" (click)="updateEitNot(i)"> <!-- <button ion-button icon-only *ngIf="item.Collection_Notification[0].ACTION!='DELETE_ROW'" (click)="updateEitNot(i)">
<ion-icon name="create"></ion-icon> <ion-icon name="create"></ion-icon>
</button> --> </button> -->
<div class="editIconDiv"><button ion-button *ngIf="item.Collection_Notification[0].ACTION!='DELETE_ROW'" (click)="updateEitNot(i)"> <div [ngClass]=" direction === 'en' ? 'editIconDiv' : 'editIconDiv-ar'"><button style="background: #024d71;" ion-button *ngIf="item.Collection_Notification[0].ACTION!='DELETE_ROW'" (click)="updateEitNot(i)">
<img class="imgSize" src="../assets/imgs/edit.png"></button> <img class="imgSize" src="../assets/imgs/profile-icons/editingWhite.png"></button>
</div> </div>
</ion-card-header> </ion-card-header>
<ion-card-content> <ion-card-content>

@ -15,3 +15,11 @@
position: absolute; position: absolute;
top: 10px; top: 10px;
} }
.editIconDiv-ar{
left: 10px;
position: absolute;
top: 10px;
}

@ -5,6 +5,7 @@ import { Component, OnInit } from '@angular/core';
import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { CommonService } from 'src/app/hmg-common/services/common/common.service';
import { EITNotificatonBodyResponse } from '../models/EITNotificationBodyRes'; import { EITNotificatonBodyResponse } from '../models/EITNotificationBodyRes';
import { EitService } from '../services/eit.service'; import { EitService } from '../services/eit.service';
import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service";
@Component({ @Component({
selector: 'app-eit-update-list', selector: 'app-eit-update-list',
@ -23,8 +24,9 @@ export class EitUpdateListComponent implements OnInit {
private eitTransactionTbl: any = []; private eitTransactionTbl: any = [];
private eitRequest: EitRequest; private eitRequest: EitRequest;
private descFlex: string; private descFlex: string;
direction: string;
constructor(public cs: CommonService, public eitService: EitService, public modalController: ModalController) { constructor(public cs: CommonService, public eitService: EitService, public modalController: ModalController, private ts: TranslatorService) {
this.notificationBodyRes = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.SHARED_DATA, false); this.notificationBodyRes = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.SHARED_DATA, false);
let notification = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); let notification = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false);
this.itemKey = notification.ITEM_KEY; this.itemKey = notification.ITEM_KEY;
@ -32,6 +34,7 @@ export class EitUpdateListComponent implements OnInit {
this.functionName = notification.FUNCTION_NAME; this.functionName = notification.FUNCTION_NAME;
this.selEmp = notification.SELECTED_EMPLOYEE_NUMBER; this.selEmp = notification.SELECTED_EMPLOYEE_NUMBER;
this.descFlex = notification.DESC_FLEX_CONTEXT_CODE; this.descFlex = notification.DESC_FLEX_CONTEXT_CODE;
this.direction = TranslatorService.getCurrentLanguageName();
this.fillEitTransactionTable(); this.fillEitTransactionTable();
} }
@ -67,12 +70,13 @@ export class EitUpdateListComponent implements OnInit {
} }
updateTransactionList(list) { updateTransactionList(list) {
list.forEach(element => { // list.forEach(element => {
const index = this.eitTransactionTbl.findIndex(x => x.TRANSACTION_NUMBER === element.TRANSACTION_NUMBER); // const index = this.eitTransactionTbl.findIndex(x => x.TRANSACTION_NUMBER === element.TRANSACTION_NUMBER);
if (index != -1) // if (index != -1)
this.eitTransactionTbl.splice(index, 1); // this.eitTransactionTbl.splice(index, 1);
}); // });
this.eitTransactionTbl = this.eitTransactionTbl ? this.eitTransactionTbl.concat(list) : list; // this.eitTransactionTbl = this.eitTransactionTbl ? this.eitTransactionTbl.concat(list) : list;
this.eitTransactionTbl = list;
} }
resubmitEit() { resubmitEit() {

@ -53,7 +53,7 @@
width: 100%; width: 100%;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; // overflow: hidden;
display: block; display: block;
margin-left: -10px; margin-left: -10px;
margin-top: -10px; margin-top: -10px;

@ -24,7 +24,8 @@
<img style=" <img style="
width: 20px; width: 20px;
height: 20px; height: 20px;
margin-top: 5px;" position: absolute;
top: -30px;"
[src]="close" [src]="close"
/> />
</div> </div>

@ -745,14 +745,14 @@
</div> </div>
<div *ngIf="messageSuccess" class="succssfullMSG"> <!-- <div *ngIf="messageSuccess" class="succssfullMSG">
<ion-col size="12"> <ion-col size="12">
<ion-icon class="succssfullIcon" name="checkmark"></ion-icon> <ion-icon class="succssfullIcon" name="checkmark"></ion-icon>
</ion-col> </ion-col>
<ion-col size="12"> <ion-col size="12">
<div style="font-size: 30px !important"> {{'worklistMain, Tran_Succ' | translate}} </div> <div style="font-size: 30px !important"> {{'worklistMain, Tran_Succ' | translate}} </div>
</ion-col> </ion-col>
</div> </div> -->
</ion-content> </ion-content>

@ -354,7 +354,7 @@
<h2 style="font-weight: bold; font-size: 15px;margin:0">{{data.CONTACT_NAME}}</h2> <h2 style="font-weight: bold; font-size: 15px;margin:0">{{data.CONTACT_NAME}}</h2>
</ion-col> </ion-col>
<ion-col [size]='direction === "ltr" ? 5 : 8 ' [offset]='direction === "ltr" ? 3 : 0 ' [ngClass]="dependentDetails && dependentDetails.UPDATE_BUTTON === 'Y' ? '' :'disabledButton'"> <ion-col [size]='direction === "ltr" ? 5 : 8 ' [offset]='direction === "ltr" ? 3 : 0 ' [ngClass]="dependentDetails && dependentDetails.UPDATE_BUTTON === 'Y' ? '' :'disabledButton'">
<div class='family-member-button' style="height: 32px !important;" (click)='updateFunction(data)'> <div [ngClass]="direction === 'ltr' ? 'float-right-moe' :'float-left-moe'" class='family-member-button' style="height: 32px !important;" (click)='updateFunction(data)'>
<ion-icon style="width: 20px;" name="create"></ion-icon> <ion-icon style="width: 20px;" name="create"></ion-icon>
<p>{{ts.trPK('userProfile','update')}}</p> <p>{{ts.trPK('userProfile','update')}}</p>
</div> </div>
@ -365,7 +365,7 @@
<ion-label><p style="font-weight: bold; font-size: 14px;">{{data.RELATIONSHIP}}</p></ion-label> <ion-label><p style="font-weight: bold; font-size: 14px;">{{data.RELATIONSHIP}}</p></ion-label>
</ion-col> </ion-col>
<ion-col [size]='direction === "ltr" ? 5 : 8 ' [offset]='direction === "ltr" ? 3 : 0 '> <ion-col [size]='direction === "ltr" ? 5 : 8 ' [offset]='direction === "ltr" ? 3 : 0 '>
<div class='family-member-button' style="height: 32px !important;" (click)='RemoveFunction(data)' [ngClass]="dependentDetails && dependentDetails.DELETE_BUTTON === 'Y' ? '' :'disabledButton'"> <div [ngClass]="direction === 'ltr' ? 'float-right-moe' :'float-left-moe'" class='family-member-button' style="height: 32px !important;" (click)='RemoveFunction(data)' [ngClass]="dependentDetails && dependentDetails.DELETE_BUTTON === 'Y' ? '' :'disabledButton'">
<ion-icon name="trash" style="width: 20px; height: 20px; color: #CA3332;"></ion-icon> <ion-icon name="trash" style="width: 20px; height: 20px; color: #CA3332;"></ion-icon>
<p style="color: #CA3332;">{{ts.trPK('userProfile','remove')}}</p> <p style="color: #CA3332;">{{ts.trPK('userProfile','remove')}}</p>
</div> </div>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

@ -1967,3 +1967,12 @@ ion-app[dir="rtl"] {
margin: 5px !important; margin: 5px !important;
} }
} }
.float-right-moe {
float: right;
}
.float-left-moe {
float: left;
}
Loading…
Cancel
Save