Merge branch 'MOE_DEV_NEW_TEMPORARY_DESIGN' of https://gitlab.com/haroon6138/mohemmionic5 into MOE_DEV_NEW_TEMPORARY_DESIGN

MOE_MAIN
Sultan Khan 3 years ago
commit 31629cc830

@ -60,7 +60,7 @@
{{ts.trPK('userProfile','HR-Request')}}
</ion-label>
</ion-item> -->
<div *ngFor="let menu of menuList">
<!-- <div *ngFor="let menu of menuList">
<ion-item (click)="oepnMyRequest(menu)" *ngIf="menu.MENU_TYPE == 'E'">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 20px !important;" src="../assets/imgs/my-request.png" item-left>
@ -69,7 +69,7 @@
{{menu.MENU_NAME}}
</ion-label>
</ion-item>
</div>
</div> -->
<!-- <ion-item (click)="oepnTransaction()">
<ion-thumbnail slot="start" class="menu-thumb">
@ -182,7 +182,7 @@
{{ts.trPK('userProfile','HR-Request')}}
</ion-label>
</ion-item> -->
<div *ngFor="let menu of menuList">
<!-- <div *ngFor="let menu of menuList">
<ion-item (click)="oepnMyRequest(menu)" *ngIf="menu.MENU_TYPE == 'E'">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 20px !important;" src="../assets/imgs/my-request.png" item-left>
@ -191,7 +191,7 @@
{{menu.MENU_NAME}}
</ion-label>
</ion-item>
</div>
</div> -->
<!-- <ion-item (click)="oepnTransaction()">
<ion-thumbnail slot="start" class="menu-thumb">

@ -27,11 +27,12 @@
display: block;
}
.pClass {
font-size: 11px;
font-size: 10px;
text-align: center;
margin-top: 10px;
color: black;
font-weight: 600;
}
}

@ -134,6 +134,7 @@ export class HomePage implements OnInit {
direction: string;
public isPostNoLoad = true;
public showStaticServices = false;
public myRequestData: any;
constructor(
public ts: TranslatorService,
@ -432,6 +433,10 @@ export class HomePage implements OnInit {
} else {
this.events.publish('myTeamFlag', 'false');
}
if (this.menuList[i].MENU_TYPE === 'E') {
this.myRequestData = this.menuList[i];
}
}
// if (item.MENU_TYPE === 'M') {
@ -868,6 +873,7 @@ export class HomePage implements OnInit {
// tslint:disable-next-line: triple-equals
} else if (link == '4') {
// this.openPage(this.ticketRequestObject);
this.common.sharedService.setSharedData(this.myRequestData, MenuResponse.SELECTED_MENU);
this.common.openConcurrentTransactionsHome();
// if (this.menuList) {

@ -61,7 +61,7 @@
</ion-segment-button>
</ion-col>
<ion-col>
<span class="btnTitle">{{ts.trPK('myTeam','profile-details')}}</span>
<span [ngClass]="direction == 'en' ? 'btnTitle' : 'btnTitle_ar'">{{ts.trPK('myTeam','profile-details')}}</span>
</ion-col>
</ion-col>
<ion-col [size]="4" (click)="getMenuEntries(employee)">
@ -72,7 +72,7 @@
<img class="imgSize" src="../assets/imgs/create-req.svg">
</ion-segment-button>
</ion-col>
<ion-col > <span class="btnTitle">{{ts.trPK('vacation-rule','create-request')}}</span></ion-col>
<ion-col > <span [ngClass]="direction == 'en' ? 'btnTitle' : 'btnTitle_ar'">{{ts.trPK('vacation-rule','create-request')}}</span></ion-col>
</ion-col>
<!-- <ion-col [size]="3">
<ion-col>
@ -93,7 +93,7 @@
<img class="imgSize" src="../assets/imgs/team-members.svg">
</ion-segment-button>
</ion-col>
<ion-col><span class="btnTitle">{{ts.trPK('myTeam','team-members')}}</span></ion-col>
<ion-col><span [ngClass]="direction == 'en' ? 'btnTitle' : 'btnTitle_ar'">{{ts.trPK('myTeam','team-members')}}</span></ion-col>
</ion-col>
</ion-segment>

@ -1107,6 +1107,16 @@ $actionBtnSize : 36px;
}
.btnTitle {
text-align: center;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 10px;
font-size: 12px;
color: #4D4D4D;
margin-top: -13px;
font-weight: bold;
}
.btnTitle_ar {
text-align: center;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 10px;
@ -1116,6 +1126,7 @@ $actionBtnSize : 36px;
font-weight: bold;
}
.btnDiv {
position: relative;
display: flex;

@ -1,6 +1,5 @@
<app-generic-header
showBack="true"
subordinateLeave='true'
backLink="/home"
[headerText]="'myTeam, myTeam-header' | translate">
</app-generic-header>

@ -23,7 +23,7 @@
<p-chart *ngIf="showChart && receivedITGCount" class="today-graph" type="doughnut" [data]="data" [options]="options"></p-chart>
</div>
<ion-row class="filters-row">
<ion-row [ngClass]="direction === 'ar' ? 'filters-row-ar' : 'filters-row'">
<ion-slides [options]="slideOptsOne">
<ion-slide *ngFor="let filter of filters; let i=index" [ngClass]="filter.disable === true ? 'disable-filter' : ''">
<app-card-filter
@ -60,7 +60,7 @@
</ion-col>
</ion-row>
<div style="position: relative;">
<div [ngClass]="direction === 'ar' ? 'worklist-content-ar' : 'worklist-content'">
<div [ngClass]="showFormattedData.length > 0 && direction == 'en'? 'work-list-container' : 'work-list-container-ar'" *ngIf='selectedFilter != "ITG" && showFormattedData.length > 0'>
<div *ngFor="let formattedData of showFormattedData; let i = index">
<span [ngClass]="direction == 'en'? 'date-span':'date-span-ar'">{{formattedData.date}}</span>

@ -339,10 +339,24 @@ ion-content {
}
.filters-row {
margin-top: 10px;
margin-top: 20px;
margin-left: 20px;
}
.filters-row-ar {
margin-top: 20px;
margin-right: 20px;
}
.worklist-content {
position: relative;
}
.worklist-content-ar {
position: relative;
margin-right: 20px;
}
.work-list-container {
position: relative;
padding-left: 60px;
@ -442,7 +456,7 @@ ion-content {
border-radius: 50%;
width: 15px;
height: 15px;
background-color: #38c9b3;
background-color: #024d71;
top: 1px;
}

@ -1843,6 +1843,8 @@ ion-app[dir="rtl"] {
.iconBox img {
margin: 5px !important;
}
.pClass {
font-size: 12px;
}
}
Loading…
Cancel
Save