no message

MOE-PHASE-2-SPRINT-1
Sultan khan 3 years ago
parent b15ea892bf
commit e473a3cfd1

@ -79,8 +79,7 @@
} }
.title { .title {
font-family: "Inter" !important;
font-family: 'Inter' !important;
line-height: 12px; line-height: 12px;
letter-spacing: -0.56px; letter-spacing: -0.56px;
color: #575757; color: #575757;
@ -89,10 +88,10 @@
width: 100%; width: 100%;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
// overflow: hidden;
display: block; display: block;
margin-left: -10px; margin-left: -10px;
margin-top: -10px; margin-top: -10px;
overflow: hidden;
} }
} }

@ -91,7 +91,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;

@ -7,9 +7,9 @@
<ion-content> <ion-content>
<div class="contentBg"> <div class="contentBg">
<ul class="supervisor"> <ul [class]="direction =='en' ? 'supervisor' : 'supervisor-ar'">
<ng-container *ngFor="let subordinate of supervisorHierarchyList;let i=index"> <ng-container *ngFor="let subordinate of supervisorHierarchyList;let i=index">
<li class="supervisor-li"><app-employee-hierarchy-card <li [class]="direction =='en' ? 'supervisor-li' : 'supervisor-li-ar'"><app-employee-hierarchy-card
[name]="subordinate.EMPLOYEE_NAME" [name]="subordinate.EMPLOYEE_NAME"
[title]="subordinate.POSITION_NAME" [title]="subordinate.POSITION_NAME"
[employeeImage]="subordinate.EMPLOYEE_IMAGE ? 'data:image/png;base64,'+subordinate.EMPLOYEE_IMAGE : '../assets/imgs/profile.png'" [employeeImage]="subordinate.EMPLOYEE_IMAGE ? 'data:image/png;base64,'+subordinate.EMPLOYEE_IMAGE : '../assets/imgs/profile.png'"
@ -18,7 +18,7 @@
</app-employee-hierarchy-card> </app-employee-hierarchy-card>
</li> </li>
</ng-container> </ng-container>
<ul *ngIf="supervisorHierarchyList || subordinateHierarchyList" class="current-employee"> <ul *ngIf="supervisorHierarchyList || subordinateHierarchyList" [class]="direction =='en' ? 'current-employee' : 'current-employee-ar'">
<li> <li>
<app-employee-hierarchy-card <app-employee-hierarchy-card
[name]="personalInfo.EMPLOYEE_NAME" [name]="personalInfo.EMPLOYEE_NAME"

@ -4,38 +4,17 @@
} }
.current-employee { .current-employee, .current-employee-ar {
padding: 0px 20px; padding: 0px 20px;
} }
// .current-employee::before{
// content: "";
// position: absolute;
// top: -10px;
// left: -20px;
// border-left: 1px solid #ddd;
// border-bottom: 1px solid #ddd;
// width: 20px;
// height: 15px;
// }
// .current-employee::after{
// position: absolute;
// content: "";
// top: 5px;
// left: -20px;
// border-left: 1px solid #000;
// border-top: 1px solid #000;
// width: 20px;
// height: 100%;
// }
ul { ul {
margin:10px; margin:10px;
padding:0; padding:0;
} }
.current-employee li { .current-employee, .current-employee-ar li {
list-style-type: none; list-style-type: none;
margin: 10px 0 10px 10px; margin: 10px 0 10px 10px;
position: relative; position: relative;
@ -60,6 +39,17 @@ ul {
width: 20px; width: 20px;
height: 110px !important; height: 110px !important;
} }
.current-employee-ar li:after {
position: absolute;
content: "";
top: -22px !important;
right: -16px !important;
border-right: 2px solid #000 !important;
border-top: 2px solid #000;
width: 20px;
height: 176px !important;
}
// .current-employee li:last-child:after { // .current-employee li:last-child:after {
// display: none; // display: none;
@ -75,7 +65,17 @@ ul {
width: 20px; width: 20px;
height: 100%; height: 100%;
} }
.supervisor li { .supervisor-ar li:after {
position: absolute;
content: "";
top: 46px;
right: -16px;
border-right: 2px solid #000;
border-top: 0;
width: 16px;
height: 74px;
}
.supervisor li, .supervisor-ar li {
list-style-type: none; list-style-type: none;
margin: 10px 0 10px 10px; margin: 10px 0 10px 10px;
position: relative; position: relative;
@ -92,13 +92,24 @@ ul {
height: 55px; height: 55px;
} }
.supervisor-ar li:before {
content: "";
position: absolute;
top: -12px;
right: -16px;
border-bottom: 2px solid #000;
width: 15px;
height: 62px;
border-right: 2px solid #000;
}
// li:last-child:after, li:last-child:before { // li:last-child:after, li:last-child:before {
// display: none; // display: none;
// } // }
.supervisor li:last-child:after{ .supervisor li:last-child:after, .supervisor-ar li:last-child:after{
visibility: hidden; visibility: hidden;
} }
.supervisor-li li:last-child:after, li.supervisor-li:last-of-type::after{ .supervisor-li li:last-child:after, li.supervisor-li:last-of-type::after, .supervisor-li-ar li:last-child:after, li.supervisor-li-ar:last-of-type::after{
visibility: hidden; visibility: hidden;
} }
@ -109,12 +120,20 @@ li.supervisor-li:first-of-type::before{
height: 65px; height: 65px;
border-left: 0; border-left: 0;
} }
li.supervisor-li:first-of-type::after{ li.supervisor-li-ar:first-of-type::before{
border-top: 0;
top: 45px; top: 45px;
height: 0px;
} }
li.supervisor-li:first-of-type::after{
top: 45px;
}
li.supervisor-li-ar:first-of-type::after{
top: 45px;
}
.current-employee li.subordinate:before{ .current-employee li.subordinate:before{
top: -6px !important; top: -13px !important;
} }
ul.current-employee, .current-employee ul{ ul.current-employee, .current-employee ul{
margin:0; margin:0;
@ -123,4 +142,22 @@ ul.current-employee, .current-employee ul{
left: -14px !important; left: -14px !important;
top: -15px !important; top: -15px !important;
width: 13px; width: 13px;
} }
.current-employee-ar li.subordinate-ar:before{
top: -13px !important;
}
ul.current-employee-ar, .current-employee-ar ul{
margin:0;
}
.current-employee-ar li:before{
left: -14px !important;
top: -16px !important;
width: 15px;
}

@ -18,7 +18,7 @@ export class EmployeeHierarchyComponent implements OnInit {
public subordinateHierarchyList: any; public subordinateHierarchyList: any;
public supervisorHierarchyList: any; public supervisorHierarchyList: any;
public currentEmployee: any; public currentEmployee: any;
public direction: String;
constructor( constructor(
public ts: TranslatorService, public ts: TranslatorService,
public authService: AuthenticationService, public authService: AuthenticationService,
@ -29,6 +29,7 @@ export class EmployeeHierarchyComponent implements OnInit {
ngOnInit() { ngOnInit() {
this.currentEmployee = this.common.sharedService.getSharedData('employee-hierarchy', false); this.currentEmployee = this.common.sharedService.getSharedData('employee-hierarchy', false);
this.direction = TranslatorService.getCurrentLanguageName();
if (!this.currentEmployee) { if (!this.currentEmployee) {
this.getProfile(); this.getProfile();
} else { } else {

Loading…
Cancel
Save