fixed merge issues

zohaib-huawei-q2
Fatimah Alshammari 5 years ago
parent 93762ccfe8
commit 3080d0bb74

@ -1,5 +1,6 @@
<app-generic-header
showBack="true"
backLink="/my-team/home"
[headerText]="headerTitle">
</app-generic-header>

@ -1,13 +1,9 @@
<ion-header>
<ion-toolbar class="header-toolbar-new">
<ion-buttons slot="start">
<nav-buttons (backClick)="goback()" [navigate]="false"></nav-buttons>
</ion-buttons>
<ion-title style=" color:white; text-align: center;">{{ts.trPK('userProfile','createHR-Request')}}</ion-title>
</ion-toolbar>
</ion-header>
<app-generic-header
showBack="true"
[headerText]="'userProfile, createHR-Request' | translate">
</app-generic-header>
<ion-content>
<!-- <form [formGroup] = "form" (ngSubmit) = "submitRequest(form.value)"> -->
@ -46,12 +42,6 @@
*ngFor="let x of departTypeList; let i=index;">
{{x.departmentName}} </option>
</select>
<!-- <select class="filed1" placeholder="Select Department" type="text">
<option >{{EmpRelations}}</option>
<option >{{Hr}}</option>
<option >{{Payroll}}</option>
<option >{{GovRelation}}</option>
</select> -->
</ion-item>
<label class="labels">{{ts.trPK('userProfile','RelatedSection')}}</label>
<ion-item lines="none" class="filed-container">
@ -72,16 +62,14 @@
</ion-item>
</ion-list>
</div>
<div class="request-heading">
<span>{{ts.trPK('userProfile','SupportingDocument')}}</span>
</div>
<div>
<div class="fileUpload btn btn-primary">
<img slot="start" style=" height: 55px;"src="../assets/imgs/add-photo.svg">
<input end class="upload" type="file" ng2FileSelect [uploader]="uploader"(change)="onFileSelected($event)" />
<input end class="upload" type="file" ng2FileSelect [uploader]="uploader"
(change)="onFileSelected($event)" (click)="onFileSelectedclick($event)" />
</div>
<ion-slides>
<ion-slide>
@ -90,58 +78,30 @@
<ion-col size="4">
<label for="">{{ item?.file?.name }}</label>
</ion-col>
<!-- <ion-col size="4">
<label *ngIf="uploader.options.isHTML5">{{ item?.file?.size/1024/1024 | number:'.2' }}
MB</label>
</ion-col> -->
<ion-col size="2">
<button class="iconButton" ion-button (click)="removeFile(item)">
<ion-icon style="color: red;" name="close"></ion-icon>
<!-- <img class="imgSize" src="../assets/imgs/close_menu_icon.png "> -->
</button>
</ion-col>
</ion-col>
</ion-grid>
</ion-slide>
</ion-slides>
<!-- <div>
<button class="iconButton" ion-button (click)="removeFile(item)">
<img class="imgSize" src="../assets/imgs/close_menu_icon.png "></button>
</div>
<div class="fileUpload btn btn-primary">
<img slot="start" style=" height: 55px;"src="../assets/imgs/add-photo.svg">
<input type="file" class="upload" ng2FileSelect [uploader]="uploader"
(change)="onFileSelected($event)" (click)="onFileSelectedclick($event)" />
</div> -->
</div>
<div class="request-heading">
<span>{{ts.trPK('userProfile','Description')}}</span>
</div>
<ion-col size="12">
<ion-item style="margin-left: -20px;margin-right: -13px;margin-top: -24px;" lines="none">
<ion-input [(ngModel)]="Description" [ngClass]="direction == 'en' ? 'filedDesc':'filedDesc-ar' " placeholder="{{ts.trPK('userProfile','Description')}}" type="text"></ion-input>
</ion-item>
</ion-col>
</div>
</ion-card-content>
</ion-card>
</div>
<!-- </form> -->
</ion-content>
<ion-footer >
<div class="centerDiv">
<button class="gridCancelBtn" ion-button (click)="cancelRequest()">{{ts.trPK('general','cancel')}}</button>

@ -1,13 +1,9 @@
<ion-header>
<ion-toolbar class="header-toolbar-new">
<ion-buttons slot="start">
<nav-buttons (backClick)="goback()" [navigate]="false"></nav-buttons>
</ion-buttons>
<ion-title style=" color:white; text-align: center;">{{ts.trPK('userProfile','createHR-Request')}}</ion-title>
</ion-toolbar>
</ion-header>
<app-generic-header
showBack="true"
[headerText]="'userProfile, createHR-Request' | translate">
</app-generic-header>
<ion-content>
@ -133,10 +129,3 @@
</ion-content>
<!-- <ion-footer *ngIf="showRequestDetails" >
<div class="centerDiv">
<button class="gridCancelBtn" ion-button (click)="cancelRequest()">{{ts.trPK('general','cancel')}}</button>
<button class="gridSubmitBtn" ion-button (click)="submitRequest()">{{ts.trPK('general','submit')}}</button>
</div>
</ion-footer> -->

@ -422,7 +422,7 @@ ion-input {
font-family: 'WorkSans-Bold';
}
.CreateBtn{
@media screen and (min-width: 300px) { .CreateBtn{
--background: var(--newgreen) !important;
background: var(--newgreen) !important;
white-space: normal;
@ -433,7 +433,22 @@ ion-input {
border-radius: 7px !important;
--min-height: 1.6cm !important;
width: 315px;
}
}}
@media screen and (min-width: 1px) and (max-width:290px) {
.CreateBtn{
--background: var(--newgreen) !important;
background: var(--newgreen) !important;
white-space: normal;
color: var(--light);
text-transform: capitalize;
min-height: 1.0cm;
--border-radius: 7px !important;
border-radius: 7px !important;
--min-height: 1.6cm !important;
width: 231px;
}}
.footer{
padding: 15px 0px 0px 0px;
background-color: var(--light) !important;

@ -34,43 +34,24 @@ export class HRRequestComponent implements OnInit {
public EmpImg: string;
public userImage: any = '../assets/imgs/profile.png';
public loginData = new LoginModel();
public searchKeySelect = 'Complaints';
myColor: string = 'secondary';
public showRequestDetails = false;
public proID = "CS"
public inquiry: string;
public HR: string;
public complaints: string;
public Projectresult: any;
public EmpRelations: any;
public Hr: any;
public Payroll: any;
public GovRelation: any;
public projName: any;
public topicName: any;
public departTypeList: any;
public topicTypeList: any;
public sectionTypeList: any;
filterAllowedType: any = ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'];
public projectDetial: any;
public projectDep: any;
public sectionDep: any;
public direction: string;
constructor(
public ts: TranslatorService,
public cs: CommonService,
public authService: AuthenticationService,
public sharedData: SharedDataService,
public events: Events,
public MowadhafiService: MowadhafiService,
private location: Location,
private menu: MenuController,
) {
this.direction = TranslatorService.getCurrentLanguageName();
}
public direction: string;
constructor(
public ts: TranslatorService,
public cs: CommonService,
public authService: AuthenticationService,
public sharedData: SharedDataService,
public events: Events,
public MowadhafiService: MowadhafiService,
private location: Location,
private menu: MenuController,
) {
this.direction = TranslatorService.getCurrentLanguageName();
}
ngOnInit() {
this.getUserInformation();

@ -1,19 +1,15 @@
<ion-header>
<ion-toolbar class="header-toolbar-new" >
<ion-buttons slot="start">
<nav-buttons (backClick)="goback()" [navigate]="false"></nav-buttons>
</ion-buttons>
<ion-title style=" color:white; text-align: center;">{{ts.trPK('userProfile','MyHR-request')}}</ion-title>
</ion-toolbar>
</ion-header>
<app-generic-header
showBack="true"
[headerText]="'userProfile, MyHR-request' | translate">
</app-generic-header>
<ion-content>
<!-- <div>
<ion-row [ngClass]="direction == 'en' ? 'empty-en':'empty-ar' ">{{ts.trPK('general','empty')}}</ion-row>
</div> -->
<div>
<div *ngIf="ticketsInfo.length !=0">
<ion-card *ngFor="let ticket of ticketsInfo ;let i = index" class="result-container" (click)="openRequestDetailsPage(ticket)">
<ion-card-content>
<ion-row style="margin-left: -3px; margin-right: -9px;">
@ -21,10 +17,22 @@
<ion-col class="date">{{ts.trPK('userProfile','postedDate')}} {{(ticket.created)?.substring(0,10)}}</ion-col>
</ion-row>
<ion-row>{{ticket.description}}</ion-row>
<ion-row style="margin-top: 5px;color: #e69f44; font-family:'WorkSans-bold';">{{ticket.ticketStatusName}}</ion-row>
<!-- <ion-row [ngClass]="{
'New': ticket.ticketStatusId === 1 ,
'ReOpen': ticket.ticketStatusId === 2,
'AssToManager': ticket.ticketStatusId === 3,
'AssToSpec': ticket.ticketStatusId === 4,
'Pending': ticket.ticketStatusId === 5,
'BackToSpec': ticket.ticketStatusId === 6,
'Closed': ticket.ticketStatusId === 7,
'BackToManager': ticket.ticketStatusId === 8,
'AssignedToHR': ticket.ticketStatusId === 9,}">{{ticket.ticketStatusName}}</ion-row> -->
<ion-row style="margin-top: 5px;color: #259CB8; font-family:'WorkSans-bold';">{{ticket.ticketStatusName}}</ion-row>
</ion-card-content>
</ion-card>
</div>
<div *ngIf="ticketsInfo.length === 0">
<ion-row [ngClass]="direction == 'en' ? 'empty-en':'empty-ar' ">{{ts.trPK('general','empty')}}</ion-row></div>
</ion-content>
<ion-footer class="footer">
<div class="Btn">

@ -32,15 +32,27 @@
font-family: 'WorkSans-bold';
}
@media screen and (min-width: 300px){
.date{
margin-top: -9px;
margin-right: -49px;
color: gray;
font-size: 12px;
}
}}
@media screen and (min-width: 1px) and (max-width:290px) {
.date{
margin-top: -9px;
margin-right: -55px;
color: gray;
font-size: 12px;
margin-left: -88px;
}}
.CreateBtn{
@media screen and (min-width: 300px){
.CreateBtn{
--background: var(--newgreen) !important;
background: var(--newgreen) !important;
white-space: normal;
@ -51,7 +63,22 @@
border-radius: 7px !important;
--min-height: 1.6cm !important;
width: 315px;
}
}}
@media screen and (min-width: 1px) and (max-width:290px) {
.CreateBtn{
--background: var(--newgreen) !important;
background: var(--newgreen) !important;
white-space: normal;
color: var(--light);
text-transform: capitalize;
min-height: 1.0cm;
--border-radius: 7px !important;
border-radius: 7px !important;
--min-height: 1.6cm !important;
width: 257px;
}}
.footer{
padding: 15px 0px;
background-color: var(--light) !important;
@ -61,4 +88,51 @@
}
.Btn{
margin: auto; text-align: center; display: block;
}
}
.New{
margin-top: 5px;
color: #1FA169;
font-family:'WorkSans-bold';
}
.ReOpen{ margin-top: 5px;
color: #1FA169;
font-family:'WorkSans-bold';}
.AssToManager{ margin-top: 5px;
color: #259CB8;
font-family:'WorkSans-bold';}
.AssToSpec{ margin-top: 5px;
color: #259CB8;
font-family:'WorkSans-bold';}
.Pending{ margin-top: 5px;
color: #E29D03;
font-family:'WorkSans-bold';}
.BackToSpec{ margin-top: 5px;
color: #3A476E;
font-family:'WorkSans-bold';}
.Closed{ margin-top: 5px;
color: #CA3332;
font-family:'WorkSans-bold';}
.BackToManager{ margin-top: 5px;
color: #3A476E;
font-family:'WorkSans-bold';}
.AssignedToHR{ margin-top: 5px;
color: #259CB8;
font-family:'WorkSans-bold';}
.empty-en{
color: black;
text-align: center;
font-size: 15px;
font-family: WorkSans-Bold;
margin: 50px 0px 0px 100px;
}
.empty-ar{
color: black;
text-align: center;
font-size: 15px;
font-family: WorkSans-Bold;
margin: 50px 100px 0px 0px;
}

@ -1,25 +1,29 @@
<ion-header>
<ion-toolbar class="header-toolbar-new">
<ion-buttons slot="start">
<nav-buttons (backClick)="goback()" [navigate]="false"></nav-buttons>
</ion-buttons>
<ion-title style=" color:white; text-align: center;">{{ts.trPK('userProfile','MyHR-request')}}</ion-title>
</ion-toolbar>
</ion-header>
<app-generic-header
showBack="true"
[headerText]="'userProfile, MyHR-request' | translate">
</app-generic-header>
<ion-content>
<!-- <div>
<ion-row [ngClass]="direction == 'en' ? 'empty-en':'empty-ar' ">{{ts.trPK('general','empty')}}</ion-row>
</div> -->
<div>
<ion-card class="result-container" >
<ion-card class="result-container" >
<ion-card-content>
<ion-row style="margin-left: -3px; margin-right: -9px;">
<ion-col style="color: #e69f44;" > {{status}}</ion-col>
<ion-row [ngClass]=" direction == 'en'? 'card-content' : 'card-content-ar'" >
<!-- <ion-col [ngClass]="{
'New': statusID === 1 ,
'ReOpen': statusID === 2,
'AssToManager': statusID === 3,
'AssToSpec': statusID === 4,
'Pending': statusID === 5,
'BackToSpec': statusID === 6,
'Closed': statusID === 7,
'BackToManager': statusID === 8,
'AssignedToHR': statusID === 9,}" > {{status}}</ion-col> -->
<ion-col > {{status}}</ion-col>
<ion-col class="date">{{ts.trPK('userProfile','postedDate')}}{{date}}</ion-col>
</ion-row>
<ion-col [size]="12">

@ -59,12 +59,20 @@
// margin-top: -9px;
font-family: 'WorkSans-bold';
}
@media screen and (min-width: 1px) and (max-width:360px) {
.date{
margin-right: -38px;
color: gray;
font-size: 12px;
}}
@media screen and (min-width: 365px) {
.date{
// margin-top: -9px;
margin-right: -49px;
color: gray;
font-size: 12px;
}
}}
.labels{
font-size: 13px;
@ -156,7 +164,7 @@
font-size: 14px;
}
}
@media screen and (min-width: 365px){
.date-span{
font-size: 13px;
margin-bottom: 0px;
@ -164,11 +172,60 @@
color: gray;
margin-left: 172px;
}
}}
@media screen and (min-width: 1px) and (max-width:360px) {
.date-span{
font-size: 13px;
margin-bottom: 0px;
margin-top: -10px;
color: gray;
margin-left: 162px;
}}
.date-span-ar{
font-size: 13px;
margin-bottom: 0px;
margin-top: -10px;
color: gray;
margin-right: 155px;
}
}
.New{
margin-top: 5px;
color: #1FA169;
font-family:'WorkSans-bold';
}
.ReOpen{ margin-top: 5px;
color: #1FA169;
}
.AssToManager{ margin-top: 5px;
color: #259CB8;
}
.AssToSpec{ margin-top: 5px;
color: #259CB8;
}
.Pending{ margin-top: 5px;
color: #E29D03;
}
.BackToSpec{ margin-top: 5px;
color: #3A476E;
}
.Closed{ margin-top: 5px;
color: #CA3332;
}
.BackToManager{ margin-top: 5px;
color: #3A476E;
}
.AssignedToHR{ margin-top: 5px;
color: #259CB8;
}
.card-content{
margin-left: -3px; margin-right: -9px;}
.card-content-ar{
margin-left: -122px;
}

@ -24,6 +24,7 @@ export class RequestDetailsComponent implements OnInit {
public date:any;
public status:any;
public teckitDetial:any;
public statusID :any;
constructor(
@ -97,6 +98,7 @@ export class RequestDetailsComponent implements OnInit {
console.log(res);
this.teckitInfo = res.result.data;
this.status =this.teckitInfo.ticketStatusName;
this.statusID =this.teckitInfo.ticketStatusId;
this.date =this.teckitInfo.created.substring(0, 10);
this.ticketRefre =this.teckitInfo.ticketReferenceNo;
this.section = this.teckitInfo.sectionName;

@ -1,11 +1,8 @@
<ion-header>
<ion-toolbar class="header-toolbar-new">
<ion-buttons slot="start">
<nav-buttons (backClick)="goback()" [navigate]="false"></nav-buttons>
</ion-buttons>
<ion-title>{{ts.trPK('userProfile','emp-detail')}}</ion-title>
</ion-toolbar>
</ion-header>
<app-generic-header
showBack="true"
[headerText]="'userProfile, emp-detail' | translate">
</app-generic-header>
<ion-content>
<div class="contentBg">
@ -13,14 +10,14 @@
<div class="user-info">
<div class="user-image-container">
<div (click)="setFavorite(employee)">
<img *ngIf="!isFavorite" style="height: 18px; margin-left: 23px;" src="../assets/imgs/fav.svg">
<img *ngIf="isFavorite" style="height: 18px; margin-left: 23px;" src="../assets/imgs/favFilled.svg">
<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"/>
</div>
<div style="margin-right: 16px;" slot="end" >
<div [ngClass]="direction == 'en' ? 'call':'call-ar' " slot="end" >
<a [ngClass]="employee.EMPLOYEE_MOBILE_NUMBER == '' ? 'disable-phone action-button-icon' : 'action-button-icon'" href="tel:{{employee.EMPLOYEE_MOBILE_NUMBER}}"></a>
<img src="../assets/imgs/call-o.svg"></div>
<!-- <a [ngClass]="employee.EMPLOYEE_MOBILE_NUMBER == '' ? 'disable-phone action-button-icon' : 'action-button-icon'" href="tel:{{employee.EMPLOYEE_MOBILE_NUMBER}}">
@ -332,7 +329,7 @@
</ion-col>
<ion-col [size]="4">
<ion-row>
<button (click)="showCalender()" style="background: white; margin-left: 15px; margin-top: 6px;">
<button (click)="showCalender()" class=".statsIcon" >
<label class="stats" >{{ts.trPK('attendance-tracking','view-stats')}}</label>
<img src="../assets/imgs/view-stats.svg">
</button>
@ -400,7 +397,8 @@
<div style="margin-top: -23px;">
<ion-row>
<ion-col><p class="text">{{ts.trPK('myTeam','my-team-members')}}</p></ion-col>
<ion-col> <div class="number"><p class="numberEmp">{{EmployeeTotal}}</p></div></ion-col>
<ion-col> <div [ngClass]="direction == 'en' ? 'number':'number-ar' ">
<p class="numberEmp">{{EmployeeTotal}}</p></div></ion-col>
</ion-row>
</div>

@ -90,7 +90,7 @@ ion-title{
margin-bottom: 4px;
}
span{
font-size: 11px;
font-size: 12px;
display: block;
// color: #888
@ -508,13 +508,22 @@ ion-title{
font-size: 14px;
}
span{
font-size: 11px;
font-size: 12px;
margin-bottom: 3px;
}
}
}
@media screen and (min-width: 360px) {
.statsIcon{
background: white; margin-left: 15px; margin-top: 6px;
}}
@media screen and (min-width: 300px) and (max-width:359px) {
.statsIcon{
background: white;
margin-left: -1px;
margin-top: 6px;
}}
.month-year-span{
font-size: 16px;
// font-family: WorkSans-Bold;
@ -687,20 +696,31 @@ ion-title{
}
.number{
width: 20px;
width: 22px;
height: 20px;
border-radius: 100%;
background-color: #269DB8;
z-index: 9;
margin-top: 25px;
padding-left: 4px;
}
.number-ar{
width: 22px;
height: 20px;
padding-right: -10px;
border-radius: 100%;
background-color: #269DB8;
z-index: 9;
margin-top: 26px;
margin-top: 25px;
padding-right: 4px;
}
.numberEmp{
color: white;
font-size: 13px;
font-size: 12px;
font-weight: bolder;
margin-left: 6px;
/* margin-left: 3px; */
padding-top: 2px;
}
.slider-container{
@ -716,8 +736,21 @@ ion-title{
pointer-events: none;
opacity: .3;
}
.favIcon{
height: 18px; margin-left: 23px;
}
.favIcon-ar{
height: 18px; margin-right: 23px;
}
.call{
margin-right: 16px;
}
.call-ar{
margin-left: 16px;
}

@ -47,7 +47,8 @@
<div>
<ion-row>
<ion-col><p class="text">{{ts.trPK('myTeam','my-team-members')}}</p></ion-col>
<ion-col> <div class="number"><p class="numberEmp">{{EmployeeTotal}}</p></div></ion-col>
<ion-col> <div [ngClass]="direction == 'en' ? 'number':'number-ar' ">
<p class="numberEmp">{{EmployeeTotal}}</p></div></ion-col>
</ion-row>
</div>

@ -224,19 +224,47 @@ ion-content {
margin-top: 27px;
}
// .number{
// width: 21px;
// height: 21px;
// padding-right: -10px;
// border-radius: 100%;
// background-color: #269DB8;
// z-index: 9;
// margin-top: 26px;
// }
// .numberEmp{
// color: white;
// font-size: 12px;
// font-weight: bolder;
// margin-left: 3px;
// padding-top: 2px;
// }
.number{
width: 20px;
width: 22px;
height: 20px;
padding-right: -10px;
border-radius: 100%;
background-color: #269DB8;
z-index: 9;
margin-top: 26px;
margin-top: 25px;
padding-left: 4px;
}
.number-ar{
width: 22px;
height: 20px;
border-radius: 100%;
background-color: #269DB8;
z-index: 9;
margin-top: 25px;
padding-right: 4px;
}
.numberEmp{
color: white;
font-size: 13px;
font-size: 12px;
font-weight: bolder;
margin-left: 6px;
}
/* margin-left: 3px; */
padding-top: 2px;
}

@ -32,6 +32,7 @@ export class HomeComponent implements OnInit {
myColor: string = 'secondary';
public EmpTotal = [];
public EmployeeTotal: any;
public direction:any;
public options = {
cutoutPercentage: 80,
@ -94,7 +95,10 @@ export class HomeComponent implements OnInit {
public myTeamService: MyTeamService,
public modalController: ModalController,
private location: Location
) {}
) {
this.direction = TranslatorService.getCurrentLanguageName();
}
ngOnInit() {
this.common.sharedService.setSharedData( [], DetailsComponent.opendEmployeesARR);

@ -378,7 +378,7 @@
"ar": "الديانة"
},
"empty": {
"en": "Sorry no data avaiable",
"en": "Sorry no data available",
"ar": "لا يوجد بيانات"
},
"no-match": {
@ -1800,7 +1800,7 @@
"ar": " عرض الحضور"
},
"profile-details": {
"en": "Profile Detailes",
"en": "Profile Details",
"ar": " الملف الشخصي"
},
"my-team-members": {

Loading…
Cancel
Save