pushed sfh changes

enad-SFH
umasoodch 4 years ago
parent c5c57941ac
commit 95009a1e80

@ -27,14 +27,14 @@
<br>
<ion-list class="list-en" >
<ion-item (click)="profile()">
<!-- <ion-item (click)="profile()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 24px !important;" src="../assets/imgs/profile_icon.png" item-left>
</ion-thumbnail>
<ion-label class="profile">
{{ts.trPK('userProfile','title')}}
</ion-label>
</ion-item>
</ion-item> -->
<ion-item [hidden]="TeamFlag!='true'" (click)="openMyTeamPage()">
<ion-thumbnail slot="start" class="menu-thumb">
@ -125,14 +125,14 @@
<br>
<ion-list class="list-ar" >
<ion-item (click)="profile()">
<!-- <ion-item (click)="profile()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 24px !important;" src="../assets/imgs/profile_icon.png" item-left>
</ion-thumbnail>
<ion-label class="profile">
{{ts.trPK('userProfile','title')}}
</ion-label>
</ion-item>
</ion-item> -->
<ion-item [hidden]="TeamFlag!='true'" (click)="openMyTeamPage()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 14px !important;" src="../assets/imgs/my_team_icon.png" item-left>

@ -343,10 +343,12 @@ button.menu-item.item.item-block.item-ios {
margin-bottom: 70px;
}
.logoImg{
width: 77px;
// position: relative;
// width: 77px;
// margin-top: -1px;
// margin-bottom: 180px;
width: 120px;
margin-top: -1px;
margin-bottom: 180px;
margin-bottom: 135px;
}
.companyTxt {
font-size: 12px;

@ -204,11 +204,11 @@ export class AppComponent implements OnInit {
} else {
this.user_image = user.EMPLOYEE_IMAGE ? 'data:image/png;base64,' + user.EMPLOYEE_IMAGE : '../assets/imgs/profile.png';
}
// this.User_Job_name = user.JOB_NAME;
let jobTitle = user.POSITION_NAME.split('.');
if (jobTitle && jobTitle.length > 1) {
this.User_Job_name = jobTitle[0] + " " + jobTitle[1];
}
this.User_Job_name = user.JOB_NAME;
// let jobTitle = user.POSITION_NAME.split('.');
// if (jobTitle && jobTitle.length > 1) {
// this.User_Job_name = jobTitle[0] + " " + jobTitle[1];
// }
//erm channel
// if (!CommonService.SKIP)
// this.cs.navigateForward('/erm-channel/survey');

@ -22,10 +22,11 @@ export class DigitalIdComponent implements OnInit {
}
console.log(this.userInfo);
if (this.userInfo) {
let jobTitle = this.userInfo.POSITION_NAME.split('.');
if (jobTitle && jobTitle.length > 1) {
this.userJobName = jobTitle[0] + " " + jobTitle[1];
}
// let jobTitle = this.userInfo.POSITION_NAME.split('.');
this.userJobName = this.userInfo.JOB_NAME;
// if (jobTitle && jobTitle.length > 1) {
// this.userJobName = jobTitle[0] + " " + jobTitle[1];
// }
}
}

@ -1,4 +1,4 @@
<div feedback class="custom-button">
<div feedback class="custom-button" [ngClass]="requestType === 'SIT' ? 'disable-filter' : ''">
<div class="iconBox">
<img *ngIf="title !='Announcement' && title !='اعلان' && title !='Items For Sale' && title !='بضاعه للبع' && title !='العروض والخصومات' && title !='Offers & Discount' && title != 'My Team' && title != 'Vacation Rule' && title != 'فريقي' && title != 'الإنابة بالإجازات' " [src]="'data:image/png;base64,'+icon" class="icon">
<!-- <img *ngIf="title == 'My Team' || title == 'Vacation Rule'" [src]="icon" class="icon"> -->

@ -31,4 +31,9 @@
margin-top: 10px;
color: black;
font-weight: bold;
}
.disable-filter {
pointer-events: none;
opacity: .4;
}

@ -12,6 +12,7 @@ export class ServicesButtonComponent implements OnInit {
@Input() buttonClass: any = '';
@Input() icon: string;
@Input() title: string;
@Input() requestType: any;
@Output() trigger = new EventEmitter();
@Input() focusicon: string;
@Input() disabled = false;
@ -24,7 +25,9 @@ export class ServicesButtonComponent implements OnInit {
public ts: TranslatorService
) {}
ngOnInit() {}
ngOnInit() {
console.log(this.requestType);
}
public onClicked() {}
}

@ -29,33 +29,34 @@
<ion-slides [options]="slideOptsTwo">
<ion-slide *ngFor="let subMenu of menuItem.children; let j=index">
<app-services-button
(click)="openPage(subMenu)"
[title]="subMenu.PROMPT"
[icon]="subMenu.ICON">
<app-services-button
(click)="openPage(subMenu)"
[title]="subMenu.PROMPT"
[icon]="subMenu.ICON"
[requestType]="subMenu.REQUEST_TYPE">
</app-services-button>
</ion-slide>
<ion-slide *ngIf="i == 0 && showVcationRule">
<!-- <ion-slide *ngIf="i == 0 && showVcationRule">
<app-services-button
(click)="Vacation_Rule()"
[title]="vacationRuleTitle"
>
</app-services-button>
</ion-slide>
</ion-slide> -->
</ion-slides>
<!-- <ion-row class="attendance-module" *ngIf="i == 0">
<ion-row class="attendance-module" *ngIf="i == 0">
<ion-col [size]="8">
<h3>{{'home,monthly-attendance' | translate}}</h3>
<h3>{{'userProfile,personal-informaion' | translate}}</h3>
<span>{{'home,monthly-time-sheet-view' | translate}}</span>
<ion-button (click)="openTimeCard()">
<ion-button (click)="openPersonalInfo()">
{{'home,view-detail' | translate}}
</ion-button>
</ion-col>
<ion-col [size]="4">
<img src="assets/icon/new-design/attendance_button_icon.png"/>
<img src="assets/icon/new-design/profile.png"/>
</ion-col>
</ion-row> -->
</ion-row>
</ion-row>
<!-- <ion-row *ngIf="showStaticServices">

@ -81,14 +81,14 @@ export class HomePage implements OnInit {
statsValue: 0,
icon: 'assets/icon/new-design/leave_balance.png',
link: '3',
show: this.isShow,
show: true
},
{
title: this.ts.trPK('absenceList', 'tickets-balance'),
title: this.ts.trPK('vacation-rule', 'vacationRule'),
statsValue: 0,
icon: 'assets/icon/new-design/ticket_balance.png',
link: '4',
show: this.isShow
icon: 'assets/icon/new-design/vacation_rules_icon.png',
link: '999',
show: true
}
];
@ -293,7 +293,7 @@ export class HomePage implements OnInit {
if (servicePrivilage.Previlege === false) {
if (servicePrivilage.ServiceName === 'accrualBalance') {
this.statsButtons[1].show = false;
this.statsButtons[2].show = false;
// this.statsButtons[2].show = false;
}
if (servicePrivilage.ServiceName === 'vacationRule') {
this.showVcationRule = false;
@ -305,7 +305,7 @@ export class HomePage implements OnInit {
// 'grayscale(1)';
} else {
this.statsButtons[1].show = true;
this.statsButtons[2].show = true;
// this.statsButtons[2].show = true;
this.showVcationRule = true;
}
}
@ -729,7 +729,7 @@ export class HomePage implements OnInit {
let totalTicketsLeft = 0;
this.accrualBalancesList = result.GetAccrualBalancesList;
for (const accrualBalance of result.GetAccrualBalancesList) {
if (accrualBalance.ACCURAL_PLAN_NAME === 'HMG Annual Vacation Accrual Plan') {
if (accrualBalance.ACCURAL_PLAN_NAME === 'SFHP Annual Leave Plan') {
this.statsButtons[1].statsValue = accrualBalance.ACCRUAL_NET_ENTITLEMENT === null ? 0 : Number(accrualBalance.ACCRUAL_NET_ENTITLEMENT.toFixed(2));
this.common.sharedService.setSharedData(accrualBalance, 'leaveAccrualBalance');
this.common.sharedService.setSharedData(request, 'leaveAccrualBalanceDate');
@ -738,7 +738,7 @@ export class HomePage implements OnInit {
totalTicketsLeft = totalTicketsLeft + accrualBalance.ACCRUAL_NET_ENTITLEMENT;
}
}
this.statsButtons[2].statsValue = Number(totalTicketsLeft.toFixed(2));
// this.statsButtons[2].statsValue = Number(totalTicketsLeft.toFixed(2));
}
});
}
@ -770,7 +770,9 @@ export class HomePage implements OnInit {
// tslint:disable-next-line: triple-equals
} else if (link == '4') {
this.openPage(this.ticketRequestObject);
}
} else if (link == '999') {
this.Vacation_Rule();
}
}
async openDigitalId() {

@ -6,7 +6,6 @@
</app-generic-header>
<ion-content>
<div class="contentBg">
<div class="result-graph" >
@ -15,7 +14,6 @@
<div (click)="setFavorite(employee)">
<img *ngIf="!isFavorite" [ngClass]="direction == 'en' ? 'favIcon':'favIcon-ar' " src="../assets/imgs/fav.svg">
<img *ngIf="isFavorite" [ngClass]="direction == 'en' ? 'favIcon':'favIcon-ar' " src="../assets/imgs/favFilled.svg">
<!-- <ion-col><img src="../assets/imgs/fav filled.svg"></ion-col> -->
</div>
<div class="user-image">
<img class="img" [src]="employee.EMPLOYEE_IMAGE ? 'data:image/png;base64,'+employee.EMPLOYEE_IMAGE : '../assets/imgs/profile.png'" alt="Team Member Image"/>
@ -25,9 +23,6 @@
<img src="../assets/imgs/call-o.svg">
</a>
</div>
<!-- <a [ngClass]="employee.EMPLOYEE_MOBILE_NUMBER == '' ? 'disable-phone action-button-icon' : 'action-button-icon'" href="tel:{{employee.EMPLOYEE_MOBILE_NUMBER}}">
<img src="../assets/imgs/profile.svg">
</a> -->
</div>
<div style="margin-top: 25px;">
<h1 class="name">{{employee.EMPLOYEE_NAME}}</h1>
@ -48,8 +43,7 @@
</div>
<div class="btnDiv">
<ion-segment
<ion-segment
(ionChange)="segmentChanged($event)"
[value]="activeSegment">
<ion-col [size]="3">
@ -57,7 +51,6 @@
<ion-segment-button
value="About"
[ngClass]="activeSegment == 'About' ? 'active-Segment' : 'normal-Segment'">
<!-- <ion-label> Team Members</ion-label> -->
<img class="imgSize" src="../assets/imgs/profile.svg">
</ion-segment-button>
</ion-col>
@ -65,7 +58,7 @@
<span class="btnTitle">{{ts.trPK('myTeam','profile-details')}}</span>
</ion-col>
</ion-col>
<ion-col [size]="3" (click)="getMenuEntries(employee)">
<ion-col style="pointer-events: none; opacity: .4;" [size]="3" (click)="getMenuEntries(employee)">
<ion-col>
<ion-segment-button
value="create-request"
@ -75,23 +68,11 @@
</ion-col>
<ion-col > <span class="btnTitle">{{ts.trPK('vacation-rule','create-request')}}</span></ion-col>
</ion-col>
<ion-col [size]="3">
<ion-col>
<ion-segment-button
value="Attendance"
[ngClass]="activeSegment == 'Attendance' ? 'active-Segment' : 'normal-Segment'" >
<!-- <ion-label>{{ts.trPK('attendance','attendance')}}</ion-label> -->
<img class="imgSize" src="../assets/imgs/view-attendance.svg">
</ion-segment-button>
</ion-col>
<ion-col> <span class="btnTitle">{{ts.trPK('myTeam','view-attendence')}} </span></ion-col>
</ion-col>
<ion-col [size]="3">
<ion-col>
<ion-segment-button
value="TeamMembers"
[ngClass]="activeSegment == 'TeamMembers' ? 'active-Segment' : 'normal-Segment'">
<!-- <ion-label>{{ts.trPK('myTeam','team-members')}}</ion-label> -->
<img class="imgSize" src="../assets/imgs/team-members.svg">
</ion-segment-button>
</ion-col>
@ -100,95 +81,9 @@
</ion-segment>
</div>
<!-- <div class="user-actions">
<ion-row class="ion-justify-content-center">
<ion-col [size]="3">
<div class="action-button col-button">
<span>{{ts.trPK('myTeam','profile-details')}}</span>
</div>
</ion-col>
<ion-col [size]="3" (click)="getMenuEntries(employee)">
<div class="action-button col-button">
<span>{{ts.trPK('vacation-rule','create-request')}}</span>
</div>
</ion-col>
<ion-col [size]="3" >
<div class="action-button col-button">
<span>{{ts.trPK('myTeam','view-attendence')}} </span>
</div>
</ion-col>
<ion-col [size]="3" >
<div class="action-button col-button">
<span>{{ts.trPK('myTeam','team-members')}}</span>
</div>
</ion-col>
</div> -->
<!-- <div class="user-actions">
<ion-row class="ion-justify-content-center">
<ion-col [size]="4">
<div class="action-button col-button">
<a [ngClass]="employee.EMPLOYEE_MOBILE_NUMBER == '' ? 'disable-phone action-button-icon' : 'action-button-icon'" href="tel:{{employee.EMPLOYEE_MOBILE_NUMBER}}">
<img src="../assets/imgs/call_icon.png">
</a>
<span>{{ts.trPK('vacation-rule','call')}}</span>
</div>
</ion-col>
<ion-col [size]="4" (click)="getMenuEntries(employee)">
<div class="action-button col-button">
<span class="action-button-icon">
<img src="../assets/imgs/create_request_icon.png">
</span>
<span>{{ts.trPK('vacation-rule','create-request')}}</span>
</div>
</ion-col>
<ion-col [size]="4" style="opacity:0.3;">
<div class="action-button col-button">
<span class="action-button-icon">
<img src="../assets/imgs/message_icon.png">
</span>
<span>{{ts.trPK('vacation-rule','message-label')}}</span>
</div>
</ion-col>
</ion-row>
</div> -->
</div>
<!-- <div class="user-actions">
<ion-segment
(ionChange)="segmentChanged($event)"
[value]="activeSegment">
<ion-segment-button
value="Attendance"
[ngClass]="activeSegment == 'Attendance' ? 'active-Segment' : 'normal-Segment'" >
<ion-label>{{ts.trPK('attendance','attendance')}}</ion-label>
<img src="../assets/imgs/days.svg">
</ion-segment-button>
<ion-segment-button
value="Team Members"
[ngClass]="[activeSegment == 'Team Members' ? 'active-Segment' : 'normal-Segment', empSubordinate.length === 0 ? 'disable-phone': '']">
<ion-label>{{ts.trPK('myTeam','team-members')}}</ion-label>
<img src="../assets/imgs/days.svg">
</ion-segment-button>
<ion-segment-button
value="About"
[ngClass]="activeSegment == 'About' ? 'active-Segment' : 'normal-Segment'">
<ion-label> Team Members</ion-label>
<img src="../assets/imgs/profile.svg">
</ion-segment-button>
<ion-segment-button
value="create-request"
[ngClass]="activeSegment == 'create-request' ? 'active-Segment' : 'normal-Segment'">
<img src="../assets/imgs/create_request_icon.png">
<ion-label> {{ts.trPK('vacation-rule','create-request')}}</ion-label>
</ion-segment-button>
</ion-segment>
</div> -->
<!-- <div *ngIf="activeSegment === 'create-request'">
</div> -->
<div *ngIf="activeSegment === 'Attendance'">
<div class="attendence">
@ -217,8 +112,6 @@
</div>
</ion-col>
</ion-row>
<!-- <ion-row *ngIf="attendanceTrackingList.stats == '' || attendanceTrackingList.stats == '' "> Hello </ion-row>
</div> -->
</div>
@ -256,32 +149,6 @@
</ion-slides>
</ion-row>
</div>
<!--
<ion-row *ngIf="direction == 'en'">
<ion-col [size]="2" style="text-align: left;">
<ion-icon class="activeArrow" ios="ios-arrow-dropleft-circle" md="md-arrow-dropleft-circle" (click)="previousSlide()"></ion-icon>
</ion-col>
<ion-col [size]="8" style="text-align: center;">
<span class="month-year-span">{{month}} </span>
</ion-col>
<ion-col [size]="2" style="text-align: right;">
<ion-icon *ngIf="currentMonthName !== month" [ngClass]=" currentMonthName === month ? 'disabledArrow' : 'activeArrow'" ios="ios-arrow-dropright-circle" md="md-arrow-dropright-circle" (click)="nextSlide()"></ion-icon>
</ion-col>
</ion-row>
<ion-row *ngIf="direction == 'ar'">
<ion-col [size]="2" style="text-align: right;">
<ion-icon class="activeArrow" ios="ios-arrow-dropright-circle" md="md-arrow-dropright-circle" (click)="previousSlide()"></ion-icon>
</ion-col>
<ion-col [size]="8" style="text-align: center;">
<span class="month-year-span">{{month}}</span>
</ion-col>
<ion-col [size]="2" style="text-align: left;">
<ion-icon *ngIf="currentMonthName !== month" [ngClass]=" currentMonthName === month ? 'disabledArrow' : 'activeArrow'" ios="ios-arrow-dropleft-circle" md="md-arrow-dropleft-circle" (click)="nextSlide()"></ion-icon>
</ion-col>
</ion-row> -->
</div>
</div>
<div>
@ -380,34 +247,8 @@
</ion-slide>
</ion-slides>
</ion-row>
</div>
<!-- <ion-row *ngIf="direction == 'en'">
<ion-col [size]="2" style="text-align: left;">
<ion-icon class="activeArrow" ios="ios-arrow-dropleft-circle" md="md-arrow-dropleft-circle" (click)="previousSlide()"></ion-icon>
</ion-col>
<ion-col [size]="8" style="text-align: center;">
<span class="month-year-span">{{month}} </span>
</ion-col>
<ion-col [size]="2" style="text-align: right;">
<ion-icon *ngIf="currentMonthName !== month" [ngClass]=" currentMonthName === month ? 'disabledArrow' : 'activeArrow'" ios="ios-arrow-dropright-circle" md="md-arrow-dropright-circle" (click)="nextSlide()"></ion-icon>
</ion-col>
</ion-row>
<ion-row *ngIf="direction == 'ar'">
<ion-col [size]="2" style="text-align: right;">
<ion-icon class="activeArrow" ios="ios-arrow-dropright-circle" md="md-arrow-dropright-circle" (click)="previousSlide()"></ion-icon>
</ion-col>
<ion-col [size]="8" style="text-align: center;">
<span class="month-year-span">{{month}}</span>
</ion-col>
<ion-col [size]="2" style="text-align: left;">
<ion-icon *ngIf="currentMonthName !== month" [ngClass]=" currentMonthName === month ? 'disabledArrow' : 'activeArrow'" ios="ios-arrow-dropleft-circle" md="md-arrow-dropleft-circle" (click)="nextSlide()"></ion-icon>
</ion-col>
</ion-row> -->
</div>
</div>
</div>
</div>
<app-circle-calendar
[currentDateParent]="currentDate"
@ -424,42 +265,6 @@
<div class="MyTeamtext" >{{ts.trPK('myTeam','my-team-members')}}</div>
<div [ngClass]="direction == 'en' ? 'numberEmp':'numberEmp-ar' " >{{EmployeeTotal}}</div>
</div>
<!-- <div style="margin-top: -23px;">
<ion-row>
<ion-col><p class="text">{{ts.trPK('myTeam','my-team-members')}}</p></ion-col>
<ion-col> <div [ngClass]="direction == 'en' ? 'number':'number-ar' ">
<p class="numberEmp">{{EmployeeTotal}}</p></div></ion-col>
</ion-row>
</div> -->
<!-- <div style="margin-top: 15px;background: white;border-radius: 100px;overflow: hidden;">
<ion-row no-padding>
<ion-col [size]="3" class="search-dropdown" no-padding>
<ion-select okText="{{ts.trPK('general','ok')}}" cancelText="{{ts.trPK('general','cancel')}}"
[(ngModel)]="searchKeySelect" (ionChange)="showSelectedField($event)">
<ion-select-option value="Name" selected="true">{{ts.trPK('searchForReplacment','name')}}</ion-select-option>
<ion-select-option value="User Name">{{ts.trPK('searchForReplacment','userName')}} </ion-select-option>
<ion-select-option value="Email">{{ts.trPK('searchForReplacment','email')}} </ion-select-option>
</ion-select>
</ion-col>
<ion-col [size]="7" class="input-container" no-padding>
<ion-input *ngIf="showEmailInput" placeholder="Employee Email" [(ngModel)]="searchEmail" pattern="email"></ion-input>
<ion-input *ngIf="showUserNameOrNameInput" placeholder="Search" [(ngModel)]="searchNameOrUserName"></ion-input>
</ion-col>
<ion-col [size]="2" style="background: #ccc;text-align: center;" no-padding (click)="searchEmployeeTwo()">
<ion-icon style="margin-top: 10px;font-size: 20px;" class="search-icons" color="light" name="search"></ion-icon>
</ion-col>
</ion-row>
</div> -->
<!-- <div *ngIf="isSearch">
<ion-row class="search-container">
<ion-col style="float: left;" size=[6] (click)="clearSearchTwo()">
<span style="margin-left: 5px;">{{ts.trPK('work-list','clear-search')}}</span>
<ion-icon name="close" ></ion-icon>
</ion-col>
</ion-row>
</div> -->
<ng-container *ngFor="let subordinate of empSubordinate;let i=index">
<app-employee-information
@ -479,10 +284,6 @@
<div class="employee-information-indetail" *ngIf="activeSegment === 'About'">
<ion-row style=" padding-left: 13px;">
<!-- <ion-col [size]="6" [ngStyle]="direction == 'en' ? {'border-right': '1px solid #ccc'} : {'border-left': '1px solid #ccc'}">
<h2>{{ts.trPK('userProfile','empNo')}}</h2>
<p>{{employee.EMPLOYEE_NUMBER}}</p>
</ion-col> -->
<ion-col>
<p [ngClass]="direction == 'en' ? 'profile':'profile-ar' " >{{ts.trPK('userProfile','profile-details')}}</p>
</ion-col>
@ -510,10 +311,6 @@
<h2 [ngClass]="direction == 'en' ? 'label1':'label1-ar' ">{{ts.trPK('userProfile','payrol')}}</h2>
<p [ngClass]="direction == 'en' ? 'label2':'label2-ar' ">{{employee.PAYROLL_NAME}}</p>
</ion-col>
<!-- <ion-col [size]="12">
<h2>{{ts.trPK('userProfile','orgEmail')}}</h2>
<p>{{employee.EMPLOYEE_EMAIL_ADDRESS}}</p>
</ion-col> -->
<ion-col [size]="12">
<h2 [ngClass]="direction == 'en' ? 'label1':'label1-ar' ">{{ts.trPK('userProfile','position')}}</h2>
<p [ngClass]="direction == 'en' ? 'label2':'label2-ar' ">{{jobName}}</p>

@ -235,7 +235,10 @@ export class DetailsComponent implements OnInit {
ngOnInit() {
this.common.startLoading();
this.intializeMemberDetail();
this.showAttendanceTracking();
this.employee = this.common.sharedService.getSharedData(MyTeamService.EMPLOYEE_SHARED_DATA, false);
console.log(this.employee);
this.jobName = this.employee.JOB_NAME;
// this.showAttendanceTracking();
// tslint:disable-next-line: max-line-length
this.currentMonthName = this.direction === 'en' ? this.common.getMonthName(this.monthIndex) : this.common.getMonthNameAr(this.monthIndex);
}
@ -245,10 +248,11 @@ export class DetailsComponent implements OnInit {
this.employee = this.common.sharedService.getSharedData(MyTeamService.EMPLOYEE_SHARED_DATA, false);
console.log(this.employee);
let jobTitle = this.employee.POSITION_NAME.split('.');
if (jobTitle && jobTitle.length > 1) {
this.jobName = jobTitle[0] + " " + jobTitle[1];
}
this.jobName = this.employee.JOB_NAME;
// let jobTitle = this.employee.POSITION_NAME.split('.');
// if (jobTitle && jobTitle.length > 1) {
// this.jobName = jobTitle[0] + " " + jobTitle[1];
// }
const request = {
P_SELECTED_EMPLOYEE_NUMBER: this.employee.EMPLOYEE_NUMBER

@ -133,7 +133,7 @@
<ng-container *ngFor="let subordinate of empSubordinate;let i=index">
<app-employee-information
[name]="subordinate.EMPLOYEE_NAME"
[title]="subordinate.POSITION_NAME"
[title]="subordinate.JOB_NAME"
[employeeImage]="subordinate.EMPLOYEE_IMAGE ? 'data:image/png;base64,'+subordinate.EMPLOYEE_IMAGE : '../assets/imgs/profile.png'"
[employeePhoneNumber]="subordinate.EMPLOYEE_MOBILE_NUMBER"
(onGetDetails)="getDetails(i)">

@ -10,7 +10,7 @@
<div class="request-heading">
<span>{{ts.trPK('work-list','open-analysis')}}</span>
</div>
<div class="result-text-container" [ngStyle]="showChart === false || receivedITGCount === false ? {'visibility': 'hidden'} : {}">
<div class="result-text-container" [ngStyle]="showChart === false ? {'visibility': 'hidden'} : {}">
<span *ngIf="selectedFilter === 'ALL'">{{newWorkListResponse.length + ITGCount}} {{ts.trPK('work-list','of')}} </span>
<span *ngIf="showSearchButton && newWorkListResponse.length > 0 && selectedFilter !== 'ALL' && itemType !== ''">{{newWorkListResponse.length}} {{ts.trPK('work-list','of')}} </span>
<h2 *ngIf="!showSearchButton">{{totalRequestCount}}</h2>
@ -18,11 +18,11 @@
<h2 *ngIf="showSearchButton && newWorkListResponse.length > 0 && selectedFilter !== 'ALL' && itemType !== ''">{{newWorkListResponse[0].NO_OF_ROWS}}</h2>
<span>{{ts.trPK('work-list','total')}} <br> {{ts.trPK('work-list','open-reqest')}}</span>
</div>
<p-chart *ngIf="!showChart || !receivedITGCount" class="today-graph" type="doughnut" [data]="data" [options]="options"></p-chart>
<p-chart *ngIf="!showChart" class="today-graph" type="doughnut" [data]="data" [options]="options"></p-chart>
<p-chart *ngIf="checkLoadingStatus()" class="today-graph" type="doughnut" [data]="data" [options]="options"></p-chart>
</div>
<ion-row class="filters-row" *ngIf="showChart && receivedITGCount">
<ion-row class="filters-row" *ngIf="showChart">
<ion-slides [options]="slideOptsOne">
<ion-slide *ngFor="let filter of filters; let i=index" [ngClass]="filter.disable === true ? 'disable-filter' : ''">
<app-card-filter
@ -36,7 +36,7 @@
</ion-slides>
</ion-row>
<ion-row class="search-container">
<ion-row class="search-container" style="pointer-events: none;opacity: .4;">
<ion-col style="float: left;" size=[6] *ngIf="showSearchButton" (click)="clearSearch()">
<span style="margin-left: 5px;">{{ts.trPK('work-list','clear-search')}}</span>
<ion-icon name="close" ></ion-icon>

@ -45,7 +45,6 @@ export class HomeComponent implements OnInit {
public isAll = true;
public isPR = false;
public isPO = false;
public isMR = false;
public isHR = false;
public noData = false;
public isITG = false;
@ -74,7 +73,6 @@ export class HomeComponent implements OnInit {
public totalHR = 0;
public totalPO = 0;
public totalPR = 0;
public totalMR = 0;
public totalIC = 0;
public totalStamp = 0;
@ -89,17 +87,13 @@ export class HomeComponent implements OnInit {
public data = {
datasets: [
{
data: [0, 0, 0, 0, 0, 0, 0],
data: [0, 0, 0],
backgroundColor: [
'#18a169',
'#3cb9d5',
'#114475',
'#38c9b3',
'#cc3232',
'#9e7e97',
'#ff9800'
'#38c9b3'
],
borderWidth: 6
borderWidth: 5
}]
};
public filters = [
@ -119,14 +113,6 @@ export class HomeComponent implements OnInit {
key: 'HRSSA',
disable: false
},
{
value: 0,
name: 'MR',
active: false,
color: '#3cb9d5',
key: 'INVMOA',
disable: false
},
{
value: 0,
name: 'PR',
@ -142,30 +128,6 @@ export class HomeComponent implements OnInit {
color: '#38c9b3',
key: 'POAPPRV',
disable: false
},
{
value: 0,
name: 'ITG',
active: false,
color: '#cc3232',
key: 'ITG',
disable: false
},
{
value: 0,
name: 'IC',
active: false,
color: '#9e7e97',
key: 'INVITEM',
disable: false
},
{
value: 0,
name: 'STAMP',
active: false,
color: '#ff9800',
key: 'STAMP',
disable: false
}
];
@ -227,7 +189,6 @@ export class HomeComponent implements OnInit {
}
callWorkListServices() {
this.Count();
this.getAllPushNotificationFun();
}
@ -237,7 +198,7 @@ export class HomeComponent implements OnInit {
this.worklistNotifications = result;
this.totalRequestCount = this.worklistNotifications.P_OPEN_NTF_NUMBER;
this.common.sharedService.setSharedData(result, 'worklistNotifications');
this.Details();
// this.Details();
this.callWorkListServices();
}
});
@ -247,10 +208,8 @@ export class HomeComponent implements OnInit {
this.ngZone.run(() => {
this.filters[0].value = this.worklistNotifications.P_OPEN_NTF_NUMBER;
this.filters[1].value = this.totalHR;
this.filters[2].value = this.totalMR;
this.filters[3].value = this.totalPR;
this.filters[4].value = this.totalPO;
this.filters[6].value = this.totalIC;
this.filters[2].value = this.totalPR;
this.filters[3].value = this.totalPO;
});
@ -266,39 +225,18 @@ export class HomeComponent implements OnInit {
this.data.datasets[0].data[2] = 0;
}
if (this.totalMR === 0) {
this.data.datasets[0].data[3] = 0;
}
if (this.totalIC === 0) {
this.data.datasets[0].data[5] = 0;
}
if (this.totalStamp === 0) {
this.data.datasets[0].data[6] = 0;
}
const openNotificationsArray = this.worklistNotifications.GetOpenNotificationsList;
for (const notification of openNotificationsArray) {
if (notification.ITEM_TYPE === 'HRSSA') {
this.filters[1].value = this.totalHR;
this.data.datasets[0].data[0] = notification.OPEN_NTF_NUMBER;
} else if (notification.ITEM_TYPE === 'INVMOA') {
this.filters[2].value = this.totalMR;
this.data.datasets[0].data[1] = notification.OPEN_NTF_NUMBER;
} else if (notification.ITEM_TYPE === 'REQAPPRV') {
this.filters[3].value = this.totalPR;
this.filters[2].value = this.totalPR;
this.data.datasets[0].data[2] = notification.OPEN_NTF_NUMBER;
} else if (notification.ITEM_TYPE === 'POAPPRV') {
this.filters[4].value = this.totalPO;
this.filters[3].value = this.totalPO;
this.data.datasets[0].data[3] = notification.OPEN_NTF_NUMBER;
} else if (notification.ITEM_TYPE === 'INVITEM') {
this.filters[6].value = this.totalIC;
this.data.datasets[0].data[5] = notification.OPEN_NTF_NUMBER;
} else if (notification.ITEM_TYPE === 'STAMP') {
this.filters[7].value = this.totalStamp;
this.data.datasets[0].data[6] = notification.OPEN_NTF_NUMBER;
}
}
// this.data.datasets[0].data[4] = this.ITGCount;
@ -308,7 +246,7 @@ export class HomeComponent implements OnInit {
}
checkLoadingStatus() {
if (this.showChart && this.receivedITGCount) {
if (this.showChart) {
this.common.stopLoading();
return true;
} else {
@ -453,8 +391,6 @@ export class HomeComponent implements OnInit {
this.totalPO = this.totalPO + 1;
} else if (workList.ITEM_TYPE === 'REQAPPRV') {
this.totalPR = this.totalPR + 1;
} else if (workList.ITEM_TYPE === 'INVMOA') {
this.totalMR = this.totalMR + 1;
} else if (workList.ITEM_TYPE === 'INVITEM') {
this.totalIC = this.totalIC + 1;
} else if (workList.ITEM_TYPE === 'STAMP') {
@ -467,7 +403,6 @@ export class HomeComponent implements OnInit {
this.totalHR = 0;
this.totalPO = 0;
this.totalPR = 0;
this.totalMR = 0;
this.totalIC = 0;
})
@ -505,6 +440,7 @@ export class HomeComponent implements OnInit {
}
private handleWorkListResult(result: any) {
this.common.stopLoading();
console.log(this.filters);
const lastItemIndex = result.length - 1;
const lastitem = result[lastItemIndex];
@ -542,7 +478,7 @@ export class HomeComponent implements OnInit {
if (this.showFormattedData.length === 0) {
this.resetFiltersUI();
}
this.data.datasets[0].data[4] = this.ITGCount;
// this.data.datasets[0].data[4] = this.ITGCount;
this.showChart = true;
// this.common.stopLoading();
this.isLoading = false;
@ -555,14 +491,10 @@ export class HomeComponent implements OnInit {
this.filters[1].value = 0;
this.filters[2].value = 0;
this.filters[3].value = 0;
this.filters[4].value = 0;
this.filters[6].value = 0;
this.data.datasets[0].data[0] = 0;
this.data.datasets[0].data[1] = 0;
this.data.datasets[0].data[2] = 0;
this.data.datasets[0].data[3] = 0;
this.data.datasets[0].data[5] = 0;
});
}
@ -574,8 +506,6 @@ export class HomeComponent implements OnInit {
this.common.openWorklistMainPRPage();
} else if (obj.REQUEST_TYPE === 'PO') {
this.common.openWorklistMainPOPage();
} else if (obj.REQUEST_TYPE === 'MO') {
this.common.openWorklistMainMRPage();
} else if (obj.REQUEST_TYPE === 'ITEM_CREATION') {
this.common.openWorklistMainICPage();
} else {

@ -264,7 +264,7 @@
<label class="colItemReq" for="">{{'worklistMain, job-name' |
translate}}</label>
<br />
<label for="">{{formatJobName(submitterInfo.POSITION_NAME)}}</label>
<label for="">{{submitterInfo.JOB_NAME}}</label>
</ion-col>
</ion-row>
<ion-row class="rowBorder submitterInfo">
@ -280,7 +280,7 @@
<label class="colItemReq" for="">{{'worklistMain, job_cate' |
translate}}</label>
<br />
<label for="">{{formatJobName(submitterInfo.POSITION_NAME)}}</label>
<label for="">{{submitterInfo.JOB_NAME}}</label>
</ion-col>
</ion-row>
<ion-row class="rowBorder submitterInfo">

@ -105,10 +105,10 @@ export class HomeComponent implements OnInit {
if (this.targetValue === 'sideMenu') {
for (let i = 0; i < this.menuEntries.length; i++) {
if (this.menuEntries[i].MENU_NAME === 'MBL_E_PROFESSIONALS_01') {
if (this.menuEntries[i].MENU_NAME === 'MBL_E_HR_SS') {
personalInformationChildren = this.menuEntries[i].children;
for (let j = 0; j < personalInformationChildren.length; j++) {
if (personalInformationChildren[j].MENU_NAME = 'MBL_PERINFO_SS' && personalInformationChildren[j].ENTRY_SEQUENCE === 15) {
if (personalInformationChildren[j].MENU_NAME = 'MBL_PERINFO_SS' && personalInformationChildren[j].ENTRY_SEQUENCE === 5) {
personalInfoNestedChildren = personalInformationChildren[j].children;
for (let k = 0; k < personalInfoNestedChildren.length; k++) {
if (personalInfoNestedChildren[k].REQUEST_TYPE === 'BASIC_DETAILS') {
@ -145,11 +145,11 @@ export class HomeComponent implements OnInit {
if (user) {
console.log(user);
this.personalInfo = user;
let jobTitle = user.POSITION_NAME.split('.');
if (jobTitle && jobTitle.length > 1) {
this.jobName = jobTitle[0] + " " + jobTitle[1];
}
this.jobName = user.JOB_NAME;
// let jobTitle = user.POSITION_NAME.split('.');
// if (jobTitle && jobTitle.length > 1) {
// this.jobName = jobTitle[0] + " " + jobTitle[1];
// }
if (this.cs.getUpdateImage().status) {
this.user_image = this.sanitizer.bypassSecurityTrustUrl('data:image/png;base64,' + this.cs.getUpdateImage().img);

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

@ -1152,12 +1152,12 @@
"ar": "الحضور الشهري"
},
"monthly-time-sheet-view": {
"en": "View your Monthly Time Sheet",
"ar": "عرض حضورك الشهري لساعات العمل"
"en": "View your Profile Details",
"ar": "عرض تفاصيل ملف التعريف الخاص بك"
},
"view-detail": {
"en": "View Detail",
"ar": "عرض التفاصيل"
"en": "View Profile",
"ar": "عرض الصفحة الشخصية"
},
"time-left": {
"en": "Time Left Today",
@ -1380,7 +1380,7 @@
"ar": "تم تغيير الصورة الشخصية بنجاح"
},
"personal-informaion": {
"en": "Personal Informaion",
"en": "Profile Informaion",
"ar": "المعلومات الشخصية"
},
"family-name": {

Loading…
Cancel
Save