fixed employee hierarchy design

MOE-PHASE-2-SPRINT-1
Sultan khan 3 years ago
parent 124eb3cc92
commit f383fc83e9

@ -43,9 +43,7 @@
}
.title {
font-family: 'Inter' !important;
line-height: 12px;
font-family: "Inter" !important;
letter-spacing: -0.56px;
color: #575757;
opacity: 1;
@ -53,10 +51,10 @@
width: 100%;
text-overflow: ellipsis;
white-space: nowrap;
// overflow: hidden;
display: block;
margin-left: -10px;
margin-top: -10px;
margin-top: -15px;
overflow: hidden;
}
}
@ -123,28 +121,36 @@
.numberEmp {
color: white;
font-size: 12px;
font-size: 11px;
font-weight: bolder;
margin-left: 13px;
width: 23px;
height: 23px;
width: 22px;
height: 22px;
border-radius: 100%;
background-color: #024d71;
z-index: 9;
text-align: center;
padding-top: 3px;
padding: 4px 2px 2px;
position: absolute;
right: 10px;
top: -8px;
}
.numberEmp-ar {
color: white;
font-size: 12px;
font-size: 11px;
font-weight: bolder;
margin-right: 13px;
width: 23px;
height: 23px;
margin-left: 13px;
width: 22px;
height: 22px;
border-radius: 100%;
background-color: #024d71;
z-index: 9;
text-align: center;
padding-top: 3px;
padding: 4px 2px 2px;
position: absolute;
left: 10px;
top: -8px;
}

@ -7,38 +7,46 @@
<ion-content>
<div class="contentBg">
<ul class="supervisor">
<ng-container *ngFor="let subordinate of supervisorHierarchyList;let i=index">
<app-employee-hierarchy-card
<li class="supervisor-li"><app-employee-hierarchy-card
[name]="subordinate.EMPLOYEE_NAME"
[title]="subordinate.POSITION_NAME"
[employeeImage]="subordinate.EMPLOYEE_IMAGE ? 'data:image/png;base64,'+subordinate.EMPLOYEE_IMAGE : '../assets/imgs/profile.png'"
[employeePhoneNumber]="subordinate.EMPLOYEE_MOBILE_NUMBER"
(onGetDetails)="getDetails(i)">
</app-employee-hierarchy-card>
</li>
</ng-container>
<ul *ngIf="personalInfo" class="current-employee">
<li>
<app-employee-hierarchy-card
[name]="personalInfo.EMPLOYEE_NAME"
[title]="personalInfo.POSITION_NAME"
[employeeImage]="personalInfo.EMPLOYEE_IMAGE ? 'data:image/png;base64,'+personalInfo.EMPLOYEE_IMAGE : '../assets/imgs/profile.png'"
[employeePhoneNumber]="personalInfo.EMPLOYEE_MOBILE_NUMBER"
(onGetDetails)="getDetails('personal')">
</app-employee-hierarchy-card>
<ul class="contentBg">
<li *ngFor="let subordinate of subordinateHierarchyList;let i=index" class="subordinate">
<app-employee-hierarchy-card
[name]="subordinate.EMPLOYEE_NAME"
[title]="subordinate.POSITION_NAME"
[employeeImage]="subordinate.EMPLOYEE_IMAGE ? 'data:image/png;base64,'+subordinate.EMPLOYEE_IMAGE : '../assets/imgs/profile.png'"
[employeePhoneNumber]="subordinate.EMPLOYEE_MOBILE_NUMBER"
(onGetDetails)="getDetails(i)">
</app-employee-hierarchy-card>
</li>
</ul>
</li>
</ul>
</ul>
</div>
<div *ngIf="personalInfo" class="current-employee">
<app-employee-hierarchy-card
[name]="personalInfo.EMPLOYEE_NAME"
[title]="personalInfo.POSITION_NAME"
[employeeImage]="personalInfo.EMPLOYEE_IMAGE ? 'data:image/png;base64,'+personalInfo.EMPLOYEE_IMAGE : '../assets/imgs/profile.png'"
[employeePhoneNumber]="personalInfo.EMPLOYEE_MOBILE_NUMBER"
(onGetDetails)="getDetails('personal')">
</app-employee-hierarchy-card>
</div>
<div class="contentBg">
<ng-container *ngFor="let subordinate of subordinateHierarchyList;let i=index">
<app-employee-hierarchy-card
[name]="subordinate.EMPLOYEE_NAME"
[title]="subordinate.POSITION_NAME"
[employeeImage]="subordinate.EMPLOYEE_IMAGE ? 'data:image/png;base64,'+subordinate.EMPLOYEE_IMAGE : '../assets/imgs/profile.png'"
[employeePhoneNumber]="subordinate.EMPLOYEE_MOBILE_NUMBER"
(onGetDetails)="getDetails(i)">
</app-employee-hierarchy-card>
</ng-container>
</div>
</ion-content>

@ -1,9 +1,126 @@
.contentBg {
padding: 0px 20px;
padding: 0px 15px;
margin-top: 20px;
}
.current-employee {
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 {
margin:10px;
padding:0;
}
.current-employee li {
list-style-type: none;
margin: 10px 0 10px 10px;
position: relative;
}
.current-employee li:before {
content: "";
position: absolute;
top: -15px !important;
left: -20px;
border-left: 2px solid #000;
border-bottom: 2px solid #000;
width: 20px;
height: 15px;
}
.current-employee li:after {
position: absolute;
content: "";
top: 5px;
left: -20px;
border-left: 2px solid #000;
border-top: 2px solid #000;
width: 20px;
height: 100%;
}
// .current-employee li:last-child:after {
// display: none;
// }
.supervisor li:after {
position: absolute;
content: "";
top: 5px;
left: -20px;
border-left: 2px solid #000;
border-top: 0;
width: 20px;
height: 100%;
}
.supervisor li {
list-style-type: none;
margin: 10px 0 10px 10px;
position: relative;
}
.supervisor li:before {
content: "";
position: absolute;
top: -10px;
left: -20px;
border-left: 2px solid #000;
border-bottom: 2px solid #000;
width: 20px;
height: 55px;
}
// li:last-child:after, li:last-child:before {
// display: none;
// }
.supervisor li:last-child:after{
visibility: hidden;
}
.supervisor-li li:last-child:after, li.supervisor-li:last-of-type::after{
visibility: hidden;
}
li.supervisor-li:first-of-type::before{
border-top: 0;
top: -20px;
height: 65px;
border-left: 0;
}
li.supervisor-li:first-of-type::after{
top: 45px;
}
.current-employee li.subordinate:before{
top: -15px !important;
}
ul.current-employee, .current-employee ul{
margin:0;
}
.current-employee li:before{
left:-13px !important;
top: -17px !important;
width: 13px;
}

@ -1268,7 +1268,7 @@
"ar": "هل ترغب في تسجيل الدخول باسم المستخدم الحالي؟"
},
"monthly-attendance": {
"ar": "التقويم يترك",
"ar":"اجازاتي",
"en": "Leaves Calendar"
},
"monthly-time-sheet-view": {

@ -2010,4 +2010,14 @@ ion-app[dir="rtl"] {
}
.toolTip-inside ion-icon{
position: absolute;
}
}
.current-employee{
.name{
font-size: 14px !important;
margin-left: -5px !important;
}
.title{
margin-left: -5px !important;
}
}
Loading…
Cancel
Save