fixing srca branch

SRCA_DEV_2
umasoodch 3 years ago
parent 4064939d4c
commit 7d26b1373f

@ -1,285 +1,300 @@
.imgSize{ .imgSize {
position: absolute; position: absolute;
right: 15px; right: 15px;
top: 0; top: 0;
bottom: 0; bottom: 0;
margin: auto; margin: auto;
height:20px; height: 20px;
width:20px; width: 20px;
} }
.rowAH ion-col { .rowAH ion-col {
border: 1px solid #d9d9d9; border: 1px solid #d9d9d9;
font-size: 13px; font-size: 13px;
} }
.titleH { .titleH {
font-size: 13px; font-size: 13px;
border: 1px solid #d9d9d9; border: 1px solid #d9d9d9;
border-top-right-radius: 5px; border-top-right-radius: 5px;
border-top-left-radius: 5px; border-top-left-radius: 5px;
border-bottom: 0px; border-bottom: 0px;
} }
.gridAH { .gridAH {
text-align: center; text-align: center;
padding: 5px 5px !important; padding: 5px 5px !important;
border-radius: 5px; border-radius: 5px;
} }
ion-card-content.confirm-details{
padding: 0; ion-card-content.confirm-details {
padding: 0;
} }
.confirm-details label{
font-size: 13px; .confirm-details label {
font-size: 13px;
} }
/****************** NEW Design ***************************************/ /****************** NEW Design ***************************************/
.footer-button { .footer-button {
border-radius: 2px; border-radius: 2px;
padding: 0 1.1em; padding: 0 1.1em;
min-height: 45px; min-height: 45px;
min-width: 200px; min-width: 200px;
} }
.Header {
font-weight: bold;
color: #c6903e !important;
font-size: 10px;
}
.tbData {
font-size: 10px;
}
.btnBack {
background: transparent;
float: right;
}
.attachmentDiv {
background: #ffffff;
height: auto;
text-align: center;
padding-top: 1px;
margin: 10px;
border-radius: 15px;
border: 1px solid grey;
}
.noDataDiv {
background: #ffffff;
height: 11%;
text-align: center;
padding-top: 1px;
border-radius: 10px;
margin: 10px;
border-radius: 5px;
}
.submitNote {
background: #ffffff;
height: 80px;
padding-top: 1px;
margin: 10px;
border-radius: 15px;
border: 1px solid grey;
}
.approvalList {
--background: #f0efef;
height: auto;
text-align: center;
padding-top: 1px;
border-radius: 10px;
margin: 10px;
border-radius: 5px;
}
/************************New Design**********************************/
.notification-list {
background: none;
background: none;
border-radius: 32px;
ion-item {
// margin-top: 5px;
// margin-bottom: 5px;
background-color: transparent;
.item-date {
width: 100%;
font-size: 16px;
font-weight: bold;
text-align: start;
padding: 0;
margin: 0;
position: absolute;
left: 0;
top: 12%;
}
ion-label,
[item-end] {
white-space: normal;
font-size: 14px;
padding-top: 15%;
// :root[dir="ltr"]{
// margin-left: 10px;
// }
// :root[dir="rtl"]{
// margin-right: 10px;
// }
.Header {
font-weight: bold;
color: #1a586d !important;
font-size: 10px;
}
.tbData {
font-size: 10px;
}
.btnBack {
background: transparent;
float: right;
}
.attachmentDiv{
background: #ffffff;
height: auto;
text-align: center;
padding-top: 1px;
margin: 10px;
border-radius: 15px;
border: 1px solid grey;
}
.noDataDiv{
background: #ffffff;
height: 11%;
text-align: center;
padding-top: 1px;
border-radius: 10px;
margin: 10px;
border-radius: 5px;
}
.submitNote{
background: #ffffff;
height: 80px;
padding-top: 1px;
margin: 10px;
border-radius: 15px;
border: 1px solid grey;
}
.approvalList{
--background: #f0efef;
height: auto;
text-align: center;
padding-top: 1px;
border-radius: 10px;
margin: 10px;
border-radius: 5px;
}
/************************New Design**********************************/
.notification-list{
background: none;
background: none;
border-radius: 32px;
ion-item{
// margin-top: 5px;
// margin-bottom: 5px;
background-color: transparent;
.item-date{
width: 100%;
font-size: 16px;
font-weight: bold;
text-align: start;
padding: 0;
margin: 0;
position: absolute;
left: 0;
top: 12%;
}
ion-label , [item-end]{
white-space: normal;
font-size: 14px;
padding-top: 15%;
// :root[dir="ltr"]{
// margin-left: 10px;
// }
// :root[dir="rtl"]{
// margin-right: 10px;
// }
}
} }
}
.timeline {
position: relative;
margin: 15px 0 0 0;
// border-bottom: solid 1px var(--cusgray);
}
.timeline:before {
content: '';
position: inherit !important;
top: 0;
bottom: 0;
width: 4px;
// background: #e4e4e4;
z-index: 1;
left: 35px;
/* margin-left: -10px; */
/* z-index: 1; */
}
.timeline .timeline-thumb {
border-radius: 500px;
width: 70px !important;
z-index: 2;
position: absolute;
left: 0px;
// :root[dir="ltr"]{
// left: 37px;
// }
// :root[dir="rtl"]{
// right: 37px;
// }
float: right;
top: 9px;
}
.timeline .timeline-thumb.timeline-icon {
height: 70px;
// text-align: center;
// color: white;
// border: 5px solid #CBD0D3;
// transform: scale(0.2);
}
.timeline .timeline-item {
// width: 40px;
}
.timeline .timeline-stats {
position: relative;
font-size: 12px;
color: var(--darkgray);
}
.empImge{
border-radius: 50%;
width:60px;
height: 60px;
border: #dedede solid 1px;
}
.empImgeRep {
border-radius: 50% !important;
width: 80px;
height: 80px;
border: #dedede solid 1px;
}
.line{
padding-bottom:87px;
}
.attachLable{
position: absolute;
top: 0px;
z-index: 0;
background: #44A7A1;
color: #fff;
border-radius: 50%;
border: 0px;
width: 24px;
height: 24px;
text-align: center;
font-size: 5px;
}
.removeLable{
top: 0px;
z-index: 0;
background: #d8252d;
color: #fff;
border-radius: 50%;
border: 0px;
width: 20px;
height: 20px;
text-align: center;
font-size: 5px;
}
.note-modal {
// width: 90%;
// height: 50%;
// top: 20%;
// left: 5%;
// right: 5%;
// bottom: 5%;
background: rgba(0, 0, 0, 0.5) !important;
padding: 30% 10% !important;
--height: 12cm !important;
// --width: 80% !important;
--border-radius:20px;
}
.header-toolbar-new{
--background: #024d71;
}
.confirmEitOkButton{
white-space: normal !important;
text-transform: capitalize !important;
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
--background: #0ca2de;
width: 80% !important;
color: white!important;
border-radius: 16px !important;
}
.approvalTitle-ar{
font-weight: bold;
font-size: 16px;
text-align: right;
} }
.approvalTitle{ }
font-weight: bold;
font-size: 16px;
text-align: left;
}
.timeline {
position: relative;
margin: 15px 0 0 0;
// border-bottom: solid 1px var(--cusgray);
}
.timeline:before {
content: '';
position: inherit !important;
top: 0;
bottom: 0;
width: 4px;
// background: #e4e4e4;
z-index: 1;
left: 35px;
/* margin-left: -10px; */
/* z-index: 1; */
}
.timeline .timeline-thumb {
border-radius: 500px;
width: 70px !important;
z-index: 2;
position: absolute;
left: 0px;
// :root[dir="ltr"]{
// left: 37px;
// }
// :root[dir="rtl"]{
// right: 37px;
// }
float: right;
top: 9px;
}
.timeline .timeline-thumb.timeline-icon {
height: 70px;
// text-align: center;
// color: white;
// border: 5px solid #CBD0D3;
// transform: scale(0.2);
}
.timeline .timeline-item {
// width: 40px;
}
.timeline .timeline-stats {
position: relative;
font-size: 12px;
color: var(--darkgray);
}
.empImge {
border-radius: 50%;
width: 60px;
height: 60px;
border: #dedede solid 1px;
}
.empImgeRep {
border-radius: 50% !important;
width: 80px;
height: 80px;
border: #dedede solid 1px;
}
.line {
padding-bottom: 87px;
}
.attachLable {
position: absolute;
top: 0px;
z-index: 0;
background: #30b8c6;
color: #fff;
border-radius: 50%;
border: 0px;
width: 24px;
height: 24px;
text-align: center;
font-size: 5px;
}
.removeLable {
top: 0px;
z-index: 0;
background: #d8252d;
color: #fff;
border-radius: 50%;
border: 0px;
width: 20px;
height: 20px;
text-align: center;
font-size: 5px;
}
.note-modal {
// width: 90%;
// height: 50%;
// top: 20%;
// left: 5%;
// right: 5%;
// bottom: 5%;
background: rgba(0, 0, 0, 0.5) !important;
padding: 30% 10% !important;
--height: 12cm !important;
// --width: 80% !important;
--border-radius: 20px;
}
.header-toolbar-new {
--background: #BE332F;
}
.confirmEitOkButton {
white-space: normal !important;
text-transform: capitalize !important;
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
--background: #BE332F;
width: 80% !important;
color: white !important;
border-radius: 16px !important;
--border-radius: 16px !important;
--box-shadow: none;
}
.approvalTitle-ar {
font-weight: bold;
font-size: 16px;
text-align: right;
}
.approvalTitle {
font-weight: bold;
font-size: 16px;
text-align: left;
}

@ -123,10 +123,10 @@
<ion-footer> <ion-footer>
<div class="centerDiv"> <div class="centerDiv">
<ion-button class="footer-button" style="background: var(--newgreen)!important;border-radius: 10px; --background: transparent; --border-radius: 10px; " ion-button (click)="submitAction()"> <ion-button class="footer-button" style="background: var(--newgreen)!important;border-radius: 10px; --background: transparent; " ion-button (click)="submitAction()">
{{'general, submit' | translate}}</ion-button> {{'general, submit' | translate}}</ion-button>
<ion-button class="footer-button" style="background: var(--darkblue)!important;border-radius: 10px; --background: transparent; --border-radius: 10px; " ion-button (click)="closeModal()"> <ion-button class="footer-button" style="background: var(--darkblue)!important;border-radius: 10px; --background: transparent; " ion-button (click)="closeModal()">
{{'general, cancel' | translate}}</ion-button> {{'general, cancel' | translate}}</ion-button>
</div> </div>
</ion-footer> </ion-footer>

@ -145,7 +145,7 @@
<div> <div>
<ion-row> <ion-row>
<ion-col class="colBold"> <ion-col class="colBold">
<label style="color:#024d71;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','startDate')}} </label> <label style="color:#BE332F;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','startDate')}} </label>
<br> <br>
<label class="label" style="color:black;" for=""> {{item.START_DATE}}</label> <label class="label" style="color:black;" for=""> {{item.START_DATE}}</label>
<br> <br>
@ -154,7 +154,7 @@
</ion-row> </ion-row>
<ion-row> <ion-row>
<ion-col class="colBold"> <ion-col class="colBold">
<label style="color:#024d71;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','endDate')}}</label> <label style="color:#BE332F;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','endDate')}}</label>
<br> <br>
<label class="label" style="color:black;" for=""> {{item.END_DATE}}</label> <label class="label" style="color:black;" for=""> {{item.END_DATE}}</label>
<br> <br>
@ -163,7 +163,7 @@
</ion-row> </ion-row>
<ion-row> <ion-row>
<ion-col class="colBold"> <ion-col class="colBold">
<label style="color:#024d71;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','absenceType')}} </label> <label style="color:#BE332F;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','absenceType')}} </label>
<br> <br>
<label class="label" style="color:black;" for="">{{item.ABSENCE_TYPE}}</label> <label class="label" style="color:black;" for="">{{item.ABSENCE_TYPE}}</label>
<br> <br>
@ -172,7 +172,7 @@
</ion-row> </ion-row>
<ion-row> <ion-row>
<ion-col class="colBold"> <ion-col class="colBold">
<label style="color:#024d71;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','absenceCategory')}}</label> <label style="color:#BE332F;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','absenceCategory')}}</label>
<br> <br>
<label class="label" style="color:black;" for="">{{item.ABSENCE_CATEGORY}}</label> <label class="label" style="color:black;" for="">{{item.ABSENCE_CATEGORY}}</label>
<br> <br>
@ -181,7 +181,7 @@
</ion-row> </ion-row>
<ion-row> <ion-row>
<ion-col class="colBold"> <ion-col class="colBold">
<label style="color:#024d71;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','days')}}</label> <label style="color:#BE332F;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','days')}}</label>
<br> <br>
<label class="label" style="color:black;" for="">{{item.ABSENCE_DAYS}}</label> <label class="label" style="color:black;" for="">{{item.ABSENCE_DAYS}}</label>
<br> <br>
@ -190,7 +190,7 @@
</ion-row> </ion-row>
<ion-row> <ion-row>
<ion-col class="colBold"> <ion-col class="colBold">
<label style="color:#024d71;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','hours')}}</label> <label style="color:#BE332F;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','hours')}}</label>
<br> <br>
<label class="label" style="color:black;" for="">{{item.ABSENCE_HOURS}}</label> <label class="label" style="color:black;" for="">{{item.ABSENCE_HOURS}}</label>
<br> <br>
@ -199,7 +199,7 @@
</ion-row> </ion-row>
<ion-row> <ion-row>
<ion-col class="colBold"> <ion-col class="colBold">
<label style="color:#024d71;font-weight: bold;" for="">{{ts.trPK('absenceList','approvalStatus')}}</label> <label style="color:#BE332F;font-weight: bold;" for="">{{ts.trPK('absenceList','approvalStatus')}}</label>
<br> <br>
<label class="label" style="color:black;" for="">{{item.APPROVAL_STATUS}}</label> <label class="label" style="color:black;" for="">{{item.APPROVAL_STATUS}}</label>
<br> <br>
@ -208,7 +208,7 @@
</ion-row> </ion-row>
<ion-row> <ion-row>
<ion-col class="colBold"> <ion-col class="colBold">
<label style="color:#024d71;font-weight: bold;" for="">{{ts.trPK('absenceList','absenceStatus')}}</label> <label style="color:#BE332F;font-weight: bold;" for="">{{ts.trPK('absenceList','absenceStatus')}}</label>
<br> <br>
<label class="label" style="color:black;" for="">{{item.ABSENCE_STATUS}}</label> <label class="label" style="color:black;" for="">{{item.ABSENCE_STATUS}}</label>
<br> <br>

@ -1,125 +1,128 @@
.imgSize{ .imgSize {
position: absolute; position: absolute;
right: 15px; right: 15px;
top: 0; top: 0;
bottom: 0; bottom: 0;
margin: auto; margin: auto;
height:20px; height: 20px;
width:20px; width: 20px;
} }
.addClass{
background-color: #024d71;
width: 80px;
height: 80px;
right: 8%;
position: fixed;
color: white;
bottom: 5%;
border-radius: 50%;
z-index: 999;
-webkit-box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59);
-moz-box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59);
box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59);
}
.grids{ .addClass {
border-radius: 20px !important; background-color: #BE332F;
background: white; width: 80px;
padding-left: 1px; height: 80px;
padding-right: 1px; right: 8%;
margin: 13px; position: fixed;
padding-top: 0px; color: white;
padding-bottom: 3px; bottom: 5%;
padding-left: 13px; border-radius: 50%;
padding-right: 13px; z-index: 999;
border: 1px solid #cac8c8; -webkit-box-shadow: 2px -1px 13px 0px rgba(0, 0, 0, 0.59);
margin-bottom: 10% !important; -moz-box-shadow: 2px -1px 13px 0px rgba(0, 0, 0, 0.59);
} box-shadow: 2px -1px 13px 0px rgba(0, 0, 0, 0.59);
}
.bgcolor {
color: white;
border-top-right-radius: 19px;
border-top-left-radius: 15px;
padding-top: 1;
padding-bottom: 0;
margin-top: 0;
margin-bottom: 0;
/* border-radius: 12px !important; */
background: #024d71;
border-bottom: 1px solid #a7a4a4;
border-top: 1px solid #cac8c8;
margin-left: -13px;
margin-right: -13px;
}
.header-div {
background-color: #024d71;
text-transform: capitalize;
height: 100px;
}
.header-toolbar-new{
--background: #024d71;
}
.hrClass{
border-width: 0;
box-sizing: content-box;
border-bottom: 1px solid #e6e6e6;
background: #fff !important;
height: 1px;
}
//////////////////////////////////////////////down .grids {
border-radius: 20px !important;
background: white;
padding-left: 1px;
padding-right: 1px;
margin: 13px;
padding-top: 0px;
padding-bottom: 3px;
padding-left: 13px;
padding-right: 13px;
border: 1px solid #cac8c8;
margin-bottom: 10% !important;
}
.colorBG{ .bgcolor {
--background: #f0efef;
} color: white;
border-top-right-radius: 19px;
border-top-left-radius: 15px;
padding-top: 1;
padding-bottom: 0;
margin-top: 0;
margin-bottom: 0;
/* border-radius: 12px !important; */
background: #BE332F;
border-bottom: 1px solid #a7a4a4;
border-top: 1px solid #cac8c8;
margin-left: -13px;
margin-right: -13px;
}
.header-div {
background-color: #BE332F;
text-transform: capitalize;
height: 100px;
}
.header-toolbar-new {
--background: #BE332F;
}
.Title{
text-align: center;
color: white;
margin-top: -33px;
font-size: 17px;
}
.result-graph{ .hrClass {
font-size: 14px; border-width: 0;
margin-left: -48px; box-sizing: content-box;
margin-right: 3px; border-bottom: 1px solid #e6e6e6;
margin-bottom: -30px; background: #fff !important;
} height: 1px;
}
.datetime{ //////////////////////////////////////////////down
text-align: center;
font-family: WorkSans-Bold; .colorBG {
margin-left: -120px; --background: #f0efef;
margin-top: -19px; }
.Title {
text-align: center;
color: white;
margin-top: -33px;
font-size: 17px;
}
.result-graph {
font-size: 14px;
margin-left: -48px;
margin-right: 3px;
margin-bottom: -30px;
}
.datetime {
text-align: center;
font-family: WorkSans-Bold;
margin-left: -120px;
margin-top: -19px;
}
.datelabel {
margin-left: 150px;
color: black !important;
font-family: WorkSans-Bold;
}
.iconCalendar {
// margin-left: -241px;
// margin-top: 5px;
margin-left: -12px !important;
width: 22% !important;
height: 26px !important;
margin-top: -50px !important;
margin-bottom: 23px !important;
}
}
.datelabel{
margin-left: 150px;
color: black !important;
font-family: WorkSans-Bold;
}
.iconCalendar{
// margin-left: -241px;
// margin-top: 5px;
margin-left: -12px !important;
width: 22% !important;
height: 26px !important;
margin-top: -50px !important;
margin-bottom: 23px !important;
}
// .today-graph{ // .today-graph{
// display: block !important; // display: block !important;
// height: 196px; // height: 196px;
// width: 385px; // width: 385px;
@ -137,100 +140,104 @@
// margin-bottom: -30px; // margin-bottom: -30px;
// } // }
.headerGrid{ .headerGrid {
background-color: white !important; background-color: white !important;
border: 1px solid #cac8c8 !important; border: 1px solid #cac8c8 !important;
border-radius: 20px !important; border-radius: 20px !important;
padding-top: 28px; padding-top: 28px;
padding-bottom: 26px; padding-bottom: 26px;
margin-left: 13px; margin-left: 13px;
margin-right: 13px; margin-right: 13px;
margin-top: -93px; margin-top: -93px;
margin-bottom: 10px; margin-bottom: 10px;
} }
.header{
.header {
margin-top: -126px;
} margin-top: -126px;
.result-text-container { }
padding: 0;
margin: 0; .result-text-container {
position: absolute; padding: 0;
left: 31%; margin: 0;
top: 23%; position: absolute;
display: block; left: 31%;
text-align: center; top: 23%;
transform: translate(-50%, -50%); display: block;
text-align: center;
transform: translate(-50%, -50%);
h2 { h2 {
font-size: 25px; font-size: 25px;
font-family: WorkSans-Bold; font-family: WorkSans-Bold;
margin: 0 auto; margin: 0 auto;
// margin-top: 289px; // margin-top: 289px;
line-height: 36px; line-height: 36px;
} }
span { span {
width: 125px; width: 125px;
display: block; display: block;
margin: 0 auto; margin: 0 auto;
font-size: 12px; font-size: 12px;
// margin-top: 289px; // margin-top: 289px;
font-family: workSans-Regular; font-family: workSans-Regular;
}
} }
.green-label{
font-size: 12px;
margin-top: -13px;
} }
.green-amount{ .green-label {
font-size: 12px;
margin-top: -13px;
}
.green-amount {
font-size: 15px; font-size: 15px;
font-family: WorkSans-Bold; font-family: WorkSans-Bold;
margin-top: 0px; margin-top: 0px;
} }
.red-label{ .red-label {
font-size: 12px; font-size: 12px;
margin-top: -13px; margin-top: -13px;
} }
.red-amount{ .red-amount {
font-size: 15px; font-size: 15px;
font-family: WorkSans-Bold; font-family: WorkSans-Bold;
margin-top: 0px; margin-top: 0px;
} }
.orng-label{
font-size: 12px; .orng-label {
margin-top: -13px; font-size: 12px;
} margin-top: -13px;
}
.orng-amount{
font-size: 15px; .orng-amount {
font-family: WorkSans-Bold; font-size: 15px;
margin-top: 0px; font-family: WorkSans-Bold;
} margin-top: 0px;
}
.contentEit:before {
position: absolute; .contentEit:before {
position: absolute;
content: ""; content: "";
// background: #024d71; // background: #BE332F;
height: 140px; height: 140px;
width: 100%; width: 100%;
left: 0; left: 0;
top: 0px; top: 0px;
z-index: 1; z-index: 1;
} }
.div-green{
.div-green {
position: relative; position: relative;
left: 82%; left: 82%;
bottom: 141px; bottom: 141px;
@ -238,9 +245,9 @@ margin-top: -13px;
background-color: #1FA269; background-color: #1FA269;
width: 11%; width: 11%;
height: 6px; height: 6px;
} }
.div-red-ar{ .div-red-ar {
position: relative; position: relative;
bottom: 59px; bottom: 59px;
color: black; color: black;
@ -250,7 +257,8 @@ margin-top: -13px;
height: 6px; height: 6px;
right: 16px; right: 16px;
} }
// .div-red-ar{ // .div-red-ar{
// position: relative; // position: relative;
// bottom: 131px; // bottom: 131px;
@ -266,12 +274,12 @@ margin-top: -13px;
// bottom: 146px; // bottom: 146px;
// color: black; // color: black;
// background-color: #CB3232; // background-color: #CB3232;
// // background-color: #024d71; // // background-color: #BE332F;
// width: 11%; // width: 11%;
// height: 6px; // height: 6px;
// } // }
.div-red{ .div-red {
position: relative; position: relative;
left: 82%; left: 82%;
bottom: 80px; bottom: 80px;
@ -280,8 +288,9 @@ margin-top: -13px;
// background-color: #DDB017; // background-color: #DDB017;
width: 11%; width: 11%;
height: 6px; height: 6px;
} }
.div-green-ar{
.div-green-ar {
position: relative; position: relative;
bottom: 124px; bottom: 124px;
color: black; color: black;
@ -290,15 +299,16 @@ margin-top: -13px;
width: 11%; width: 11%;
height: 6px; height: 6px;
right: 16px; right: 16px;
} }
.subTitle{
.subTitle {
margin-top: -10px; margin-top: -10px;
margin-left: 10px; margin-left: 10px;
font-family: WorkSans-Bold; font-family: WorkSans-Bold;
font-size: 16px; font-size: 16px;
} }
.subTitle-ar{ .subTitle-ar {
margin-top: -10px; margin-top: -10px;
margin-right: 10px; margin-right: 10px;
font-family: WorkSans-Bold; font-family: WorkSans-Bold;
@ -311,8 +321,8 @@ margin-top: -13px;
height: 102px; height: 102px;
width: 211px; width: 211px;
margin-top: 20px; margin-top: 20px;
margin-left: -39px; margin-left: -39px;
max-height: 4cm; max-height: 4cm;
} }
.today-graph-ar { .today-graph-ar {
@ -325,11 +335,12 @@ max-height: 4cm;
margin-right: 105px; margin-right: 105px;
} }
.graph-container{ .graph-container {
margin-left: 160px; margin-left: 160px;
position: relative; position: relative;
margin-top: -98px; margin-top: -98px;
} }
// .label-container{ // .label-container{
// position: absolute; // position: absolute;
// // width: 20%; // // width: 20%;
@ -337,26 +348,31 @@ max-height: 4cm;
// top: 50%; // top: 50%;
// margin-top: -27px; // margin-top: -27px;
// left: 20px; // left: 20px;
// } // }
.green-label-container{ .green-label-container {
margin-top: 20px; margin-left: 12px; margin-top: 20px;
margin-left: 12px;
} }
.green-label-container-ar{
margin-top: 20px; margin-right: 12px; .green-label-container-ar {
margin-top: 20px;
margin-right: 12px;
} }
.black-label-container{ .black-label-container {
margin-left: 12px; margin-left: 12px;
} }
.black-label-container-ar{
.black-label-container-ar {
margin-right: 12px; margin-right: 12px;
} }
.used-label-container{
.used-label-container {
// border-top: 5px solid #292F42; // border-top: 5px solid #292F42;
// padding: 1px 0px; // padding: 1px 0px;
// margin: 15px 0px // margin: 15px 0px
@ -367,7 +383,8 @@ max-height: 4cm;
background-color: #b60c0c; background-color: #b60c0c;
margin-top: 30px; margin-top: 30px;
} }
.current-label-container{
.current-label-container {
width: 12px; width: 12px;
height: 12px; height: 12px;
padding-right: -10px; padding-right: -10px;
@ -375,51 +392,53 @@ max-height: 4cm;
background-color: black; background-color: black;
margin-top: 21px; margin-top: 21px;
} }
.current-label{
.current-label {
width: 12px; width: 12px;
height: 12px; height: 12px;
padding-right: -10px; padding-right: -10px;
border-radius: 100%; border-radius: 100%;
background-color: #024d71; background-color: #BE332F;
// margin-top: 30px; // margin-top: 30px;
} }
.span-one{
.span-one {
// display: block; // display: block;
// font-size: 12px; // font-size: 12px;
// color: black; // color: black;
display: block; display: block;
font-size: 12px; font-size: 12px;
color: #024d71; color: #BE332F;
margin-left: 6px; margin-left: 6px;
margin-top: -2px; margin-top: -2px;
font-weight: bold; font-weight: bold;
} }
.span-one-ar{ .span-one-ar {
display: block; display: block;
font-size: 12px; font-size: 12px;
color: #024d71; color: #BE332F;
margin-right: 6px; margin-right: 6px;
margin-top: -2px; margin-top: -2px;
font-weight: bold; font-weight: bold;
} }
.span-two{ .span-two {
// display: block; // display: block;
// font-size: 22px; // font-size: 22px;
display: block; display: block;
font-size: 12px; font-size: 12px;
color: #024d71; color: #BE332F;
margin-left: 6px; margin-left: 6px;
margin-top: -2px; margin-top: -2px;
font-weight: bold; font-weight: bold;
font-family: WorkSans-Bold; font-family: WorkSans-Bold;
} }
.black-span1{ .black-span1 {
// display: block; // display: block;
// font-size: 12px; // font-size: 12px;
// color: black; // color: black;
@ -429,9 +448,10 @@ max-height: 4cm;
margin-left: 6px; margin-left: 6px;
margin-top: 20px; margin-top: 20px;
font-weight: bold; font-weight: bold;
} }
.black-span1-ar{
.black-span1-ar {
// display: block; // display: block;
// font-size: 12px; // font-size: 12px;
// color: black; // color: black;
@ -441,9 +461,10 @@ max-height: 4cm;
margin-right: 6px; margin-right: 6px;
margin-top: 20px; margin-top: 20px;
font-weight: bold; font-weight: bold;
} }
.black-span2{
.black-span2 {
// display: block; // display: block;
// font-size: 22px; // font-size: 22px;
display: block; display: block;
@ -453,9 +474,10 @@ max-height: 4cm;
margin-top: 20px; margin-top: 20px;
font-weight: bold; font-weight: bold;
font-family: WorkSans-Bold; font-family: WorkSans-Bold;
} }
.red-span1{
.red-span1 {
// display: block; // display: block;
// font-size: 12px; // font-size: 12px;
// color: black; // color: black;
@ -465,9 +487,10 @@ max-height: 4cm;
margin-left: 6px; margin-left: 6px;
margin-top: 28px; margin-top: 28px;
font-weight: bold; font-weight: bold;
} }
.red-span1-ar{
.red-span1-ar {
// display: block; // display: block;
// font-size: 12px; // font-size: 12px;
// color: black; // color: black;
@ -477,9 +500,10 @@ max-height: 4cm;
margin-right: 6px; margin-right: 6px;
margin-top: 28px; margin-top: 28px;
font-weight: bold; font-weight: bold;
} }
.red-span2{
.red-span2 {
// display: block; // display: block;
// font-size: 22px; // font-size: 22px;
display: block; display: block;
@ -489,16 +513,18 @@ max-height: 4cm;
margin-top: 28px; margin-top: 28px;
font-weight: bold; font-weight: bold;
font-family: WorkSans-Bold; font-family: WorkSans-Bold;
} }
.yearLabel{
.yearLabel {
font-size: 13px; font-size: 13px;
color: gray; color: gray;
font-family: WorkSans-Bold; font-family: WorkSans-Bold;
margin-left: 29px; margin-left: 29px;
margin-top: 5px; margin-top: 5px;
} }
.yearLabel-ar{
.yearLabel-ar {
font-size: 13px; font-size: 13px;
color: gray; color: gray;
font-family: WorkSans-Bold; font-family: WorkSans-Bold;

@ -118,7 +118,7 @@ export class HomeComponent implements OnInit {
backgroundColor: [ backgroundColor: [
// '#1FA269', // '#1FA269',
// '#CB3232',], // '#CB3232',],
'#024d71', '#BE332F',
'#b60c0c',], '#b60c0c',],
borderWidth: 1 borderWidth: 1
} }
@ -276,7 +276,7 @@ export class HomeComponent implements OnInit {
{ {
data: [this.accrualNet, this.accrualUsed], data: [this.accrualNet, this.accrualUsed],
backgroundColor: [ backgroundColor: [
'#024d71', '#BE332F',
'#b60c0c',], '#b60c0c',],
borderWidth: 1 borderWidth: 1
} }

@ -1,53 +1,52 @@
.rowBtn{ .rowBtn {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.Header{ .Header {
color: black !important; color: black !important;
font-size: 25px !important; font-size: 25px !important;
font-weight: bold !important;; font-weight: bold !important;
;
margin: 0; margin: 0;
text-align: center; text-align: center;
margin-bottom: 20px; margin-bottom: 20px;
} }
.labelRadio{ .labelRadio {
color: black !important; color: black !important;
font-weight: bold !important; font-weight: bold !important;
padding-bottom: 20px; padding-bottom: 20px;
} }
.labelcheck{ .labelcheck {
color: red !important; color: red !important;
font-weight: bold !important; font-weight: bold !important;
margin-bottom: 10px; margin-bottom: 10px;
} }
.submitOkButton{ .submitOkButton {
white-space: normal !important; white-space: normal !important;
text-transform: capitalize !important; text-transform: capitalize !important;
min-height: 45px !important; min-height: 45px !important;
min-width: 5px !important; min-width: 5px !important;
margin: 8px !important; margin: 8px !important;
--background:: #024d71; --background: #BE332F;
width: 100% !important; width: 100% !important;
color: white!important; color: white !important;
border-radius: 16px !important; border-radius: 16px !important;
} }
.submitCancelButton{
.submitCancelButton {
white-space: normal !important; white-space: normal !important;
text-transform: capitalize !important; text-transform: capitalize !important;
min-height: 45px !important; min-height: 45px !important;
min-width: 5px !important; min-width: 5px !important;
margin: 8px !important; margin: 8px !important;
--background:: #024d71; --background: #BE332F;
width: 100% !important; width: 100% !important;
color: white!important; color: white !important;
border-radius: 16px !important; border-radius: 16px !important;
} }

@ -1,115 +1,116 @@
.search-button{ .search-button {
background: transparent; background: transparent;
font-size: 25px; font-size: 25px;
color: #7F8C8D; color: #7F8C8D;
} }
.header-toolbar-new{ .header-toolbar-new {
--background: #024d71; --background: #BE332F;
} }
.confirmEitOkButton{ .confirmEitOkButton {
white-space: normal !important; white-space: normal !important;
text-transform: capitalize !important; text-transform: capitalize !important;
min-height: 45px !important; min-height: 45px !important;
min-width: 5px !important; min-width: 5px !important;
margin: 8px !important; margin: 8px !important;
--background: #44A7A1; --background: #BE332F;
width: 80% !important; width: 80% !important;
color: white!important; color: white !important;
border-radius: 16px !important; border-radius: 16px !important;
--border-radius: 16px !important; --border-radius: 16px !important;
} --box-shadow: none;
}
.label-Select{ .label-Select {
color: var(--dark); color: var(--dark);
font-size: 15px; font-size: 15px;
border: none; border: none;
font-weight: 400; font-weight: 400;
-webkit-transform: translate3d(0, 0, 0); -webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0);
width: 80%; width: 80%;
padding: 1px 0px; padding: 1px 0px;
background-color: var(--light); background-color: var(--light);
border-bottom: var(--cusgray) solid 1px; border-bottom: var(--cusgray) solid 1px;
border-radius: 0px; border-radius: 0px;
// margin-left: 20px; // margin-left: 20px;
margin-left: 30px; margin-left: 30px;
// margin-top: -10px; // margin-top: -10px;
// -webkit-appearance: none; // -webkit-appearance: none;
// -moz-appearance: none; // -moz-appearance: none;
text-indent: 1px; text-indent: 1px;
// text-overflow: ''; // text-overflow: '';
box-shadow: none; box-shadow: none;
-webkit-box-shadow:none; -webkit-box-shadow: none;
-moz-box-shadow: none; -moz-box-shadow: none;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
:root[dir="ltr"]{ :root[dir="ltr"] {
background-image: linear-gradient(45deg, transparent 50%, #999 50%), linear-gradient(135deg, #999 50%, transparent 50%), linear-gradient(to right, #ffffff, #ffffff); background-image: linear-gradient(45deg, transparent 50%, #999 50%), linear-gradient(135deg, #999 50%, transparent 50%), linear-gradient(to right, #ffffff, #ffffff);
background-position: calc(100% - 14px) calc(1em + 2px), calc(100% - 8px) calc(1em + 2px), 100% 0; background-position: calc(100% - 14px) calc(1em + 2px), calc(100% - 8px) calc(1em + 2px), 100% 0;
background-size: 6px 6px, 6px 6px, 2.9em 2.9em; background-size: 6px 6px, 6px 6px, 2.9em 2.9em;
background-repeat: no-repeat; background-repeat: no-repeat;
padding-right: 20px; padding-right: 20px;
} }
:root[dir="rtl"]{
background-image: linear-gradient(-135deg, #999 50%, transparent 50%),linear-gradient(-45deg, transparent 50%, #999 50%), linear-gradient(to right, #ffffff, #ffffff); :root[dir="rtl"] {
background-position: calc(1em - 10px) calc(100% - 8px), calc(1em - 4px) calc(100% - 8px), 0 100%; background-image: linear-gradient(-135deg, #999 50%, transparent 50%), linear-gradient(-45deg, transparent 50%, #999 50%), linear-gradient(to right, #ffffff, #ffffff);
background-size: 6px 6px, 6px 6px, 2.9em 2.9em; background-position: calc(1em - 10px) calc(100% - 8px), calc(1em - 4px) calc(100% - 8px), 0 100%;
background-repeat: no-repeat; background-size: 6px 6px, 6px 6px, 2.9em 2.9em;
padding-left: 20px; background-repeat: no-repeat;
} padding-left: 20px;
}
} }
.label{ .label {
font-size: 16px; font-size: 16px;
// margin-left: 15px; // margin-left: 15px;
color: #a2a5a6 !important; color: #a2a5a6 !important;
display: block; display: block;
overflow: hidden; overflow: hidden;
-webkit-box-flex: 1; -webkit-box-flex: 1;
-webkit-flex: 1; -webkit-flex: 1;
-ms-flex: 1; -ms-flex: 1;
flex: 1; flex: 1;
/* font-size: inherit; */ /* font-size: inherit; */
// text-overflow: ellipsis; // text-overflow: ellipsis;
// white-space: nowrap; // white-space: nowrap;
white-space: normal; white-space: normal;
// padding-top: 10px; // padding-top: 10px;
padding: 5px 0px; padding: 5px 0px;
padding-left: 10px !important; padding-left: 10px !important;
margin: 10px auto; margin: 10px auto;
:root[dir="ltr"]{
font-family: var(--fontFamilySemiBoldEN) !important; :root[dir="ltr"] {
} font-family: var(--fontFamilySemiBoldEN) !important;
:root[dir="rtl"]{ }
font-family: var(--fontFamilyIOSAR) !important;
font-weight: bold; :root[dir="rtl"] {
} font-family: var(--fontFamilyIOSAR) !important;
font-weight: bold;
}
} }
.Field-en{ .Field-en {
border-radius: 30px; border-radius: 30px;
border: 1px solid #a2a5a6!important; border: 1px solid #a2a5a6 !important;
margin-bottom: 20px; margin-bottom: 20px;
padding-left: 20px !important; padding-left: 20px !important;
padding-top: 6px !important; padding-top: 6px !important;
color: #999999 !important; color: #999999 !important;
} }
.Field-ar{ .Field-ar {
border-radius: 30px; border-radius: 30px;
border: 1px solid #a2a5a6!important; border: 1px solid #a2a5a6 !important;
margin-bottom: 20px; margin-bottom: 20px;
padding-right: 20px !important; padding-right: 20px !important;
padding-top: 6px !important; padding-top: 6px !important;
color: #999999 !important; color: #999999 !important;
} }

@ -322,8 +322,7 @@ export class SubmitAbsenceComponent implements OnInit {
defaultValText, defaultValText,
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG
feildsList[i].REQ_COL_TIP
); );
} else if (feildsList[i].FORMAT_TYPE == "N") { } else if (feildsList[i].FORMAT_TYPE == "N") {
// number // number
@ -334,8 +333,7 @@ export class SubmitAbsenceComponent implements OnInit {
containerId, containerId,
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG
feildsList[i].REQ_COL_TIP
); );
} else if (feildsList[i].FORMAT_TYPE == "X") { } else if (feildsList[i].FORMAT_TYPE == "X") {
// standard date // standard date
@ -354,8 +352,7 @@ export class SubmitAbsenceComponent implements OnInit {
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG,
this.direction, this.direction
feildsList[i].REQ_COL_TIP
); );
} else { } else {
this.dateInput = new DateInput( this.dateInput = new DateInput(
@ -366,8 +363,7 @@ export class SubmitAbsenceComponent implements OnInit {
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG,
this.direction, this.direction
feildsList[i].REQ_COL_TIP
); );
} }
} else if (feildsList[i].FORMAT_TYPE == "Y") { } else if (feildsList[i].FORMAT_TYPE == "Y") {
@ -386,8 +382,7 @@ export class SubmitAbsenceComponent implements OnInit {
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG,
this.direction, this.direction
feildsList[i].REQ_COL_TIP
); );
} else { } else {
this.datetimeInput = new DateTimeInput( this.datetimeInput = new DateTimeInput(
@ -398,8 +393,7 @@ export class SubmitAbsenceComponent implements OnInit {
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG,
this.direction, this.direction
feildsList[i].REQ_COL_TIP
); );
} }
const elem = document.getElementById( const elem = document.getElementById(
@ -429,8 +423,7 @@ export class SubmitAbsenceComponent implements OnInit {
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG,
this.direction, this.direction
feildsList[i].REQ_COL_TIP
); );
} else { } else {
this.timeInput = new TimeInput( this.timeInput = new TimeInput(
@ -441,8 +434,7 @@ export class SubmitAbsenceComponent implements OnInit {
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG,
this.direction, this.direction
feildsList[i].REQ_COL_TIP
); );
} }
} }
@ -456,8 +448,7 @@ export class SubmitAbsenceComponent implements OnInit {
defaultValText, defaultValText,
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG
feildsList[i].REQ_COL_TIP
); );
} else { } else {
this.selectInput = new SelectInput( this.selectInput = new SelectInput(
@ -467,8 +458,7 @@ export class SubmitAbsenceComponent implements OnInit {
containerId, containerId,
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG
feildsList[i].REQ_COL_TIP
); );
this.fillDropdownList( this.fillDropdownList(

@ -1,3 +1,3 @@
.header-toolbar-new{ .header-toolbar-new {
--background: #024d71; --background: #BE332F;
} }

@ -1,12 +1,12 @@
<ion-app [dir]="direction" id="lang"> <ion-app [dir]="direction">
<ion-split-pane> <ion-split-pane>
<ion-menu [swipeGesture]="false" side='start' *ngIf="direction ==='ltr'"> <ion-menu [swipeGesture]="false" side='start' *ngIf="direction ==='ltr'">
<ion-content class="sidebar-menu"> <ion-content class="sidebar-menu">
<div class="header-div" style="visibility: hidden;"> <div class="header-div">
<!-- <div> <div>
<img class="closeIcon" (click)="closeMenu()" style= "height: 18px !important;" src="../assets/imgs/close_menu_icon.png "> <img class="closeIcon" (click)="closeMenu()" style= "height: 18px !important;" src="../assets/imgs/close_menu_icon.png ">
</div> --> </div>
<div > <div >
<img class="mohemmLogo" src="../assets/imgs/menu_mohemm_logo.png" > <img class="mohemmLogo" src="../assets/imgs/menu_mohemm_logo.png" >
</div> </div>
@ -21,15 +21,15 @@
</div> </div>
</div> </div>
<div class="border" > <div style="border-bottom: rgb(190, 187, 187) solid 1px;" >
<button class="logout" ion-button (click)="logout();" > {{ts.trPK('home','logout')}}</button> <button class="logout" ion-button (click)="logout();" > {{ts.trPK('home','logout')}}</button>
</div> </div>
<br> <br>
<ion-list class="list-en" > <ion-list class="list-en" >
<ion-item (click)="profile()" lines="none"> <ion-item (click)="profile()">
<ion-thumbnail slot="start" class="menu-thumb"> <ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 18px !important; width:16px" src="../assets/imgs/profile_icon.png" item-left> <img style= "height: 24px !important;" src="../assets/imgs/profile_icon.png" item-left>
</ion-thumbnail> </ion-thumbnail>
<ion-label class="profile"> <ion-label class="profile">
{{ts.trPK('userProfile','title')}} {{ts.trPK('userProfile','title')}}
@ -43,7 +43,7 @@
{{ts.trPK('userProfile','performance-evaluation')}} {{ts.trPK('userProfile','performance-evaluation')}}
</ion-label> </ion-label>
</ion-item> --> </ion-item> -->
<ion-item lines="none" [hidden]="TeamFlag!='true'" (click)="openMyTeamPage()"> <ion-item [hidden]="TeamFlag!='true'" (click)="openMyTeamPage()">
<ion-thumbnail slot="start" class="menu-thumb"> <ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 14px !important;" src="../assets/imgs/my_team_icon.png" item-left> <img style= "height: 14px !important;" src="../assets/imgs/my_team_icon.png" item-left>
</ion-thumbnail> </ion-thumbnail>
@ -113,38 +113,22 @@
</ion-list> </ion-list>
<!-- <div class="" style="text-align:center"> <div class="" style="text-align:center">
<img src="../assets/icon/new-design/moe-logo.png" class="CompanyImg logoImg"> <img src="{{companyUrl}}" class="CompanyImg logoImg">
</div>
</div> -->
</ion-content>
<ion-footer style="padding: 0px;">
<ion-row>
<div class="footer-container">
<ion-col class="colPad" size="9" style="visibility: hidden">
<img class="logoFotor" src="../assets/imgs/menu_mohemm_logo.png" />
</ion-col>
<ion-col class="colPad" size="3">
<img class="moe-logo" src="../assets/icon/moe-logo.png" />
</ion-col>
</div>
</ion-row>
<div class="menuFooter" > <div class="menuFooter" >
<div> <img src="../assets/imgs/CSLogo.png" class="CompanyImg" ></div>
<p class="companyTxt">{{companyDesc}}</p> <p class="companyTxt">{{companyDesc}}</p>
</div> </div>
</ion-footer> </ion-content>
</ion-menu> </ion-menu>
<ion-menu [swipeGesture]="false" side='end' *ngIf="direction ==='rtl'"> <ion-menu [swipeGesture]="false" side='end' *ngIf="direction ==='rtl'">
<ion-content class="sidebar-menu"> <ion-content class="sidebar-menu">
<div class="header-div" style="visibility: hidden;"> <div class="header-div">
<!-- <div> <div>
<img class="closeIcon" (click)="closeMenu()" style= "height: 18px !important; margin-right: 15px;" src="../assets/imgs/close_menu_icon.png "> <img class="closeIcon" (click)="closeMenu()" style= "height: 18px !important; margin-right: 15px;" src="../assets/imgs/close_menu_icon.png ">
</div> --> </div>
<div> <div>
<img class="mohemmLogo-ar" src="../assets/imgs/menu_mohemm_logo.png" > <img class="mohemmLogo-ar" src="../assets/imgs/menu_mohemm_logo.png" >
</div> </div>
@ -158,15 +142,15 @@
</div> </div>
</div> </div>
<div class="border" > <div style="border-bottom: rgb(190, 187, 187) solid 1px;" >
<button class="logout-ar" ion-button (click)="logout();" > {{ts.trPK('home','logout')}}</button> <button class="logout-ar" ion-button (click)="logout();" > {{ts.trPK('home','logout')}}</button>
</div> </div>
<br> <br>
<ion-list class="list-ar" > <ion-list class="list-ar" >
<ion-item (click)="profile()" lines="none"> <ion-item (click)="profile()">
<ion-thumbnail slot="start" class="menu-thumb"> <ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 18px !important; width:16px" src="../assets/imgs/profile_icon.png" item-left> <img style= "height: 24px !important;" src="../assets/imgs/profile_icon.png" item-left>
</ion-thumbnail> </ion-thumbnail>
<ion-label class="profile"> <ion-label class="profile">
{{ts.trPK('userProfile','title')}} {{ts.trPK('userProfile','title')}}
@ -180,7 +164,7 @@
{{ts.trPK('userProfile','performance-evaluation')}} {{ts.trPK('userProfile','performance-evaluation')}}
</ion-label> </ion-label>
</ion-item> --> </ion-item> -->
<ion-item lines="none" [hidden]="TeamFlag!='true'" (click)="openMyTeamPage()"> <ion-item [hidden]="TeamFlag!='true'" (click)="openMyTeamPage()">
<ion-thumbnail slot="start" class="menu-thumb"> <ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 14px !important;" src="../assets/imgs/my_team_icon.png" item-left> <img style= "height: 14px !important;" src="../assets/imgs/my_team_icon.png" item-left>
</ion-thumbnail> </ion-thumbnail>
@ -272,31 +256,14 @@
</ion-item> --> </ion-item> -->
</ion-list> </ion-list>
<!-- <div class="" style="text-align:center"> --> <div class="" style="text-align:center">
<!-- <img src="{{companyUrl}}" class="CompanyImg" [ngClass]="TeamFlag!='true'? 'logoImg':'logoImgWithMyTeam'"> --> <img src="{{companyUrl}}" class="CompanyImg" [ngClass]="TeamFlag!='true'? 'logoImg':'logoImgWithMyTeam'">
<!-- <img src="../assets/icon/new-design/moe-logo.png" class="CompanyImg" [ngClass]="TeamFlag!='true'? 'logoImg':'logoImgWithMyTeam'"> --> </div>
<!-- <p class="companyTxt">{{companyDesc}}</p> --> <div class="menuFooter">
<!-- </div> --> <div> <img src="../assets/imgs/CSLogo.png" class="CompanyImg" ></div>
</ion-content>
<ion-footer style="padding: 0px;" dir="ltr">
<ion-row>
<div class="footer-container">
<ion-col class="colPad" size="9" style="visibility: hidden">
<img class="logoFotor" src="../assets/imgs/menu_mohemm_logo.png" />
</ion-col>
<ion-col class="colPad" size="3">
<img class="moe-logo" src="../assets/icon/moe-logo.png" />
</ion-col>
</div>
</ion-row>
<div class="menuFooter" >
<p class="companyTxt">{{companyDesc}}</p> <p class="companyTxt">{{companyDesc}}</p>
</div> </div>
</ion-footer> </ion-content>
</ion-menu> </ion-menu>
<ion-router-outlet main></ion-router-outlet> <ion-router-outlet main></ion-router-outlet>
</ion-split-pane> </ion-split-pane>

@ -10,21 +10,21 @@ header
} }
.mohemmLogo { .mohemmLogo {
max-width: 46% !important; max-width: 46% !important;
border: 0 !important; border: 0 !important;
margin-right: 70px !important; margin-left: 70px !important;
margin-top: -24px !important; margin-top: -24px !important;
margin-bottom: 5px; margin-bottom: 11px;
margin: auto;
display: block;
} }
.mohemmLogo-ar { .mohemmLogo-ar {
max-width: 46% !important; max-width: 46% !important;
border: 0 !important; border: 0 !important;
margin-right: 70px !important; margin-right: 70px !important;
margin-top: -24px !important; margin-top: -24px !important;
margin-bottom: 5px; margin-bottom: 11px;
} }
.closeIcon { .closeIcon {
@ -38,10 +38,6 @@ header
top: 10px; top: 10px;
} }
hr {
border-width: 1px;
}
.menubutton { .menubutton {
white-space: normal; white-space: normal;
@ -81,27 +77,28 @@ hr {
.logout { .logout {
background-color: #99B8C6; background-color: #c6903e;
border: none; border: none;
color: #004D71; color: white;
// padding: 20px;
text-align: center; text-align: center;
text-decoration: none; text-decoration: none;
display: inline-block; display: inline-block;
font-size: 12px; font-size: 12px;
margin-left: 120px !important;
margin-top: 15px !important; margin-top: 15px !important;
margin-bottom: 20px !important; margin-bottom: 20px !important;
border-radius: 30px; border-radius: 30px;
height: 35px; // width: 40px;
margin: auto; height: 26px;
padding: 0px 24px; padding: 6px 24px;
display: block;
} }
.logout-ar { .logout-ar {
background-color: #99B8C6; background-color: #c6903e;
border: none; border: none;
color: #004D71; color: white;
text-align: center; text-align: center;
text-decoration: none; text-decoration: none;
display: inline-block; display: inline-block;
@ -110,8 +107,8 @@ hr {
margin-top: 15px !important; margin-top: 15px !important;
margin-bottom: 20px !important; margin-bottom: 20px !important;
border-radius: 30px; border-radius: 30px;
height: 35px; height: 26px;
padding: 0px 24px; padding: 6px 24px;
} }
.menuImg { .menuImg {
@ -292,27 +289,22 @@ button.menu-item.item.item-block.item-ios {
} }
.TxtPlace { .TxtPlace {
font-size: 20px; margin: 0;
color: #004D71; padding: 0;
font-weight: bold; text-align: center;
text-overflow: ellipsis; font-weight: bolder;
overflow: hidden; color: black;
white-space: nowrap; font-size: 16px;
width: 90%;
margin: 10px auto auto auto;
} }
.TxtPlaces { .TxtPlaces {
margin: 0;
padding: 0;
text-align: center;
font-weight: bolder;
font-size: 14px; font-size: 14px;
color: #004D71; color: darkgray;
font-weight: bold;
// font-family: 'Inter' !important;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
width: 90%;
margin: 5px auto;
} }
.menuFooter { .menuFooter {
@ -322,7 +314,6 @@ button.menu-item.item.item-block.item-ios {
margin: auto; margin: auto;
width: 100%; width: 100%;
position: absolute; position: absolute;
top: 40px
} }
@ -332,28 +323,41 @@ button.menu-item.item.item-block.item-ios {
margin: auto; margin: auto;
} }
// .menuFooter .CompanyImg {
// width: 100%;
// height: 100%;
// }
.menuFooter .CompanyImg { .menuFooter .CompanyImg {
width: 65%; width: 80%;
height: 60%; height: 80%;
margin-bottom: -21px; margin-bottom: -21px;
} }
.logoImgWithMyTeam { // .logoImg{
// width: 120px;
// position: relative;
// }
width: 200px; .logoImgWithMyTeam {
margin: 20px auto; width: 77px;
// position: relative;
margin-top: -1px;
margin-bottom: 70px;
} }
.logoImg { .logoImg {
width: 250px;
margin-top: 20px;
margin-bottom: 180px; margin-bottom: 180px;
width: 225px;
} }
.companyTxt { .companyTxt {
font-size: 12px; font-size: 12px;
color: #004D71; color: var(--customnavy);
text-align: center; text-align: center;
font-family: 'Inter' !important;
} }
ion-thumbnail.menu-thumb { ion-thumbnail.menu-thumb {
@ -369,7 +373,7 @@ ion-thumbnail.menu-thumb {
} }
.profile { .profile {
color: #5C6F79 !important; color: black !important;
font-weight: bolder !important; font-weight: bolder !important;
} }
@ -392,8 +396,8 @@ ion-thumbnail.menu-thumb {
// } // }
.profileImg { .profileImg {
width: 100px; width: 140px;
height: 100px; height: 140px;
display: -webkit-inline-box; display: -webkit-inline-box;
display: inline-flex; display: inline-flex;
overflow: hidden; overflow: hidden;
@ -401,32 +405,4 @@ ion-thumbnail.menu-thumb {
border-radius: 70% !important; border-radius: 70% !important;
position: relative; position: relative;
top: 3px; top: 3px;
}
ion-item,
.border {
border-bottom: #c7c7c7 solid 1px
}
.footer-container {
width: 100%;
display: -webkit-box;
display: flex;
-webkit-box-align: stretch;
align-items: stretch;
}
.footer-container .logoFotor {
margin: 20px;
float: left;
width: 100px !important;
height: 30px !important;
}
.footer-container .moe-logo {
width: 45px;
float: right;
margin-right: 16px;
margin-top: 15px;
} }

@ -152,6 +152,7 @@ export class AppComponent implements OnInit {
if (user) { if (user) {
console.log(user); console.log(user);
this.userInfo = JSON.parse(localStorage.getItem('bussiness-card-info')); this.userInfo = JSON.parse(localStorage.getItem('bussiness-card-info'));
console.log('ENAD TEST')
console.log(this.userInfo) console.log(this.userInfo)
localStorage.setItem("digitalIDUser", JSON.stringify(user)); localStorage.setItem("digitalIDUser", JSON.stringify(user));
this.digitalIDUser = user//JSON.stringify(user); this.digitalIDUser = user//JSON.stringify(user);
@ -205,10 +206,10 @@ export class AppComponent implements OnInit {
this.user_image = user.EMPLOYEE_IMAGE ? 'data:image/png;base64,' + user.EMPLOYEE_IMAGE : '../assets/imgs/profile.png'; this.user_image = user.EMPLOYEE_IMAGE ? 'data:image/png;base64,' + user.EMPLOYEE_IMAGE : '../assets/imgs/profile.png';
} }
// this.User_Job_name = user.JOB_NAME; // this.User_Job_name = user.JOB_NAME;
let jobTitle = user.POSITION_NAME; let jobTitle = user.POSITION_NAME.split('.');
// if (jobTitle && jobTitle.length > 1) { if (jobTitle && jobTitle.length > 1) {
this.User_Job_name = jobTitle; this.User_Job_name = jobTitle[0] + " " + jobTitle[1];
// } }
//erm channel //erm channel
// if (!CommonService.SKIP) // if (!CommonService.SKIP)
// this.cs.navigateForward('/erm-channel/survey'); // this.cs.navigateForward('/erm-channel/survey');

@ -8,16 +8,16 @@ import { StatusBar } from '@ionic-native/status-bar/ngx';
import { AppComponent } from './app.component'; import { AppComponent } from './app.component';
import { AppRoutingModule } from './app-routing.module'; import { AppRoutingModule } from './app-routing.module';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
// import { ZBar } from '@ionic-native/zbar/ngx'; import { ZBar } from '@ionic-native/zbar/ngx';
// import { Geolocation } from '@ionic-native/geolocation/ngx'; import { Geolocation } from '@ionic-native/geolocation/ngx';
import {Camera, CameraOptions, PictureSourceType} from '@ionic-native/Camera/ngx'; import {Camera, CameraOptions, PictureSourceType} from '@ionic-native/Camera/ngx';
import { FilePath } from '@ionic-native/file-path/ngx'; import { FilePath } from '@ionic-native/file-path/ngx';
import { File } from '@ionic-native/file/ngx'; import { File } from '@ionic-native/file/ngx';
import { Base64 } from '@ionic-native/base64/ngx'; import { Base64 } from '@ionic-native/base64/ngx';
import { FirebaseX } from '@ionic-native/firebase-x/ngx'; import { FirebaseX } from '@ionic-native/firebase-x/ngx';
import { NgCalendarModule } from 'ionic2-calendar'; import { NgCalendarModule } from 'ionic2-calendar';
// import { NFC, Ndef} from "@ionic-native/nfc/ngx" import { NFC, Ndef} from "@ionic-native/nfc/ngx"
// import { WifiWizard2 } from "@ionic-native/wifi-wizard-2/ngx"; import { WifiWizard2 } from "@ionic-native/wifi-wizard-2/ngx";
import { DigitalIdComponent } from './authentication/digital-id/digital-id.component'; import { DigitalIdComponent } from './authentication/digital-id/digital-id.component';
import { BusinessCardComponent } from './authentication/business-card/business-card.component'; import { BusinessCardComponent } from './authentication/business-card/business-card.component';
import { AppUpdateComponent } from './authentication/app-update/app-update.component'; import { AppUpdateComponent } from './authentication/app-update/app-update.component';
@ -38,17 +38,17 @@ import { AppUpdateComponent } from './authentication/app-update/app-update.compo
providers: [ providers: [
StatusBar, StatusBar,
SplashScreen, SplashScreen,
// ZBar, ZBar,
// Geolocation, Geolocation,
Camera, Camera,
File, File,
FilePath, FilePath,
Base64, Base64,
FirebaseX, FirebaseX,
{ provide: RouteReuseStrategy, useClass: IonicRouteStrategy }, { provide: RouteReuseStrategy, useClass: IonicRouteStrategy },
// NFC, NFC,
// Ndef, Ndef,
// WifiWizard2 WifiWizard2
], ],
bootstrap: [AppComponent] bootstrap: [AppComponent]
}) })

@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
// import { Geolocation } from '@ionic-native/geolocation/ngx'; import { Geolocation } from '@ionic-native/geolocation/ngx';
// import { ZBar, ZBarOptions } from '@ionic-native/zbar/ngx'; import { ZBar, ZBarOptions } from '@ionic-native/zbar/ngx';
import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
@ -11,28 +11,28 @@ import { TranslatorService } from 'src/app/hmg-common/services/translator/transl
}) })
export class HomeComponent implements OnInit { export class HomeComponent implements OnInit {
// zbarOptions: any; zbarOptions: any;
scannedResult: any; scannedResult: any;
lat: any; lat: any;
longt: any; longt: any;
constructor(public ts: TranslatorService) { constructor(public ts: TranslatorService, private zbar: ZBar, private geolocation: Geolocation) {
// this.zbarOptions = { this.zbarOptions = {
// flash: 'off', flash: 'off',
// drawSight: false drawSight: false
// }; };
console.log('your currnt location is'); console.log('your currnt location is');
// this.geolocation.getCurrentPosition().then((resp) => { this.geolocation.getCurrentPosition().then((resp) => {
// // resp.coords.latitude // resp.coords.latitude
// // resp.coords.longitude // resp.coords.longitude
// // console.log("Loc 2"); // console.log("Loc 2");
// console.log(resp.coords.latitude); console.log(resp.coords.latitude);
// console.log(resp.coords.longitude); console.log(resp.coords.longitude);
// this.lat = resp.coords.latitude; this.lat = resp.coords.latitude;
// this.longt = resp.coords.longitude; this.longt = resp.coords.longitude;
// }).catch((error) => { }).catch((error) => {
// console.log('Error getting location', error); console.log('Error getting location', error);
// }); });
this.scanCode(); this.scanCode();
} }
@ -43,13 +43,13 @@ export class HomeComponent implements OnInit {
} }
scanCode() { scanCode() {
// this.zbar.scan(this.zbarOptions) this.zbar.scan(this.zbarOptions)
// .then(result => { .then(result => {
// console.log(result); // Scanned code console.log(result); // Scanned code
// this.scannedResult = result; this.scannedResult = result;
// }) })
// .catch(error => { .catch(error => {
// alert(error); // Error message alert(error); // Error message
// }); });
} }
} }

@ -44,14 +44,14 @@
left: 79%; left: 79%;
bottom: 35px; bottom: 35px;
color: black; color: black;
background-color: #024d71; background-color: #BE332F;
width: 20%; height: 6px;"> width: 20%; height: 6px;">
</div> </div>
<div style="position: relative; <div style="position: relative;
left: 79%; left: 79%;
bottom: 20px; bottom: 20px;
color: black; color: black;
background-color: #024d71; background-color: #BE332F;
width: 20%; height: 6px;"> width: 20%; height: 6px;">
</div> </div>

@ -1,14 +1,15 @@
.colorBG { .colorBG {
--background: #f0efef; --background: #f0efef;
} }
.header-div { .header-div {
background: #024d71; background: #BE332F;
color: var(--light); color: var(--light);
text-transform: capitalize; text-transform: capitalize;
display: block; display: block;
position: relative; position: relative;
height: 210px; height: 210px;
margin-bottom: 60px; margin-bottom: 60px;
} }
@ -16,227 +17,230 @@
.chart-modal .modal-Wrapper { .chart-modal .modal-Wrapper {
--background: rgb(116, 108, 108) !important; --background: rgb(116, 108, 108) !important;
--border-color:white!important ; --border-color: white !important;
width: 85%!important ; width: 85% !important;
height: 40px !important ; height: 40px !important;
}
.navbar{ }
font-size: 10px !important;
--background: #024d71 !important;
color: aliceblue !important;
// margin-top: 10px !important;
} .navbar {
font-size: 10px !important;
--background: #BE332F !important;
color: aliceblue !important;
// margin-top: 10px !important;
.menu{ }
// margin-left:330px !important;
margin-top: 0px !important;
font-size: 35px !important;
background: #024d71;
color: aliceblue;
margin-left: 0px !important;
} .menu {
// margin-left:330px !important;
margin-top: 0px !important;
font-size: 35px !important;
background: #BE332F;
color: aliceblue;
margin-left: 0px !important;
.person{ }
margin-left:100px !important;
margin-top: 0px !important;
font-size: 23px !important;
background: #024d71 !important;
color: aliceblue !important;
}
.grid{ .person {
margin-bottom: 550px !important;
margin-top: 20px !important;
margin-left: 15px !important;
margin-right: 15px !important;
background-color:white !important;
border-radius: 20px !important;
height: 250px !important;
}
.headerGrid{ margin-left: 100px !important;
margin-bottom: 550px !important; margin-top: 0px !important;
margin-top: 80px !important; font-size: 23px !important;
margin-left: 15px !important; background: #BE332F !important;
margin-right: 15px !important; color: aliceblue !important;
background-color:white !important;
border-radius: 20px !important;
height: 250px !important;
}
.bodyGrid{ }
margin-bottom: 550px !important;
margin-top: 20px !important;
margin-left: 15px !important;
margin-right: 15px !important;
background-color:white !important;
border-radius: 20px !important;
height: 270px !important;
}
.labelGrid{
margin-top: -30px !important;
background-color:white !important;
border-radius: 20px !important;
height: 100px !important;
}
.ionSliders{ .grid {
margin: 0px !important; margin-bottom: 550px !important;
padding: 0px !important; margin-top: 20px !important;
margin-left: 15px !important;
margin-right: 15px !important;
background-color: white !important;
border-radius: 20px !important;
height: 250px !important;
}
.headerGrid {
margin-bottom: 550px !important;
margin-top: 80px !important;
margin-left: 15px !important;
margin-right: 15px !important;
background-color: white !important;
border-radius: 20px !important;
height: 250px !important;
} }
.bodyGrid {
margin-bottom: 550px !important;
margin-top: 20px !important;
margin-left: 15px !important;
margin-right: 15px !important;
background-color: white !important;
border-radius: 20px !important;
height: 270px !important;
}
.ionSlide{ .labelGrid {
margin-top: 5px !important; margin-top: -30px !important;
margin-left: 190px !important; background-color: white !important;
color: black !important; border-radius: 20px !important;
height: 100px !important;
}
} .ionSliders {
.dateLable{ margin: 0px !important;
padding: 0px !important;
}
.ionSlide {
margin-top: 5px !important;
margin-left: 190px !important;
color: black !important;
}
.dateLable {
margin-left: 90px !important;
color: black !important;
font-size: small !important;
margin-top: 15px !important;
}
margin-left: 90px !important;
color: black !important;
font-size: small !important;
margin-top: 15px !important;
}
// h1{ // h1{
// font-size: 15px !important; // font-size: 15px !important;
// text-align: center !important; // text-align: center !important;
// } // }
.arrowDropright{ .arrowDropright {
margin-left:100px !important; margin-left: 100px !important;
font-size: 20px !important; font-size: 20px !important;
color: rgb(168, 165, 165) !important; color: rgb(168, 165, 165) !important;
margin-top: 15px !important; margin-top: 15px !important;
} }
.arrowDropleft{
font-size: 20px !important; .arrowDropleft {
font-size: 20px !important;
margin-left: 10px !important; margin-left: 10px !important;
margin-top: 15px !important; margin-top: 15px !important;
color: rgb(116, 108, 108) !important; color: rgb(116, 108, 108) !important;
} }
.ionLable{ .ionLable {
font-size: 10px !important; font-size: 10px !important;
} }
.number{ .number {
font-size: 18px !important; font-size: 18px !important;
font-weight: bolder !important; font-weight: bolder !important;
color: black !important; color: black !important;
} }
.header-div {
background: var(--primary);
background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%, var(--secondary) 59%, var(--customnavy) 100%);
background: -webkit-linear-gradient(45deg, (--primary) 0%, var(--secondary) 36%, var(--secondary) 59%, var(--customnavy) 100%);
background: #BE332F;
// background: linear-gradient(90deg, #85C48D 0%, #85C48D 13%, #2BB5C6 98%, #2BB5C6 100%);
color: var(--light);
text-transform: capitalize;
display: block;
position: relative;
height: 210px;
margin-bottom: 60px;
// border-radius: 0px 0px 70px 70px;
}
.request-heading {
span {
text-align: center;
.header-div{
background:var(--primary);
background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%);
background: -webkit-linear-gradient(45deg, (--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%);
background: #024d71;
// background: linear-gradient(90deg, #85C48D 0%, #85C48D 13%, #2BB5C6 98%, #2BB5C6 100%);
color:var(--light);
text-transform: capitalize;
display: block; display: block;
position: relative;
height: 210px; padding-top: 8px;
margin-bottom:60px;
// border-radius: 0px 0px 70px 70px; font-family: workSans-Regular;
}
}
.request-heading {
}
span {
text-align: center;
.result-graph {
display: block;
position: relative;
padding-top: 8px;
background: white;
font-family: workSans-Regular;
margin-right: 20px;
}
margin-left: 20px;
margin-top: 20px;
padding-bottom: 20px;
border-radius: 20px;
}
.result-text-container {
padding: 0;
margin: 0;
position: absolute;
left: 50%;
top: 50%;
display: block;
text-align: center;
transform: translate(-50%, -50%);
h2 {
font-size: 38px;
font-family: WorkSans-Bold;
margin: 0 auto;
line-height: 36px;
} }
span {
.result-graph { width: 125px;
position: relative;
background: white;
margin-right: 20px;
margin-left: 20px;
margin-top: 20px;
padding-bottom: 20px;
border-radius: 20px;
}
.result-text-container {
padding: 0;
margin: 0;
position: absolute;
left: 50%;
top: 50%;
display: block; display: block;
text-align: center; margin: 0 auto;
transform: translate(-50%, -50%); font-size: 12px;
h2 { font-family: workSans-Regular;
font-size: 38px;
font-family: WorkSans-Bold;
margin: 0 auto;
line-height: 36px;
}
span {
width: 125px;
display: block;
margin: 0 auto;
font-size: 12px;
font-family: workSans-Regular;
}
} }
}

@ -40,7 +40,7 @@ export class MonthlyAttendanceComponent implements OnInit {
public data = { public data = {
datasets: [ datasets: [
@ -50,9 +50,9 @@ public data = {
backgroundColor: [ backgroundColor: [
'#024d71', '#BE332F',
'#024d71', '#BE332F',
], ],
borderWidth: 2 borderWidth: 2
@ -65,12 +65,12 @@ public data = {
ionViewWillEnter() { ionViewWillEnter() {
this.currentMonth = this.sharedData.getSharedData("currentMonth"); this.currentMonth = this.sharedData.getSharedData("currentMonth");
console.log(this.currentMonth); console.log(this.currentMonth);
let day = this.currentMonth.split(" "); let day = this.currentMonth.split(" ");
this.todayMonth =day[0]; this.todayMonth = day[0];
this.todayYear = day[1]; this.todayYear = day[1];
this.todayYear = parseInt(this.todayYear); this.todayYear = parseInt(this.todayYear);
console.log("MONTH: " +this.todayMonth); console.log("MONTH: " + this.todayMonth);
console.log("YEAR: " +this.todayYear); console.log("YEAR: " + this.todayYear);
this.getSubordinatesAttStatus() this.getSubordinatesAttStatus()
} }
@ -92,7 +92,7 @@ public data = {
} }
x(){ x() {
console.log("ENAD CHANge") console.log("ENAD CHANge")
} }

@ -3,7 +3,7 @@
<img src="assets/icon/update_rocket_image.png" style="width: 100%;" /> <img src="assets/icon/update_rocket_image.png" style="width: 100%;" />
</div> </div>
<div style="text-align: center;"> <div style="text-align: center;">
<img style="height: 75px" src="assets/icon/moe-logo.png" /> <img src="assets/imgs/CSLogo.png" />
</div> </div>
<h1 style="text-align: center; font-weight: bold"> {{ 'general,app-update' | translate }}</h1> <h1 style="text-align: center; font-weight: bold"> {{ 'general,app-update' | translate }}</h1>
@ -15,7 +15,7 @@
<ion-grid> <ion-grid>
<ion-row class="ion-justify-content-center"> <ion-row class="ion-justify-content-center">
<ion-col [size]="11" [sizeLg]="8" [sizeXl]="6" no-padding> <ion-col [size]="11" [sizeLg]="8" [sizeXl]="6" no-padding>
<ion-button style="font-size: 16px !important; width:100%; --background: #44a7a1; background: white;" expand="block" <ion-button style="font-size: 16px !important; width:100%; --background: #259CB8; background: white;" expand="block"
(click)='dismiss()'> (click)='dismiss()'>
{{ 'general,update-now' | translate }} {{ 'general,update-now' | translate }}
</ion-button> </ion-button>

@ -1,8 +1,8 @@
.header-toolbar{ .header-toolbar {
--background: linear-gradient(45deg, #3ac1f1 0%, #19a163 36%, #19a163 59%, #1a586d 100%); --background: linear-gradient(45deg, #3ac1f1 0%, #19a163 36%, #19a163 59%, #c6903e 100%);
} }
.btnBack{ .btnBack {
background: transparent; background: transparent;
} }
@ -11,21 +11,22 @@
.login-input { .login-input {
border: none; border: none;
} }
.item-input{
.item-input {
--min-height: 1.0cm !important; --min-height: 1.0cm !important;
--border-radius: 12px; --border-radius: 12px;
--ion-color-base: white !important; --ion-color-base: white !important;
// --background: color: var(--darkgray) !important; // --background: color: var(--darkgray) !important;
// background: #7f8c8d !important; // background: #7f8c8d !important;
border-radius: 33px; border-radius: 33px;
--border: solid #9999992b !important; --border: solid #9999992b !important;
border: solid #9999992b !important; border: solid #9999992b !important;
margin-bottom :12px; margin-bottom: 12px;
margin-left: 12px; margin-left: 12px;
margin-right: 12px; margin-right: 12px;
} }
.button-login{ .button-login {
--background: var(--newgreen) !important; --background: var(--newgreen) !important;
background: var(--newgreen) !important; background: var(--newgreen) !important;
@ -38,4 +39,5 @@
--min-height: 1.6cm !important; --min-height: 1.6cm !important;
width: 315px; width: 315px;
} }
/////////////////////////////////////////// ///////////////////////////////////////////

@ -1,7 +1,6 @@
<app-generic-header <app-generic-header
*ngIf="!accessFromOutSide" *ngIf="!accessFromOutSide"
showBack="true" showBack="true"
[moeImage]="false"
[headerText]="'login,verify-login' | translate"> [headerText]="'login,verify-login' | translate">
</app-generic-header> </app-generic-header>
@ -32,9 +31,9 @@
--> -->
</ion-col> </ion-col>
</ion-row> </ion-row>
<div *ngIf="onlySMSBox"><p class="p-color">{{ts.trPK('login','verify-login-with')}}</p></div> <div *ngIf="onlySMSBox"><p>{{ts.trPK('login','verify-login-with')}}</p></div>
<div *ngIf="!onlySMSBox && FFloginType == 2"><p class="p-color">{{ts.trPK('login','verify-fingerprint')}}</p></div> <div *ngIf="!onlySMSBox && FFloginType == 2"><p>{{ts.trPK('login','verify-fingerprint')}}</p></div>
<div *ngIf="!onlySMSBox && FFloginType == 3"><p class="p-color">{{ts.trPK('login','verify-faceId')}}</p></div> <div *ngIf="!onlySMSBox && FFloginType == 3"><p>{{ts.trPK('login','verify-faceId')}}</p></div>
</ion-col> </ion-col>
</ion-row> </ion-row>

@ -2,8 +2,12 @@
height: 25vh; height: 25vh;
} }
.rowOutside{
// margin-top: -37px;
.button-digital-id { }
.button-digital-id{
--background: white !important; --background: white !important;
background: white !important; background: white !important;
white-space: normal; white-space: normal;
@ -18,21 +22,16 @@
} }
.digital-id-en { .digital-id-en{
color: black; color: black;
position: absolute; position: absolute;
right: 20px; right: 20px;
width: 10%; width: 10%;
} }
.digital-id-ar { .digital-id-ar{
color: black; color: black;
position: absolute; position: absolute;
left: 20px; left: 20px;
width: 10%; width: 10%;
} }
.p-color {
color: #004D71;
font-weight: bold;
}

@ -17,7 +17,7 @@ import { CheckUserAuthenticationResponse } from 'src/app/hmg-common/services/aut
import { LoginModel } from '../models/LoginModel'; import { LoginModel } from '../models/LoginModel';
import * as moment from 'moment'; import * as moment from 'moment';
import { CheckAppVersionResponse } from 'src/app/hmg-common/services/authentication/models/check-app-version.response'; import { CheckAppVersionResponse } from 'src/app/hmg-common/services/authentication/models/check-app-version.response';
// import { NFC } from "@ionic-native/nfc/ngx"; import { NFC } from "@ionic-native/nfc/ngx";
import { DigitalIdComponent } from '../digital-id/digital-id.component'; import { DigitalIdComponent } from '../digital-id/digital-id.component';
import { AppUpdateComponent } from '../app-update/app-update.component'; import { AppUpdateComponent } from '../app-update/app-update.component';
import { Password } from '../models/password'; import { Password } from '../models/password';
@ -69,7 +69,7 @@ export class ConfirmLoginComponent implements OnInit {
public platform: Platform, public platform: Platform,
public modalController: ModalController, public modalController: ModalController,
public alertController: AlertController, public alertController: AlertController,
// private nfc: NFC, private nfc: NFC,
private smsRetriever: SmsRetriever private smsRetriever: SmsRetriever
) { ) {
this.loginData = this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false); this.loginData = this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false);
@ -307,7 +307,7 @@ export class ConfirmLoginComponent implements OnInit {
private presentBiometricDialog() { private presentBiometricDialog() {
this.faio.show({ this.faio.show({
title: 'Biometric Authetnciation', // (Android Only) | optional | Default: "<APP_NAME> Biometric Sign On" title: 'Biometric Authetnciation', // (Android Only) | optional | Default: "<APP_NAME> Biometric Sign On"
subtitle: 'خدماتي', // (Android Only) | optional | Default: null subtitle: 'Masader', // (Android Only) | optional | Default: null
description: this.ts.trPK('general', 'auth-please'), // optional | Default: null description: this.ts.trPK('general', 'auth-please'), // optional | Default: null
fallbackButtonTitle: this.ts.trPK('general', 'use-pin'), // optional | When disableBackup is false defaults to "Use Pin". fallbackButtonTitle: this.ts.trPK('general', 'use-pin'), // optional | When disableBackup is false defaults to "Use Pin".
disableBackup: true, // optional | default: false disableBackup: true, // optional | default: false
@ -353,20 +353,20 @@ export class ConfirmLoginComponent implements OnInit {
} }
async checkNFCStatus() { async checkNFCStatus() {
// try { try {
// let nfcStatus = await this.nfc.enabled(); let nfcStatus = await this.nfc.enabled();
// console.log("nfc status >>>>>>>>>>" + nfcStatus); console.log("nfc status >>>>>>>>>>" + nfcStatus);
// this.isNFCAvailable = true; this.isNFCAvailable = true;
// } catch (err) { } catch (err) {
// console.log("Error reading tag", err); console.log("Error reading tag", err);
// if (err === "NO_NFC") { if (err === "NO_NFC") {
// this.isNFCAvailable = false; this.isNFCAvailable = false;
// } else if (err === "NFC_DISABLED") { } else if (err === "NFC_DISABLED") {
// this.isNFCAvailable = true; this.isNFCAvailable = true;
// } else { } else {
// this.isNFCAvailable = false; this.isNFCAvailable = false;
// } }
// } }
} }
public checkSMS() { public checkSMS() {
@ -380,7 +380,6 @@ export class ConfirmLoginComponent implements OnInit {
this.authService.checkSMS(request, () => { }, this.ts.trPK('general', 'ok')) this.authService.checkSMS(request, () => { }, this.ts.trPK('general', 'ok'))
.subscribe((result: SMSCheckResponse) => { .subscribe((result: SMSCheckResponse) => {
if (this.cs.validResponse(result)) { if (this.cs.validResponse(result)) {
this.cs.sharedService.setSharedData(result.MemberLoginList.P_ORACLE_USER_NAME, 'oracle-user-name');
this.businessInfo = { this.businessInfo = {
show_business: result.BusinessCardPrivilege, show_business: result.BusinessCardPrivilege,
name_en: result.MemberInformationList[0].EMPLOYEE_NAME_En, name_en: result.MemberInformationList[0].EMPLOYEE_NAME_En,

@ -7,9 +7,7 @@
<div class="last-circle"></div> <div class="last-circle"></div>
</div> </div>
</ion-row> </ion-row>
</ion-grid>
<div class="login-container">
<ion-grid>
<ion-row> <ion-row>
<ion-col *ngIf="!user"> <ion-col *ngIf="!user">
<P class="pageTitle text-caps">{{ts.trPK('login','login')}}</P> <P class="pageTitle text-caps">{{ts.trPK('login','login')}}</P>
@ -18,13 +16,13 @@
</ion-grid> </ion-grid>
<div *ngIf="!user" [dir]="currentLang==1 ?'rtl': 'ltr'"> <div *ngIf="!user" [dir]="currentLang==1 ?'rtl': 'ltr'">
<ion-item class="item-input-login" lines="none"> <ion-item class="item-input-login">
<img style="margin: 9px 8px 9px 0 !important;" class="item-icon" src="assets/imgs/username.png" item-start /> <img style="margin: 9px 8px 9px 0 !important;" class="item-icon" src="assets/imgs/username.png" item-start />
<ion-input class="login-input" required type="text" [(ngModel)]="username" placeholder="{{ts.trPK('login','username')}}"> <ion-input class="login-input" required type="text" [(ngModel)]="username" placeholder="{{ts.trPK('login','username')}}">
</ion-input> </ion-input>
</ion-item> </ion-item>
<ion-item class="item-input-login" lines="none"> <ion-item class="item-input-login">
<img style="margin: 9px 8px 9px 0 !important;" class="item-icon" src="assets/imgs/password.png" item-start /> <img style="margin: 9px 8px 9px 0 !important;" class="item-icon" src="assets/imgs/password.png" item-start />
<ion-input class="login-input" required [type]="inputType" [(ngModel)]="password" placeholder="{{ts.trPK('login','password')}}"> <ion-input class="login-input" required [type]="inputType" [(ngModel)]="password" placeholder="{{ts.trPK('login','password')}}">
</ion-input> </ion-input>
@ -36,21 +34,21 @@
<a>{{ts.trPK('login','signup')}}</a> <a>{{ts.trPK('login','signup')}}</a>
</div> </div>
<div ng class="gridDiv" aria-disabled="true"> <div ng class="gridDiv" aria-disabled="true">
<button class="gridBtn border-moe-right" ion-button (click)="changeLanguage('2')" [ngClass]="{'active':currentLang ==2}">English</button> <button class="gridBtn" ion-button (click)="changeLanguage('2')" [ngClass]="{'active':currentLang ==2}">English</button>
<button class="gridBtn arTxt border-moe-left" ion-button (click)="changeLanguage('1')" [ngClass]="{'active':currentLang ==1}">عربي</button> <button class="gridBtn arTxt" ion-button (click)="changeLanguage('1')" [ngClass]="{'active':currentLang ==1}">عربي</button>
</div> </div>
</div> </div>
<div *ngIf="!user" class="centerDiv" style="margin: 25px 15px !important;">
<ion-button [ngClass]="{'disable-button-opacity': isValidForm()}" class="button-login" (click)="onLogin()" [disabled]="isValidForm()" style="width: 100% !important;">{{ts.trPK('login','login')}}</ion-button>
</div>
<!-- <div *ngIf="welcomeBack"> --> <!-- <div *ngIf="welcomeBack"> -->
<welcome-login (onLogin)="login()" (loginWithUser)="loginWithUser()" *ngIf="user"> <welcome-login (onLogin)="login()" (loginWithUser)="loginWithUser()" *ngIf="user">
</welcome-login> </welcome-login>
<!-- </div> --> <!-- </div> -->
<div *ngIf="!user" class="centerDiv" style="margin: 25px 15px !important;">
<ion-button [ngClass]="{'disable-button-opacity': isValidForm()}" class="button-login" (click)="onLogin()" [disabled]="isValidForm()" style="width: 100% !important;">{{ts.trPK('login','login')}}</ion-button>
<!-- digital ID button --> <!-- digital ID button -->
<!-- <ion-button *ngIf="userInfo" class="button-digital-id" (click)="openDigitalId()"> <!-- <ion-button *ngIf="userInfo" class="button-digital-id" (click)="openDigitalId()">
<p style="color: black;">{{ts.trPK('general','digital-id')}}</p> <p style="color: black;">{{ts.trPK('general','digital-id')}}</p>
@ -64,20 +62,10 @@
</div> </div>
</ion-content> </ion-content>
<ion-footer *ngIf="!user" [ngStyle]="keyboardOpened === true ? {'display': 'none'} : {}" style="padding: 0px;" dir="ltr"> <ion-footer *ngIf="!user" [ngStyle]="keyboardOpened === true ? {'display': 'none'} : {}" style="padding: 0px;">
<ion-row> <ion-row>
<div class="footer-container"> <ion-col class="colPad">
<ion-col class="colPad" size="9" style="visibility: hidden"> <img class="centerDiv logoFotor" src="../assets/imgs/CSLogo.png" />
<img class="logoFotor" src="../assets/imgs/menu_mohemm_logo.png" />
</ion-col>
<ion-col class="colPad" size="3">
<img class="moe-logo" src="../assets/icon/moe-logo.png" />
</ion-col> </ion-col>
</div>
</ion-row> </ion-row>
<div class="menuFooter" >
<p class="companyTxt">{{companyDesc}}</p>
</div>
</ion-footer> </ion-footer>

@ -23,7 +23,6 @@
text-align: center; text-align: center;
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
font-weight: bold;
} }
.TxtPlace { .TxtPlace {
@ -98,12 +97,10 @@ img.centerDiv {
} }
button.arTxt { button.arTxt {
font-family: var(--fontFamilyIOSAR) !important;
:root[dir="rtl"] { :root[dir="rtl"] {
float: right; float: right;
color: var(--customnavy) !important; color: var(--customnavy) !important;
font-family: var(--fontFamilyIOSAR) !important;
font-weight: bold; font-weight: bold;
border-radius: 2px 0px 0px 2px !important; border-radius: 2px 0px 0px 2px !important;
} }
@ -121,11 +118,10 @@ img.centerDiv {
.login-input { .login-input {
border: none; border: none;
margin-right: 5px; margin-right: 5px;
font-family: 'Kufi';
} }
.item-input { .item-input {
--min-height: 1.5cm !important; --min-height: 1.0cm !important;
--border-radius: 12px; --border-radius: 12px;
--ion-color-base: white !important; --ion-color-base: white !important;
// --background: color: var(--darkgray) !important; // --background: color: var(--darkgray) !important;
@ -145,7 +141,7 @@ img.centerDiv {
white-space: normal; white-space: normal;
color: var(--light); color: var(--light);
text-transform: capitalize; text-transform: capitalize;
min-height: 1.3cm; min-height: 1.0cm;
--border-radius: 33px !important; --border-radius: 33px !important;
border-radius: 33px !important; border-radius: 33px !important;
--min-height: 1.6cm !important; --min-height: 1.6cm !important;
@ -174,10 +170,10 @@ img.centerDiv {
} }
.first-circle { .first-circle {
background: #024D71 !important; background: var(--newgreen) !important;
border-radius: 50%; border-radius: 50%;
height: 310px; height: 292px;
width: 310px; width: 288px;
float: left; float: left;
margin-left: -55px; margin-left: -55px;
margin-top: -140px; margin-top: -140px;
@ -186,27 +182,27 @@ img.centerDiv {
.middle-circle { .middle-circle {
position: relative; position: relative;
background: #44A7A1 !important; background: #c6903e !important;
border-radius: 50%; border-radius: 50%;
height: 160px; height: 160px;
width: 190px; width: 170px;
margin: -115px 0px 0px 179px; margin: -115px 0px 0px 179px;
} }
.last-circle { .last-circle {
position: inherit; position: inherit;
background: #D5E2E8 !important; background: #91692d !important;
border-radius: 50%; border-radius: 50%;
height: 166px; height: 166px;
width: 140px; width: 140px;
margin: -147px 0px 0px 274px; margin: -147px 0px 0px 274px;
} }
// .logoFotor { .logoFotor {
// width: 45px !important; width: 45px !important;
// height: 45px !important; height: 45px !important;
// } }
.welcomeText { .welcomeText {
justify-content: center; justify-content: center;
@ -275,54 +271,4 @@ img.centerDiv {
position: absolute; position: absolute;
left: 20px; left: 20px;
width: 10%; width: 10%;
} }
.footer-container {
width: 100%;
display: -webkit-box;
display: flex;
-webkit-box-align: stretch;
align-items: stretch;
}
.footer-container .logoFotor {
margin: 20px;
float: left;
width: 100px !important;
height: 30px !important;
}
.footer-container .moe-logo {
width: 45px;
float: right;
margin-right: 16px;
margin-top: 15px;
}
.border-moe-right {
border-top-right-radius: 16px;
border-bottom-right-radius: 16px;
}
.border-moe-left {
border-top-left-radius: 16px;
border-bottom-left-radius: 16px;
}
.menuFooter {
// position: fixed;
bottom: 0px;
text-align: center;
margin: auto;
width: 100%;
position: absolute;
top: 40px
}
.companyTxt {
font-size: 12px;
color: #004D71;
text-align: center;
font-family: 'Inter' !important;
}

@ -1,7 +1,7 @@
import { Component, OnInit, NgZone, OnDestroy } from '@angular/core'; import { Component, OnInit, NgZone, OnDestroy } from '@angular/core';
import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { CommonService } from 'src/app/hmg-common/services/common/common.service';
import { AuthenticationService } from 'src/app/hmg-common/services/authentication/authentication.service'; import { AuthenticationService } from 'src/app/hmg-common/services/authentication/authentication.service';
import { ActivatedRoute, Router } from '@angular/router'; import { Router } from '@angular/router';
import { AlertController, Platform, Events } from '@ionic/angular'; import { AlertController, Platform, Events } from '@ionic/angular';
import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
import { CheckUserAuthenticationResponse } from 'src/app/hmg-common/services/authentication/models/check-user-auth.response'; import { CheckUserAuthenticationResponse } from 'src/app/hmg-common/services/authentication/models/check-user-auth.response';
@ -22,7 +22,6 @@ import { ModalController } from '@ionic/angular';
import { DigitalIdComponent } from '../digital-id/digital-id.component'; import { DigitalIdComponent } from '../digital-id/digital-id.component';
import { AppUpdateComponent } from '../app-update/app-update.component'; import { AppUpdateComponent } from '../app-update/app-update.component';
@Component({ @Component({
selector: 'login', selector: 'login',
templateUrl: './login.component.html', templateUrl: './login.component.html',
@ -31,8 +30,6 @@ import { AppUpdateComponent } from '../app-update/app-update.component';
export class LoginComponent implements OnInit, OnDestroy { export class LoginComponent implements OnInit, OnDestroy {
deviceToken1: any; deviceToken1: any;
userInfo: any; userInfo: any;
companyDesc = 'Powered By Cloud Solutions';
constructor( constructor(
public cs: CommonService, public cs: CommonService,
@ -50,9 +47,7 @@ export class LoginComponent implements OnInit, OnDestroy {
public plt: Platform, public plt: Platform,
public pushService: PushService, public pushService: PushService,
public keyboardService: KeyboardService, public keyboardService: KeyboardService,
public modalController: ModalController, public modalController: ModalController
public route:ActivatedRoute,
) { ) {
this.events.subscribe('logoutFlage', logoutFlage => { this.events.subscribe('logoutFlage', logoutFlage => {
console.log('login compont logoutFlage: ' + logoutFlage); console.log('login compont logoutFlage: ' + logoutFlage);
@ -73,13 +68,6 @@ export class LoginComponent implements OnInit, OnDestroy {
} else { } else {
this.user = false; this.user = false;
} }
// this.route
//.params.subscribe(val => {
console.log("login page called init...")
} }
appLang = 1; appLang = 1;
@ -115,25 +103,19 @@ export class LoginComponent implements OnInit, OnDestroy {
private checkUserResult: CheckUserAuthenticationResponse; private checkUserResult: CheckUserAuthenticationResponse;
public inputType = "password"; public inputType = "password";
ngOnInit() { ngOnInit() {
this.monitorKeyboardChange(); this.monitorKeyboardChange();
this.userInfo = JSON.parse(localStorage.getItem('digitalIDUser')); this.userInfo = JSON.parse(localStorage.getItem('digitalIDUser'));
this.currentLang = TranslatorService.getCurrentLanguageCode();
console.log("login page called...");
if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) {
var previousLanguage= localStorage.getItem(TranslatorService.LNG_KEY); this.language = "US";
if(previousLanguage){ this.changeLanguage('2')
this.currentLang = previousLanguage =='en' ? 2 : 1; } else {
}else{ this.language = "AR";
document.getElementById('lang').lang = 'en'; this.changeLanguage('1')
TranslatorService.CURRENT_LANGUAGE = TranslatorService.EN; }
this.currentLang =2;
};
this.events.subscribe('user', user => { this.user = user; }); this.events.subscribe('user', user => { this.user = user; });
this.deviceToken = this.cs.getDeviceToken(); this.deviceToken = this.cs.getDeviceToken();
if (this.deviceToken) { if (this.deviceToken) {
@ -157,31 +139,25 @@ export class LoginComponent implements OnInit, OnDestroy {
this.backClicked(); this.backClicked();
} }
start() {
this.cs.startLoading();
}
ngAfterViewInit(){
}
public changeLanguage(langNumber) { public changeLanguage(langNumber) {
console.log("current lang: " + this.currentLang) console.log("current lang: " + this.currentLang)
console.log("click lang: " + langNumber) console.log("click lang: " + langNumber)
if (this.currentLang == langNumber) { if (this.currentLang == langNumber) {
this.currentLang = langNumber; this.currentLang = langNumber;
return; return;
} else { } else {
this.ts.switchLanguage(); this.ts.switchLanguage();
// tslint:disable-next-line: triple-equals
if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) { if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) {
this.language = 'US'; this.language = 'US';
} else { } else {
this.language = 'AR'; this.language = 'AR';
} }
this.currentLang = TranslatorService.getCurrentLanguageCode(); this.currentLang = TranslatorService.getCurrentLanguageCode();
} }
this.currentLang = langNumber; this.currentLang = langNumber;
document.getElementById('lang').lang = this.currentLang == 1 ? 'ar' : 'en';
} }
public forgetPasswordPage() { public forgetPasswordPage() {
@ -364,14 +340,6 @@ export class LoginComponent implements OnInit, OnDestroy {
if (anotherUser) { if (anotherUser) {
this.username = ''; this.username = '';
this.password = ''; this.password = '';
var previousLanguage= localStorage.getItem(TranslatorService.LNG_KEY);
if(previousLanguage){
this.currentLang = previousLanguage =='en' ? 2 : 1;
}else{
document.getElementById('lang').lang = 'en';
TranslatorService.CURRENT_LANGUAGE = TranslatorService.EN;
this.currentLang =2;
};
} }
console.log('login emit'); console.log('login emit');
console.log('login'); console.log('login');
@ -382,14 +350,6 @@ export class LoginComponent implements OnInit, OnDestroy {
loginWithUser() { loginWithUser() {
console.log('loginWithUser'); console.log('loginWithUser');
var previousLanguage= localStorage.getItem(TranslatorService.LNG_KEY);
if(previousLanguage){
this.currentLang = previousLanguage =='en' ? 2 : 1;
}else{
document.getElementById('lang').lang = 'en';
TranslatorService.CURRENT_LANGUAGE = TranslatorService.EN;
this.currentLang =2;
};
this.cs.openConfirmLoginPage(); this.cs.openConfirmLoginPage();
} }

@ -5,7 +5,7 @@
<app-generic-header <app-generic-header
showBack="true" showBack="true"
[moeImage]="false"
[headerText]="'verificationcode,verificationcode' | translate"> [headerText]="'verificationcode,verificationcode' | translate">
</app-generic-header> </app-generic-header>

@ -1,5 +1,5 @@
.header-toolbar { .header-toolbar {
--background: linear-gradient(45deg, #3ac1f1 0%, #19a163 36%, #19a163 59%, #1a586d 100%); --background: linear-gradient(45deg, #3ac1f1 0%, #19a163 36%, #19a163 59%, #c6903e 100%);
} }
.btnBack { .btnBack {
@ -56,9 +56,8 @@ ion-input {
outline: none; outline: none;
width: 20%; width: 20%;
transition: all .2s ease-in-out; transition: all .2s ease-in-out;
border-radius: 15px; border-radius: 3px;
display: inline-block; display: inline-block;
--padding-start: 8px;
&:focus { &:focus {
border-color: var(--ion-color-secondary) !important; border-color: var(--ion-color-secondary) !important;

@ -24,7 +24,7 @@ import { GetLoginInfoRequest } from 'src/app/hmg-common/services/authentication/
import * as moment from 'moment'; import * as moment from 'moment';
// import { NFC } from "@ionic-native/nfc/ngx"; import { NFC } from "@ionic-native/nfc/ngx";
import { SmsRetriever } from '@ionic-native/sms-retriever/ngx'; import { SmsRetriever } from '@ionic-native/sms-retriever/ngx';
@ -125,7 +125,7 @@ export class SmsPageComponent implements OnInit {
public platform: Platform, public platform: Platform,
// private nfc: NFC, private nfc: NFC,
private smsRetriever: SmsRetriever private smsRetriever: SmsRetriever
@ -367,33 +367,33 @@ export class SmsPageComponent implements OnInit {
async checkNFCStatus() { async checkNFCStatus() {
// try { try {
// let nfcStatus = await this.nfc.enabled(); let nfcStatus = await this.nfc.enabled();
// console.log("nfc status >>>>>>>>>>" + nfcStatus); console.log("nfc status >>>>>>>>>>" + nfcStatus);
// this.isNFCAvailable = true; this.isNFCAvailable = true;
// } catch (err) { } catch (err) {
// console.log("Error reading tag", err); console.log("Error reading tag", err);
// if (err === "NO_NFC") { if (err === "NO_NFC") {
// this.isNFCAvailable = false; this.isNFCAvailable = false;
// } else if (err === "NFC_DISABLED") { } else if (err === "NFC_DISABLED") {
// this.isNFCAvailable = true; this.isNFCAvailable = true;
// } else { } else {
// this.isNFCAvailable = false; this.isNFCAvailable = false;
// } }
// } }
} }
@ -421,7 +421,7 @@ export class SmsPageComponent implements OnInit {
if (this.common.validResponse(result)) { if (this.common.validResponse(result)) {
this.common.sharedService.setSharedData(result.MemberLoginList.P_ORACLE_USER_NAME, 'oracle-user-name')
//save business card info //save business card info

@ -13,7 +13,8 @@
width: 22px; width: 22px;
height: 22px; height: 22px;
} }
.Header { .Header {
font-weight: bold; font-weight: bold;
color: #1a586d; color: #c6903e;
} }

@ -1,45 +1,48 @@
.footer-button { .footer-button {
border-radius: 2px; border-radius: 2px;
padding: 0 1.1em; padding: 0 1.1em;
min-height: 45px; min-height: 45px;
min-width: 200px; min-width: 200px;
} }
ion-label {
color: var(--customnavy) !important;
}
.daynamicForm-Label {
font-size: 16px;
color: #a2a5a6 !important;
display: block;
overflow: hidden;
-webkit-flex: 1;
flex: 1;
font-size: inherit;
white-space: normal;
padding: 5px 0px;
margin: 10px auto;
padding-left: 10px;
}
.header-toolbar-new{
--background: #024d71;
}
.addEitOkButton{
white-space: normal !important;
text-transform: capitalize !important;
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
background-color: #024d71;
width: 80% !important;
color: white!important;
border-radius: 16px !important;
}
.country{ ion-label {
margin-top: 10px; color: var(--customnavy) !important;
padding: 10px; }
}
.daynamicForm-Label {
font-size: 16px;
color: #a2a5a6 !important;
display: block;
overflow: hidden;
-webkit-flex: 1;
flex: 1;
font-size: inherit;
white-space: normal;
padding: 5px 0px;
margin: 10px auto;
padding-left: 10px;
}
.header-toolbar-new {
--background: #BE332F;
}
.addEitOkButton {
white-space: normal !important;
text-transform: capitalize !important;
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
background-color: #BE332F;
width: 80% !important;
color: white !important;
border-radius: 16px !important;
--border-radius: 16px !important;
--box-shadow: none;
}
.country {
margin-top: 10px;
padding: 10px;
}

@ -177,8 +177,7 @@ export class AddCeiComponent implements OnInit {
defaultValText, defaultValText,
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG
feildsList[i].REQ_COL_TIP
); );
// }else if(feildsList[i].DEFAULT_TYPE=="P"||feildsList[i].DEFAULT_TYPE=="S"){// profile/ sql // }else if(feildsList[i].DEFAULT_TYPE=="P"||feildsList[i].DEFAULT_TYPE=="S"){// profile/ sql
// this.textInput = new TextInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,this.getDefaultValue(feildsList[i].DESC_FLEX_NAME,feildsList[i].DESC_FLEX_CONTEXT_CODE,feildsList[i].SEGMENT_NAME,feildsList[i].PARENT_SEGMENTS_VS_SplitedVS,feildsList[i].PARENT_SEGMENTS_DV_Splited),containerId,feildsList[i].MOBILE_ENABLED); // this.textInput = new TextInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,this.getDefaultValue(feildsList[i].DESC_FLEX_NAME,feildsList[i].DESC_FLEX_CONTEXT_CODE,feildsList[i].SEGMENT_NAME,feildsList[i].PARENT_SEGMENTS_VS_SplitedVS,feildsList[i].PARENT_SEGMENTS_DV_Splited),containerId,feildsList[i].MOBILE_ENABLED);
@ -193,8 +192,7 @@ export class AddCeiComponent implements OnInit {
containerId, containerId,
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG
feildsList[i].REQ_COL_TIP
); );
// }else if(feildsList[i].DEFAULT_TYPE=="P"||feildsList[i].DEFAULT_TYPE=="S"){ // }else if(feildsList[i].DEFAULT_TYPE=="P"||feildsList[i].DEFAULT_TYPE=="S"){
// this.numberInput = new NumberInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,this.getDefaultValue(feildsList[i].DESC_FLEX_NAME,feildsList[i].DESC_FLEX_CONTEXT_CODE,feildsList[i].SEGMENT_NAME,feildsList[i].PARENT_SEGMENTS_VS_SplitedVS,feildsList[i].PARENT_SEGMENTS_DV_Splited),containerId,feildsList[i].MOBILE_ENABLED); // this.numberInput = new NumberInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,this.getDefaultValue(feildsList[i].DESC_FLEX_NAME,feildsList[i].DESC_FLEX_CONTEXT_CODE,feildsList[i].SEGMENT_NAME,feildsList[i].PARENT_SEGMENTS_VS_SplitedVS,feildsList[i].PARENT_SEGMENTS_DV_Splited),containerId,feildsList[i].MOBILE_ENABLED);
@ -216,8 +214,7 @@ export class AddCeiComponent implements OnInit {
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG,
this.direction, this.direction
feildsList[i].REQ_COL_TIP
); );
} else { } else {
this.dateInput = new DateInput( this.dateInput = new DateInput(
@ -228,8 +225,7 @@ export class AddCeiComponent implements OnInit {
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG,
this.direction, this.direction
feildsList[i].REQ_COL_TIP
); );
} }
// else if(feildsList[i].DEFAULT_TYPE=="D"){//current date // else if(feildsList[i].DEFAULT_TYPE=="D"){//current date
@ -255,8 +251,7 @@ export class AddCeiComponent implements OnInit {
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG,
this.direction, this.direction
feildsList[i].REQ_COL_TIP
); );
} else { } else {
this.datetimeInput = new DateTimeInput( this.datetimeInput = new DateTimeInput(
@ -267,8 +262,7 @@ export class AddCeiComponent implements OnInit {
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG,
this.direction, this.direction
feildsList[i].REQ_COL_TIP
); );
} }
const elem = document.getElementById( const elem = document.getElementById(
@ -303,8 +297,7 @@ export class AddCeiComponent implements OnInit {
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG,
this.direction, this.direction
feildsList[i].REQ_COL_TIP
); );
} else { } else {
this.timeInput = new TimeInput( this.timeInput = new TimeInput(
@ -315,8 +308,7 @@ export class AddCeiComponent implements OnInit {
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG,
this.direction, this.direction
feildsList[i].REQ_COL_TIP
); );
} }
} }
@ -330,8 +322,7 @@ export class AddCeiComponent implements OnInit {
defaultValText, defaultValText,
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG
feildsList[i].REQ_COL_TIP
); );
} else { } else {
// dropdown list missing open in differnt page // dropdown list missing open in differnt page
@ -344,8 +335,7 @@ export class AddCeiComponent implements OnInit {
containerId, containerId,
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG
feildsList[i].REQ_COL_TIP
); );
// }else{ // }else{
// this.selectInput = new SelectInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,"",containerId,feildsList[i].MOBILE_ENABLED); // this.selectInput = new SelectInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,"",containerId,feildsList[i].MOBILE_ENABLED);

@ -24,18 +24,20 @@ ion-label {
} }
.header-toolbar-new{ .header-toolbar-new {
--background: #024d71; --background: #BE332F;
} }
.addEitOkButton{
.addEitOkButton {
white-space: normal !important; white-space: normal !important;
text-transform: capitalize !important; text-transform: capitalize !important;
min-height: 45px !important; min-height: 45px !important;
min-width: 5px !important; min-width: 5px !important;
margin: 8px !important; margin: 8px !important;
background-color: #44A7A1; background-color: #BE332F;
width: 80% !important; width: 80% !important;
color: white!important; color: white !important;
border-radius: 16px !important; border-radius: 16px !important;
--border-radius: 16px !important; --border-radius: 16px !important;
--box-shadow: none;
} }

@ -3,7 +3,7 @@ import { Component, OnInit, ViewChild, ElementRef } from "@angular/core";
import { MenuEntry } from "src/app/hmg-common/services/menu/models/menu.entry"; import { MenuEntry } from "src/app/hmg-common/services/menu/models/menu.entry";
import { MenuResponse } from "src/app/hmg-common/services/menu/models/menu-response"; import { MenuResponse } from "src/app/hmg-common/services/menu/models/menu-response";
import { EitRequest } from "../models/eit.request"; import { EitRequest } from "../models/eit.request";
import { ModalController, Platform } from "@ionic/angular"; import { ModalController } from "@ionic/angular";
import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service"; import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service";
import { EITTransactionsRequest } from "../models/EITTransactionsReq"; import { EITTransactionsRequest } from "../models/EITTransactionsReq";
import { EitService } from "../services/eit.service"; import { EitService } from "../services/eit.service";
@ -73,8 +73,7 @@ export class AddEitComponent implements OnInit {
public cs: CommonService, public cs: CommonService,
private ts: TranslatorService, private ts: TranslatorService,
private eitService: EitService, private eitService: EitService,
public datePicker: DatePicker, public datePicker: DatePicker
public platform: Platform
) { ) {
this.direction = TranslatorService.getCurrentLanguageName(); this.direction = TranslatorService.getCurrentLanguageName();
this.selEmp = this.cs.sharedService.getSharedData( this.selEmp = this.cs.sharedService.getSharedData(
@ -123,10 +122,6 @@ export class AddEitComponent implements OnInit {
EITTransactionsRequest.SUBMIT_EIT_ACTION EITTransactionsRequest.SUBMIT_EIT_ACTION
); );
} }
// window.addEventListener('keyboardDidShow', () => {
// document.activeElement.scrollIntoView(false);
// });
} }
ngOnInit() {} ngOnInit() {}
@ -186,8 +181,7 @@ export class AddEitComponent implements OnInit {
defaultValText, defaultValText,
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG
feildsList[i].REQ_COL_TIP
); );
// }else if(feildsList[i].DEFAULT_TYPE=="P"||feildsList[i].DEFAULT_TYPE=="S"){// profile/ sql // }else if(feildsList[i].DEFAULT_TYPE=="P"||feildsList[i].DEFAULT_TYPE=="S"){// profile/ sql
// this.textInput = new TextInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,this.getDefaultValue(feildsList[i].DESC_FLEX_NAME,feildsList[i].DESC_FLEX_CONTEXT_CODE,feildsList[i].SEGMENT_NAME,feildsList[i].PARENT_SEGMENTS_VS_SplitedVS,feildsList[i].PARENT_SEGMENTS_DV_Splited),containerId,feildsList[i].MOBILE_ENABLED); // this.textInput = new TextInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,this.getDefaultValue(feildsList[i].DESC_FLEX_NAME,feildsList[i].DESC_FLEX_CONTEXT_CODE,feildsList[i].SEGMENT_NAME,feildsList[i].PARENT_SEGMENTS_VS_SplitedVS,feildsList[i].PARENT_SEGMENTS_DV_Splited),containerId,feildsList[i].MOBILE_ENABLED);
@ -202,8 +196,7 @@ export class AddEitComponent implements OnInit {
containerId, containerId,
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG
feildsList[i].REQ_COL_TIP
); );
// }else if(feildsList[i].DEFAULT_TYPE=="P"||feildsList[i].DEFAULT_TYPE=="S"){ // }else if(feildsList[i].DEFAULT_TYPE=="P"||feildsList[i].DEFAULT_TYPE=="S"){
// this.numberInput = new NumberInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,this.getDefaultValue(feildsList[i].DESC_FLEX_NAME,feildsList[i].DESC_FLEX_CONTEXT_CODE,feildsList[i].SEGMENT_NAME,feildsList[i].PARENT_SEGMENTS_VS_SplitedVS,feildsList[i].PARENT_SEGMENTS_DV_Splited),containerId,feildsList[i].MOBILE_ENABLED); // this.numberInput = new NumberInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,this.getDefaultValue(feildsList[i].DESC_FLEX_NAME,feildsList[i].DESC_FLEX_CONTEXT_CODE,feildsList[i].SEGMENT_NAME,feildsList[i].PARENT_SEGMENTS_VS_SplitedVS,feildsList[i].PARENT_SEGMENTS_DV_Splited),containerId,feildsList[i].MOBILE_ENABLED);
@ -225,8 +218,7 @@ export class AddEitComponent implements OnInit {
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG,
this.direction, this.direction
feildsList[i].REQ_COL_TIP
); );
} else { } else {
this.dateInput = new DateInput( this.dateInput = new DateInput(
@ -237,8 +229,7 @@ export class AddEitComponent implements OnInit {
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG,
this.direction, this.direction
feildsList[i].REQ_COL_TIP,
); );
} }
// else if(feildsList[i].DEFAULT_TYPE=="D"){//current date // else if(feildsList[i].DEFAULT_TYPE=="D"){//current date
@ -264,8 +255,7 @@ export class AddEitComponent implements OnInit {
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG,
this.direction, this.direction
feildsList[i].REQ_COL_TIP
); );
} else { } else {
this.datetimeInput = new DateTimeInput( this.datetimeInput = new DateTimeInput(
@ -276,8 +266,7 @@ export class AddEitComponent implements OnInit {
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG,
this.direction, this.direction
feildsList[i].REQ_COL_TIP
); );
} }
const elem = document.getElementById( const elem = document.getElementById(
@ -312,8 +301,7 @@ export class AddEitComponent implements OnInit {
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG,
this.direction, this.direction
feildsList[i].REQ_COL_TIP
); );
} else { } else {
this.timeInput = new TimeInput( this.timeInput = new TimeInput(
@ -324,8 +312,7 @@ export class AddEitComponent implements OnInit {
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG,
this.direction, this.direction
feildsList[i].REQ_COL_TIP
); );
} }
} }
@ -339,8 +326,7 @@ export class AddEitComponent implements OnInit {
defaultValText, defaultValText,
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG
feildsList[i].REQ_COL_TIP
); );
} else { } else {
// dropdown list missing open in differnt page // dropdown list missing open in differnt page
@ -353,8 +339,7 @@ export class AddEitComponent implements OnInit {
containerId, containerId,
feildsList[i].MOBILE_ENABLED, feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG, feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG, feildsList[i].REQUIRED_FLAG
feildsList[i].REQ_COL_TIP
); );
// }else{ // }else{
// this.selectInput = new SelectInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,"",containerId,feildsList[i].MOBILE_ENABLED); // this.selectInput = new SelectInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,"",containerId,feildsList[i].MOBILE_ENABLED);
@ -406,8 +391,6 @@ export class AddEitComponent implements OnInit {
if (this.validateEitObj && this.validateEitObj.length > 0) { if (this.validateEitObj && this.validateEitObj.length > 0) {
this.fillEITStructure(); this.fillEITStructure();
} }
this.bindToolTip();
} }
addFieldToDOM( addFieldToDOM(
@ -547,18 +530,7 @@ export class AddEitComponent implements OnInit {
} }
} }
bindToolTip () {
const toolTips = Array.from(document.getElementsByClassName('toolTip'));
toolTips.forEach(toolTip => {
toolTip.addEventListener('click', e => {
const toolTipData = toolTip.getAttribute("data-tooltip");
this.cs.yellowToast(toolTipData);
});
});
}
bindHtmlElemEvents(id, obj) { bindHtmlElemEvents(id, obj) {
const isIOS = this.platform.is('ios');
const elem = document.getElementById(id); const elem = document.getElementById(id);
console.log(elem); console.log(elem);
console.log(obj); console.log(obj);
@ -568,18 +540,6 @@ export class AddEitComponent implements OnInit {
if (elemType == "SELECT") changeEvent = "change"; if (elemType == "SELECT") changeEvent = "change";
try { try {
if (isIOS && (obj.FORMAT_TYPE == "N" || obj.FORMAT_TYPE == "C")) {
elem.addEventListener("ionFocus", event => {
setTimeout(()=>{
console.log(event.target as Element);
var e = event.target as Element;
e.scrollIntoView(true);
},1000)
})
}
// elem.addEventListener("change", (e) => { // elem.addEventListener("change", (e) => {
elem.addEventListener(changeEvent, e => { elem.addEventListener(changeEvent, e => {
//console.log("elem change "+elem.id); //console.log("elem change "+elem.id);
@ -588,13 +548,6 @@ export class AddEitComponent implements OnInit {
// if(!x.value) // if(!x.value)
// isEmpty=true; // isEmpty=true;
//emptyChildElement //emptyChildElement
if (obj.FORMAT_TYPE == "N") {
const maxSize = obj.MAXIMUM_SIZE;
const value = (document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value;
(document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value = value.length > maxSize ? value.substring(0, maxSize) : value;
}
elem.classList.remove("requiredClassElm"); elem.classList.remove("requiredClassElm");
if ( if (
obj.CHILD_SEGMENTS_VS_Splited && obj.CHILD_SEGMENTS_VS_Splited &&
@ -1278,7 +1231,6 @@ export class AddEitComponent implements OnInit {
} }
if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !elemVal) { if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !elemVal) {
elem.classList.add("requiredClassElm"); elem.classList.add("requiredClassElm");
this.cs.redToastPK("eit", "required-text");
//this.common.showRequiredMsg(); //this.common.showRequiredMsg();
return false; return false;
} else { } else {
@ -1317,7 +1269,6 @@ export class AddEitComponent implements OnInit {
} }
if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !varcharValue) { if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !varcharValue) {
x.classList.add("requiredClassElm"); x.classList.add("requiredClassElm");
this.cs.redToastPK("eit", "required-text");
//this.common.showRequiredMsg(); //this.common.showRequiredMsg();
return false; return false;
} else { } else {
@ -1349,7 +1300,6 @@ export class AddEitComponent implements OnInit {
if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !val) { if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !val) {
x.classList.add("requiredClassElm"); x.classList.add("requiredClassElm");
this.cs.redToastPK("eit", "required-text");
//this.common.showRequiredMsg(); //this.common.showRequiredMsg();
return false; return false;
} else { } else {

@ -63,7 +63,7 @@
<!-- <ion-footer style="background: #f5f5f5 !important;"> <!-- <ion-footer style="background: #f5f5f5 !important;">
<div class="centerDiv" (click)="gotoTransactionsPage()"> <div class="centerDiv" (click)="gotoTransactionsPage()">
<ion-button ion-button style="background: #024d71 !important; --background: #024d71"> <ion-button ion-button style="background: #BE332F !important; --background: #BE332F">
{{'vacation-rule, next-label' | translate}}</ion-button> {{'vacation-rule, next-label' | translate}}</ion-button>
</div> </div>
</ion-footer> --> </ion-footer> -->

@ -22,7 +22,7 @@
<div *ngFor="let item of EITTransactionList.Collection_Transaction"> <div *ngFor="let item of EITTransactionList.Collection_Transaction">
<ion-row *ngIf="item.DISPLAY_FLAG != 'N' " class=""> <ion-row *ngIf="item.DISPLAY_FLAG != 'N' " class="">
<ion-col class="" *ngIf="item.SEGMENT_PROMPT!=''"> <ion-col class="" *ngIf="item.SEGMENT_PROMPT!=''">
<label style="color:#024d71;font-weight: bold;" class="label" for="">{{item.SEGMENT_PROMPT}} </label> <label style="color:#BE332F;font-weight: bold;" class="label" for="">{{item.SEGMENT_PROMPT}} </label>
<br> <br>
<label class="label" style="color:black;" for="">{{item.SEGMENT_VALUE_DSP}} </label> <label class="label" style="color:black;" for="">{{item.SEGMENT_VALUE_DSP}} </label>
<br> <br>

@ -1,330 +1,350 @@
.footer-button { .footer-button {
border-radius: 2px; border-radius: 2px;
padding: 0 1.1em; padding: 0 1.1em;
min-height: 45px; min-height: 45px;
min-width: 200px; min-width: 200px;
} }
.datetime{ .datetime {
text-align: center; text-align: center;
font-family: WorkSans-Bold; font-family: WorkSans-Bold;
margin-left: 47px; margin-left: 47px;
margin-top: -19px; margin-top: -19px;
} }
.iconCalendar{
margin-left: 30px !important; .iconCalendar {
width: 22% !important; margin-left: 30px !important;
height: 26px !important; width: 22% !important;
margin-top: -69px !important; height: 26px !important;
margin-bottom: 20px !important; margin-top: -69px !important;
} margin-bottom: 20px !important;
h4 { }
font-size: 2.2rem;
text-align: center; h4 {
color: #000000; font-size: 2.2rem;
} text-align: center;
.grids{ color: #000000;
border-radius: 20px !important; }
background: white;
padding-left: 1px; .grids {
padding-right: 1px; border-radius: 20px !important;
margin: 13px; background: white;
padding-top: 0px; padding-left: 1px;
padding-bottom: 3px; padding-right: 1px;
padding-left: 13px; margin: 13px;
padding-right: 13px; padding-top: 0px;
border: 1px solid #cac8c8; padding-bottom: 3px;
} padding-left: 13px;
padding-right: 13px;
.bgcolor { border: 1px solid #cac8c8;
}
color: white;
border-top-right-radius: 19px; .bgcolor {
border-top-left-radius: 15px;
padding-top: 1; color: white;
padding-bottom: 0; border-top-right-radius: 19px;
margin-top: 0; border-top-left-radius: 15px;
margin-bottom: 0; padding-top: 1;
/* border-radius: 12px !important; */ padding-bottom: 0;
background: #024d71; margin-top: 0;
border-bottom: 1px solid #a7a4a4; margin-bottom: 0;
border-top: 1px solid #cac8c8; /* border-radius: 12px !important; */
margin-left: -13px; background: #BE332F;
margin-right: -13px; border-bottom: 1px solid #a7a4a4;
} border-top: 1px solid #cac8c8;
.colEit{ margin-left: -13px;
border-right: 1px solid #cac8c8; margin-right: -13px;
border-bottom-left-radius: -10px !important; }
padding-top: 8px;
padding-bottom: 8px; .colEit {
margin-left: 18px; border-right: 1px solid #cac8c8;
font-size: 12px !important; border-bottom-left-radius: -10px !important;
} padding-top: 8px;
padding-bottom: 8px;
.header-div { margin-left: 18px;
font-size: 12px !important;
background-color: #024d71; }
text-transform: capitalize;
height: 160px; .header-div {
// position: relative;
display: block; background-color: #BE332F;
margin-bottom: -28px; text-transform: capitalize;
} height: 160px;
// position: relative;
.header-toolbar-new{ display: block;
--background: #024d71; margin-bottom: -28px;
} }
.addClass{ .header-toolbar-new {
background-color: #024d71; --background: #BE332F;
width: 80px; }
height: 80px;
right: 8%; .addClass {
position: fixed; background-color: #BE332F;
color: white; width: 80px;
bottom: 5%; height: 80px;
border-radius: 50%; right: 8%;
z-index: 999; position: fixed;
-webkit-box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); color: white;
-moz-box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); bottom: 5%;
box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); border-radius: 50%;
} z-index: 999;
-webkit-box-shadow: 2px -1px 13px 0px rgba(0, 0, 0, 0.59);
.contentEit:before { -moz-box-shadow: 2px -1px 13px 0px rgba(0, 0, 0, 0.59);
position: absolute; box-shadow: 2px -1px 13px 0px rgba(0, 0, 0, 0.59);
}
.contentEit:before {
position: absolute;
content: ""; content: "";
// background: #024d71; // background: #BE332F;
height: 140px; height: 140px;
width: 100%; width: 100%;
left: 0; left: 0;
top: 0px; top: 0px;
z-index: 1; z-index: 1;
} }
.hrClass{ .hrClass {
border-width: 0; border-width: 0;
box-sizing: content-box; box-sizing: content-box;
border-bottom: 1px solid #e6e6e6; border-bottom: 1px solid #e6e6e6;
background: #fff !important; background: #fff !important;
height: 1px; height: 1px;
} }
//////////////////////////////// ////////////////////////////////
.content:before { .content:before {
position: absolute; position: absolute;
content: ""; content: "";
background: #024d71; background: #BE332F;
height: 140px; height: 140px;
width: 100%; width: 100%;
left: 0; left: 0;
top: 0px; top: 0px;
z-index: 1; z-index: 1;
} }
.colorBG{ .colorBG {
--background: #f0efef; --background: #f0efef;
} }
.Title{ .Title {
text-align: center; text-align: center;
color: white; color: white;
margin-top: -33px; margin-top: -33px;
font-size: 17px; font-size: 17px;
} }
.title{
text-align: center; .title {
color: black; text-align: center;
margin-top: 5px; color: black;
font-size: 17px; margin-top: 5px;
} font-size: 17px;
.today-graph{ }
display: block !important;
height: 196px; .today-graph {
width: 365px; display: block !important;
/* padding-left: 51px; */ height: 196px;
margin-left: 28px !important; width: 365px;
} /* padding-left: 51px; */
margin-left: 28px !important;
.headerGrid{ }
background-color: white !important;
border: 1px solid #cac8c8 !important; .headerGrid {
padding-bottom: 53px; background-color: white !important;
padding-top: -30px; border: 1px solid #cac8c8 !important;
margin-left: 13px; padding-bottom: 53px;
margin-right: 13px; padding-top: -30px;
margin-bottom: 10px; margin-left: 13px;
position: relative; margin-right: 13px;
z-index: 1; margin-bottom: 10px;
border-radius: 20px; position: relative;
margin-top: 17px; z-index: 1;
} border-radius: 20px;
.result-graph{ margin-top: 17px;
font-size: 14px; }
margin-left: -48px;
margin-right: 3px; .result-graph {
margin-bottom: -30px; font-size: 14px;
margin-left: -48px;
margin-right: 3px;
margin-bottom: -30px;
}
.green-label{
font-size: 15px !important; }
margin-left: 7px !important;
margin-right: 42px; .green-label {
} font-size: 15px !important;
.green-label-ar{ margin-left: 7px !important;
font-size: 15px !important; margin-right: 42px;
margin-left: 7px !important; }
margin-right: 15px;
} .green-label-ar {
.blue-label{ font-size: 15px !important;
font-size: 15px !important; margin-left: 7px !important;
margin-left: 7px !important; margin-right: 15px;
margin-right: 13px; }
}
.light-label{ .blue-label {
font-size: 15px !important; font-size: 15px !important;
margin-left: 7px !important; margin-left: 7px !important;
margin-right: -26px; margin-right: 13px;
} }
.light-label-ar{
font-size: 15px !important; .light-label {
margin-right: 7px !important; font-size: 15px !important;
margin-left: -26px; margin-left: 7px !important;
} margin-right: -26px;
}
.light-dote{
background-color: #3CB9D5; .light-label-ar {
width: 12px; font-size: 15px !important;
height: 12px; margin-right: 7px !important;
border-radius: 50% !important; margin-left: -26px;
display: inline-block; }
}
.blue-dote{ .light-dote {
background-color: #3CB9D5;
background-color: #024d71; width: 12px;
width: 12px; height: 12px;
height: 12px; border-radius: 50% !important;
border-radius: 50% !important; display: inline-block;
display: inline-block; }
}
.green-dote{ .blue-dote {
background-color: #1FA269;
width: 12px; background-color: #BE332F;
height: 12px; width: 12px;
border-radius: 50% !important; height: 12px;
display: inline-block; border-radius: 50% !important;
margin-right: -1px; display: inline-block;
} }
.col{
text-align: right; .green-dote {
} background-color: #1FA269;
width: 12px;
.gridService{ height: 12px;
border-radius: 50% !important;
/* margin-top: 87px; */ display: inline-block;
border-radius: 10px; margin-right: -1px;
/* margin-bottom: -49px; */ }
margin-left: 14px;
margin-right: 14px; .col {
text-align: right;
} }
.columns{
margin: 3px; .gridService {
margin-bottom: 13px;
background: white; /* margin-top: 87px; */
border-radius: 27px; border-radius: 10px;
padding-left: 30px; /* margin-bottom: -49px; */
padding-right: 6px; margin-left: 14px;
padding-top: 19px; margin-right: 14px;
padding-bottom: 8px;
border: 1px solid #cac8c8 !important; }
}
.columns {
margin: 3px;
.service{ margin-bottom: 13px;
font-size: 22px; background: white;
color: black; border-radius: 27px;
letter-spacing: 1px; padding-left: 30px;
font-weight: bold; padding-right: 6px;
} padding-top: 19px;
.services{ padding-bottom: 8px;
border: 1px solid #cac8c8 !important;
font-size: 12px; }
color: black;
}
.service {
.adult-dote{ font-size: 22px;
background-color: #3CB9D5; color: black;
width: 15px; letter-spacing: 1px;
height: 15px; font-weight: bold;
border-radius: 50% !important; }
display: inline-block;
margin-left: -17px; .services {
margin-right: 5px;
} font-size: 12px;
color: black;
.adult-dote-ar{ }
background-color: #3CB9D5;
width: 15px; .adult-dote {
height: 15px; background-color: #3CB9D5;
border-radius: 50% !important; width: 15px;
display: inline-block; height: 15px;
margin-right: 0px; border-radius: 50% !important;
margin-left: 5px; display: inline-block;
} margin-left: -17px;
.child-dote{ margin-right: 5px;
}
background-color: #024d71;
width: 15px; .adult-dote-ar {
height: 15px; background-color: #3CB9D5;
border-radius: 50% !important; width: 15px;
display: inline-block; height: 15px;
margin-left: -17px; border-radius: 50% !important;
margin-right: 5px; display: inline-block;
} margin-right: 0px;
.child-dote-ar{ margin-left: 5px;
background-color: #024d71; }
width: 15px;
height: 15px; .child-dote {
border-radius: 50% !important;
display: inline-block; background-color: #BE332F;
margin-right: 1px; width: 15px;
margin-left: 5px; height: 15px;
} border-radius: 50% !important;
.infants-dote{ display: inline-block;
background-color: #1FA269; margin-left: -17px;
width: 15px; margin-right: 5px;
height: 15px; }
border-radius: 50% !important;
display: inline-block; .child-dote-ar {
margin-left: -17px; background-color: #BE332F;
margin-right: 5px; width: 15px;
// margin-bottom: 6px; height: 15px;
} border-radius: 50% !important;
display: inline-block;
.infants-dote-ar{ margin-right: 1px;
background-color: #1FA269; margin-left: 5px;
width: 15px; }
height: 15px;
border-radius: 50% !important; .infants-dote {
display: inline-block; background-color: #1FA269;
margin-right: 1px; width: 15px;
margin-left: 5px; height: 15px;
} border-radius: 50% !important;
.addEitOkButton{ display: inline-block;
white-space: normal !important; margin-left: -17px;
text-transform: capitalize !important; margin-right: 5px;
min-height: 45px !important; // margin-bottom: 6px;
min-width: 5px !important; }
margin: 8px !important;
background-color: #024d71; .infants-dote-ar {
width: 80% !important; background-color: #1FA269;
color: white!important; width: 15px;
border-radius: 16px !important; height: 15px;
} border-radius: 50% !important;
display: inline-block;
margin-right: 1px;
margin-left: 5px;
}
.addEitOkButton {
white-space: normal !important;
text-transform: capitalize !important;
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
background-color: #BE332F;
width: 80% !important;
color: white !important;
border-radius: 16px !important;
--border-radius: 16px !important;
--box-shadow: none;
}

@ -1,263 +1,275 @@
.footer-button { .footer-button {
border-radius: 2px; border-radius: 2px;
padding: 0 1.1em; padding: 0 1.1em;
min-height: 45px; min-height: 45px;
min-width: 200px; min-width: 200px;
} }
.imgSize { .imgSize {
width: 22px; width: 22px;
height: 22px; height: 22px;
} }
.Header { .Header {
font-weight: bold; font-weight: bold;
color: #1a586d !important; color: #c6903e !important;
font-size: 10px; font-size: 10px;
} }
.tbData { .tbData {
font-size: 10px; font-size: 10px;
} }
.btnBack { .btnBack {
background: transparent; background: transparent;
float: right; float: right;
} }
.attachmentDiv{ .attachmentDiv {
background: #ffffff; background: #ffffff;
height: auto; height: auto;
text-align: center; text-align: center;
padding-top: 1px; padding-top: 1px;
margin: 10px; margin: 10px;
border-radius: 15px; border-radius: 15px;
border: 1px solid grey; border: 1px solid grey;
} }
.noDataDiv{ .noDataDiv {
background: #ffffff; background: #ffffff;
height: 11%; height: 11%;
text-align: center; text-align: center;
padding-top: 1px; padding-top: 1px;
border-radius: 10px; border-radius: 10px;
margin: 10px; margin: 10px;
border-radius: 5px; border-radius: 5px;
} }
.submitNote{
background: #ffffff; .submitNote {
height: 80px; background: #ffffff;
padding-top: 1px; height: 80px;
margin: 10px; padding-top: 1px;
border-radius: 15px; margin: 10px;
border: 1px solid grey; border-radius: 15px;
} border: 1px solid grey;
}
.approvalList{
--background: #f0efef; .approvalList {
height: auto; --background: #f0efef;
text-align: center; height: auto;
padding-top: 1px; text-align: center;
border-radius: 10px; padding-top: 1px;
margin: 10px; border-radius: 10px;
border-radius: 5px; margin: 10px;
} border-radius: 5px;
}
/************************New Design**********************************/
.notification-list{ /************************New Design**********************************/
background: none; .notification-list {
background: none; background: none;
border-radius: 32px; background: none;
ion-item{ border-radius: 32px;
// margin-top: 5px;
// margin-bottom: 5px; ion-item {
// margin-top: 5px;
background-color: transparent; // margin-bottom: 5px;
.item-date{
width: 100%; background-color: transparent;
font-size: 16px;
font-weight: bold; .item-date {
width: 100%;
text-align: start; font-size: 16px;
padding: 0; font-weight: bold;
margin: 0;
text-align: start;
position: absolute; padding: 0;
left: 0; margin: 0;
top: 12%;
} position: absolute;
ion-label , [item-end]{ left: 0;
top: 12%;
white-space: normal;
font-size: 14px;
padding-top: 15%;
// :root[dir="ltr"]{
// margin-left: 10px;
// }
// :root[dir="rtl"]{
// margin-right: 10px;
// }
}
} }
ion-label,
[item-end] {
white-space: normal;
font-size: 14px;
padding-top: 15%;
// :root[dir="ltr"]{
// margin-left: 10px;
// }
// :root[dir="rtl"]{
// margin-right: 10px;
// }
}
} }
}
.timeline {
position: relative; .timeline {
margin: 15px 0 0 0; position: relative;
// border-bottom: solid 1px var(--cusgray); margin: 15px 0 0 0;
} // border-bottom: solid 1px var(--cusgray);
}
.timeline:before {
.timeline:before {
content: '';
position: inherit !important; content: '';
top: 0; position: inherit !important;
bottom: 0; top: 0;
width: 4px; bottom: 0;
// background: #e4e4e4; width: 4px;
z-index: 1; // background: #e4e4e4;
left: 35px; z-index: 1;
/* margin-left: -10px; */ left: 35px;
/* z-index: 1; */ /* margin-left: -10px; */
} /* z-index: 1; */
}
.timeline .timeline-thumb {
.timeline .timeline-thumb {
border-radius: 500px;
width: 70px !important; border-radius: 500px;
z-index: 2; width: 70px !important;
position: absolute; z-index: 2;
left: 0px; position: absolute;
// :root[dir="ltr"]{ left: 0px;
// left: 37px; // :root[dir="ltr"]{
// } // left: 37px;
// :root[dir="rtl"]{ // }
// right: 37px; // :root[dir="rtl"]{
// } // right: 37px;
float: right; // }
top: 9px; float: right;
} top: 9px;
}
.timeline .timeline-thumb.timeline-icon {
height: 70px; .timeline .timeline-thumb.timeline-icon {
// text-align: center; height: 70px;
// color: white; // text-align: center;
// border: 5px solid #CBD0D3; // color: white;
// transform: scale(0.2); // border: 5px solid #CBD0D3;
} // transform: scale(0.2);
}
.timeline .timeline-item {
width: 40px; .timeline .timeline-item {
width: 40px;
}
}
.timeline .timeline-stats {
position: relative; .timeline .timeline-stats {
font-size: 12px; position: relative;
color: var(--darkgray); font-size: 12px;
color: var(--darkgray);
}
}
.empImge{
border-radius: 50%; .empImge {
width:100%; border-radius: 50%;
height: 100%; width: 100%;
border: #dedede solid 1px; height: 100%;
border: #dedede solid 1px;
}
.empImgeRep { }
border-radius: 50% !important;
width: 80px; .empImgeRep {
height: 80px; border-radius: 50% !important;
border: #dedede solid 1px; width: 80px;
} height: 80px;
border: #dedede solid 1px;
.line{ }
padding-bottom:87px;
} .line {
padding-bottom: 87px;
.attachLable{ }
position: absolute;
top: 0px; .attachLable {
z-index: 0; position: absolute;
background: #44A7A1; top: 0px;
color: #fff; z-index: 0;
border-radius: 50%; background: #30b8c6;
border: 0px; color: #fff;
width: 24px; border-radius: 50%;
height: 24px; border: 0px;
text-align: center; width: 24px;
font-size: 5px; height: 24px;
} text-align: center;
font-size: 5px;
.removeLable{ }
top: 0px;
z-index: 0; .removeLable {
background: #d8252d; top: 0px;
color: #fff; z-index: 0;
border-radius: 50%; background: #d8252d;
border: 0px; color: #fff;
width: 20px; border-radius: 50%;
height: 20px; border: 0px;
text-align: center; width: 20px;
font-size: 5px; height: 20px;
} text-align: center;
font-size: 5px;
.note-modal { }
// width: 90%;
// height: 50%; .note-modal {
// top: 20%; // width: 90%;
// left: 5%; // height: 50%;
// right: 5%; // top: 20%;
// bottom: 5%; // left: 5%;
background: rgba(0, 0, 0, 0.5) !important; // right: 5%;
padding: 30% 10% !important; // bottom: 5%;
--height: 12cm !important; background: rgba(0, 0, 0, 0.5) !important;
// --width: 80% !important; padding: 30% 10% !important;
--border-radius:20px; --height: 12cm !important;
// --width: 80% !important;
} --border-radius: 20px;
.header-toolbar-new{
--background: #024d71; }
}
.title{ .header-toolbar-new {
margin-top: -37px; --background: #BE332F;
margin-left: 85px; }
}
.title-ar{ .title {
margin-top: -37px; margin-top: -37px;
margin-right: 101px; margin-left: 85px;
} }
.confirmEitOkButton{
white-space: normal !important; .title-ar {
text-transform: capitalize !important; margin-top: -37px;
min-height: 45px !important; margin-right: 101px;
min-width: 5px !important; }
margin: 8px !important;
background-color: #0ca2de; .confirmEitOkButton {
width: 80% !important; white-space: normal !important;
color: white!important; text-transform: capitalize !important;
border-radius: 16px !important; min-height: 45px !important;
} min-width: 5px !important;
margin: 8px !important;
.approvalTitle-ar{ background-color: #BE332F;
font-weight: bold; width: 80% !important;
font-size: 16px; color: white !important;
text-align: right; border-radius: 16px !important;
--border-radius: 16px !important;
} --box-shadow: none;
.approvalTitle{ }
font-weight: bold;
font-size: 16px; .approvalTitle-ar {
text-align: left; font-weight: bold;
} font-size: 16px;
text-align: right;
}
.approvalTitle {
font-weight: bold;
font-size: 16px;
text-align: left;
}

@ -1,14 +1,9 @@
<!-- <ion-header> <ion-header>
<ion-toolbar class="header-toolbar-new"> <ion-toolbar class="header-toolbar-new">
<nav-buttons></nav-buttons> <nav-buttons></nav-buttons>
<ion-title [ngClass]=" direction === 'en' ? 'title' : 'title-ar'" color="light">{{headerTitle}}</ion-title> <ion-title [ngClass]=" direction === 'en' ? 'title' : 'title-ar'" color="light">{{headerTitle}}</ion-title>
</ion-toolbar> </ion-toolbar>
</ion-header> --> </ion-header>
<app-generic-header
[showBack]="true"
[headerText]="headerTitle">
</app-generic-header>
<ion-content> <ion-content>
@ -16,14 +11,10 @@
<ion-grid> <ion-grid>
<ion-row style="margin-top: 20px;margin-left: 12px;"> <ion-row style="margin-top: 20px;margin-left: 12px;">
<ion-col> <ion-col>
<div style="position: relative" size="10" [ngClass]=" direction === 'en' ? 'approvalTitle' : 'approvalTitle-ar'" > <div size="10" [ngClass]=" direction === 'en' ? 'approvalTitle' : 'approvalTitle-ar'" >{{'general, addAttach' | translate}} <span *ngIf="isAttachment ==='Y'">*</span></div>
{{'general, addAttach' | translate}}
<span *ngIf="isAttachment =='Y' || isAttachmentGET_MENU === 'Y'">*</span>
<div *ngIf="selMenu.GetMenuEntriesList.REQ_ATTACHMENT_TIP" (click)="showToolTip(selMenu.GetMenuEntriesList.REQ_ATTACHMENT_TIP)" class='toolTip-inside'><ion-icon style='font-size: 20px' name='information-circle-outline'></ion-icon> </div>
</div>
</ion-col> </ion-col>
<ion-col style="padding-left: 7%;" size="2"> <ion-col style="padding-left: 7%;" size="2">
<div [ngClass]=" direction === 'en' ? 'fileDiv-en' : 'fileDiv-ar'"> <div class="fileDiv">
<input end class="inputfile" style="margin-top: 10px;z-index: 99999;position: absolute;opacity: 0;" type="file" ng2FileSelect [uploader]="uploader" <input end class="inputfile" style="margin-top: 10px;z-index: 99999;position: absolute;opacity: 0;" type="file" ng2FileSelect [uploader]="uploader"
(change)="onFileSelected($event)" (click)="onFileSelectedclick($event)" /> (change)="onFileSelected($event)" (click)="onFileSelectedclick($event)" />
<label end for="file" class="attachLable"> <label end for="file" class="attachLable">

@ -12,7 +12,7 @@
.Header { .Header {
font-weight: bold; font-weight: bold;
color: #1a586d !important; color: #c6903e !important;
font-size: 10px; font-size: 10px;
} }
@ -25,7 +25,7 @@
float: right; float: right;
} }
.attachmentDiv{ .attachmentDiv {
background: #ffffff; background: #ffffff;
height: auto; height: auto;
text-align: center; text-align: center;
@ -35,7 +35,7 @@
border: 1px solid grey; border: 1px solid grey;
} }
.noDataDiv{ .noDataDiv {
background: #ffffff; background: #ffffff;
height: 11%; height: 11%;
text-align: center; text-align: center;
@ -44,7 +44,8 @@
margin: 10px; margin: 10px;
border-radius: 5px; border-radius: 5px;
} }
.submitNote{
.submitNote {
background: #ffffff; background: #ffffff;
height: 80px; height: 80px;
padding-top: 1px; padding-top: 1px;
@ -53,7 +54,7 @@
border: 1px solid grey; border: 1px solid grey;
} }
.approvalList{ .approvalList {
--background: #f0efef; --background: #f0efef;
height: auto; height: auto;
text-align: center; text-align: center;
@ -64,41 +65,45 @@
} }
/************************New Design**********************************/ /************************New Design**********************************/
.notification-list{ .notification-list {
background: none; background: none;
background: none; background: none;
border-radius: 32px; border-radius: 32px;
ion-item{
// margin-top: 5px; ion-item {
// margin-bottom: 5px; // margin-top: 5px;
// margin-bottom: 5px;
background-color: transparent;
.item-date{ background-color: transparent;
width: 100%;
font-size: 16px; .item-date {
font-weight: bold; width: 100%;
font-size: 16px;
text-align: start; font-weight: bold;
padding: 0;
margin: 0; text-align: start;
padding: 0;
position: absolute; margin: 0;
left: 0;
top: 12%; position: absolute;
} left: 0;
ion-label , [item-end]{ top: 12%;
}
white-space: normal;
font-size: 14px; ion-label,
padding-top: 15%; [item-end] {
// :root[dir="ltr"]{
// margin-left: 10px; white-space: normal;
// } font-size: 14px;
// :root[dir="rtl"]{ padding-top: 15%;
// margin-right: 10px; // :root[dir="ltr"]{
// } // margin-left: 10px;
// }
} // :root[dir="rtl"]{
// margin-right: 10px;
// }
}
} }
} }
@ -109,13 +114,13 @@
.timeline { .timeline {
position: relative; position: relative;
margin: 15px 0 0 0; margin: 15px 0 0 0;
// border-bottom: solid 1px var(--cusgray); // border-bottom: solid 1px var(--cusgray);
} }
.timeline:before { .timeline:before {
content: ''; content: '';
position: inherit !important; position: inherit !important;
top: 0; top: 0;
@ -129,7 +134,7 @@
} }
.timeline .timeline-thumb { .timeline .timeline-thumb {
border-radius: 500px; border-radius: 500px;
width: 70px !important; width: 70px !important;
z-index: 2; z-index: 2;
@ -146,7 +151,7 @@
} }
.timeline .timeline-thumb.timeline-icon { .timeline .timeline-thumb.timeline-icon {
height: 70px; height: 70px;
// text-align: center; // text-align: center;
// color: white; // color: white;
// border: 5px solid #CBD0D3; // border: 5px solid #CBD0D3;
@ -161,19 +166,20 @@
} }
.timeline .timeline-stats { .timeline .timeline-stats {
position: relative; position: relative;
font-size: 12px; font-size: 12px;
color: var(--darkgray); color: var(--darkgray);
} }
.empImge{ .empImge {
border-radius: 50%; border-radius: 50%;
width:100%; width: 100%;
height: 100%; height: 100%;
border: #dedede solid 1px; border: #dedede solid 1px;
} }
.empImgeRep { .empImgeRep {
border-radius: 50% !important; border-radius: 50% !important;
width: 80px; width: 80px;
@ -181,25 +187,25 @@
border: #dedede solid 1px; border: #dedede solid 1px;
} }
.line{ .line {
padding-bottom:87px; padding-bottom: 87px;
} }
.attachLable{ .attachLable {
position: absolute; position: absolute;
top: 0px; top: 0px;
z-index: 0; z-index: 0;
background: #44A7A1; background: #c6903e;
color: #fff; color: #fff;
border-radius: 50%; border-radius: 50%;
border: 0px; border: 0px;
width: 24px; width: 24px;
height: 24px; height: 24px;
text-align: center; text-align: center;
font-size: 5px; font-size: 5px;
} }
.removeLable{ .removeLable {
top: 0px; top: 0px;
z-index: 0; z-index: 0;
background: #d8252d; background: #d8252d;
@ -223,50 +229,47 @@
padding: 30% 10% !important; padding: 30% 10% !important;
--height: 12cm !important; --height: 12cm !important;
// --width: 80% !important; // --width: 80% !important;
--border-radius:20px; --border-radius: 20px;
} }
.header-toolbar-new{
--background: #024d71; .header-toolbar-new {
--background: #BE332F;
} }
.title{
.title {
margin-top: -37px; margin-top: -37px;
margin-left: 85px; margin-left: 85px;
} }
.title-ar{
.title-ar {
margin-top: -37px; margin-top: -37px;
margin-right: 101px; margin-right: 101px;
} }
.confirmEitOkButton{
.confirmEitOkButton {
white-space: normal !important; white-space: normal !important;
text-transform: capitalize !important; text-transform: capitalize !important;
min-height: 45px !important; min-height: 45px !important;
min-width: 5px !important; min-width: 5px !important;
margin: 8px !important; margin: 8px !important;
background-color: #44A7A1; background-color: #BE332F;
width: 80% !important; width: 80% !important;
color: white!important; color: white !important;
border-radius: 16px !important; border-radius: 16px !important;
--border-radius: 16px !important; --border-radius: 16px !important;
--box-shadow: none;
} }
.approvalTitle-ar{ .approvalTitle-ar {
font-weight: bold; font-weight: bold;
font-size: 16px; font-size: 16px;
text-align: right; text-align: right;
} }
.approvalTitle{
.approvalTitle {
font-weight: bold; font-weight: bold;
font-size: 16px; font-size: 16px;
text-align: left; text-align: left;
} }
.fileDiv-en {
// float: right;
}
.fileDiv-ar {
float: left;
}

@ -62,8 +62,7 @@ export class ConfirmAddEitComponent implements OnInit {
indexLastObj: any = 0; indexLastObj: any = 0;
filterAllowedType: any = ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']; filterAllowedType: any = ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'];
direction: string; direction: string;
isAttachment: string = 'N'; isAttachment: string;
isAttachmentGET_MENU: string = 'N';
constructor(public modalController: ModalController, public cs: CommonService, private ts: TranslatorService, private eitService: EitService) { constructor(public modalController: ModalController, public cs: CommonService, private ts: TranslatorService, private eitService: EitService) {
this.direction = TranslatorService.getCurrentLanguageName() this.direction = TranslatorService.getCurrentLanguageName()
@ -79,7 +78,7 @@ export class ConfirmAddEitComponent implements OnInit {
this.respID = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_RESP_ID, false); this.respID = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_RESP_ID, false);
this.eitRequest = this.cs.sharedService.getSharedData(EitRequest.SHARED_DATA, false); this.eitRequest = this.cs.sharedService.getSharedData(EitRequest.SHARED_DATA, false);
this.isResubmitEIT = this.cs.sharedService.getSharedData('confirmAddEITData', false).isResubmit; this.isResubmitEIT = this.cs.sharedService.getSharedData('confirmAddEITData', false).isResubmit;
this.isAttachmentGET_MENU = this.selMenu.GetMenuEntriesList.ATTACHMENT_REQUIRED; this.isAttachment = this.selMenu.GetMenuEntriesList.ATTACHMENT_REQUIRED;
if (this.isResubmitEIT) { if (this.isResubmitEIT) {
this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); //WARINING ** this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); //WARINING **
// console.log("this.getPassNotificationDetails: " + this.getPassNotificationDetails); // console.log("this.getPassNotificationDetails: " + this.getPassNotificationDetails);
@ -103,7 +102,7 @@ export class ConfirmAddEitComponent implements OnInit {
this.itemKey = this.addrespList.SubmitEITTransactionList.P_ITEM_KEY; this.itemKey = this.addrespList.SubmitEITTransactionList.P_ITEM_KEY;
this.P_TransactionID = this.addrespList.SubmitEITTransactionList.P_TRANSACTION_ID; this.P_TransactionID = this.addrespList.SubmitEITTransactionList.P_TRANSACTION_ID;
this.isDelete = this.isResubmitEIT = this.cs.sharedService.getSharedData('confirmAddEITData', false).isDelete; this.isDelete = this.isResubmitEIT = this.cs.sharedService.getSharedData('confirmAddEITData', false).isDelete;
this.isAttachment = this.addrespList.SubmitEITTransactionList.P_ATTACHMENT_REQUIRED;
this.getApproversList(); this.getApproversList();
// this.confirmAddEit.submitEit(this.eitRequest).subscribe((result: AddEitResponse) => { // this.confirmAddEit.submitEit(this.eitRequest).subscribe((result: AddEitResponse) => {
@ -570,9 +569,5 @@ export class ConfirmAddEitComponent implements OnInit {
// } // }
showToolTip(toolTip: any) {
this.cs.yellowToast(toolTip);
}
} }

@ -181,9 +181,6 @@
</ion-row> </ion-row>
<h4> {{'general, noData' | translate}}</h4> <h4> {{'general, noData' | translate}}</h4>
</div> </div>
<div class="terms" *ngIf="getPassMnuEntryObj.REQ_TIP && getResEITTransactionList[0]?.Collection_Transaction">
<p>{{getPassMnuEntryObj.REQ_TIP}}</p>
</div>
<!-- <no-data *ngIf="!getResEITTransactionList || getResEITTransactionList[0]?.Collection_Transaction.length <= 0" txt="{{'general.noData' | translate}}"></no-data> --> <!-- <no-data *ngIf="!getResEITTransactionList || getResEITTransactionList[0]?.Collection_Transaction.length <= 0" txt="{{'general.noData' | translate}}"></no-data> -->
<div *ngIf="getResEITTransactionList && getResEITTransactionList[0]?.Collection_Transaction.length > 0 "> <div *ngIf="getResEITTransactionList && getResEITTransactionList[0]?.Collection_Transaction.length > 0 ">
<!-- <div> --> <!-- <div> -->
@ -203,20 +200,17 @@
<ion-grid> <ion-grid>
<!-- <div> <div>
<ion-row> <!-- <ion-row>
<ion-col class="colBold"> <ion-col class="colBold">
<label for="">status</label> <label for="">status</label>
</ion-col> </ion-col>
<ion-col> <ion-col>
<label for="">{{EITTransactionList.status}}</label> <label for="">{{EITTransactionList.status}}</label>
</ion-col> </ion-col>
</ion-row> </ion-row> -->
</div> --> </div>
<ion-grid class="grids"> <ion-grid class="grids">
<ion-col size="2" *ngIf="getPassMnuEntryObj.UPDATE_BUTTON == 'Y'" (click)="updateEITRrq(i)" >
<img [ngClass]="direction == 'en' ? 'icon-img':'icon-img-ar' " src="../assets/imgs/profile-icons/editing@2x.png" >
</ion-col>
<div *ngFor="let item of EITTransactionList.Collection_Transaction"> <div *ngFor="let item of EITTransactionList.Collection_Transaction">
<!-- <ion-row *ngIf="item.DISPLAY_FLAG != 'N' "> <!-- <ion-row *ngIf="item.DISPLAY_FLAG != 'N' ">
<ion-col class="colBold"> <ion-col class="colBold">
@ -229,7 +223,7 @@
<ion-row *ngIf="item.DISPLAY_FLAG != 'N' " class=""> <ion-row *ngIf="item.DISPLAY_FLAG != 'N' " class="">
<ion-col class="" *ngIf="item.SEGMENT_PROMPT!=''"> <ion-col class="" *ngIf="item.SEGMENT_PROMPT!=''">
<label style="color:#024d71;font-weight: bold;" class="label" for="">{{item.SEGMENT_PROMPT}} </label> <label style="color:#BE332F;font-weight: bold;" class="label" for="">{{item.SEGMENT_PROMPT}} </label>
<br> <br>
<label class="label" style="color:black;" for="">{{item.SEGMENT_VALUE_DSP}} </label> <label class="label" style="color:black;" for="">{{item.SEGMENT_VALUE_DSP}} </label>
<br> <br>
@ -252,7 +246,7 @@
</ion-infinite-scroll> </ion-infinite-scroll>
</div> </div>
</ion-content> </ion-content>
<ion-icon *ngIf="addButton == 'Y'" class="addClass" name="add" (click)="addEITRrq()"></ion-icon> <ion-icon class="addClass" name="add" (click)="addEITRrq()"></ion-icon>
<!-- <ion-footer> <!-- <ion-footer>
<div class="centerDiv"> --> <div class="centerDiv"> -->

@ -5,7 +5,7 @@
min-width: 200px; min-width: 200px;
} }
.datetime{ .datetime {
// text-align: center; // text-align: center;
// font-family: WorkSans-Bold; // font-family: WorkSans-Bold;
// margin-left: 111px; // margin-left: 111px;
@ -14,8 +14,9 @@
margin-left: 47px; margin-left: 47px;
margin-top: -19px; margin-top: -19px;
} }
.iconCalendar{
.iconCalendar {
// margin-left: -241px; // margin-left: -241px;
// margin-top: 5px; // margin-top: 5px;
margin-left: 30px !important; margin-left: 30px !important;
@ -23,13 +24,15 @@
height: 26px !important; height: 26px !important;
margin-top: -69px !important; margin-top: -69px !important;
margin-bottom: 20px !important; margin-bottom: 20px !important;
} }
h4 { h4 {
font-size: 2.2rem; font-size: 2.2rem;
text-align: center; text-align: center;
color: #000000; color: #000000;
} }
.grids{
.grids {
border-radius: 20px !important; border-radius: 20px !important;
background: white; background: white;
padding-left: 1px; padding-left: 1px;
@ -40,9 +43,9 @@ h4 {
padding-left: 13px; padding-left: 13px;
padding-right: 13px; padding-right: 13px;
border: 1px solid #cac8c8; border: 1px solid #cac8c8;
} }
.bgcolor { .bgcolor {
color: white; color: white;
border-top-right-radius: 19px; border-top-right-radius: 19px;
@ -52,24 +55,25 @@ h4 {
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
/* border-radius: 12px !important; */ /* border-radius: 12px !important; */
background: #024d71; background: #BE332F;
border-bottom: 1px solid #a7a4a4; border-bottom: 1px solid #a7a4a4;
border-top: 1px solid #cac8c8; border-top: 1px solid #cac8c8;
margin-left: -13px; margin-left: -13px;
margin-right: -13px; margin-right: -13px;
} }
.colEit{
.colEit {
border-right: 1px solid #cac8c8; border-right: 1px solid #cac8c8;
border-bottom-left-radius: -10px !important; border-bottom-left-radius: -10px !important;
padding-top: 8px; padding-top: 8px;
padding-bottom: 8px; padding-bottom: 8px;
margin-left: 18px; margin-left: 18px;
font-size: 12px !important; font-size: 12px !important;
} }
.header-div { .header-div {
background-color: #024d71; background-color: #BE332F;
text-transform: capitalize; text-transform: capitalize;
height: 160px; height: 160px;
// position: relative; // position: relative;
@ -77,74 +81,76 @@ h4 {
margin-bottom: -28px; margin-bottom: -28px;
} }
.header-toolbar-new{ .header-toolbar-new {
--background: #024d71; --background: #BE332F;
} }
.addClass{ .addClass {
background-color: #024d71; background-color: #BE332F;
width: 80px; width: 80px;
height: 80px; height: 80px;
right: 8%; right: 8%;
position: fixed; position: fixed;
color: white; color: white;
bottom: 5%; bottom: 5%;
border-radius: 50%; border-radius: 50%;
z-index: 999; z-index: 999;
-webkit-box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); -webkit-box-shadow: 2px -1px 13px 0px rgba(0, 0, 0, 0.59);
-moz-box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); -moz-box-shadow: 2px -1px 13px 0px rgba(0, 0, 0, 0.59);
box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); box-shadow: 2px -1px 13px 0px rgba(0, 0, 0, 0.59);
} }
.contentEit:before { .contentEit:before {
position: absolute; position: absolute;
content: ""; content: "";
// background: #024d71; // background: #BE332F;
height: 140px; height: 140px;
width: 100%; width: 100%;
left: 0; left: 0;
top: 0px; top: 0px;
z-index: 1; z-index: 1;
} }
.hrClass{ .hrClass {
border-width: 0; border-width: 0;
box-sizing: content-box; box-sizing: content-box;
border-bottom: 1px solid #e6e6e6; border-bottom: 1px solid #e6e6e6;
background: #fff !important; background: #fff !important;
height: 1px; height: 1px;
} }
//////////////////////////////// ////////////////////////////////
.content:before { .content:before {
position: absolute; position: absolute;
content: ""; content: "";
background: #024d71; background: #BE332F;
height: 140px; height: 140px;
width: 100%; width: 100%;
left: 0; left: 0;
top: 0px; top: 0px;
z-index: 1; z-index: 1;
} }
.colorBG{ .colorBG {
--background: #f0efef; --background: #f0efef;
} }
.Title{ .Title {
text-align: center; text-align: center;
color: white; color: white;
margin-top: -33px; margin-top: -33px;
font-size: 17px; font-size: 17px;
} }
.title{
.title {
text-align: center; text-align: center;
color: black; color: black;
margin-top: 5px; margin-top: 5px;
font-size: 17px; font-size: 17px;
} }
.today-graph{
.today-graph {
display: block !important; display: block !important;
height: 196px; height: 196px;
width: 365px; width: 365px;
@ -152,202 +158,195 @@ z-index: 1;
margin-left: 28px !important; margin-left: 28px !important;
} }
.headerGrid{ .headerGrid {
// background-color: white !important; // background-color: white !important;
// border: 1px solid #cac8c8 !important; // border: 1px solid #cac8c8 !important;
// border-radius: 20px !important; // border-radius: 20px !important;
// padding-top: 28px; // padding-top: 28px;
// padding-bottom: 53px; // padding-bottom: 53px;
// margin-left: 9px; // margin-left: 9px;
// margin-right: 13px; // margin-right: 13px;
// margin-top: -94px; // margin-top: -94px;
// margin-bottom: 10px; // margin-bottom: 10px;
background-color: white !important; background-color: white !important;
border: 1px solid #cac8c8 !important; border: 1px solid #cac8c8 !important;
/* padding-top: 28px; */ /* padding-top: 28px; */
padding-bottom: 53px; padding-bottom: 53px;
padding-top: -30px; padding-top: -30px;
margin-left: 13px; margin-left: 13px;
margin-right: 13px; margin-right: 13px;
/* margin-top: -86px; */ /* margin-top: -86px; */
margin-bottom: 10px; margin-bottom: 10px;
position: relative; position: relative;
z-index: 1; z-index: 1;
border-radius: 20px; border-radius: 20px;
margin-top: 17px; margin-top: 17px;
} }
.result-graph{
font-size: 14px; .result-graph {
margin-left: -48px; font-size: 14px;
margin-right: 3px; margin-left: -48px;
margin-bottom: -30px; margin-right: 3px;
margin-bottom: -30px;
}
}
.green-label{
font-size: 15px !important; .green-label {
margin-left: 7px !important; font-size: 15px !important;
margin-right: 42px; margin-left: 7px !important;
} margin-right: 42px;
.green-label-ar{ }
font-size: 15px !important;
margin-left: 7px !important; .green-label-ar {
margin-right: 15px; font-size: 15px !important;
} margin-left: 7px !important;
.blue-label{ margin-right: 15px;
font-size: 15px !important; }
margin-left: 7px !important;
margin-right: 13px; .blue-label {
} font-size: 15px !important;
.light-label{ margin-left: 7px !important;
font-size: 15px !important; margin-right: 13px;
margin-left: 7px !important; }
margin-right: -26px;
} .light-label {
.light-label-ar{ font-size: 15px !important;
font-size: 15px !important; margin-left: 7px !important;
margin-right: 7px !important; margin-right: -26px;
margin-left: -26px; }
}
.light-label-ar {
.light-dote{ font-size: 15px !important;
background-color: #3CB9D5; margin-right: 7px !important;
width: 12px; margin-left: -26px;
height: 12px; }
border-radius: 50% !important;
display: inline-block; .light-dote {
} background-color: #3CB9D5;
.blue-dote{ width: 12px;
height: 12px;
background-color: #024d71; border-radius: 50% !important;
width: 12px; display: inline-block;
height: 12px; }
border-radius: 50% !important;
display: inline-block; .blue-dote {
}
.green-dote{ background-color: #BE332F;
background-color: #1FA269; width: 12px;
width: 12px; height: 12px;
height: 12px; border-radius: 50% !important;
border-radius: 50% !important; display: inline-block;
display: inline-block; }
margin-right: -1px;
} .green-dote {
.col{ background-color: #1FA269;
text-align: right; width: 12px;
} height: 12px;
border-radius: 50% !important;
.gridService{ display: inline-block;
margin-right: -1px;
/* margin-top: 87px; */ }
border-radius: 10px;
/* margin-bottom: -49px; */ .col {
margin-left: 14px; text-align: right;
margin-right: 14px; }
} .gridService {
.columns{
margin: 3px; /* margin-top: 87px; */
margin-bottom: 13px; border-radius: 10px;
background: white; /* margin-bottom: -49px; */
border-radius: 27px; margin-left: 14px;
padding-left: 30px; margin-right: 14px;
padding-right: 6px;
padding-top: 19px; }
padding-bottom: 8px;
border: 1px solid #cac8c8 !important; .columns {
} margin: 3px;
margin-bottom: 13px;
background: white;
.service{ border-radius: 27px;
font-size: 22px; padding-left: 30px;
color: black; padding-right: 6px;
letter-spacing: 1px; padding-top: 19px;
font-weight: bold; padding-bottom: 8px;
} border: 1px solid #cac8c8 !important;
.services{ }
font-size: 12px;
color: black; .service {
} font-size: 22px;
color: black;
.adult-dote{ letter-spacing: 1px;
background-color: #3CB9D5; font-weight: bold;
width: 15px; }
height: 15px;
border-radius: 50% !important; .services {
display: inline-block;
margin-left: -17px; font-size: 12px;
margin-right: 5px; color: black;
} }
.adult-dote-ar{ .adult-dote {
background-color: #3CB9D5; background-color: #3CB9D5;
width: 15px; width: 15px;
height: 15px; height: 15px;
border-radius: 50% !important; border-radius: 50% !important;
display: inline-block; display: inline-block;
margin-right: 0px; margin-left: -17px;
margin-left: 5px; margin-right: 5px;
} }
.child-dote{
.adult-dote-ar {
background-color: #024d71; background-color: #3CB9D5;
width: 15px; width: 15px;
height: 15px; height: 15px;
border-radius: 50% !important; border-radius: 50% !important;
display: inline-block; display: inline-block;
margin-left: -17px; margin-right: 0px;
margin-right: 5px; margin-left: 5px;
} }
.child-dote-ar{
background-color: #024d71; .child-dote {
width: 15px;
height: 15px; background-color: #BE332F;
border-radius: 50% !important; width: 15px;
display: inline-block; height: 15px;
margin-right: 1px; border-radius: 50% !important;
margin-left: 5px; display: inline-block;
} margin-left: -17px;
.infants-dote{ margin-right: 5px;
background-color: #1FA269; }
width: 15px;
height: 15px; .child-dote-ar {
border-radius: 50% !important; background-color: #BE332F;
display: inline-block; width: 15px;
margin-left: -17px; height: 15px;
margin-right: 5px; border-radius: 50% !important;
// margin-bottom: 6px; display: inline-block;
} margin-right: 1px;
margin-left: 5px;
.infants-dote-ar{ }
background-color: #1FA269;
width: 15px; .infants-dote {
height: 15px; background-color: #1FA269;
border-radius: 50% !important; width: 15px;
display: inline-block; height: 15px;
margin-right: 1px; border-radius: 50% !important;
margin-left: 5px; display: inline-block;
} margin-left: -17px;
margin-right: 5px;
.icon-img { // margin-bottom: 6px;
width: 20px; }
height: 20px;
float: right; .infants-dote-ar {
margin-top: 20px; background-color: #1FA269;
} width: 15px;
height: 15px;
.icon-img-ar { border-radius: 50% !important;
width: 20px; display: inline-block;
height: 20px; margin-right: 1px;
float: left; margin-left: 5px;
margin-top: 20px; }
}
.terms {
text-align: center;
color: #004D71;
font-weight: bold;
}

@ -21,7 +21,7 @@ import { AuthenticatedUser } from 'src/app/hmg-common/services/authentication/mo
export class EitListComponent implements OnInit { export class EitListComponent implements OnInit {
Sdate: any; Sdate: any;
emp_no: any; emp_no: any;
balance:any; balance: any;
//////////////up //////////////up
P_PAGE_NUM: number; P_PAGE_NUM: number;
P_PAGE_LIMIT: number; P_PAGE_LIMIT: number;
@ -49,22 +49,22 @@ export class EitListComponent implements OnInit {
accrualNetInfants: any; accrualNetInfants: any;
accrualUNetChild: any; accrualUNetChild: any;
accrualNetAdult: any; accrualNetAdult: any;
addButton: string = 'Y';
public options = { public options = {
cutoutPercentage: 80, cutoutPercentage: 80,
tooltips: { enabled: false }, tooltips: { enabled: false },
legend: { display: false }}; legend: { display: false }
gaugeType = 'full'; };
gaugeType = 'full';
accrualBalancesList: any; accrualBalancesList: any;
common: any; common: any;
direction: string; direction: string;
// gaugeValue = 11.200; // gaugeValue = 11.200;
// gaugeLabel = ""; // gaugeLabel = "";
// tslint:disable-next-line: max-line-length // tslint:disable-next-line: max-line-length
constructor(private cs: CommonService, private EITService: EitService, public ts: TranslatorService, constructor(private cs: CommonService, private EITService: EitService, public ts: TranslatorService,
private modalCtrl: ModalController, public accrualService: AccrualService, public authService:AuthenticationService,) { private modalCtrl: ModalController, public accrualService: AccrualService, public authService: AuthenticationService,) {
this.direction = TranslatorService.getCurrentLanguageName(); this.direction = TranslatorService.getCurrentLanguageName();
this.selMenu = this.cs.sharedService.getSharedData(MenuResponse.SHARED_DATA, false); this.selMenu = this.cs.sharedService.getSharedData(MenuResponse.SHARED_DATA, false);
this.selEmp = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_EMP, false); this.selEmp = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_EMP, false);
@ -81,42 +81,42 @@ export class EitListComponent implements OnInit {
ngOnInit() { ngOnInit() {
///////////// /////////////
this.addButton = this.selMenu.GetMenuEntriesList.ADD_BUTTON;
this.Sdate = new Date().toISOString(); this.Sdate = new Date().toISOString();
this.getUserDetails(); this.getUserDetails();
////////////////up ////////////////up
this.getEITTransactions(); this.getEITTransactions();
this.accrualBalancesList = this.cs.sharedService.getSharedData('tickitsbalance', false); this.accrualBalancesList = this.cs.sharedService.getSharedData('tickitsbalance', false);
// accrualNetInfants // accrualNetInfants
// accrualUNetChild // accrualUNetChild
// accrualNetAdult // accrualNetAdult
if(this.accrualBalancesList){ if (this.accrualBalancesList) {
this.accrualNetAdult = this.accrualBalancesList[1].ACCRUAL_NET_ENTITLEMENT; this.accrualNetAdult = this.accrualBalancesList[1].ACCRUAL_NET_ENTITLEMENT;
this.accrualUNetChild = this.accrualBalancesList[2].ACCRUAL_NET_ENTITLEMENT; this.accrualUNetChild = this.accrualBalancesList[2].ACCRUAL_NET_ENTITLEMENT;
this. accrualNetInfants = this.accrualBalancesList[3].ACCRUAL_NET_ENTITLEMENT; this.accrualNetInfants = this.accrualBalancesList[3].ACCRUAL_NET_ENTITLEMENT;
} }
this.data = { this.data = {
// labels: ['earingTotal', 'deductionTotal'], // labels: ['earingTotal', 'deductionTotal'],
datasets: [ datasets: [
{ data: [this.accrualNetInfants, this.accrualUNetChild, this.accrualNetAdult], {
backgroundColor: [ data: [this.accrualNetInfants, this.accrualUNetChild, this.accrualNetAdult],
'#1FA269', backgroundColor: [
'#024d71', '#1FA269',
'#3CB9D5', ], '#BE332F',
borderWidth: 2 '#3CB9D5',],
} borderWidth: 2
] }
}; ]
};
} }
getUserDetails(){ getUserDetails() {
this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => { this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => {
if (user) { if (user) {
// this.emp_no=user.EMPLOYEE_NUMBER; // this.emp_no=user.EMPLOYEE_NUMBER;
} }
}); });
} }
public getAccrualBalance() { public getAccrualBalance() {
if (this.Sdate) { if (this.Sdate) {
@ -139,11 +139,11 @@ export class EitListComponent implements OnInit {
} }
handleAccrualResult(result) { handleAccrualResult(result) {
if (this.cs.validResponse(result)) { if (this.cs.validResponse(result)) {
this.balance=result.GetAccrualBalancesList; this.balance = result.GetAccrualBalancesList;
this.accrualNetAdult = this.balance[1].ACCRUAL_NET_ENTITLEMENT; this.accrualNetAdult = this.balance[1].ACCRUAL_NET_ENTITLEMENT;
this.accrualUNetChild = this.balance[2].ACCRUAL_NET_ENTITLEMENT; this.accrualUNetChild = this.balance[2].ACCRUAL_NET_ENTITLEMENT;
this. accrualNetInfants = this.balance[3].ACCRUAL_NET_ENTITLEMENT; this.accrualNetInfants = this.balance[3].ACCRUAL_NET_ENTITLEMENT;
} }
} }
/////////////////////////////////// ///////////////////////////////////
@ -192,7 +192,7 @@ export class EitListComponent implements OnInit {
this.EITTransactionsListObj.P_PAGE_NUM = this.P_PAGE_NUM; this.EITTransactionsListObj.P_PAGE_NUM = this.P_PAGE_NUM;
result.GetEITTransactionList.forEach(vr => { result.GetEITTransactionList.forEach(vr => {
console.log(vr.length); console.log(vr.length);
if(vr.length && vr.length != 0){ if (vr.length && vr.length != 0) {
if (vr.Collection_Transaction[0].ROW_NUM == vr.Collection_Transaction[0].NO_OF_ROWS) { if (vr.Collection_Transaction[0].ROW_NUM == vr.Collection_Transaction[0].NO_OF_ROWS) {
this.IsReachEnd = true; this.IsReachEnd = true;
} else { } else {
@ -229,6 +229,9 @@ export class EitListComponent implements OnInit {
this.pAction = EIT_ACTION.UPDATE; this.pAction = EIT_ACTION.UPDATE;
this.cs.sharedService.setSharedData(this.getResEITTransactionList[i].Collection_Transaction, EITTransactionsRequest.SHARED_DATA); this.cs.sharedService.setSharedData(this.getResEITTransactionList[i].Collection_Transaction, EITTransactionsRequest.SHARED_DATA);
this.cs.sharedService.setSharedData(this.pAction, EITTransactionsRequest.SUBMIT_EIT_ACTION); this.cs.sharedService.setSharedData(this.pAction, EITTransactionsRequest.SUBMIT_EIT_ACTION);
// this.fillEitTransactionTable(i);
// this.navCtrl.push("AddEitPage");
// this.openEit(i);
this.openEitNew(i); this.openEitNew(i);
} }
deleteEIT(i) { deleteEIT(i) {
@ -378,7 +381,7 @@ export class EitListComponent implements OnInit {
} }
else if (item.APPLICATION_COLUMN_NAME == 'PEI_EXTRA_INFO_ID') { else if (item.APPLICATION_COLUMN_NAME == 'PEI_EXTRA_INFO_ID') {
obj.peiExtraInfoID = item.NUMBER_VALUE; obj.peiExtraInfoID = item.NUMBER_VALUE;
} }
} }
}// end for }// end for
@ -567,40 +570,40 @@ export class EitListComponent implements OnInit {
this.removeItems(item.Collection_Transaction[0].TRANSACTION_NUMBER); this.removeItems(item.Collection_Transaction[0].TRANSACTION_NUMBER);
} }
////////////////////////// //////////////////////////
// getUserDetails(){ // getUserDetails(){
// this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => { // this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => {
// if (user) { // if (user) {
// this.emp_no=user.EMPLOYEE_NUMBER; // this.emp_no=user.EMPLOYEE_NUMBER;
// } // }
// }); // });
// } // }
// public getAccrualBalance() { // public getAccrualBalance() {
// if (this.Sdate) { // if (this.Sdate) {
// let today = new Date(this.Sdate); // let today = new Date(this.Sdate);
// let day = today.getDate(); // let day = today.getDate();
// let month = today.getMonth() + 1; // let month = today.getMonth() + 1;
// let year = today.getFullYear(); // let year = today.getFullYear();
// let todayDate = month + '/' + day + '/' + year; // let todayDate = month + '/' + day + '/' + year;
// let effectiveDate = todayDate; // let effectiveDate = todayDate;
// const request = { // const request = {
// P_SELECTED_EMPLOYEE_NUMBER: this.emp_no, // P_SELECTED_EMPLOYEE_NUMBER: this.emp_no,
// P_EFFECTIVE_DATE: effectiveDate // P_EFFECTIVE_DATE: effectiveDate
// }; // };
// this.accrualService // this.accrualService
// .getAccrualBalances(request) // .getAccrualBalances(request)
// .subscribe((result: any) => { // .subscribe((result: any) => {
// this.handleAccrualResult(result); // this.handleAccrualResult(result);
// }); // });
// } // }
// } // }
// handleAccrualResult(result) { // handleAccrualResult(result) {
// if (this.cs.validResponse(result)) { // if (this.cs.validResponse(result)) {
// this.balance=result.GetAccrualBalancesList; // this.balance=result.GetAccrualBalancesList;
// } // }
// } // }
} }
////////////////////////////////up ////////////////////////////////up

@ -1,25 +1,25 @@
<app-generic-header <ion-header>
showBack="true" <ion-toolbar class="header-toolbar-new">
[headerText]="'eit, update-title' | translate"> <nav-buttons></nav-buttons>
</app-generic-header> <ion-title color="light">{{'eit, update-title' | translate}}</ion-title>
</ion-toolbar>
</ion-header>
<ion-content padding> <ion-content padding>
<!-- <button ion-button (click)="resubmitEit()">next</button> --> <!-- <button ion-button (click)="resubmitEit()">next</button> -->
<div *ngIf="notificationBodyRes?.length > 0 "> <div *ngIf="notificationBodyRes?.length > 0 ">
<ion-card *ngFor="let item of notificationBodyRes; let i=index "> <ion-card *ngFor="let item of notificationBodyRes; let i=index ">
<ion-card-header class="hrTitle" style="background: #024d71;"> <ion-card-header class="hrTitle">
<div class="hrTitle">{{'worklistMain, notfDetails' | translate}} </div> <div class="hrTitle">{{'worklistMain, notfDetails' | translate}} </div>
<!-- <button ion-button icon-only *ngIf="item.Collection_Notification[0].ACTION!='DELETE_ROW'" (click)="updateEitNot(i)"> <!-- <button ion-button icon-only *ngIf="item.Collection_Notification[0].ACTION!='DELETE_ROW'" (click)="updateEitNot(i)">
<ion-icon name="create"></ion-icon> <ion-icon name="create"></ion-icon>
</button> --> </button> -->
<div [ngClass]=" direction === 'en' ? 'editIconDiv' : 'editIconDiv-ar'"><button style="background: #024d71;" ion-button *ngIf="item.Collection_Notification[0].ACTION!='DELETE_ROW'" (click)="updateEitNot(i)"> <div class="editIconDiv"><button ion-button *ngIf="item.Collection_Notification[0].ACTION!='DELETE_ROW'" (click)="updateEitNot(i)">
<img class="imgSize" src="../assets/imgs/profile-icons/editingWhite.png"></button> <img class="imgSize" src="../assets/imgs/edit.png"></button>
</div> </div>
</ion-card-header> </ion-card-header>
@ -29,7 +29,7 @@
<div *ngFor="let notificationBody of item.Collection_Notification "> <div *ngFor="let notificationBody of item.Collection_Notification ">
<ion-row *ngIf=" notificationBody.DISPLAY_FLAG != 'N' "> <ion-row *ngIf=" notificationBody.DISPLAY_FLAG != 'N' ">
<ion-col class="colBold"> <ion-col class="colBold">
<label style="color:#024d71;font-weight: bold;" class="label" for="">{{notificationBody.SEGMENT_PROMPT}}</label> <label style="color:#BE332F;font-weight: bold;" class="label" for="">{{notificationBody.SEGMENT_PROMPT}}</label>
<!-- </ion-col> <!-- </ion-col>
<ion-col class="colBold"> --> <ion-col class="colBold"> -->
<br> <br>

@ -1,25 +1,19 @@
.addEitOkButton{ .addEitOkButton {
white-space: normal !important; white-space: normal !important;
text-transform: capitalize !important; text-transform: capitalize !important;
min-height: 45px !important; min-height: 45px !important;
min-width: 5px !important; min-width: 5px !important;
margin: 8px !important; margin: 8px !important;
background-color: #024d71; background-color: #BE332F;
width: 80% !important; width: 80% !important;
color: white!important; color: white !important;
border-radius: 16px !important; border-radius: 16px !important;
} --border-radius: 16px !important;
--box-shadow: none;
}
.editIconDiv{ .editIconDiv {
right: 10px; right: 10px;
position: absolute; position: absolute;
top: 10px; top: 10px;
} }
.editIconDiv-ar{
left: 10px;
position: absolute;
top: 10px;
}

@ -5,7 +5,6 @@ import { Component, OnInit } from '@angular/core';
import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { CommonService } from 'src/app/hmg-common/services/common/common.service';
import { EITNotificatonBodyResponse } from '../models/EITNotificationBodyRes'; import { EITNotificatonBodyResponse } from '../models/EITNotificationBodyRes';
import { EitService } from '../services/eit.service'; import { EitService } from '../services/eit.service';
import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service";
@Component({ @Component({
selector: 'app-eit-update-list', selector: 'app-eit-update-list',
@ -24,9 +23,8 @@ export class EitUpdateListComponent implements OnInit {
private eitTransactionTbl: any = []; private eitTransactionTbl: any = [];
private eitRequest: EitRequest; private eitRequest: EitRequest;
private descFlex: string; private descFlex: string;
direction: string;
constructor(public cs: CommonService, public eitService: EitService, public modalController: ModalController, private ts: TranslatorService) { constructor(public cs: CommonService, public eitService: EitService, public modalController: ModalController) {
this.notificationBodyRes = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.SHARED_DATA, false); this.notificationBodyRes = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.SHARED_DATA, false);
let notification = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); let notification = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false);
this.itemKey = notification.ITEM_KEY; this.itemKey = notification.ITEM_KEY;
@ -34,7 +32,6 @@ export class EitUpdateListComponent implements OnInit {
this.functionName = notification.FUNCTION_NAME; this.functionName = notification.FUNCTION_NAME;
this.selEmp = notification.SELECTED_EMPLOYEE_NUMBER; this.selEmp = notification.SELECTED_EMPLOYEE_NUMBER;
this.descFlex = notification.DESC_FLEX_CONTEXT_CODE; this.descFlex = notification.DESC_FLEX_CONTEXT_CODE;
this.direction = TranslatorService.getCurrentLanguageName();
this.fillEitTransactionTable(); this.fillEitTransactionTable();
} }
@ -70,13 +67,12 @@ export class EitUpdateListComponent implements OnInit {
} }
updateTransactionList(list) { updateTransactionList(list) {
// list.forEach(element => { list.forEach(element => {
// const index = this.eitTransactionTbl.findIndex(x => x.TRANSACTION_NUMBER === element.TRANSACTION_NUMBER); const index = this.eitTransactionTbl.findIndex(x => x.TRANSACTION_NUMBER === element.TRANSACTION_NUMBER);
// if (index != -1) if (index != -1)
// this.eitTransactionTbl.splice(index, 1); this.eitTransactionTbl.splice(index, 1);
// }); });
// this.eitTransactionTbl = this.eitTransactionTbl ? this.eitTransactionTbl.concat(list) : list; this.eitTransactionTbl = this.eitTransactionTbl ? this.eitTransactionTbl.concat(list) : list;
this.eitTransactionTbl = list;
} }
resubmitEit() { resubmitEit() {

@ -12,8 +12,8 @@ ion-item.custCollabs.item.item-block.item-ios {
border-bottom: 1px solid #c8c8c8; border-bottom: 1px solid #c8c8c8;
} }
.header-toolbar-new{ .header-toolbar-new {
--background: #024d71; --background: #BE332F;
} }
ion-item.item.item-block { ion-item.item.item-block {
@ -25,6 +25,7 @@ ion-item.item.item-block {
ion-item.childItem.item.item-block { ion-item.childItem.item.item-block {
padding: 0px 5px; padding: 0px 5px;
width: 100%; width: 100%;
ion-label.label.label-md, ion-label.label.label-md,
ion-label.label.label-ios { ion-label.label.label-ios {
-webkit-box-shadow: none; -webkit-box-shadow: none;
@ -46,9 +47,11 @@ ion-item.item.item-block {
padding: 0px 10px; padding: 0px 10px;
min-height: 40px; min-height: 40px;
} }
div.notSelected { div.notSelected {
padding: 0px 10px; padding: 0px 10px;
} }
// ion-label.label.label-md, // ion-label.label.label-md,
// ion-label.label.label-ios { // ion-label.label.label-ios {
} }
@ -56,40 +59,43 @@ ion-item.item.item-block {
ion-icon::before { ion-icon::before {
line-height: 2; line-height: 2;
} }
.arrow-down{
.arrow-down {
position: absolute; position: absolute;
top: 0; top: 0;
right:0; right: 0;
} }
// .list-md > .item-block:last-child .item-inner, // .list-md > .item-block:last-child .item-inner,
// .list-ios > .item-block:last-child .item-inner{ // .list-ios > .item-block:last-child .item-inner{
// border-bottom: 1px solid #dedede; // border-bottom: 1px solid #dedede;
// } // }
.span-arrow-en{ .span-arrow-en {
float: right; float: right;
font-size: 25px; font-size: 25px;
color: grey; color: grey;
transform: rotate(0deg); transform: rotate(0deg);
} }
.span-arrow-ar{ .span-arrow-ar {
float: left; float: left;
font-size: 25px; font-size: 25px;
color: grey; color: grey;
transform: rotate(180deg); transform: rotate(180deg);
} }
.arrow-forward{ .arrow-forward {
float: right; float: right;
font-size: 25px; font-size: 25px;
color: grey; color: grey;
} }
.arrow-forward-ar{
.arrow-forward-ar {
float: left; float: left;
font-size: 25px; font-size: 25px;
color: grey; color: grey;
-webkit-transform: rotate(180deg); -webkit-transform: rotate(180deg);
transform: rotate(180deg); transform: rotate(180deg);
} }

@ -1,53 +1,52 @@
.rowBtn{ .rowBtn {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.Header{ .Header {
color: black !important; color: black !important;
font-size: 25px !important; font-size: 25px !important;
font-weight: bold !important;; font-weight: bold !important;
;
margin: 0; margin: 0;
text-align: center; text-align: center;
margin-bottom: 20px; margin-bottom: 20px;
} }
.labelRadio{ .labelRadio {
color: black !important; color: black !important;
font-weight: bold !important; font-weight: bold !important;
padding-bottom: 20px; padding-bottom: 20px;
} }
.labelcheck{ .labelcheck {
color: red !important; color: red !important;
font-weight: bold !important; font-weight: bold !important;
margin-bottom: 10px; margin-bottom: 10px;
} }
.submitOkButton{ .submitOkButton {
white-space: normal !important; white-space: normal !important;
text-transform: capitalize !important; text-transform: capitalize !important;
min-height: 45px !important; min-height: 45px !important;
min-width: 5px !important; min-width: 5px !important;
margin: 8px !important; margin: 8px !important;
--background:: #024d71; --background: #BE332F;
width: 100% !important; width: 100% !important;
color: white!important; color: white !important;
border-radius: 16px !important; border-radius: 16px !important;
} }
.submitCancelButton{
.submitCancelButton {
white-space: normal !important; white-space: normal !important;
text-transform: capitalize !important; text-transform: capitalize !important;
min-height: 45px !important; min-height: 45px !important;
min-width: 5px !important; min-width: 5px !important;
margin: 8px !important; margin: 8px !important;
--background:: #024d71; --background: #BE332F;
width: 100% !important; width: 100% !important;
color: white!important; color: white !important;
border-radius: 16px !important; border-radius: 16px !important;
} }

@ -21,7 +21,7 @@ import { TranslatePipe } from './pipes/translate/translate.pipe';
import { DatePipeTransform } from './pipes/date/date.pipe'; import { DatePipeTransform } from './pipes/date/date.pipe';
import { AlertControllerService } from './ui/alert/alert-controller.service'; import { AlertControllerService } from './ui/alert/alert-controller.service';
import { DateTimePipe } from './pipes/date-time/date-time.pipe'; import { DateTimePipe } from './pipes/date-time/date-time.pipe';
// import { ThemeableBrowser } from '@ionic-native/themeable-browser/ngx'; import { ThemeableBrowser } from '@ionic-native/themeable-browser/ngx';
import { LaunchNavigator } from '@ionic-native/launch-navigator/ngx'; import { LaunchNavigator } from '@ionic-native/launch-navigator/ngx';
import { SafeHtmlPipe } from './pipes/safe-html/safe-html.pipe'; import { SafeHtmlPipe } from './pipes/safe-html/safe-html.pipe';
import { BackButtonComponent } from './ui/back-button/back-button.component'; import { BackButtonComponent } from './ui/back-button/back-button.component';
@ -78,7 +78,7 @@ import { RouterModule } from '@angular/router';
import { HeaderButtonComponent } from './ui/header-button/header-button.component'; import { HeaderButtonComponent } from './ui/header-button/header-button.component';
import { AppRate } from '@ionic-native/app-rate/ngx'; import { AppRate } from '@ionic-native/app-rate/ngx';
import { RatingService } from './services/rating/rating.service'; import { RatingService } from './services/rating/rating.service';
// import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { RateService } from './services/rate/rate.service'; import { RateService } from './services/rate/rate.service';
import { MenuService } from './services/menu/menuservice.service'; import { MenuService } from './services/menu/menuservice.service';
import { ReplacementListComponent } from '../vacation-rule/replacement-list/replacement-list.component'; import { ReplacementListComponent } from '../vacation-rule/replacement-list/replacement-list.component';
@ -99,7 +99,7 @@ import { ConfirmLoginComponent } from '../authentication/confirm-login/confirm-l
import { WelcomeComponent } from './ui/welcome-login/welcome.component' import { WelcomeComponent } from './ui/welcome-login/welcome.component'
import { FabButtonComponent } from './ui/fab-button/fab-button.component' import { FabButtonComponent } from './ui/fab-button/fab-button.component'
import { AttendScanService } from './services/attend-services/attend-scan.service'; import { AttendScanService } from './services/attend-services/attend-scan.service';
// import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx'; import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx';
import { NgCircleProgressModule } from 'ng-circle-progress'; import { NgCircleProgressModule } from 'ng-circle-progress';
import { CardFilterComponent } from './ui/card-filter/card-filter.component'; import { CardFilterComponent } from './ui/card-filter/card-filter.component';
import { EmployeeInformationComponent } from './ui/employee-information/employee-information.component'; import { EmployeeInformationComponent } from './ui/employee-information/employee-information.component';
@ -108,7 +108,7 @@ import { NgCalendarModule } from 'ionic2-calendar';
import { DateInfoModalComponent } from './ui/circle-calendar/date-info-modal/date-info-modal.component'; import { DateInfoModalComponent } from './ui/circle-calendar/date-info-modal/date-info-modal.component';
import { ChartModule } from 'primeng/chart'; import { ChartModule } from 'primeng/chart';
import { GenericHeaderComponent } from './ui/generic-header/generic-header.component'; import { GenericHeaderComponent } from './ui/generic-header/generic-header.component';
// import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx'; import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
import { AttendanceOptionsComponent } from '../home/attendance-options/attendance-options.component'; import { AttendanceOptionsComponent } from '../home/attendance-options/attendance-options.component';
import { CardCalendarComponent } from './ui/card-calendar/card-calendar.component'; import { CardCalendarComponent } from './ui/card-calendar/card-calendar.component';
import { WorklistSettingComponent } from '../notification/worklist-setting/worklist-setting.component'; import { WorklistSettingComponent } from '../notification/worklist-setting/worklist-setting.component';
@ -287,7 +287,7 @@ import { SanitizeHtmlPipe } from '../itemforsale/services/domsafe';
Globalization, Globalization,
SharedDataService, SharedDataService,
AlertControllerService, AlertControllerService,
// ThemeableBrowser, ThemeableBrowser,
LaunchNavigator, LaunchNavigator,
ProjectsService, ProjectsService,
NationalityService, NationalityService,
@ -309,14 +309,14 @@ import { SanitizeHtmlPipe } from '../itemforsale/services/domsafe';
Diagnostic, Diagnostic,
AppRate, AppRate,
RatingService, RatingService,
// InAppBrowser, InAppBrowser,
RateService, RateService,
Camera, Camera,
File, File,
MenuService, MenuService,
OpenNativeSettings, OpenNativeSettings,
// BarcodeScanner, BarcodeScanner,
// BackgroundGeolocation, BackgroundGeolocation,
FileOpener, FileOpener,
FilePath, FilePath,
FileChooser, FileChooser,

@ -1,9 +1,9 @@
import { Injectable } from "@angular/core"; import { Injectable } from "@angular/core";
// import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx'; import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
import { CommonService } from "src/app/hmg-common/services/common/common.service"; import { CommonService } from "src/app/hmg-common/services/common/common.service";
import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service"; import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service";
import { DevicePermissionsService } from 'src/app/hmg-common/services/device-permissions/device-permissions.service'; import { DevicePermissionsService } from 'src/app/hmg-common/services/device-permissions/device-permissions.service';
// import { Geolocation } from '@ionic-native/geolocation/ngx'; import { Geolocation } from '@ionic-native/geolocation/ngx';
import { Platform } from "@ionic/angular"; import { Platform } from "@ionic/angular";
declare const cordova: any; declare const cordova: any;
@ -13,10 +13,10 @@ declare const cordova: any;
}) })
export class HMGUtils { export class HMGUtils {
constructor( constructor(
// public backgroundGeolocation: BackgroundGeolocation, public backgroundGeolocation: BackgroundGeolocation,
public common: CommonService, public common: CommonService,
public ts: TranslatorService, public ts: TranslatorService,
// private geolocation: Geolocation, private geolocation: Geolocation,
public platform: Platform, public platform: Platform,
public devicePermissionsService:DevicePermissionsService, public devicePermissionsService:DevicePermissionsService,
) { } ) { }
@ -98,32 +98,32 @@ export class HMGUtils {
} }
private getGMSLocation(callBack: Function) { private getGMSLocation(callBack: Function) {
// this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => { this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => {
// if (resp && (resp.latitude && resp.longitude)) { if (resp && (resp.latitude && resp.longitude)) {
// const isFakeLocation = resp.isFromMockProvider || resp.mockLocationsEnabled; const isFakeLocation = resp.isFromMockProvider || resp.mockLocationsEnabled;
// const lat = resp.latitude; const lat = resp.latitude;
// const long = resp.longitude; const long = resp.longitude;
// callBack({"latitude":lat, "longitude":long, "isfake":isFakeLocation}) callBack({"latitude":lat, "longitude":long, "isfake":isFakeLocation})
// } else { } else {
// this.common.presentAlert(this.ts.trPK('home', 'position-error')); this.common.presentAlert(this.ts.trPK('home', 'position-error'));
// } }
// }, (error) => { }, (error) => {
// this.common.presentAlert(this.ts.trPK('home', 'position-error')); this.common.presentAlert(this.ts.trPK('home', 'position-error'));
// }); });
} }
private getIOSLocation(callBack: Function) { private getIOSLocation(callBack: Function) {
// this.geolocation.getCurrentPosition({ maximumAge: 3000, timeout: 10000, enableHighAccuracy: true }).then(resp => { this.geolocation.getCurrentPosition({ maximumAge: 3000, timeout: 10000, enableHighAccuracy: true }).then(resp => {
// if (resp && resp.coords.latitude && resp.coords.longitude) { if (resp && resp.coords.latitude && resp.coords.longitude) {
// const lat = resp.coords.latitude; const lat = resp.coords.latitude;
// const long = resp.coords.longitude; const long = resp.coords.longitude;
// callBack({"latitude":lat, "longitude":long, "isfake":false}) callBack({"latitude":lat, "longitude":long, "isfake":false})
// } else { } else {
// this.common.presentAlert(this.ts.trPK('home', 'position-error')); this.common.presentAlert(this.ts.trPK('home', 'position-error'));
// } }
// }).catch(error => { }).catch(error => {
// this.common.presentAlert(this.ts.trPK('home', 'position-error')); this.common.presentAlert(this.ts.trPK('home', 'position-error'));
// }); });
} }

@ -2,10 +2,10 @@ import { Injectable } from '@angular/core';
// import { DevicePermissionsService } from '../device-permissions/device-permissions.service'; // import { DevicePermissionsService } from '../device-permissions/device-permissions.service';
import { DomSanitizer } from '@angular/platform-browser'; import { DomSanitizer } from '@angular/platform-browser';
import { SharedDataService } from '../shared-data-service/shared-data.service'; import { SharedDataService } from '../shared-data-service/shared-data.service';
// import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx'; import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx';
import { AttendanceService } from 'src/app/home/services/attendance.services'; import { AttendanceService } from 'src/app/home/services/attendance.services';
// import { ZBar } from '@ionic-native/zbar/ngx'; import { ZBar } from '@ionic-native/zbar/ngx';
// import { Geolocation } from '@ionic-native/geolocation/ngx'; import { Geolocation } from '@ionic-native/geolocation/ngx';
import { attendanceSwipeScannerRequest } from 'src/app/home/models/attendanceSwipe.Request'; import { attendanceSwipeScannerRequest } from 'src/app/home/models/attendanceSwipe.Request';
import { AuthenticatedUser } from '../authentication/models/authenticated-user'; import { AuthenticatedUser } from '../authentication/models/authenticated-user';
import { CommonService } from '../common/common.service'; import { CommonService } from '../common/common.service';
@ -14,7 +14,7 @@ import { Response } from 'src/app/hmg-common/services/models/response';
import { Camera, CameraOptions, PictureSourceType} from '@ionic-native/Camera/ngx'; import { Camera, CameraOptions, PictureSourceType} from '@ionic-native/Camera/ngx';
import { DevicePermissionsService } from '../../services/device-permissions/device-permissions.service'; import { DevicePermissionsService } from '../../services/device-permissions/device-permissions.service';
import { Device } from '@ionic-native/device/ngx'; import { Device } from '@ionic-native/device/ngx';
// import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx'; import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
import { Platform } from '@ionic/angular'; import { Platform } from '@ionic/angular';
import { ModalController } from '@ionic/angular'; import { ModalController } from '@ionic/angular';
import { FirebaseX } from '@ionic-native/firebase-x/ngx'; import { FirebaseX } from '@ionic-native/firebase-x/ngx';
@ -37,17 +37,17 @@ export class AttendScanService {
public collection = 'CS'; public collection = 'CS';
constructor(private device: Device, constructor(private device: Device,
// private zbar: ZBar, private zbar: ZBar,
// private geolocation: Geolocation, private geolocation: Geolocation,
private attendance_service: AttendanceService, private attendance_service: AttendanceService,
// private barcodeScanner: BarcodeScanner, private barcodeScanner: BarcodeScanner,
private cameraController: Camera, private cameraController: Camera,
public sharedData: SharedDataService, public sharedData: SharedDataService,
private sanitizer: DomSanitizer, private sanitizer: DomSanitizer,
private permissions: DevicePermissionsService, private permissions: DevicePermissionsService,
public common: CommonService, public common: CommonService,
public ts: TranslatorService, public ts: TranslatorService,
// public backgroundGeolocation: BackgroundGeolocation, public backgroundGeolocation: BackgroundGeolocation,
public platform: Platform, public platform: Platform,
public modalController: ModalController, public modalController: ModalController,
public firebasex: FirebaseX, public firebasex: FirebaseX,
@ -135,22 +135,22 @@ export class AttendScanService {
} }
scanCode() { scanCode() {
// this.barcodeScanner this.barcodeScanner
// .scan() .scan()
// .then(barcodeData => { .then(barcodeData => {
// if (!barcodeData.cancelled) { if (!barcodeData.cancelled) {
// this.scannedResult = barcodeData; this.scannedResult = barcodeData;
// this.deviceID = this.device.uuid; this.deviceID = this.device.uuid;
// if (this.isFakeLocationUsed) { if (this.isFakeLocationUsed) {
// this.fakeSwipeAttendance(); this.fakeSwipeAttendance();
// } else { } else {
// this.swipeAttendance(); this.swipeAttendance();
// } }
// } }
// }) })
// .catch(err => { .catch(err => {
// console.log('Error', err); console.log('Error', err);
// }); });
} }
fakeSwipeAttendance() { fakeSwipeAttendance() {

@ -107,15 +107,14 @@ export class AuthenticationService {
this.setPublicFields(request); this.setPublicFields(request);
const user = this.getAuthenticatedUser(); const user = this.getAuthenticatedUser();
const oracleUserName = this.cs.sharedService.getSharedData('oracle-user-name', false); if (user) {
if (user && oracleUserName) {
const userName = this.cs.sharedService.getSharedData(LoginRequest.SHARED_DATA, false); const userName = this.cs.sharedService.getSharedData(LoginRequest.SHARED_DATA, false);
request.P_SESSION_ID = user.P_SESSION_ID; request.P_SESSION_ID = user.P_SESSION_ID;
request.MobileNumber = user.EMPLOYEE_MOBILE_NUMBER; request.MobileNumber = user.EMPLOYEE_MOBILE_NUMBER;
request.LogInTokenID = user.LogInTokenID; request.LogInTokenID = user.LogInTokenID;
request.TokenID = user.TokenID; request.TokenID = user.TokenID;
request.P_USER_NAME = oracleUserName; // '1100313582' ALWAYS USER NAME request.P_USER_NAME = userName; // '1100313582' ALWAYS USER NAME
request.UserName = oracleUserName; // '1100313582' request.UserName = userName; // '1100313582'
request.P_EMAIL_ADDRESS = user.EMPLOYEE_EMAIL_ADDRESS; request.P_EMAIL_ADDRESS = user.EMPLOYEE_EMAIL_ADDRESS;
if (AuthenticationService.requireRelogin) { if (AuthenticationService.requireRelogin) {
this.sessionTimeOutDialog(); this.sessionTimeOutDialog();
@ -147,7 +146,7 @@ export class AuthenticationService {
} else { } else {
mobileType = 'android'; mobileType = 'android';
} }
request.VersionID = 1.0; request.VersionID = 3.7;
request.Channel = 31; request.Channel = 31;
request.LanguageID = TranslatorService.getCurrentLanguageCode(); request.LanguageID = TranslatorService.getCurrentLanguageCode();
request.MobileType = mobileType; request.MobileType = mobileType;
@ -587,7 +586,6 @@ export class AuthenticationService {
// tslint:disable-next-line: max-line-length // tslint:disable-next-line: max-line-length
public insertMobileLoginInfo(request: GetLoginInfoRequest, onError: any, errorLabel: string, isPostNoLoad = false): Observable<GetLoginInfoResponse> { public insertMobileLoginInfo(request: GetLoginInfoRequest, onError: any, errorLabel: string, isPostNoLoad = false): Observable<GetLoginInfoResponse> {
this.authenticateRequest(request); this.authenticateRequest(request);
request.UserName = localStorage.getItem("user");
if (isPostNoLoad) { if (isPostNoLoad) {
return this.con.postNoLoad(AuthenticationService.insertMobileLoginInfo, request, onError, errorLabel); return this.con.postNoLoad(AuthenticationService.insertMobileLoginInfo, request, onError, errorLabel);
} else { } else {

@ -3,7 +3,6 @@ import { Response } from 'src/app/hmg-common/services/models/response';
import { AuthenticatedUser } from './authenticated-user'; import { AuthenticatedUser } from './authenticated-user';
import { PrivilageModel } from './privilage-model'; import { PrivilageModel } from './privilage-model';
export class SMSCheckResponse extends Response { export class SMSCheckResponse extends Response {
MemberLoginList: any = {};
BasicMemberInformation: any = {}; BasicMemberInformation: any = {};
AuthenticationTokenID: string; AuthenticationTokenID: string;
MemberInformationList:AuthenticatedUser[]; MemberInformationList:AuthenticatedUser[];

@ -13,7 +13,7 @@ import { AlertControllerService } from '../../ui/alert/alert-controller.service'
//import { Response } from "../models/response"; //import { Response } from "../models/response";
import { Response } from 'src/app/hmg-common/services/models/response'; import { Response } from 'src/app/hmg-common/services/models/response';
import { Location, DatePipe } from '@angular/common'; import { Location, DatePipe } from '@angular/common';
// import { ThemeableBrowser } from '@ionic-native/themeable-browser/ngx'; import { ThemeableBrowser } from '@ionic-native/themeable-browser/ngx';
import { BrowserConfig } from './models/browser-config'; import { BrowserConfig } from './models/browser-config';
import { import {
LaunchNavigator, LaunchNavigator,
@ -26,7 +26,7 @@ import { SharedDataService } from '../shared-data-service/shared-data.service';
import { Badge } from '@ionic-native/badge/ngx'; import { Badge } from '@ionic-native/badge/ngx';
import { LifeCycleService } from '../life-cycle/life-cycle.service'; import { LifeCycleService } from '../life-cycle/life-cycle.service';
import { Diagnostic } from '@ionic-native/diagnostic/ngx'; import { Diagnostic } from '@ionic-native/diagnostic/ngx';
// import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
@ -105,7 +105,7 @@ export class CommonService {
public toastController: ToastController, public toastController: ToastController,
public alertController: AlertControllerService, public alertController: AlertControllerService,
public alertControllerIonic: AlertController, public alertControllerIonic: AlertController,
// public themeableBrowser: ThemeableBrowser, public themeableBrowser: ThemeableBrowser,
public launchNavigation: LaunchNavigator, public launchNavigation: LaunchNavigator,
public platform: Platform, public platform: Platform,
public device: Device, public device: Device,
@ -113,7 +113,7 @@ export class CommonService {
public badge: Badge, public badge: Badge,
public lifeCycle: LifeCycleService, public lifeCycle: LifeCycleService,
public diagnostic: Diagnostic, public diagnostic: Diagnostic,
// public iab: InAppBrowser, public iab: InAppBrowser,
private menu: MenuController, private menu: MenuController,
) { } ) { }
@ -243,19 +243,6 @@ export class CommonService {
}); });
toast.present(); toast.present();
} }
async yellowToast(message: string) {
const toast = await this.toastController.create({
message: message,
showCloseButton: true,
position: 'top',
duration: 3000,
color: 'warning',
closeButtonText: this.ts.trPK('general', 'close')
});
toast.present();
}
async greenToast(message: string) { async greenToast(message: string) {
const toast = await this.toastController.create({ const toast = await this.toastController.create({
message: message, message: message,
@ -696,52 +683,52 @@ export class CommonService {
onSuccess?, onSuccess?,
successURLS?: string[] successURLS?: string[]
) { ) {
// this.platform.ready().then(() => { this.platform.ready().then(() => {
// const browser = this.iab.create( const browser = this.iab.create(
// url, url,
// '_blank', '_blank',
// 'closebuttoncolor=#60686b,hidenavigationbuttons=yes,hideurlbar=yes,zoom=no' 'closebuttoncolor=#60686b,hidenavigationbuttons=yes,hideurlbar=yes,zoom=no'
// ); );
// // browser.executeScript(...); // browser.executeScript(...);
// // browser.insertCSS(...); // browser.insertCSS(...);
// browser.on('loaderror').subscribe(event => { browser.on('loaderror').subscribe(event => {
// if (onFaild) { if (onFaild) {
// onFaild(); onFaild();
// } }
// browser.close(); browser.close();
// }); });
// /* /*
// browser.on('loadstop').subscribe(event => { browser.on('loadstop').subscribe(event => {
// // browser.insertCSS({ code: 'body{color: white;}' }); // browser.insertCSS({ code: 'body{color: white;}' });
// if (onSuccess) { if (onSuccess) {
// onSuccess(); onSuccess();
// } }
// }); });
// */ */
// browser.on('exit').subscribe(event => { browser.on('exit').subscribe(event => {
// if (onExit) { if (onExit) {
// onExit(); onExit();
// } }
// }); });
// browser.on('loadstart').subscribe(event => { browser.on('loadstart').subscribe(event => {
// if (successURLS) { if (successURLS) {
// successURLS.forEach((successURL, index) => { successURLS.forEach((successURL, index) => {
// if (event.url && event.url.indexOf(successURL) >= 0) { if (event.url && event.url.indexOf(successURL) >= 0) {
// // alert('load start found success url'); // alert('load start found success url');
// browser.close(); browser.close();
// if (onSuccess) { if (onSuccess) {
// onSuccess(); onSuccess();
// } }
// } }
// }); });
// } }
// }); });
// }); });
} }
public imageFromBase64(base64: string) { public imageFromBase64(base64: string) {
@ -1205,6 +1192,7 @@ export class CommonService {
this.nav.navigateForward(['/eit/homepage']); this.nav.navigateForward(['/eit/homepage']);
} }
public openMyTeamPage() { public openMyTeamPage() {
console.log('someeeeeeee');
this.nav.navigateForward(['/my-team/home']); this.nav.navigateForward(['/my-team/home']);
} }
public openMyTeamDetailPage() { public openMyTeamDetailPage() {
@ -1362,13 +1350,9 @@ export class CommonService {
public openAnnouncement() { public openAnnouncement() {
this.nav.navigateForward(['/backend-integrations/announcement']); this.nav.navigateForward(['/backend-integrations/announcement']);
} }
public openConcurrentReport(value: boolean) { public openConcurrentReport() {
const navigationExtras: NavigationExtras = {
queryParams: { this.nav.navigateForward(['/reports/concurrent-report']);
fromHome: value
}
};
this.nav.navigateForward(['/reports/concurrent-report'], navigationExtras);
} }
public openConcurrentTransaction() { public openConcurrentTransaction() {
@ -1616,14 +1600,9 @@ export class CommonService {
} }
public setFilterValues(data) { public setFilterValues(data) {
if (data.length > 0) { for (const notification of data) {
for (const notification of data) { this.filterKeys[notification.ITEM_TYPE] = notification.OPEN_NTF_NUMBER
this.filterKeys[notification.ITEM_TYPE] = notification.OPEN_NTF_NUMBER
}
} else {
this.filterKeys['HRSSA'] = 0;
} }
} }
@ -1632,7 +1611,7 @@ export class CommonService {
value: 0, value: 0,
name: 'HR', name: 'HR',
active: false, active: false,
color: '#18a169', color: '#c6903e',
key: 'HRSSA', key: 'HRSSA',
disable: false, disable: false,
total: 0 total: 0
@ -1707,7 +1686,7 @@ export class CommonService {
{ {
data: [0, 0, 0, 0, 0, 0, 0, 0], data: [0, 0, 0, 0, 0, 0, 0, 0],
backgroundColor: [ backgroundColor: [
'#18a169', '#c6903e',
'#3cb9d5', '#3cb9d5',
'#114475', '#114475',
'#38c9b3', '#38c9b3',

@ -1,64 +1,64 @@
// import { ThemeableBrowserOptions } from '@ionic-native/themeable-browser/ngx'; import { ThemeableBrowserOptions } from '@ionic-native/themeable-browser/ngx';
export class BrowserConfig { export class BrowserConfig {
// public static OPTIONS: ThemeableBrowserOptions = { public static OPTIONS: ThemeableBrowserOptions = {
// statusbar: { statusbar: {
// color: '#ffffffff' color: '#ffffffff'
// }, },
// toolbar: { toolbar: {
// height: 44, height: 44,
// color: '#f0f0f0ff' color: '#f0f0f0ff'
// }, },
// title: { title: {
// color: '#003264ff', color: '#003264ff',
// showPageTitle: true showPageTitle: true
// }, },
// backButton: { backButton: {
// image: 'back', image: 'back',
// imagePressed: 'back_pressed', imagePressed: 'back_pressed',
// align: 'left', align: 'left',
// event: 'backPressed' event: 'backPressed'
// }, },
// forwardButton: { forwardButton: {
// image: 'forward', image: 'forward',
// imagePressed: 'forward_pressed', imagePressed: 'forward_pressed',
// align: 'left', align: 'left',
// event: 'forwardPressed' event: 'forwardPressed'
// }, },
// closeButton: { closeButton: {
// image: 'close', image: 'close',
// imagePressed: 'close_pressed', imagePressed: 'close_pressed',
// align: 'left', align: 'left',
// event: 'closePressed' event: 'closePressed'
// }, },
// customButtons: [ customButtons: [
// { {
// image: 'share', image: 'share',
// imagePressed: 'share_pressed', imagePressed: 'share_pressed',
// align: 'right', align: 'right',
// event: 'sharePressed' event: 'sharePressed'
// } }
// ], ],
// menu: { menu: {
// image: 'menu', image: 'menu',
// imagePressed: 'menu_pressed', imagePressed: 'menu_pressed',
// title: 'Test', title: 'Test',
// cancel: 'Cancel', cancel: 'Cancel',
// align: 'right', align: 'right',
// items: [ items: [
// { {
// event: 'helloPressed', event: 'helloPressed',
// label: 'Hello World!' label: 'Hello World!'
// }, },
// { {
// event: 'testPressed', event: 'testPressed',
// label: 'Test!' label: 'Test!'
// } }
// ] ]
// }, },
// backButtonCanClose: true, backButtonCanClose: true,
// clearcache: true, clearcache: true,
// clearsessioncache: true, clearsessioncache: true,
// disallowoverscroll: 'yes' disallowoverscroll: 'yes'
// }; };
} }

@ -27,13 +27,9 @@ export class ConnectorService {
public static retryTimes = 0; public static retryTimes = 0;
public static timeOut = 180 * 1000; public static timeOut = 180 * 1000;
// public static host = 'https://uat.hmgwebservices.com/'; // public static host = 'http://mohemm-app-test.srca.org.sa:1010/';
// public static host = 'https://hmgwebservices.com/'; public static host = 'https://erptstapp.srca.org.sa/' //UAT
// public static host = 'http://10.0.50.241:4444/' // MOE live vpn // public static host = 'https://masaderapp.srca.org.sa/' //LIVE
// public static host = 'https://uathrmsys.moenergy.gov.sa/' //MOE UAT
public static host = 'https://hrmsys.moenergy.gov.sa/' // MOE ;LIVE

@ -1,74 +1,74 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
// import { ThemeableBrowser, ThemeableBrowserOptions, ThemeableBrowserObject } from '@ionic-native/themeable-browser/ngx'; import { ThemeableBrowser, ThemeableBrowserOptions, ThemeableBrowserObject } from '@ionic-native/themeable-browser/ngx';
import { Platform } from '@ionic/angular'; import { Platform } from '@ionic/angular';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
}) })
export class HmgBrowserService { export class HmgBrowserService {
// static options: ThemeableBrowserOptions = { static options: ThemeableBrowserOptions = {
// statusbar: { statusbar: {
// color: '#ffffffff' color: '#ffffffff'
// }, },
// toolbar: { toolbar: {
// height: 44, height: 44,
// color: '#f0f0f0ff' color: '#f0f0f0ff'
// }, },
// title: { title: {
// color: '#60686b', color: '#60686b',
// showPageTitle: true showPageTitle: true
// }, },
// backButton: { backButton: {
// image: 'back', image: 'back',
// imagePressed: 'back_pressed', imagePressed: 'back_pressed',
// align: 'left', align: 'left',
// event: 'backPressed' event: 'backPressed'
// }, },
// forwardButton: { forwardButton: {
// image: 'forward', image: 'forward',
// imagePressed: 'forward_pressed', imagePressed: 'forward_pressed',
// align: 'left', align: 'left',
// event: 'forwardPressed' event: 'forwardPressed'
// }, },
// closeButton: { closeButton: {
// image: 'close', image: 'close',
// imagePressed: 'close_pressed', imagePressed: 'close_pressed',
// align: 'left', align: 'left',
// event: 'closePressed' event: 'closePressed'
// }, },
// /* /*
// customButtons: [ customButtons: [
// { {
// image: 'share', image: 'share',
// imagePressed: 'share_pressed', imagePressed: 'share_pressed',
// align: 'right', align: 'right',
// event: 'sharePressed' event: 'sharePressed'
// } }
// ], ],
// menu: { menu: {
// image: 'menu', image: 'menu',
// imagePressed: 'menu_pressed', imagePressed: 'menu_pressed',
// title: 'Test', title: 'Test',
// cancel: 'Cancel', cancel: 'Cancel',
// align: 'right', align: 'right',
// items: [ items: [
// { {
// event: 'helloPressed', event: 'helloPressed',
// label: 'Hello World!' label: 'Hello World!'
// }, },
// { {
// event: 'testPressed', event: 'testPressed',
// label: 'Test!' label: 'Test!'
// } }
// ] ]
// }, },
// */ */
// backButtonCanClose: true backButtonCanClose: true
// }; };
// private browser: ThemeableBrowserObject; private browser: ThemeableBrowserObject;
constructor( constructor(
// private themeableBrowser: ThemeableBrowser, private themeableBrowser: ThemeableBrowser,
private platform: Platform private platform: Platform
) { } ) { }
@ -81,18 +81,18 @@ export class HmgBrowserService {
} }
private registerEvent(eventName: string, event: any) { private registerEvent(eventName: string, event: any) {
// if (this.browser) { if (this.browser) {
// this.browser.on(eventName).subscribe((data: any) => { this.browser.on(eventName).subscribe((data: any) => {
// if (event) { if (event) {
// event(); event();
// } }
// }); });
// } }
} }
public openURLThemable(url: string) { public openURLThemable(url: string) {
this.platform.ready().then(() => { this.platform.ready().then(() => {
// this.browser = this.themeableBrowser.create(url, '_blank', HmgBrowserService.options); this.browser = this.themeableBrowser.create(url, '_blank', HmgBrowserService.options);
}); });
} }

@ -11,5 +11,4 @@ export class MenuEntry {
public PROMPT: string; public PROMPT: string;
public REQUEST_TYPE: string; public REQUEST_TYPE: string;
public ATTACHMENT_REQUIRED: string; public ATTACHMENT_REQUIRED: string;
public REQ_ATTACHMENT_TIP: string;
} }

@ -115,18 +115,14 @@ export class TranslatorService {
public loadResources(onSuccess: any) { public loadResources(onSuccess: any) {
this.platform.ready().then(() => { this.platform.ready().then(() => {
var previousLanguage= localStorage.getItem(TranslatorService.LNG_KEY); this.nativeStorage.getItem(TranslatorService.LNG_KEY).then((previousLanguage: string) => {
if(previousLanguage){
// .then((previousLanguage: string) => {
TranslatorService.CURRENT_LANGUAGE = previousLanguage; TranslatorService.CURRENT_LANGUAGE = previousLanguage;
document.getElementById('lang').lang = previousLanguage;
this.loadTranslationAsset(onSuccess); this.loadTranslationAsset(onSuccess);
}else{ }, () => {
document.getElementById('lang').lang = 'en';
this.setCurrentLanguageToDefault(); this.setCurrentLanguageToDefault();
this.loadTranslationAsset(onSuccess); this.loadTranslationAsset(onSuccess);
}; });
}); });
} }
@ -183,24 +179,18 @@ export class TranslatorService {
public setCurrentLanguage(language: string) { public setCurrentLanguage(language: string) {
TranslatorService.CURRENT_LANGUAGE = language; TranslatorService.CURRENT_LANGUAGE = language;
this.events.publish(TranslatorService.CHANGE_EVENT); this.events.publish(TranslatorService.CHANGE_EVENT);
localStorage.setItem(TranslatorService.LNG_KEY, language); this.nativeStorage.setItem(TranslatorService.LNG_KEY, language).then(() => {
}, () => { });
} }
public switchLanguage() { public switchLanguage() {
// this.nativeStorage.getItem(TranslatorService.LNG_KEY).then((previousLanguage: string) => { this.nativeStorage.getItem(TranslatorService.LNG_KEY).then((previousLanguage: string) => {
var lang = localStorage.getItem(TranslatorService.LNG_KEY) this.setCurrentLanguage(this.getNextLanguage(previousLanguage));
if(lang){ }, () => {
this.setCurrentLanguage(this.getNextLanguage(lang)); this.setCurrentLanguage(this.getNextLanguage(TranslatorService.CURRENT_LANGUAGE));
}else{ });
this.setCurrentLanguage(this.getNextLanguage(TranslatorService.CURRENT_LANGUAGE));
}
//}, () => {
// });
} }
private getNextLanguage(currentLanguage: string) { private getNextLanguage(currentLanguage: string) {

@ -3,10 +3,12 @@
margin-left: 2%; margin-left: 2%;
margin-right: 2%; margin-right: 2%;
height: 4cm; height: 4cm;
box-shadow: 0px 0px 8px 2px #d5d5d5ab;
background: white; background: white;
margin-bottom: 0.3cm; margin-bottom: 0.3cm;
border-radius: 30px !important; // border-color: #ececec;
border: 1.3px solid #8b8b8b; border-style: solid;
border-width: 0.02cm;
} }
// .custom-button:hover { // .custom-button:hover {
@ -17,7 +19,7 @@
.icon { .icon{
margin-top: 0.7cm; margin-top: 0.7cm;
margin-left: 27%; margin-left: 27%;
margin-right: 27%; margin-right: 27%;

@ -2,5 +2,5 @@
<div class="main-container" [ngStyle]="active === true ? {'color': color} : {}"> <div class="main-container" [ngStyle]="active === true ? {'color': color} : {}">
<div class="main-container-radius" [ngStyle]="active === true ? {'color': '#ffffff'} : {'color': color}"></div> <div class="main-container-radius" [ngStyle]="active === true ? {'color': '#ffffff'} : {'color': color}"></div>
<span class="text-span" [ngStyle]="active === true ? {'color': '#024d71'} : {}">{{text}}</span> <span class="text-span" [ngStyle]="active === true ? {'color': '#BE332F'} : {}">{{text}}</span>
</div> </div>

@ -1,7 +1,7 @@
<div class="main-container" [ngStyle]="active === true ? {'background': color} : {}"> <div class="main-container" [ngStyle]="active === true ? {'background': color} : {}">
<div class="main-container-radius" [ngStyle]="active === true ? {'background-color': '#ffffff'} : {'background-color': color}"></div> <div class="main-container-radius" [ngStyle]="active === true ? {'background-color': '#ffffff'} : {'background-color': color}"></div>
<span *ngIf="text != 'All'" class="number-span" [ngStyle]="active === true ? {'color': '#ffffff'} : {}">{{value}}</span> <span *ngIf="text != 'All'" class="number-span" [ngStyle]="active === true ? {'color': '#ffffff'} : {}">{{value}}</span>
<span class="text-span text-span-moe" [ngStyle]="active === true ? {'color': '#ffffff'} : {}">{{text}}</span> <span class="text-span" [ngStyle]="active === true ? {'color': '#ffffff'} : {}">{{text}}</span>
</div> </div>

@ -1,5 +1,4 @@
import { Component, OnInit, Input } from '@angular/core'; import { Component, OnInit, Input } from '@angular/core';
import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
@Component({ @Component({
selector: 'app-card-filter', selector: 'app-card-filter',
@ -12,16 +11,8 @@ export class CardFilterComponent implements OnInit {
@Input() active: boolean; @Input() active: boolean;
@Input() color: string; @Input() color: string;
direction: string;
constructor() { } constructor() { }
ngOnInit() { ngOnInit() {}
this.direction = TranslatorService.getCurrentLanguageName();
console.log(this.direction);
if (this.direction == 'ar') {
this.text = 'الموارد البشرية';
}
}
} }

@ -1,111 +1,114 @@
.chart-modal .modal-Wrapper { .chart-modal .modal-Wrapper {
--background: rgb(116, 108, 108) !important; --background: rgb(116, 108, 108) !important;
--border-color:white!important ; --border-color: white !important;
width: 85%!important ; width: 85% !important;
height: 40px !important ; height: 40px !important;
} }
.navbar{ .navbar {
font-size: 10px !important; font-size: 10px !important;
--background: #024d71 !important; --background: #BE332F !important;
color: aliceblue !important; color: aliceblue !important;
} }
.menu { .menu {
margin-top: 0px !important; margin-top: 0px !important;
font-size: 35px !important; font-size: 35px !important;
background: #024d71; background: #BE332F;
color: aliceblue; color: aliceblue;
margin-left: 0px !important; margin-left: 0px !important;
} }
.person{ .person {
margin-left:100px !important; margin-left: 100px !important;
margin-top: 0px !important; margin-top: 0px !important;
font-size: 23px !important; font-size: 23px !important;
background: #024d71 !important; background: #BE332F !important;
color: aliceblue !important; color: aliceblue !important;
} }
.grid{ .grid {
margin-bottom: 550px !important; margin-bottom: 550px !important;
margin-top: 20px !important; margin-top: 20px !important;
margin-left: 15px !important; margin-left: 15px !important;
margin-right: 15px !important; margin-right: 15px !important;
background-color:white !important; background-color: white !important;
border-radius: 20px !important; border-radius: 20px !important;
height: 250px !important; height: 250px !important;
} }
.ionSliders{ .ionSliders {
margin: 0px !important; margin: 0px !important;
padding: 0px !important; padding: 0px !important;
} }
.ionSlide{ .ionSlide {
margin-top: 5px !important; margin-top: 5px !important;
margin-left: 190px !important; margin-left: 190px !important;
color: black !important; color: black !important;
} }
.dateLable{
.dateLable {
margin-left: 90px !important;
color: black !important; margin-left: 90px !important;
font-size: small !important; color: black !important;
margin-top: 15px !important; font-size: small !important;
} margin-top: 15px !important;
}
// h1{ // h1{
// font-size: 15px !important; // font-size: 15px !important;
// text-align: center !important; // text-align: center !important;
// } // }
.arrowDropright{ .arrowDropright {
margin-left:100px !important; margin-left: 100px !important;
font-size: 20px !important; font-size: 20px !important;
color: rgb(168, 165, 165) !important; color: rgb(168, 165, 165) !important;
margin-top: 15px !important; margin-top: 15px !important;
} }
.arrowDropleft{
font-size: 20px !important; .arrowDropleft {
font-size: 20px !important;
margin-left: 10px !important; margin-left: 10px !important;
margin-top: 15px !important; margin-top: 15px !important;
color: rgb(116, 108, 108) !important; color: rgb(116, 108, 108) !important;
} }
.ionLable{ .ionLable {
font-size: 10px !important; font-size: 10px !important;
} }
.number{ .number {
font-size: 18px !important; font-size: 18px !important;
font-weight: bolder !important; font-weight: bolder !important;
color: black !important; color: black !important;
} }
.header-div{ .header-div {
background:var(--primary); background: var(--primary);
background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%, var(--secondary) 59%, var(--customnavy) 100%);
background: -webkit-linear-gradient(45deg, (--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); background: -webkit-linear-gradient(45deg, (--primary) 0%, var(--secondary) 36%, var(--secondary) 59%, var(--customnavy) 100%);
background: #024d71; background: #BE332F;
// background: linear-gradient(90deg, #85C48D 0%, #85C48D 13%, #2BB5C6 98%, #2BB5C6 100%); // background: linear-gradient(90deg, #85C48D 0%, #85C48D 13%, #2BB5C6 98%, #2BB5C6 100%);
color:var(--light); color: var(--light);
text-transform: capitalize; text-transform: capitalize;
display: block; display: block;
position: relative; position: relative;
height: 210px; height: 210px;
margin-bottom:60px; margin-bottom: 60px;
// border-radius: 0px 0px 70px 70px; // border-radius: 0px 0px 70px 70px;
} }
.advanced-search-modal { .advanced-search-modal {
--height: 12cm !important; --height: 12cm !important;
--width: 80% !important; --width: 80% !important;
--border-radius: 0.4cm; --border-radius: 0.4cm;
} }

@ -7,12 +7,14 @@
display: block; display: block;
text-align: center; text-align: center;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
h2 { h2 {
font-size: 25px; font-size: 25px;
font-weight: bold; font-weight: bold;
margin: 0 auto; margin: 0 auto;
line-height: 36px; line-height: 36px;
} }
span { span {
width: 125px; width: 125px;
display: block; display: block;
@ -61,19 +63,22 @@
color: rgb(163, 163, 163) !important; color: rgb(163, 163, 163) !important;
} }
} }
.today-graph{
.today-graph {
display: block; display: block;
height: 127px; height: 127px;
width: 270px; width: 270px;
margin-left: -60px; margin-left: -60px;
} }
.today-graph-ar{
.today-graph-ar {
display: block; display: block;
height: 127px; height: 127px;
width: 270px; width: 270px;
margin-right: -70px; margin-right: -70px;
} }
.amountlabel{
.amountlabel {
color: black !important; color: black !important;
font-weight: bold !important; font-weight: bold !important;
font-size: 13px !important; font-size: 13px !important;
@ -82,136 +87,153 @@
display: block; display: block;
text-align: center; text-align: center;
} }
.rowlabel{
color: #a3a3a3 !important;
font-size: 13px !important;
font-family: WorkSans-Bold;
display: block;
width: 100%;
text-align: center;
padding: 1px;
}
.grid{
padding-bottom: -20px !important;
padding-top: -20px !important;
height: 360px !important;
} .rowlabel {
.liftcol{ color: #a3a3a3 !important;
border-right: 1px solid rgb(163, 163, 163) !important; font-size: 13px !important;
} font-family: WorkSans-Bold;
.liftcol-ar{ display: block;
width: 100%;
border-left: 1px solid rgb(163, 163, 163) !important; text-align: center;
} padding: 1px;
}
.rightcol{ .grid {
padding-bottom: -20px !important;
padding-top: -20px !important;
height: 360px !important;
margin-left: 5px !important; }
}
.gridrow{
border-top: 1px solid rgb(163, 163, 163) !important;
margin-left: 19px;
margin-right: 12px;
}
.div{
border: 1px solid #a3a3a3 !important;
border-radius: 10px;
margin-bottom:10px;
}
.div-ar{
border: 1px solid #a3a3a3 !important;
border-radius: 9px;
width: 264%;
margin-right: -302px;
}
.p0{
margin-bottom: -13px !important;
color: black !important;
font-weight: bold !important;
font-size: 14px !important;
margin-top: 8px;
text-align: center;
display: block;
width: 100%;
}
.p1{
margin-bottom: -7px !important;
color: black !important;
font-family: WorkSans-Bold !important;
font-size: 33px;
margin-top: 10px;
text-align: center;
display: block;
width: 100%;
}
.p2{
font-weight: bold !important;
font-size: 17px !important;
margin-bottom: 43px !important;
margin-top: 0px !important;
color: black !important;
font-weight: bold !important;
text-align: center;
display: block;
width: 100%;
}
.p3{
color: black !important;
font-weight: bold !important;
font-size: 19px;
margin-top: -43px;
text-align: center;
display: block;
width: 100%;
}
.p2-ar{ font-weight: bold !important; .liftcol {
font-size: 17px !important; border-right: 1px solid rgb(163, 163, 163) !important;
margin-bottom: 43px !important; }
margin-top: 0px !important;
color: black !important;
font-weight: bold !important;
margin-right: 33px;
}
.p3-ar{ /* margin-bottom: -72px !important; */
color: black !important;
font-weight: bold !important;
font-size: 19px;
margin-top: -43px;
margin-right: 27px;
}
.p4{ margin-bottom: 56px !important;
margin-top: -26px !important;
color: black !important;
}
// .pdiv{background-color: gray;height: 26px;}
.p5{
font-size: 14px;
text-align: center;
background-color: #024d71;
color: white;
margin-top: -13px;
margin-bottom: -3px;
height: 21px;
width: 110px;
padding-top: 7px;
padding-bottom: 21px;
border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;
}
.slider-container { .liftcol-ar {
padding-bottom: 20px;
} border-left: 1px solid rgb(163, 163, 163) !important;
.col{ }
border-bottom: 1px solid rgb(204, 204, 204);
border-right: 1px solid rgb(204, 204, 204);
} .rightcol {
.col-ar{
border-bottom: 1px solid rgb(204, 204, 204); margin-left: 5px !important;
border-left: 1px solid rgb(204, 204, 204); }
}
.gridrow {
border-top: 1px solid rgb(163, 163, 163) !important;
margin-left: 19px;
margin-right: 12px;
}
.div {
border: 1px solid #a3a3a3 !important;
border-radius: 10px;
margin-bottom: 10px;
}
.div-ar {
border: 1px solid #a3a3a3 !important;
border-radius: 9px;
width: 264%;
margin-right: -302px;
}
.p0 {
margin-bottom: -13px !important;
color: black !important;
font-weight: bold !important;
font-size: 14px !important;
margin-top: 8px;
text-align: center;
display: block;
width: 100%;
}
.p1 {
margin-bottom: -7px !important;
color: black !important;
font-family: WorkSans-Bold !important;
font-size: 33px;
margin-top: 10px;
text-align: center;
display: block;
width: 100%;
}
.p2 {
font-weight: bold !important;
font-size: 17px !important;
margin-bottom: 43px !important;
margin-top: 0px !important;
color: black !important;
font-weight: bold !important;
text-align: center;
display: block;
width: 100%;
}
.p3 {
color: black !important;
font-weight: bold !important;
font-size: 19px;
margin-top: -43px;
text-align: center;
display: block;
width: 100%;
}
.p2-ar {
font-weight: bold !important;
font-size: 17px !important;
margin-bottom: 43px !important;
margin-top: 0px !important;
color: black !important;
font-weight: bold !important;
margin-right: 33px;
}
.p3-ar {
/* margin-bottom: -72px !important; */
color: black !important;
font-weight: bold !important;
font-size: 19px;
margin-top: -43px;
margin-right: 27px;
}
.p4 {
margin-bottom: 56px !important;
margin-top: -26px !important;
color: black !important;
}
// .pdiv{background-color: gray;height: 26px;}
.p5 {
font-size: 14px;
text-align: center;
background-color: #BE332F;
color: white;
margin-top: -13px;
margin-bottom: -3px;
height: 21px;
width: 110px;
padding-top: 7px;
padding-bottom: 21px;
border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;
}
.slider-container {
padding-bottom: 20px;
}
.col {
border-bottom: 1px solid rgb(204, 204, 204);
border-right: 1px solid rgb(204, 204, 204);
}
.col-ar {
border-bottom: 1px solid rgb(204, 204, 204);
border-left: 1px solid rgb(204, 204, 204);
}

@ -54,16 +54,16 @@ export class DateInfoModalComponent implements OnInit {
public navParams: NavParams, public navParams: NavParams,
public ts: TranslatorService, public ts: TranslatorService,
public common: CommonService public common: CommonService
) { ) {
this.direction = TranslatorService.getCurrentDirection(); this.direction = TranslatorService.getCurrentDirection();
} }
ngOnInit() { ngOnInit() {
console.log(this.TODAYDATE); console.log(this.TODAYDATE);
this.excess = this.TODAYDATE.EXCESS_HRS; this.excess = this.TODAYDATE.EXCESS_HRS;
this.lateIn = this.TODAYDATE.LATE_IN_HRS; this.lateIn = this.TODAYDATE.LATE_IN_HRS;
this.shortage = this.TODAYDATE.SHORTAGE_HRS; this.shortage = this.TODAYDATE.SHORTAGE_HRS;
this.earlyOut = this.TODAYDATE.EARLY_OUT_HRS ; this.earlyOut = this.TODAYDATE.EARLY_OUT_HRS;
this.scheduleDate = this.TODAYDATE.SCHEDULE_DATE; this.scheduleDate = this.TODAYDATE.SCHEDULE_DATE;
this.assignData(this.SHIFTDETAILS.GetScheduleShiftsDetailsList[0]); this.assignData(this.SHIFTDETAILS.GetScheduleShiftsDetailsList[0]);
} }
@ -94,19 +94,19 @@ export class DateInfoModalComponent implements OnInit {
{ {
data: [this.percChart], data: [this.percChart],
backgroundColor: [ backgroundColor: [
'#024d71' '#BE332F'
], ],
borderWidth: 2 borderWidth: 2
}] }]
}; };
} }
slideChanged(ev) { slideChanged(ev) {
this.slides.getActiveIndex().then(index => { this.slides.getActiveIndex().then(index => {
const shiftDetails = this.SHIFTDETAILS.GetScheduleShiftsDetailsList[index]; const shiftDetails = this.SHIFTDETAILS.GetScheduleShiftsDetailsList[index];
this.assignData(shiftDetails); this.assignData(shiftDetails);
}); });
} }
getHeaderDay(date: any) { getHeaderDay(date: any) {
if (this.direction === 'ltr') { if (this.direction === 'ltr') {

@ -1,122 +1,186 @@
.team-member-container { .team-member-container{
// background: white;
// border-radius: 100px 20px 20px 100px;
// margin-top: 15px;
// font-family: WorkSans-Regular;
// border: 1px solid #ccc;
// border-radius: 15px;
// padding-bottom: 8px;
background: white; background: white;
/* margin-top: 2px; */ /* margin-top: 2px; */
font-family: WorkSans-Regular; font-family: WorkSans-Regular;
border: 1px solid #ccc; border: 1px solid #ccc;
border-radius: 15px; border-radius: 15px;
padding-bottom: 5px; padding-bottom: 8px;
margin-bottom: 15px; margin-bottom: 7px;
box-shadow: 0px 1px 5px #cdcdcd;
} }
.user-image { // .user-image-container{
// position: relative;
// width: 70px;
// height: 70px;
// display: block;
// margin: 0 auto;
// &:before{
// position: absolute;
// content: "";
// width: 20px;
// height: 20px;
// border-radius: 20px;
// border: 1px solid white;
// top: 0;
// right: 0;
// background-color: red;
// z-index: 9;
// }
// &.present:before{
// background-color: green !important;
// }
// }
.user-image{
// overflow: hidden;
// position: relative;
// display: block;
// width: 100%;
// height: 100%;
// border-radius: 80px;
// border: 1px solid #ccc;
// margin: 0px auto 6px;
img { img {
width: 60px; // width: 100%;
height: 60px; // max-height: 100%;
width: 74%;
border-radius: 30px; max-height: 74%;
margin: 5px; margin-top: 4px;
margin-left: 6px;
} }
} }
.employee-name { .employee-name{
display: inline-block; display: inline-block;
width: 80%; width: 80%;
.name{
.name { // font-size: 16px;
// color: black;
font-size: 16px; // // margin: 0;
text-overflow: ellipsis; // width: 100%;
white-space: nowrap; // text-overflow: ellipsis;
overflow: hidden; // white-space: nowrap;
margin-left: -10px;
margin-top: -5px;
text-align: left;
font-weight: bold;
line-height: 25px;
letter-spacing: -0.64px;
color: #2B353E;
opacity: 1;
font-family: 'Inter' !important;
}
.title {
font-family: 'Inter' !important;
line-height: 12px;
letter-spacing: -0.56px;
color: #575757;
opacity: 1;
font-size: 14px;
width: 100%;
text-overflow: ellipsis;
white-space: nowrap;
// overflow: hidden; // overflow: hidden;
display: block; // margin-left: -10px;
margin-left: -10px; // margin-top: -5px;
margin-top: -10px; // font-family: 'WorkSans-Bold';
font-size: 16px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
margin-left: -10px;
margin-top: -5px;
text-align: left;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 25px;
letter-spacing: -0.64px;
color: #2B353E;
opacity: 1;
}
.title{
// font-size: 13px;
// color: #888;
// width: 100%;
// text-overflow: ellipsis;
// white-space: nowrap;
// overflow: hidden;
// display: block;
// margin-left: -10px;
// margin-top: -6px;
// color: black;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 12px;
letter-spacing: -0.56px;
color: #575757;
opacity: 1;
font-size: 14px;
width: 100%;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
display: block;
margin-left: -10px;
margin-top: -10px;
} }
} }
.employee-name-ar { .employee-name-ar{
display: inline-block; display: inline-block;
width: 80%; width: 80%;
.name{
.name { // font-size: 16px;
font-size: 16px; // color: black;
text-overflow: ellipsis; // // margin: 0;
white-space: nowrap; // width: 100%;
overflow: hidden; // text-overflow: ellipsis;
margin-left: -10px; // white-space: nowrap;
margin-top: -5px;
text-align: right;
font-family: 'Inter' !important;
line-height: 25px;
letter-spacing: -0.64px;
color: #2B353E;
opacity: 1;
font-weight: bold;
}
.title {
font-family: 'Inter' !important;
line-height: 12px;
letter-spacing: -0.56px;
color: #575757;
opacity: 1;
font-size: 14px;
width: 100%;
text-overflow: ellipsis;
white-space: nowrap;
// overflow: hidden; // overflow: hidden;
display: block; // margin-left: -10px;
margin-left: -10px; // margin-top: -5px;
margin-top: -10px; // font-family: 'WorkSans-Bold';
font-size: 16px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
margin-left: -10px;
margin-top: -5px;
text-align: right;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 25px;
letter-spacing: -0.64px;
color: #2B353E;
opacity: 1;
}
.title{
// font-size: 13px;
// color: #888;
// width: 100%;
// text-overflow: ellipsis;
// white-space: nowrap;
// overflow: hidden;
// display: block;
// margin-left: -10px;
// margin-top: -6px;
// color: black;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 12px;
letter-spacing: -0.56px;
color: #575757;
opacity: 1;
font-size: 14px;
width: 100%;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
display: block;
margin-left: -10px;
margin-top: -10px;
} }
} }
.image-container{
.image-container {
width: 20%; width: 20%;
display: inline-block; display: inline-block;
text-align: center; text-align: center;
vertical-align: top; vertical-align: top;
margin-top: 5px; margin-top: 5px;
position: relative;
top: 12px;
} }
.swipe-information{
.swipe-information {
color: #888; color: #888;
font-size: 12px; font-size: 12px;
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
padding-top: 6px; padding-top: 6px;
margin-top: 6px; margin-top: 6px;
.check-in { .check-in {
font-size: 12px; font-size: 12px;
margin-right: 15px; margin-right: 15px;
} }
} }

@ -1,31 +1,33 @@
//test //test
.changeImgBtn{ .changeImgBtn {
margin: 0; margin: 0;
position: absolute; position: absolute;
top: 80%; top: 80%;
left: 53%; left: 53%;
-ms-transform: translate(-50%, -50%); -ms-transform: translate(-50%, -50%);
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
.btnImge{
// button{
border-color:transparent !important;
--background: #024d71 !important;
background: #024d71 !important;
height: 57px !important; .btnImge {
width: 60px !important; // button{
border-radius: 50% !important; border-color: transparent !important;
// } --background: #BE332F !important;
background: #BE332F !important;
}
//test height: 57px !important;
.changeIcon{ width: 60px !important;
background: #024d71 !important; border-radius: 50% !important;
border-radius: 50% !important; // }
width: 73px;
height: 55px; }
color: white !important;
width: 80px; //test
height: 71px; .changeIcon {
} background: #BE332F !important;
border-radius: 50% !important;
width: 73px;
height: 55px;
color: white !important;
width: 80px;
height: 71px;
}

@ -12,11 +12,6 @@
<img [src]="userImage"/> <img [src]="userImage"/>
</div> </div>
</ion-col> </ion-col>
<ion-col *ngIf="!showImage && moeImage" [size]="2" style="padding: 0;">
<div class="profile-image-container">
<img src="../assets/icon/moe-logo.png"/>
</div>
</ion-col>
<!-- *ngIf="getPassdirfromNotifiPage == true" --> <!-- *ngIf="getPassdirfromNotifiPage == true" -->
<ion-col *ngIf="updateDirection" [size]="2" style="padding: 0;" (click)="closeModal()"> <ion-col *ngIf="updateDirection" [size]="2" style="padding: 0;" (click)="closeModal()">
@ -24,8 +19,7 @@
<img style=" <img style="
width: 20px; width: 20px;
height: 20px; height: 20px;
position: absolute; margin-top: 5px;"
top: -30px;"
[src]="close" [src]="close"
/> />
</div> </div>

@ -1,4 +1,4 @@
.profile-image-container{ .profile-image-container {
display: block; display: block;
margin: 7px auto 0; margin: 7px auto 0;
width: 32px; width: 32px;
@ -6,13 +6,15 @@
border-radius: 100%; border-radius: 100%;
overflow: hidden; overflow: hidden;
text-align: center; text-align: center;
img{
img {
display: block; display: block;
margin: 0 auto; margin: 0 auto;
max-width: 100%; max-width: 100%;
} }
} }
.ion-title{
.ion-title {
color: white; color: white;
font-size: 0.5cm; font-size: 0.5cm;
font-weight: bold; font-weight: bold;
@ -21,10 +23,12 @@
text-align: center; text-align: center;
line-height: 46px; line-height: 46px;
} }
.header-toolbar-new { .header-toolbar-new {
--background: #024d71; --background: #BE332F;
} }
.setting-conatainer{
.setting-conatainer {
height: 40px !important; height: 40px !important;
width: 40px !important; width: 40px !important;
} }

@ -13,7 +13,6 @@ import { TranslatorService } from '../../services/translator/translator.service'
styleUrls: ['./generic-header.component.scss'], styleUrls: ['./generic-header.component.scss'],
}) })
export class GenericHeaderComponent implements OnInit { export class GenericHeaderComponent implements OnInit {
@Input() moeImage = true;
@Input() userImage = ''; @Input() userImage = '';
@Input() showImage = false; @Input() showImage = false;
@Input() showMenu = false; @Input() showMenu = false;

@ -1,9 +1,10 @@
.float-left{ .float-left {
float: left; float: left;
} }
ion-menu-button { ion-menu-button {
font-size: 0.8cm; font-size: 0.8cm;
color: white; color: white;
background: #024d71; background: #BE332F;
margin: 0 auto; margin: 0 auto;
} }

@ -1,28 +1,24 @@
.custom-button { .custom-button {
background: white; background: white;
margin-bottom: 0px;
border: 1px solid #ccc;
border-radius: 20px; border-radius: 20px;
width: 100%; width: 100%;
max-width: 105px; max-width: 105px;
height: 100px; height: 100px;
padding: 10px; padding: 10px;
min-width: 100px; min-width: 96px;
margin-bottom: 5px;
box-shadow: 0px 0px 5px #00000029;
margin-top: 2px;
} }
.iconBox { .iconBox {
display: block; display: block;
width: 100%; width: 100%;
position: static; position: static;
height: 40px;
} }
.iconBox img{
.iconBox img { margin: 0px auto 10px;
margin: 0px auto 10px !important;
display: block; display: block;
width: 35px; width: 35px;
height: 33px;
// max-width: 35%; // max-width: 35%;
} }
@ -30,12 +26,10 @@
display: block; display: block;
} }
.pClass { .pClass {
font-size: 8px; font-size: 9px;
text-align: center; text-align: center;
margin-top: 10px; margin-top: 10px;
color: #004D71; color: black;
font-weight: bold; font-weight: bold;
letter-spacing: 0px;
} }

@ -1,4 +1,4 @@
<div feedback class="custom-button" *ngIf="show" [ngStyle]="link === '0' ? {'padding': '0'} : {}"> <div feedback class="custom-button" *ngIf="show" [ngStyle]="link === '1' ? {} : {'pointer-events': 'none', 'opacity': '.8'}">
<div class="iconBox" *ngIf="link !== '0'"> <div class="iconBox" *ngIf="link !== '0'">
<img [src]="icon" class="icon"> <img [src]="icon" class="icon">
</div> </div>
@ -6,7 +6,7 @@
<ion-icon class="iconFab" name="finger-print"></ion-icon> <ion-icon class="iconFab" name="finger-print"></ion-icon>
</div> </div>
<div class="titleBox" [ngStyle]="link === '0' ? {'margin-left': '5px'} : {}"> <div class="titleBox" [ngStyle]="link === '0' ? {'margin-left': '5px'} : {}">
<span [ngStyle]="link === '4' ? {'visibility': 'hidden'} : {}">{{statsValue}}</span> <span>{{statsValue}}</span>
<p class="pClass" [ngStyle]="link === '0' ? {'width': '105%', 'margin-top': '12px'} : {}">{{returnTitle(title)}}</p> <p class="pClass" [ngStyle]="link === '0' ? {'width': '105%', 'margin-top': '12px'} : {}">{{returnTitle(title)}}</p>
</div> </div>
</div> </div>

@ -1,15 +1,12 @@
.custom-button { .custom-button {
box-shadow: 0px 0px 5px #00000029;
background: white; background: white;
margin-bottom: 5px; margin-bottom: 0px;
border: 1px solid #ccc;
border-radius: 20px; border-radius: 20px;
width: 200px; width: 200px;
max-width: 105px; max-width: 105px;
height: 160px; height: 160px;
padding: 10px; padding: 10px;
@media screen and (min-width: 200px) and (max-width:300px) {
width: 80px;
}
} }
.iconBox { .iconBox {
@ -22,7 +19,7 @@
// max-width: 45%; // max-width: 45%;
// padding-bottom: 5px; // padding-bottom: 5px;
// padding-top: 5px; // padding-top: 5px;
display: inline-block; display: block;
max-width: 67%; max-width: 67%;
padding-bottom: 9px; padding-bottom: 9px;
padding-top: 5px; padding-top: 5px;
@ -36,8 +33,8 @@
span { span {
font-size: 25px; font-size: 25px;
font-weight: bold; font-weight: bold;
color: #004D71; color: black;
text-align: center; text-align: -webkit-auto;
display: block; display: block;
} }
} }
@ -47,23 +44,13 @@ ion-app[dir="rtl"] .titleBox {
} }
.pClass { .pClass {
// color: #004D71; color: black;
// width: 85%; width: 85%;
// margin-top: 5px;
// font-weight: bold;
// text-align: -webkit-auto;
// display: block;
// font-size: 15px !important;
color: #004D71;
width: 100%;
margin-top: 5px; margin-top: 5px;
font-weight: bold; font-weight: bold;
text-align: center; text-align: -webkit-auto;
display: block; display: block;
font-size: 14px !important; font-size: 15px !important;
letter-spacing: 0px;
} }
.iconFab { .iconFab {

@ -1,4 +1,4 @@
<ion-content has-bouncing="false" class="ion-no-padding" style="position: inherit !important;"> <ion-content has-bouncing="false" class="ion-no-padding" >
<ion-grid padding> <ion-grid padding>
<!-- <ion-row> <!-- <ion-row>
<ion-col [size]="12"> <ion-col [size]="12">
@ -13,7 +13,7 @@
<ion-row style="margin-top: 50px;"> <ion-row>
<ion-col [size]="12"> <ion-col [size]="12">
<h1 class="heading1">{{welcome}} </h1> <h1 class="heading1">{{welcome}} </h1>
<p *ngIf="!user" class="text1">{{welcome_txt}} </p> <p *ngIf="!user" class="text1">{{welcome_txt}} </p>

@ -67,10 +67,6 @@
line-height: 1.5; line-height: 1.5;
} }
.heading1{
font-size: 26px !important;
}
.button-digital-id{ .button-digital-id{
--background: white !important; --background: white !important;
background: white !important; background: white !important;

@ -1,5 +1,5 @@
import { Component, OnInit, NgZone, VERSION } from "@angular/core"; import { Component, OnInit, NgZone, VERSION } from "@angular/core";
// import { NFC } from "@ionic-native/nfc/ngx"; import { NFC } from "@ionic-native/nfc/ngx";
import { CommonService } from "src/app/hmg-common/services/common/common.service"; import { CommonService } from "src/app/hmg-common/services/common/common.service";
import { Platform } from "@ionic/angular"; import { Platform } from "@ionic/angular";
import { AttendScanService } from "../../hmg-common/services/attend-services/attend-scan.service"; import { AttendScanService } from "../../hmg-common/services/attend-services/attend-scan.service";
@ -13,11 +13,11 @@ import { attendanceSwipeScannerRequest } from "src/app/home/models/attendanceSwi
import { Device } from "@ionic-native/device/ngx"; import { Device } from "@ionic-native/device/ngx";
import { AttendanceService } from "src/app/home/services/attendance.services"; import { AttendanceService } from "src/app/home/services/attendance.services";
import { Response } from "src/app/hmg-common/services/models/response"; import { Response } from "src/app/hmg-common/services/models/response";
// import { WifiWizard2 } from "@ionic-native/wifi-wizard-2/ngx"; import { WifiWizard2 } from "@ionic-native/wifi-wizard-2/ngx";
import { OpenNativeSettings } from '@ionic-native/open-native-settings/ngx'; import { OpenNativeSettings } from '@ionic-native/open-native-settings/ngx';
import { DevicePermissionsService } from 'src/app/hmg-common/services/device-permissions/device-permissions.service'; import { DevicePermissionsService } from 'src/app/hmg-common/services/device-permissions/device-permissions.service';
// import { Geolocation } from '@ionic-native/geolocation/ngx'; import { Geolocation } from '@ionic-native/geolocation/ngx';
// import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx'; import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
import { FirebaseX } from '@ionic-native/firebase-x/ngx'; import { FirebaseX } from '@ionic-native/firebase-x/ngx';
import { HMGUtils } from 'src/app/hmg-common/hmg_utils'; import { HMGUtils } from 'src/app/hmg-common/hmg_utils';
@ -53,7 +53,7 @@ export class AttendanceOptionsComponent implements OnInit {
constructor( constructor(
// private nfc: NFC, private nfc: NFC,
public common: CommonService, public common: CommonService,
public platform: Platform, public platform: Platform,
public attendScanService: AttendScanService, public attendScanService: AttendScanService,
@ -62,11 +62,11 @@ export class AttendanceOptionsComponent implements OnInit {
private device: Device, private device: Device,
private attendance_service: AttendanceService, private attendance_service: AttendanceService,
public ngZone: NgZone, public ngZone: NgZone,
// private wifiWizard2: WifiWizard2, private wifiWizard2: WifiWizard2,
private openNativeSettings: OpenNativeSettings, private openNativeSettings: OpenNativeSettings,
private devicePermissionsService:DevicePermissionsService, private devicePermissionsService:DevicePermissionsService,
// private geolocation: Geolocation, private geolocation: Geolocation,
// public backgroundGeolocation: BackgroundGeolocation, public backgroundGeolocation: BackgroundGeolocation,
public hmgUtils: HMGUtils public hmgUtils: HMGUtils
) {} ) {}
@ -88,31 +88,31 @@ export class AttendanceOptionsComponent implements OnInit {
} }
async checkNFCStatus(checkValue: string) { async checkNFCStatus(checkValue: string) {
// try { try {
// let nfcStatus = await this.nfc.enabled(); let nfcStatus = await this.nfc.enabled();
// console.log("nfc status >>>>>>>>>>" + nfcStatus); console.log("nfc status >>>>>>>>>>" + nfcStatus);
// if (nfcStatus === "NFC_OK") { if (nfcStatus === "NFC_OK") {
// this.deviceNFC = true; this.deviceNFC = true;
// if (checkValue === "two") { if (checkValue === "two") {
// this.startNFC(); this.startNFC();
// } }
// } }
// if (nfcStatus === null && checkValue === "two") { if (nfcStatus === null && checkValue === "two") {
// this.startNFC(); this.startNFC();
// } }
// } catch (err) { } catch (err) {
// console.log("Error reading tag", err); console.log("Error reading tag", err);
// if (err === "NO_NFC") { if (err === "NO_NFC") {
// this.deviceNFC = false; this.deviceNFC = false;
// } else if (err === "NFC_DISABLED") { } else if (err === "NFC_DISABLED") {
// this.deviceNFC = true; this.deviceNFC = true;
// if (checkValue === "two") { if (checkValue === "two") {
// this.common.presentAlert(this.ts.trPK("general", "nfc-settings")); this.common.presentAlert(this.ts.trPK("general", "nfc-settings"));
// } }
// } else if (checkValue === "two") { } else if (checkValue === "two") {
// this.common.presentAlert(this.ts.trPK("general", "nfc-error")); this.common.presentAlert(this.ts.trPK("general", "nfc-error"));
// } }
// } }
} }
public setServicesPrivilage() { public setServicesPrivilage() {
@ -154,15 +154,15 @@ export class AttendanceOptionsComponent implements OnInit {
} }
async startIOSNfc() { async startIOSNfc() {
// try { try {
// let tag = await this.nfc.scanTag(); let tag = await this.nfc.scanTag();
// console.log(JSON.stringify(tag)); console.log(JSON.stringify(tag));
// const serialNumber = this.nfc.bytesToHexString(tag.id); const serialNumber = this.nfc.bytesToHexString(tag.id);
// this.swipeAttendanceNFC(serialNumber); this.swipeAttendanceNFC(serialNumber);
// } catch (err) { } catch (err) {
// this.common.presentAlert(this.ts.trPK("general", "nfc-error")); this.common.presentAlert(this.ts.trPK("general", "nfc-error"));
// console.log("Error reading tag", err); console.log("Error reading tag", err);
// } }
} }
public async nfcModal() { public async nfcModal() {
@ -243,38 +243,38 @@ export class AttendanceOptionsComponent implements OnInit {
public async startWifi() { public async startWifi() {
const isAndroid = this.platform.is("android"); const isAndroid = this.platform.is("android");
const isIOS = this.platform.is("ios"); const isIOS = this.platform.is("ios");
// const isWifiEnabled = await this.wifiWizard2.isWifiEnabled(); const isWifiEnabled = await this.wifiWizard2.isWifiEnabled();
const versionType = this.device.version; const versionType = this.device.version;
const versionTypeInt = parseInt(versionType); const versionTypeInt = parseInt(versionType);
console.log('version type: ' + versionType); console.log('version type: ' + versionType);
console.log('version Type: ' + versionTypeInt); console.log('version Type: ' + versionTypeInt);
if(isAndroid && versionTypeInt > 10) { if(isAndroid && versionTypeInt > 10) {
// if(!isWifiEnabled){ if(!isWifiEnabled){
// this.showWifiNotEnabled(); this.showWifiNotEnabled();
// return; return;
// } }
} }
if (isIOS) { if (isIOS) {
// if(!isWifiEnabled){ if(!isWifiEnabled){
// this.showWifiNotEnabled(); this.showWifiNotEnabled();
// return; return;
// } }
} else if(isAndroid) { } else if(isAndroid) {
let locationPermission = await this.devicePermissionsService.requestLocationAutherization(); let locationPermission = await this.devicePermissionsService.requestLocationAutherization();
if (!locationPermission) { if (!locationPermission) {
return; return;
} }
// if(!isWifiEnabled){ if(!isWifiEnabled){
// this.wifiWizard2.setWifiEnabled(true).then(()=>{ this.wifiWizard2.setWifiEnabled(true).then(()=>{
// this.startWifi(); this.startWifi();
// }).catch((err) => { }).catch((err) => {
// console.debug(err); console.debug(err);
// }); });
// return; return;
// } }
} }
// opening wifi dailog if all above conditions are passed (isWifiEnabled == true) // opening wifi dailog if all above conditions are passed (isWifiEnabled == true)
let modal = await this.modalController.create({ let modal = await this.modalController.create({

@ -5,7 +5,7 @@ import { Routes, RouterModule } from '@angular/router';
import { HmgCommonModule } from '../hmg-common/hmg-common.module'; import { HmgCommonModule } from '../hmg-common/hmg-common.module';
import { IonicModule } from '@ionic/angular'; import { IonicModule } from '@ionic/angular';
import { HomePage } from './home.page'; import { HomePage } from './home.page';
// import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx'; import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx';
import { WorklistMainService } from '../notification/service/work-list.main.service'; import { WorklistMainService } from '../notification/service/work-list.main.service';
import { AttendanceOptionsComponent } from './attendance-options/attendance-options.component'; import { AttendanceOptionsComponent } from './attendance-options/attendance-options.component';
import { NfcModalComponent } from './nfc-modal/nfc-modal.component'; import { NfcModalComponent } from './nfc-modal/nfc-modal.component';
@ -36,7 +36,7 @@ const routes: Routes = [
WifiModalComponent WifiModalComponent
], ],
providers: [ providers: [
// BarcodeScanner, BarcodeScanner,
WorklistMainService WorklistMainService
], ],
entryComponents: [ entryComponents: [

@ -25,7 +25,7 @@
</ion-slides> </ion-slides>
</ion-row> </ion-row>
<ion-row *ngFor="let menuItem of menuEntries; let i=index" class="dynamic-form"> <ion-row *ngFor="let menuItem of menuEntries; let i=index">
<ion-col [size]="12"> <ion-col [size]="12">
<ion-label class="menu-label">{{menuItem.PROMPT}}</ion-label> <ion-label class="menu-label">{{menuItem.PROMPT}}</ion-label>
</ion-col> </ion-col>
@ -61,94 +61,6 @@
</ion-row> </ion-row>
</ion-row> </ion-row>
<div *ngIf="!menuEntries">
<ion-list style="background: transparent; margin-bottom: 10px;">
<ion-list-header>
<ion-skeleton-text [animated]="true" style="width: 90px"></ion-skeleton-text>
</ion-list-header>
<ion-item lines="none" style="--background: transparent">
<ion-thumbnail slot="start" style="height: 100px; width: 100px">
<ion-skeleton-text [animated]="true"></ion-skeleton-text>
</ion-thumbnail>
<ion-thumbnail slot="start" style="height: 100px; width: 100px">
<ion-skeleton-text [animated]="true"></ion-skeleton-text>
</ion-thumbnail>
<ion-thumbnail slot="start" style="height: 100px; width: 100px">
<ion-skeleton-text [animated]="true"></ion-skeleton-text>
</ion-thumbnail>
</ion-item>
</ion-list>
<div class="empty-div">
<ion-skeleton-text [animated]="true"></ion-skeleton-text>
</div>
<ion-list style="background: transparent">
<ion-list-header>
<ion-skeleton-text [animated]="true" style="width: 90px"></ion-skeleton-text>
</ion-list-header>
<ion-item lines="none" style="--background: transparent">
<ion-thumbnail slot="start" style="height: 100px; width: 100px;">
<ion-skeleton-text [animated]="true"></ion-skeleton-text>
</ion-thumbnail>
<ion-thumbnail slot="start" style="height: 100px; width: 100px">
<ion-skeleton-text [animated]="true"></ion-skeleton-text>
</ion-thumbnail>
<ion-thumbnail slot="start" style="height: 100px; width: 100px">
<ion-skeleton-text [animated]="true"></ion-skeleton-text>
</ion-thumbnail>
</ion-item>
</ion-list>
<ion-list style="background: transparent">
<ion-list-header>
<ion-skeleton-text [animated]="true" style="width: 90px"></ion-skeleton-text>
</ion-list-header>
<ion-item lines="none" style="--background: transparent">
<ion-thumbnail slot="start" style="height: 100px; width: 100px">
<ion-skeleton-text [animated]="true"></ion-skeleton-text>
</ion-thumbnail>
<ion-thumbnail slot="start" style="height: 100px; width: 100px">
<ion-skeleton-text [animated]="true"></ion-skeleton-text>
</ion-thumbnail>
<ion-thumbnail slot="start" style="height: 100px; width: 100px">
<ion-skeleton-text [animated]="true"></ion-skeleton-text>
</ion-thumbnail>
</ion-item>
</ion-list>
<ion-list style="background: transparent">
<ion-list-header>
<ion-skeleton-text [animated]="true" style="width: 90px"></ion-skeleton-text>
</ion-list-header>
<ion-item lines="none" style="--background: transparent">
<ion-thumbnail slot="start" style="height: 100px; width: 100px">
<ion-skeleton-text [animated]="true"></ion-skeleton-text>
</ion-thumbnail>
<ion-thumbnail slot="start" style="height: 100px; width: 100px">
<ion-skeleton-text [animated]="true"></ion-skeleton-text>
</ion-thumbnail>
<ion-thumbnail slot="start" style="height: 100px; width: 100px">
<ion-skeleton-text [animated]="true"></ion-skeleton-text>
</ion-thumbnail>
</ion-item>
</ion-list>
</div>
<!-- <ion-row *ngIf="showStaticServices"> <!-- <ion-row *ngIf="showStaticServices">
<ion-col size="12"> <ion-col size="12">
<ion-label> {{'general,other-services' | translate}} </ion-label> <ion-label> {{'general,other-services' | translate}} </ion-label>

@ -4,7 +4,7 @@ ion-row {
} }
.header-toolbar-new { .header-toolbar-new {
--background: #024d71; --background: #BE332F;
} }
.profile-image-container { .profile-image-container {
@ -43,23 +43,20 @@ ion-title {
ion-label { ion-label {
display: block; display: block;
color: #004D71 !important; color: black !important;
font-size: 16px; font-size: 14px;
font-weight: bold; font-weight: bold;
letter-spacing: 0.16px;
// margin: 0px 10px 10px 10px;
} }
.main-dashboard-container { .main-dashboard-container {
position: relative; position: relative;
width: 100%; width: 100%;
--background: #f5f5f5;
} }
.contentBg:before { .contentBg:before {
position: absolute; position: absolute;
content: ""; content: "";
background: #024d71; background: #BE332F;
height: 100px; height: 100px;
width: 100%; width: 100%;
left: 0; left: 0;
@ -77,14 +74,12 @@ ion-label {
.attendance-module { .attendance-module {
border-radius: 20px; border-radius: 20px;
background-color: #44A7A1; background-color: #c6903e;
padding: 10px; padding: 10px;
color: white; color: white;
width: 100%; width: 100%;
margin-top: 25px; margin-top: 25px;
margin-bottom: 0px; margin-bottom: 0px;
// margin-right: 10px !important;
margin-left: 5px !important;
h3 { h3 {
font-size: 18px; font-size: 18px;
@ -95,7 +90,6 @@ ion-label {
span { span {
font-size: 13px; font-size: 13px;
display: block; display: block;
margin-top: 5px;
} }
img { img {
@ -107,13 +101,12 @@ ion-label {
ion-button { ion-button {
border-radius: 10px; border-radius: 10px;
padding: 10px; padding: 10px;
background: #69b9b4; background: #91692d;
letter-spacing: 0px;
--background: transparent; --background: transparent;
--box-shadow: none !important; --box-shadow: none !important;
height: auto; height: auto;
min-height: inherit; min-height: inherit;
margin-top: 15px; margin-top: 10px;
font-size: 12px; font-size: 12px;
} }
} }
@ -156,7 +149,7 @@ ion-label {
// z-index: 2; // z-index: 2;
// height: 112px; // height: 112px;
// width: 112px; // width: 112px;
// background-color: #024d71; // background-color: #BE332F;
// border-radius: 50%; // border-radius: 50%;
// display: inline-block; // display: inline-block;
// img { // img {
@ -189,19 +182,4 @@ ion-label {
img { img {
width: 25px; width: 25px;
} }
}
ion-skeleton-text {
--border-radius: 15px;
--background: rgba(188, 0, 255, 0.065);
--background-rgb: 2, 77, 113;
}
.empty-div {
border-radius: 20px;
padding: 10px;
width: 100%;
margin-bottom: 20px;
margin-left: 5px !important;
height: 140px;
} }

@ -7,8 +7,8 @@ import { AuthenticatedUser } from 'src/app/hmg-common/services/authentication/mo
import { MenuService } from 'src/app/hmg-common/services/menu/menuservice.service'; import { MenuService } from 'src/app/hmg-common/services/menu/menuservice.service';
import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-response'; import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-response';
import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { CommonService } from 'src/app/hmg-common/services/common/common.service';
// import { Geolocation } from '@ionic-native/geolocation/ngx'; import { Geolocation } from '@ionic-native/geolocation/ngx';
// import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx'; import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx';
import { Device } from '@ionic-native/device/ngx'; import { Device } from '@ionic-native/device/ngx';
import { attendanceSwipeScannerRequest } from './models/attendanceSwipe.Request'; import { attendanceSwipeScannerRequest } from './models/attendanceSwipe.Request';
import { COCRequest } from 'src/app/notification/models/COCRequest'; import { COCRequest } from 'src/app/notification/models/COCRequest';
@ -37,8 +37,8 @@ import { TimeCardService } from '../time-card/service/time-card.service';
import { WorklistMainService } from '../notification/service/work-list.main.service'; import { WorklistMainService } from '../notification/service/work-list.main.service';
import { isThisISOWeek } from 'date-fns'; import { isThisISOWeek } from 'date-fns';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
// import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx'; import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
// import { NFC, Ndef } from "@ionic-native/nfc/ngx" import { NFC, Ndef } from "@ionic-native/nfc/ngx"
import { DigitalIdComponent } from '../authentication/digital-id/digital-id.component'; import { DigitalIdComponent } from '../authentication/digital-id/digital-id.component';
import { FirebaseX } from '@ionic-native/firebase-x/ngx'; import { FirebaseX } from '@ionic-native/firebase-x/ngx';
import { BusinessCardComponent } from "src/app/authentication/business-card/business-card.component"; import { BusinessCardComponent } from "src/app/authentication/business-card/business-card.component";
@ -54,7 +54,7 @@ export class HomePage implements OnInit {
userData: any = {}; userData: any = {};
userImage: any = '../assets/imgs/profile.png'; userImage: any = '../assets/imgs/profile.png';
menuList: any = []; menuList: any = [];
// zbarOptions: any; zbarOptions: any;
scannedResult: any; scannedResult: any;
notBadge: any; notBadge: any;
lat: any; lat: any;
@ -66,7 +66,6 @@ export class HomePage implements OnInit {
camera: boolean; camera: boolean;
ticketRequestObject: any; ticketRequestObject: any;
leaveRequestObject: any; leaveRequestObject: any;
businessLeaveRequestObject: any;
missingSwipeRequestObject: any; missingSwipeRequestObject: any;
public isShow = false; public isShow = false;
public showVcationRule = false; public showVcationRule = false;
@ -100,17 +99,10 @@ export class HomePage implements OnInit {
link: '3', link: '3',
show: true, show: true,
}, },
{
title: this.ts.trPK('home', 'business-balance'),
statsValue: 0,
icon: 'assets/icon/new-design/BusinessTrip.png',
link: '5',
show: true,
},
{ {
title: this.ts.trPK('eit', 'my-reports'), title: this.ts.trPK('eit', 'my-reports'),
statsValue: 0, statsValue: 0,
icon: 'assets/icon/new-design/ticket_balance.png', icon: 'assets/icon/new-design/report.png',
link: '4', link: '4',
show: true show: true
} }
@ -142,7 +134,6 @@ export class HomePage implements OnInit {
direction: string; direction: string;
public isPostNoLoad = true; public isPostNoLoad = true;
public showStaticServices = false; public showStaticServices = false;
public myRequestData: any;
constructor( constructor(
public ts: TranslatorService, public ts: TranslatorService,
@ -152,10 +143,10 @@ export class HomePage implements OnInit {
public common: CommonService, public common: CommonService,
public events: Events, public events: Events,
private device: Device, private device: Device,
// private geolocation: Geolocation, private geolocation: Geolocation,
private attendanceService: AttendanceService, private attendanceService: AttendanceService,
private eitService: EitService, private eitService: EitService,
// private barcodeScanner: BarcodeScanner, private barcodeScanner: BarcodeScanner,
public actionSheetCtrl: ActionSheetController, public actionSheetCtrl: ActionSheetController,
public sharedData: SharedDataService, public sharedData: SharedDataService,
private sanitizer: DomSanitizer, private sanitizer: DomSanitizer,
@ -167,9 +158,9 @@ export class HomePage implements OnInit {
public workListService: WorklistMainService, public workListService: WorklistMainService,
public router: Router, public router: Router,
private platform: Platform, private platform: Platform,
// public backgroundGeolocation: BackgroundGeolocation, public backgroundGeolocation: BackgroundGeolocation,
public modalController: ModalController, public modalController: ModalController,
// private nfc: NFC, private nfc: NFC,
public firebasex: FirebaseX public firebasex: FirebaseX
) { ) {
this.events.subscribe('img-change', displayImg => { this.events.subscribe('img-change', displayImg => {
@ -201,11 +192,11 @@ export class HomePage implements OnInit {
public slideSettingsTwo() { public slideSettingsTwo() {
const width = this.platform.width(); const width = this.platform.width();
this.slideOptsOne = { this.slideOptsOne = {
slidesPerView: width > 320 ? 3.4 : 3, slidesPerView: width > 320 ? 3.2 : 3,
spaceBetween: 10 spaceBetween: 10
}; };
this.slideOptsTwo = { this.slideOptsTwo = {
slidesPerView: width > 320 ? 3.4 : 2.4, slidesPerView: width > 320 ? 3.2 : 2.5,
spaceBetween: width > 320 ? 10 : 5 spaceBetween: width > 320 ? 10 : 5
}; };
this.showStaticServices = true; this.showStaticServices = true;
@ -280,32 +271,32 @@ export class HomePage implements OnInit {
this.location = granted as boolean; this.location = granted as boolean;
if (this.location) { if (this.location) {
if (this.platform.is('android')) { if (this.platform.is('android')) {
// this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => { this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => {
// if (resp && (resp.latitude && resp.longitude)) { if (resp && (resp.latitude && resp.longitude)) {
// if (resp.isFromMockProvider || resp.mockLocationsEnabled) { if (resp.isFromMockProvider || resp.mockLocationsEnabled) {
// this.isFakeLocationUsed = true; this.isFakeLocationUsed = true;
// } }
// this.lat = resp.latitude; this.lat = resp.latitude;
// this.longt = resp.longitude; this.longt = resp.longitude;
// this.attendance(); this.attendance();
// } else { } else {
// this.common.presentAlert(this.ts.trPK('home', 'position-error')); this.common.presentAlert(this.ts.trPK('home', 'position-error'));
// } }
// }, (error) => { }, (error) => {
// this.common.presentAlert(this.ts.trPK('home', 'position-error')); this.common.presentAlert(this.ts.trPK('home', 'position-error'));
// }); });
} else { } else {
// this.geolocation.getCurrentPosition({ maximumAge: 3000, timeout: 10000, enableHighAccuracy: true }).then(resp => { this.geolocation.getCurrentPosition({ maximumAge: 3000, timeout: 10000, enableHighAccuracy: true }).then(resp => {
// if (resp && resp.coords.latitude && resp.coords.longitude) { if (resp && resp.coords.latitude && resp.coords.longitude) {
// this.lat = resp.coords.latitude; this.lat = resp.coords.latitude;
// this.longt = resp.coords.longitude; this.longt = resp.coords.longitude;
// this.attendance(); this.attendance();
// } else { } else {
// this.common.presentAlert(this.ts.trPK('home', 'position-error')); this.common.presentAlert(this.ts.trPK('home', 'position-error'));
// } }
// }).catch(error => { }).catch(error => {
// this.common.presentAlert(this.ts.trPK('home', 'position-error')); this.common.presentAlert(this.ts.trPK('home', 'position-error'));
// }); });
} }
} else { } else {
return false; return false;
@ -318,7 +309,7 @@ export class HomePage implements OnInit {
if (servicePrivilage.Previlege === false) { if (servicePrivilage.Previlege === false) {
if (servicePrivilage.ServiceName === 'accrualBalance') { if (servicePrivilage.ServiceName === 'accrualBalance') {
this.statsButtons[3].show = false; this.statsButtons[3].show = false;
// this.statsButtons[4].show = false; this.statsButtons[4].show = false;
} }
if (servicePrivilage.ServiceName === 'vacationRule') { if (servicePrivilage.ServiceName === 'vacationRule') {
this.showVcationRule = false; this.showVcationRule = false;
@ -441,10 +432,6 @@ export class HomePage implements OnInit {
} else { } else {
this.events.publish('myTeamFlag', 'false'); this.events.publish('myTeamFlag', 'false');
} }
if (this.menuList[i].MENU_TYPE === 'E') {
this.myRequestData = this.menuList[i];
}
} }
// if (item.MENU_TYPE === 'M') { // if (item.MENU_TYPE === 'M') {
@ -530,10 +517,6 @@ export class HomePage implements OnInit {
// tslint:disable-next-line: triple-equals // tslint:disable-next-line: triple-equals
} else if (result.GetMenuEntriesList[i].FUNCTION_NAME == 'HMG_OTL_MISSING_SWIPE_EIT_SS') { } else if (result.GetMenuEntriesList[i].FUNCTION_NAME == 'HMG_OTL_MISSING_SWIPE_EIT_SS') {
this.missingSwipeRequestObject = result.GetMenuEntriesList[i]; this.missingSwipeRequestObject = result.GetMenuEntriesList[i];
} else if (result.GetMenuEntriesList[i].FUNCTION_NAME == 'XXX_HR_EIT_BUSINESS_MISSION_SS') {
this.businessLeaveRequestObject = result.GetMenuEntriesList[i];
} else if (result.GetMenuEntriesList[i].FUNCTION_NAME == 'MBL_PERFORMANCE_MANAGEMENT' && result.GetMenuEntriesList[i].REQUEST_TYPE == 'PMS') {
result.GetMenuEntriesList.splice(i, 1);
} }
} }
this.sortMenuEntires(result.GetMenuEntriesList); this.sortMenuEntires(result.GetMenuEntriesList);
@ -563,22 +546,22 @@ export class HomePage implements OnInit {
} }
scanCode() { scanCode() {
// this.barcodeScanner this.barcodeScanner
// .scan() .scan()
// .then(barcodeData => { .then(barcodeData => {
// if (!barcodeData.cancelled) { if (!barcodeData.cancelled) {
// this.scannedResult = barcodeData; this.scannedResult = barcodeData;
// this.deviceID = this.device.uuid; this.deviceID = this.device.uuid;
// if (this.isFakeLocationUsed) { if (this.isFakeLocationUsed) {
// this.fakeSwipeAttendance(); this.fakeSwipeAttendance();
// } else { } else {
// this.swipeAttendance(); this.swipeAttendance();
// } }
// } }
// }) })
// .catch(err => { .catch(err => {
// console.log('Error', err); console.log('Error', err);
// }); });
} }
fakeSwipeAttendance() { fakeSwipeAttendance() {
@ -803,7 +786,7 @@ export class HomePage implements OnInit {
// if (subMenu.REQUEST_TYPE === 'EIT' && subMenu.FUNCTION_NAME === 'XXX_HR_EIT_LOA_CREATE_SS') { // if (subMenu.REQUEST_TYPE === 'EIT' && subMenu.FUNCTION_NAME === 'XXX_HR_EIT_LOA_CREATE_SS') {
if (subMenu.REQUEST_TYPE === 'EIT') { if (subMenu.REQUEST_TYPE === 'EIT') {
// this.common.openAbsencePage(); // this.common.openAbsencePage();
this.common.openEitListPage(); this.common.openEitListPage();
} else if (subMenu.REQUEST_TYPE === 'EIT') { } else if (subMenu.REQUEST_TYPE === 'EIT') {
this.common.openEitListPage(); this.common.openEitListPage();
} else if (subMenu.REQUEST_TYPE === 'PAYSLIP') { } else if (subMenu.REQUEST_TYPE === 'PAYSLIP') {
@ -820,11 +803,6 @@ export class HomePage implements OnInit {
this.common.openProfile('contact'); this.common.openProfile('contact');
} else if (subMenu.REQUEST_TYPE === 'CONTACT') { } else if (subMenu.REQUEST_TYPE === 'CONTACT') {
this.common.openProfile('family'); this.common.openProfile('family');
} else if (subMenu.REQUEST_TYPE === 'PAR') {
this.performanceEvaluation();
} else if (subMenu.REQUEST_TYPE === 'CCP') {
this.common.sharedService.setSharedData(subMenu, MenuResponse.SELECTED_MENU);
this.common.openConcurrentReport(true);
} }
if (subMenu.REQUEST_TYPE === 'TIME_CARD') { if (subMenu.REQUEST_TYPE === 'TIME_CARD') {
this.common.openTimeCardPage(); this.common.openTimeCardPage();
@ -847,13 +825,11 @@ export class HomePage implements OnInit {
let totalTicketsLeft = 0; let totalTicketsLeft = 0;
this.accrualBalancesList = result.GetAccrualBalancesList; this.accrualBalancesList = result.GetAccrualBalancesList;
for (const accrualBalance of result.GetAccrualBalancesList) { for (const accrualBalance of result.GetAccrualBalancesList) {
if (accrualBalance.ACCURAL_PLAN_NAME === 'Annual Vacation Accrual' || accrualBalance.ACCURAL_PLAN_NAME == " خطة استحقاق الاجازة الاعتيادية") { if (accrualBalance.ACCURAL_PLAN_NAME === 'Annual Vacation Accrual') {
this.statsButtons[1].statsValue = accrualBalance.ACCRUAL_NET_ENTITLEMENT === null ? 0 : Number(accrualBalance.ACCRUAL_NET_ENTITLEMENT.toFixed(2)); 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(accrualBalance, 'leaveAccrualBalance');
this.common.sharedService.setSharedData(request, 'leaveAccrualBalanceDate'); this.common.sharedService.setSharedData(request, 'leaveAccrualBalanceDate');
// this.common.sharedService.setSharedData(this.accrualBalancesList, 'tickitsbalance'); // this.common.sharedService.setSharedData(this.accrualBalancesList, 'tickitsbalance');
} else if (accrualBalance.ACCURAL_PLAN_NAME === 'Business Trip Accrual' || accrualBalance.ACCURAL_PLAN_NAME == "خطة استحقاق الإنتدابات") {
this.statsButtons[2].statsValue = accrualBalance.ACCRUAL_NET_ENTITLEMENT === null ? 0 : Number(accrualBalance.ACCRUAL_NET_ENTITLEMENT.toFixed(2));
} }
// else { // else {
// totalTicketsLeft = totalTicketsLeft + accrualBalance.ACCRUAL_NET_ENTITLEMENT; // totalTicketsLeft = totalTicketsLeft + accrualBalance.ACCRUAL_NET_ENTITLEMENT;
@ -876,20 +852,23 @@ export class HomePage implements OnInit {
// tslint:disable-next-line: triple-equals // tslint:disable-next-line: triple-equals
if (link == '0') { if (link == '0') {
this.isFakeLocationUsed = false; this.isFakeLocationUsed = false;
// this.getDeviceLocation();
this.showAttendanceOptions(); this.showAttendanceOptions();
// tslint:disable-next-line: triple-equals
} else if (link == '1') { } else if (link == '1') {
// this.common.sharedService.setSharedData(this.statsButtons[1].statsValue, 'total-count');
this.common.startLoading(); this.common.startLoading();
this.common.openNotificationPage(); this.common.openNotificationPage();
// tslint:disable-next-line: triple-equals
} else if (link == '2') { } else if (link == '2') {
this.openPage(this.missingSwipeRequestObject); // this.openPage(this.missingSwipeRequestObject);
// tslint:disable-next-line: triple-equals
} else if (link == '3') { } else if (link == '3') {
this.openPage(this.leaveRequestObject); // this.openPage(this.leaveRequestObject);
// tslint:disable-next-line: triple-equals
} else if (link == '4') { } else if (link == '4') {
this.common.sharedService.setSharedData(this.myRequestData, MenuResponse.SELECTED_MENU); // this.openPage(this.ticketRequestObject);
this.common.openConcurrentTransactionsHome(); }
} else if (link == '5') {
this.openPage(this.businessLeaveRequestObject);
}
} }
async openDigitalId() { async openDigitalId() {
@ -918,8 +897,4 @@ export class HomePage implements OnInit {
openAnnouncement() { openAnnouncement() {
this.common.openAnnouncement(); this.common.openAnnouncement();
} }
public performanceEvaluation() {
this.common.openPerformanceevaluation();
}
} }

@ -1,5 +1,5 @@
import { Component, OnInit, NgZone } from '@angular/core'; import { Component, OnInit, NgZone } from '@angular/core';
// import { NFC } from "@ionic-native/nfc/ngx" import { NFC } from "@ionic-native/nfc/ngx"
import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { CommonService } from 'src/app/hmg-common/services/common/common.service';
import {AttendScanService} from '../../hmg-common/services/attend-services/attend-scan.service'; import {AttendScanService} from '../../hmg-common/services/attend-services/attend-scan.service';
import { attendanceSwipeScannerRequest } from 'src/app/home/models/attendanceSwipe.Request'; import { attendanceSwipeScannerRequest } from 'src/app/home/models/attendanceSwipe.Request';
@ -24,7 +24,7 @@ export class NfcModalComponent implements OnInit {
public longt: number; public longt: number;
constructor( constructor(
// private nfc: NFC, private nfc: NFC,
public common: CommonService, public common: CommonService,
public attendScanService: AttendScanService, public attendScanService: AttendScanService,
private device: Device, private device: Device,
@ -45,15 +45,15 @@ export class NfcModalComponent implements OnInit {
} }
async startAndroidNfc() { async startAndroidNfc() {
// let flags = this.nfc.FLAG_READER_NFC_A | this.nfc.FLAG_READER_NFC_V; let flags = this.nfc.FLAG_READER_NFC_A | this.nfc.FLAG_READER_NFC_V;
// this.nfcReader = this.nfc.readerMode(flags).subscribe((tag) => { this.nfcReader = this.nfc.readerMode(flags).subscribe((tag) => {
// const serialNumber = this.nfc.bytesToHexString(tag.id); const serialNumber = this.nfc.bytesToHexString(tag.id);
// this.swipeAttendanceNFC(serialNumber); this.swipeAttendanceNFC(serialNumber);
// }, (error) => { }, (error) => {
// this.modalController.dismiss(); this.modalController.dismiss();
// this.common.presentAlert(this.ts.trPK('general', 'nfc-error')); this.common.presentAlert(this.ts.trPK('general', 'nfc-error'));
// console.log('error =====>>>>>> + + + =' + error); console.log('error =====>>>>>> + + + =' + error);
// }); });
} }
public swipeAttendanceNFC (nfcSerialCode: any) { public swipeAttendanceNFC (nfcSerialCode: any) {

@ -8,7 +8,7 @@ import { Response } from 'src/app/hmg-common/services/models/response';
import { ModalController } from '@ionic/angular'; import { ModalController } from '@ionic/angular';
import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
import { Platform } from "@ionic/angular"; import { Platform } from "@ionic/angular";
// import { WifiWizard2 } from "@ionic-native/wifi-wizard-2/ngx"; import { WifiWizard2 } from "@ionic-native/wifi-wizard-2/ngx";
import { OpenNativeSettings } from '@ionic-native/open-native-settings/ngx'; import { OpenNativeSettings } from '@ionic-native/open-native-settings/ngx';
import { AttendScanService } from "../../hmg-common/services/attend-services/attend-scan.service"; import { AttendScanService } from "../../hmg-common/services/attend-services/attend-scan.service";
@ -42,7 +42,7 @@ export class WifiModalComponent implements OnInit {
public modalController: ModalController, public modalController: ModalController,
public ts: TranslatorService, public ts: TranslatorService,
public ngZone: NgZone, public ngZone: NgZone,
// private wifiWizard2: WifiWizard2, private wifiWizard2: WifiWizard2,
private openNativeSettings: OpenNativeSettings, private openNativeSettings: OpenNativeSettings,
private platform: Platform, private platform: Platform,
public attendScanService: AttendScanService public attendScanService: AttendScanService
@ -58,8 +58,8 @@ export class WifiModalComponent implements OnInit {
async getConnectedBSSID(ssid:string){ async getConnectedBSSID(ssid:string){
// let avaialbleSSID = await this.wifiWizard2.getConnectedBSSID(); let avaialbleSSID = await this.wifiWizard2.getConnectedBSSID();
// console.log(avaialbleSSID); console.log(avaialbleSSID);
} }
async startWifiConnection() { async startWifiConnection() {
@ -67,49 +67,49 @@ export class WifiModalComponent implements OnInit {
const isIOS = this.platform.is("ios"); const isIOS = this.platform.is("ios");
if (isAndroid) { if (isAndroid) {
// let isWifiAvailable = await this.isWifiAvailable(this.ssid); let isWifiAvailable = await this.isWifiAvailable(this.ssid);
// console.debug("isWifiAvailable: " + isWifiAvailable); console.debug("isWifiAvailable: " + isWifiAvailable);
// if(isWifiAvailable){ if(isWifiAvailable){
// console.debug("Wifi Credientials: " + this.ssid + " | " + this.password); console.debug("Wifi Credientials: " + this.ssid + " | " + this.password);
// this.wifiWizard2.connect(this.ssid, true, this.password, this.algo).then(async (value) =>{ this.wifiWizard2.connect(this.ssid, true, this.password, this.algo).then(async (value) =>{
// let ssid_ = await this.wifiWizard2.getConnectedSSID(); let ssid_ = await this.wifiWizard2.getConnectedSSID();
// if(ssid_ == this.ssid){ if(ssid_ == this.ssid){
// console.debug("Wifi Connected: Verified Access | " + value + " | " + ssid_); console.debug("Wifi Connected: Verified Access | " + value + " | " + ssid_);
// setTimeout(() => { setTimeout(() => {
// this.swipeAttendanceWifi(ssid_); this.swipeAttendanceWifi(ssid_);
// },2000); },2000);
// }else{ }else{
// this.showErrorInvalidWorkspace(); this.showErrorInvalidWorkspace();
// } }
// }) })
// .catch((err) => { .catch((err) => {
// console.debug(err); console.debug(err);
// this.showErrorForgetWifiConfiguration(); this.showErrorForgetWifiConfiguration();
// }); });
// }else{ }else{
// console.debug("Wifi is not available considered your device is not in range"); console.debug("Wifi is not available considered your device is not in range");
// this.showErrorInvalidWorkspace(); this.showErrorInvalidWorkspace();
// } }
} else if (isIOS) { } else if (isIOS) {
// this.wifiWizard2.iOSConnectNetwork(this.ssid,this.password).then(async (value) => { this.wifiWizard2.iOSConnectNetwork(this.ssid,this.password).then(async (value) => {
// let ssid_ = await this.wifiWizard2.getConnectedSSID(); let ssid_ = await this.wifiWizard2.getConnectedSSID();
// if(ssid_ == this.ssid){ if(ssid_ == this.ssid){
// console.debug("Wifi Connected: Verified Access | " + value + " | " + ssid_); console.debug("Wifi Connected: Verified Access | " + value + " | " + ssid_);
// setTimeout(() => { setTimeout(() => {
// this.swipeAttendanceWifi(ssid_); this.swipeAttendanceWifi(ssid_);
// },6000); },6000);
// }else{ }else{
// this.showErrorInvalidWorkspace(); this.showErrorInvalidWorkspace();
// } }
// }) })
// .catch((err) => { .catch((err) => {
// console.debug(err); console.debug(err);
// this.showErrorInvalidWorkspace(); this.showErrorInvalidWorkspace();
// }); });
// if(this.wifiWizard2.isWifiEnabled){ if(this.wifiWizard2.isWifiEnabled){
// } else{ } else{
// this.showWifiNotEnabled(); this.showWifiNotEnabled();
// } }
} }
} }
@ -142,13 +142,13 @@ export class WifiModalComponent implements OnInit {
async disconnectWifi() { async disconnectWifi() {
const isAndroid = this.platform.is("android"); const isAndroid = this.platform.is("android");
const isIOS = this.platform.is("ios"); const isIOS = this.platform.is("ios");
// if(isAndroid){ if(isAndroid){
// await this.wifiWizard2.disconnect(this.ssid).catch((error)=>{ console.error(error) }); await this.wifiWizard2.disconnect(this.ssid).catch((error)=>{ console.error(error) });
// await this.wifiWizard2.remove(this.ssid).catch((error)=>{ console.error(error) }); await this.wifiWizard2.remove(this.ssid).catch((error)=>{ console.error(error) });
// console.debug("Wifi Removed"); console.debug("Wifi Removed");
// }else if(isIOS){ }else if(isIOS){
// await this.wifiWizard2.iOSDisconnectNetwork(this.ssid); await this.wifiWizard2.iOSDisconnectNetwork(this.ssid);
// } }
} }
async swipeAttendanceWifi(code:any) { async swipeAttendanceWifi(code:any) {
@ -211,15 +211,15 @@ export class WifiModalComponent implements OnInit {
} }
async isWifiAvailable(ssid:string){ async isWifiAvailable(ssid:string){
// let avaialble_wifi = await this.wifiWizard2.scan(); let avaialble_wifi = await this.wifiWizard2.scan();
// let find = avaialble_wifi.find(element => { let find = avaialble_wifi.find(element => {
// return element.SSID == ssid; return element.SSID == ssid;
// }); });
// if (find === undefined) { if (find === undefined) {
// return false; return false;
// } else { } else {
// return find.SSID == ssid; return find.SSID == ssid;
// } }
} }
} }

@ -1,25 +1,23 @@
.header-toolbar-new {
--background: #BE332F;
}
.contentBg {
.header-toolbar-new{
--background: #024d71;
}
.contentBg{
padding: 0px 20px; padding: 0px 20px;
} }
.contentBg:before { .contentBg:before {
position: absolute; position: absolute;
content: ""; content: "";
background: #024d71; background: #BE332F;
height: 140px; height: 140px;
width: 100%; width: 100%;
left: 0; left: 0;
top: 0px; top: 0px;
z-index: 1; z-index: 1;
} }
@media screen and (min-width: 1px) and (max-width:767px){ @media screen and (min-width: 1px) and (max-width:767px) {
.result-graph { .result-graph {
position: relative; position: relative;
background: white; background: white;
@ -32,142 +30,152 @@
border-radius: 20px; border-radius: 20px;
border: 1px solid #ccc; border: 1px solid #ccc;
padding-top: 12px; padding-top: 12px;
}} }
}
@media screen and (min-width: 768px) and (max-width:1024px){
.result-graph { @media screen and (min-width: 768px) and (max-width:1024px) {
position: relative; .result-graph {
background: white; position: relative;
// margin-top: 20px; background: white;
padding-bottom: 20px; // margin-top: 20px;
border-radius: 20px; padding-bottom: 20px;
z-index: 1; border-radius: 20px;
margin-bottom: 10px; z-index: 1;
margin-top: 89px; margin-bottom: 10px;
border-radius: 20px; margin-top: 89px;
border: 1px solid #ccc; border-radius: 20px;
padding-top: 114px !important; border: 1px solid #ccc;
}} padding-top: 114px !important;
}
.user-info{ }
text-align: center;
margin-bottom: 3px; .user-info {
.user-image-container{ text-align: center;
position: relative; margin-bottom: 3px;
width: 100%;
height: 24px; .user-image-container {
justify-content: space-between; position: relative;
display: flex; width: 100%;
margin: 0 auto; height: 24px;
align-items: center; justify-content: space-between;
}} display: flex;
margin: 0 auto;
.Boldtext{ align-items: center;
font-size: 13px; }
font-family: WorkSans-Bold; }
color: black !important;
display: block !important; .Boldtext {
// line-height: 0px !important; font-size: 13px;
} font-family: WorkSans-Bold;
color: black !important;
.Nametext{ display: block !important;
font-size: 15px; // line-height: 0px !important;
font-family: WorkSans-Bold; }
color: black !important;
display: block !important; .Nametext {
// line-height: 0px !important; font-size: 15px;
} font-family: WorkSans-Bold;
color: black !important;
.employee-information-indetail{ display: block !important;
background: white; // line-height: 0px !important;
margin-top: 15px; }
border-radius: 20px;
margin-bottom: 15px; .employee-information-indetail {
border-radius: 20px; background: white;
border: 1px solid #ccc; margin-top: 15px;
ion-col{ border-radius: 20px;
padding: 15px; margin-bottom: 15px;
// border-bottom: 1px solid #ccc; border-radius: 20px;
} border: 1px solid #ccc;
h2{
font-size: 13px; ion-col {
// font-family: WorkSans-Bold; padding: 15px;
margin: 0; // border-bottom: 1px solid #ccc;
font-weight: bold; }
color: rgb(128, 124, 124);
} h2 {
p{ font-size: 13px;
font-size: 13px; // font-family: WorkSans-Bold;
margin: 0; margin: 0;
font-family: WorkSans-Bold; font-weight: bold;
// margin-bottom: 10px; color: rgb(128, 124, 124);
} }
}
p {
@media screen and (min-width: 1px) and (max-width:767px){ font-size: 13px;
.user-image{ margin: 0;
position: relative; font-family: WorkSans-Bold;
display: block; // margin-bottom: 10px;
width: 95%; }
height: 100%; }
border-radius: 80px;
/* border: 1px solid #ccc; */ @media screen and (min-width: 1px) and (max-width:767px) {
margin-top: -125px; .user-image {
position: relative;
}} display: block;
@media screen and (min-width: 768px) and (max-width:1024px){ width: 95%;
.user-image{ height: 100%;
position: relative; border-radius: 80px;
display: block; /* border: 1px solid #ccc; */
width: 95%; margin-top: -125px;
height: 100%;
border-radius: 80px; }
margin-bottom: 371px; }
}}
@media screen and (min-width: 768px) and (max-width:1024px) {
.img{ .user-image {
width: 100px; position: relative;
height: 100px; display: block;
display: inline-flex; width: 95%;
overflow: hidden; height: 100%;
background: transparent; border-radius: 80px;
border-radius: 70% !important; margin-bottom: 371px;
position: relative; }
top: 3px; }
}
.img {
.sendCodeBtn{ width: 100px;
--background: #024d71; height: 100px;
color: white; display: inline-flex;
text-align: center; overflow: hidden;
text-decoration: none; background: transparent;
display: inline-block; border-radius: 70% !important;
font-size: 12px; position: relative;
margin-left: 5px !important; top: 3px;
margin-top: 15px !important; }
margin-bottom: 20px !important;
/* border-radius: 4px; */ .sendCodeBtn {
height: 26px; --background: #BE332F;
/* padding: 6px 24px; */ color: white;
font-size: 15px; text-align: center;
width: 322px; text-decoration: none;
} display: inline-block;
font-size: 12px;
.verify-code{ margin-left: 5px !important;
position: relative; margin-top: 15px !important;
background: white; margin-bottom: 20px !important;
border-radius: 20px; /* border-radius: 4px; */
z-index: 1; height: 26px;
border-radius: 20px; /* padding: 6px 24px; */
border: 1px solid #ccc; font-size: 15px;
padding: 21px 3px 34px 14px; width: 322px;
margin: 25px 22px 2px 22px; }
.verify-code {
} position: relative;
background: white;
border-radius: 20px;
z-index: 1;
border-radius: 20px;
border: 1px solid #ccc;
padding: 21px 3px 34px 14px;
margin: 25px 22px 2px 22px;
}
// .sms_code{ // .sms_code{
// margin: 0px; // margin: 0px;
// text-align: center; // text-align: center;
@ -186,18 +194,19 @@ ion-input {
transition: all .2s ease-in-out; transition: all .2s ease-in-out;
border-radius: 3px; border-radius: 3px;
display: inline-block; display: inline-block;
&:focus { &:focus {
border-color:var(--ion-color-secondary) !important; border-color: var(--ion-color-secondary) !important;
box-shadow: 0 0 5px var(--ion-color-secondary) !important; box-shadow: 0 0 5px var(--ion-color-secondary) !important;
} }
&::selection { &::selection {
background: transparent; background: transparent;
} }
} }
.sendVerifyBtn{ .sendVerifyBtn {
--background: #024d71; --background: #BE332F;
color: white; color: white;
text-align: center; text-align: center;
text-decoration: none; text-decoration: none;
@ -210,9 +219,9 @@ ion-input {
font-size: 15px; font-size: 15px;
width: 322px; width: 322px;
margin-left: 22px; margin-left: 22px;
} }
@media screen and (min-width: 1px) and (max-width:320px){ @media screen and (min-width: 1px) and (max-width:320px) {
.custom-radio .radio-icon { .custom-radio .radio-icon {
margin: 0px; margin: 0px;
border-radius: 50%; border-radius: 50%;
@ -220,157 +229,162 @@ ion-input {
border-style: var(--border-style); border-style: var(--border-style);
border-color: #dcdcdc; border-color: #dcdcdc;
margin-top: 6px !important; margin-top: 6px !important;
border-color: #d8d4d4 !important; border-color: #d8d4d4 !important;
margin-bottom: 18px;} margin-bottom: 18px;
.text-label{
color: black !important;
font-size: 9px;
margin-left: 2px;
margin-right: 2px;
font-family: 'WorkSans-Bold';
} }
@media screen and (min-width: 325px){
.custom-radio .radio-icon {
margin: 0px;
border-radius: 50%;
border-width: var(--border-width);
border-style: var(--border-style);
border-color: #dcdcdc;
margin-top: 6px !important;
border-color: #d8d4d4 !important;
margin-bottom: 18px;}
.text-label{
color: black !important;
font-size: 10px;
margin-left: 15px;
margin-right: 13px;
font-family: 'WorkSans-Bold';
} }
// .radio-list{
// background: white;
// margin-left: 18px;
// /* margin-right: 10px; */
// margin-top: 12px;
// }
.result-serviceType{
position: relative;
background: white;
border-radius: 20px;
z-index: 1;
border-radius: 25px;
border: 1px solid #ccc;
margin: 15px;
} }
.request-heading { .text-label {
span { color: black !important;
display: block; font-size: 9px;
margin-bottom: 15px; margin-left: 2px;
// padding-top: 8px; margin-right: 2px;
padding-left: 3px; font-family: 'WorkSans-Bold';
/* font-weight: bold; */
font-size: 14px;
font-family: 'WorkSans-Bold';
}
} }
}
.filed1{ @media screen and (min-width: 325px) {
border-radius: 30px; .custom-radio .radio-icon {
border: 1px solid #d3d5d5 !important; margin: 0px;
margin: 10px; border-radius: 50%;
padding-left: 10px !important; border-width: var(--border-width);
padding-top: 10px !important; border-style: var(--border-style);
color: #636161; border-color: #dcdcdc;
padding-bottom: 10px; margin-top: 6px !important;
width: 130% !important; border-color: #d8d4d4 !important;
} margin-bottom: 18px;
.filedDesc{
border-radius: 30px;
border: 1px solid #d3d5d5 !important;
// margin: 10px;
padding-left: 20px !important;
padding-top: 6px !important;
color: #636161;
--padding-bottom: 90px;
font-size: 13px;
text-align: start;
} }
.filedDesc-ar{
border-radius: 30px; .text-label {
border: 1px solid #d3d5d5 !important; color: black !important;
// margin: 10px; font-size: 10px;
padding-right: 20px !important; margin-left: 15px;
padding-top: 6px !important; margin-right: 13px;
color: #636161; font-family: 'WorkSans-Bold';
--padding-bottom: 90px;
font-size: 13px;
text-align: start;
} }
}
.labelDesc{ // .radio-list{
// background: white;
// margin-left: 18px;
// /* margin-right: 10px; */
// margin-top: 12px;
// }
.result-serviceType {
position: relative;
background: white;
border-radius: 20px;
z-index: 1;
border-radius: 25px;
border: 1px solid #ccc;
margin: 15px;
}
.request-heading {
span {
display: block; display: block;
margin-bottom: 15px;
// padding-top: 8px;
padding-left: 3px;
/* font-weight: bold; */
font-size: 14px;
font-family: 'WorkSans-Bold';
}
}
.filed1 {
border-radius: 30px;
border: 1px solid #d3d5d5 !important;
margin: 10px;
padding-left: 10px !important;
padding-top: 10px !important;
color: #636161;
padding-bottom: 10px;
width: 130% !important;
}
.filedDesc {
border-radius: 30px;
border: 1px solid #d3d5d5 !important;
// margin: 10px;
padding-left: 20px !important;
padding-top: 6px !important;
color: #636161;
--padding-bottom: 90px;
font-size: 13px;
text-align: start;
}
.filedDesc-ar {
border-radius: 30px;
border: 1px solid #d3d5d5 !important;
// margin: 10px;
padding-right: 20px !important;
padding-top: 6px !important;
color: #636161;
--padding-bottom: 90px;
font-size: 13px;
text-align: start;
}
.labelDesc {
display: block;
padding-top: 8px; padding-top: 8px;
padding-left: 15px; padding-left: 15px;
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
color: #adabab; color: #adabab;
} }
.selectLabel {
display: block;
padding-top: 8px;
padding-left: 15px;
font-size: 14px;
/* font-family: 'WorkSans-Bold'; */
font-weight: bold;
color: black;
}
.selectLabel{
display: block;
padding-top: 8px;
padding-left: 15px;
font-size: 14px;
/* font-family: 'WorkSans-Bold'; */
font-weight: bold;
color: black;
}
// .cancelRequest{
// .cancelRequest{ // padding: 10px 7px 10px 0px;
// padding: 10px 7px 10px 0px; // ion-button{
// ion-button{ // border-radius: 7px;
// border-radius: 7px; // padding: 12px 30px 12px 30px;
// padding: 12px 30px 12px 30px; // background: #d00a0a;
// background: #d00a0a; // --background: transparent;
// --background: transparent; // --box-shadow: none !important;
// --box-shadow: none !important; // height: auto;
// height: auto; // min-height: inherit;
// min-height: inherit; // font-size: 16px;
// font-size: 16px; // font-weight: bold;
// font-weight: bold; // margin-top: -5px;
// margin-top: -5px; // }}
// }} // .submitRequest{
// .submitRequest{ // padding: 10px 7px 10px 0px;
// padding: 10px 7px 10px 0px; // ion-button{
// ion-button{ // border-radius: 7px;
// border-radius: 7px; // padding: 12px 30px 12px 30px;
// padding: 12px 30px 12px 30px; // background: #19a163;
// background: #19a163; // --background: transparent;
// --background: transparent; // --box-shadow: none !important;
// --box-shadow: none !important; // height: auto;
// height: auto; // min-height: inherit;
// min-height: inherit; // font-size: 16px;
// font-size: 16px; // font-weight: bold;
// font-weight: bold; // margin-top: -5px;
// margin-top: -5px; // }}
// }}
.gridDiv {
.gridDiv{
width: 100%; width: 100%;
height: 40px; height: 40px;
margin-top: 18px; margin-top: 18px;
font-size: 14px; font-size: 14px;
} }
.gridCancelBtn{ .gridCancelBtn {
min-width: auto; min-width: auto;
// margin: 0px; // margin: 0px;
padding: 10px; padding: 10px;
@ -391,11 +405,11 @@ ion-input {
--background: #d00a0a !important; --background: #d00a0a !important;
} }
.main-button{ .main-button {
--box-shadow:none; --box-shadow: none;
} }
.gridSubmitBtn{ .gridSubmitBtn {
min-width: auto; min-width: auto;
// margin: 0px; // margin: 0px;
padding: 10px; padding: 10px;
@ -413,25 +427,26 @@ ion-input {
font-family: 'WorkSans-bold'; font-family: 'WorkSans-bold';
font-size: 16px; font-size: 16px;
min-height: 1.0cm; min-height: 1.0cm;
--background: #19a163 !important;} --background: #19a163 !important;
}
.filed-container{ .filed-container {
margin-right: -17px; margin-right: -17px;
margin-left: -25px; margin-left: -25px;
} }
.labels{ .labels {
display: block; display: block;
margin-top: 15px; margin-top: 15px;
padding-top: 8px; padding-top: 8px;
padding-left: 3px; padding-left: 3px;
font-size: 14px; font-size: 14px;
font-family: 'WorkSans-Bold'; font-family: 'WorkSans-Bold';
} }
.CreateBtn{ .CreateBtn {
--background: var(--newgreen) !important; --background: var(--newgreen) !important;
background: var(--newgreen) !important; background: var(--newgreen) !important;
white-space: normal; white-space: normal;
color: var(--light); color: var(--light);
@ -441,92 +456,102 @@ ion-input {
border-radius: 7px !important; border-radius: 7px !important;
--min-height: 1.6cm !important; --min-height: 1.6cm !important;
width: 315px; width: 315px;
} }
.footer{
.footer {
padding: 15px 0px 0px 0px; padding: 15px 0px 0px 0px;
background-color: var(--light) !important; background-color: var(--light) !important;
border: 0px !important; border: 0px !important;
box-shadow: none !important; box-shadow: none !important;
-webkit-box-shadow: none; -webkit-box-shadow: none;
} }
.Btn{
margin: auto; text-align: center; display: block;
}
.footer2{
padding: 15px 0px 0px 24px;
background-color: var(--light) !important;
border: 0px !important;
box-shadow: none !important;
-webkit-box-shadow: none;
}
ion-footer .footer-button{ .Btn {
--background: #259CB8; margin: auto;
width: 80%; text-align: center;
} display: block;
@media screen and (min-width: 325px){ }
.footer2 {
padding: 15px 0px 0px 24px;
background-color: var(--light) !important;
border: 0px !important;
box-shadow: none !important;
-webkit-box-shadow: none;
}
ion-footer .footer-button {
--background: #259CB8;
width: 80%;
}
@media screen and (min-width: 325px) {
.fileUpload { .fileUpload {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
margin: 10px; margin: 10px;
margin-left: -233px; margin-left: -233px;
}} }
@media screen and (min-width: 1px) and (max-width:320px){ }
@media screen and (min-width: 1px) and (max-width:320px) {
.fileUpload { .fileUpload {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
margin: 10px; margin: 10px;
margin-left: -158px; margin-left: -158px;
}}
.fileUpload input.upload {
position: absolute;
top: 0;
right: 0;
margin: 0;
padding: 0;
font-size: 20px;
cursor: pointer;
opacity: 0;
filter: alpha(opacity=0);
} }
}
.fileUpload input.upload {
position: absolute;
top: 0;
right: 0;
margin: 0;
padding: 0;
font-size: 20px;
cursor: pointer;
opacity: 0;
filter: alpha(opacity=0);
}
.iconButton .imgSize{ .iconButton .imgSize {
width: 10px !important; width: 10px !important;
height: 10px; height: 10px;
} }
button.iconButton.button.button-ios.button-default.button-default-ios, button.iconButton.button.button-ios.button-default.button-default-ios,
button.iconButton.button.button-md.button-default.button-default-md { button.iconButton.button.button-md.button-default.button-default-md {
padding: 0px; padding: 0px;
} }
select option[data-default] { select option[data-default] {
color: #888; color: #888;
} }
.Field-en{ .Field-en {
border-radius: 30px; border-radius: 30px;
border: 1px solid #a2a5a6!important; border: 1px solid #a2a5a6 !important;
margin-bottom: 20px; margin-bottom: 20px;
padding-left: 20px !important; padding-left: 20px !important;
padding-top: 6px !important; padding-top: 6px !important;
color: #999999 !important; color: #999999 !important;
} }
.Field-ar{ .Field-ar {
border-radius: 30px; border-radius: 30px;
border: 1px solid #a2a5a6!important; border: 1px solid #a2a5a6 !important;
margin-bottom: 20px; margin-bottom: 20px;
padding-right: 20px !important; padding-right: 20px !important;
padding-top: 6px !important; padding-top: 6px !important;
color: #999999 !important; color: #999999 !important;
} }
.button-native { .button-native {
box-shadow: none!important; box-shadow: none !important;
} }
.gridAH{
text-align: justify; .gridAH {
} text-align: justify;
}

@ -1,414 +1,449 @@
ion-content {
ion-content {
--ion-background-color: whitesmoke; --ion-background-color: whitesmoke;
} }
.sendCodeBtn{ .sendCodeBtn {
--background: #024d71; --background: #BE332F;
color: white; color: white;
text-align: center; text-align: center;
text-decoration: none; text-decoration: none;
display: inline-block; display: inline-block;
font-size: 12px;
margin-left: 23px !important;
margin-top: 15px !important;
margin-bottom: 20px !important;
/* border-radius: 4px; */
height: 26px;
/* padding: 6px 24px; */
font-size: 15px;
width: 322px;
}
.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;
}
.result-container {
// position: relative;
// background: white;
// border-radius: 20px;
// z-index: 1;
// margin: 15px;
// border-radius: 10px;
// border: 1px solid #ccc;
background: #FFFFFF 0% 0% no-repeat padding-box;
box-shadow: 0px 0px 5px #00000029;
border-radius: 10px;
opacity: 1;
}
.result-containerList {
// position: relative;
// background: white;
// border-radius: 20px;
// z-index: 1;
// margin: 15px;
// border-radius: 10px;
// border: 1px solid #ccc;
background: #FFFFFF 0% 0% no-repeat padding-box;
box-shadow: 0px 0px 5px #00000029;
border-radius: 10px;
opacity: 1;
}
.text {
text-align: left;
/* font-family: var(--fontFamilyPoppins-Medium, inherit); */
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 11px;
font-size: 16px;
letter-spacing: -0.64px;
color: #2B353E;
opacity: 1;
}
.text-ar {
text-align: right;
/* font-family: var(--fontFamilyPoppins-Medium, inherit); */
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 11px;
font-size: 16px;
letter-spacing: -0.64px;
color: #2B353E;
opacity: 1;
}
@media screen and (min-width: 1px) and (max-width:320px) {
.date {
// margin-right: -38px;
color: gray;
font-size: 12px;
margin-left: -44px;
}
}
@media screen and (min-width: 325px) {
.date {
// margin-top: -9px;
margin-right: -49px;
color: gray;
font-size: 12px; font-size: 12px;
margin-left: 23px !important; }
margin-top: 15px !important; }
margin-bottom: 20px !important;
/* border-radius: 4px; */ @media screen and (min-width: 1px) and (max-width:320px) {
height: 26px; .date-ar {
/* padding: 6px 24px; */ // margin-right: -38px;
font-size: 15px; color: gray;
width: 322px; font-size: 10px;
} margin-left: 58px;
}
.empty-en{ }
color: black;
text-align: center; @media screen and (min-width: 325px) {
font-size: 15px; .date-ar {
font-family: WorkSans-Bold; // margin-top: -9px;
margin: 50px 0px 0px 100px; margin-right: -49px;
} color: gray;
.empty-ar{ font-size: 12px;
color: black; }
text-align: center; }
font-size: 15px;
font-family: WorkSans-Bold; .labels {
margin: 50px 100px 0px 0px; // font-size: 13px;
} // margin-bottom: 0px;
// margin-top: -10px;
.result-container{ // color: #a9a5a5;
// position: relative; // font-family: 'WorkSans-bold';
// background: white; text-align: left;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
// border-radius: 20px; // font-weight: 600;
// z-index: 1; line-height: 20px;
// margin: 15px; font-size: 13px;
// border-radius: 10px; // font: normal normal 600 13px/20px Poppins;
// border: 1px solid #ccc; letter-spacing: -0.52px;
background: #FFFFFF 0% 0% no-repeat padding-box; color: #A2A2A2;
box-shadow: 0px 0px 5px #00000029; opacity: 1;
border-radius: 10px; padding-bottom: 3px;
opacity: 1; }
}
.labels-ar {
.result-containerList{ // font-size: 13px;
// position: relative;
// background: white;
// border-radius: 20px;
// z-index: 1;
// margin: 15px;
// border-radius: 10px;
// border: 1px solid #ccc;
background: #FFFFFF 0% 0% no-repeat padding-box;
box-shadow: 0px 0px 5px #00000029;
border-radius: 10px;
opacity: 1;
}
.text{
text-align: left;
/* font-family: var(--fontFamilyPoppins-Medium, inherit); */
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 11px;
font-size: 16px;
letter-spacing: -0.64px;
color: #2B353E;
opacity: 1;
}
.text-ar{
text-align: right;
/* font-family: var(--fontFamilyPoppins-Medium, inherit); */
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 11px;
font-size: 16px;
letter-spacing: -0.64px;
color: #2B353E;
opacity: 1;
}
@media screen and (min-width: 1px) and (max-width:320px) {
.date{
// margin-right: -38px;
color: gray;
font-size: 12px;
margin-left: -44px;
}}
@media screen and (min-width: 325px) {
.date{
// margin-top: -9px;
margin-right: -49px;
color: gray;
font-size: 12px;
}}
@media screen and (min-width: 1px) and (max-width:320px) {
.date-ar{
// margin-right: -38px;
color: gray;
font-size: 10px;
margin-left: 58px;
}}
@media screen and (min-width: 325px) {
.date-ar{
// margin-top: -9px;
margin-right: -49px;
color: gray;
font-size: 12px;
}}
.labels{
// font-size: 13px;
// margin-bottom: 0px;
// margin-top: -10px;
// color: #a9a5a5;
// font-family: 'WorkSans-bold';
text-align: left;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
// font-weight: 600;
line-height: 20px;
font-size: 13px;
// font: normal normal 600 13px/20px Poppins;
letter-spacing: -0.52px;
color: #A2A2A2;
opacity: 1;
padding-bottom: 3px;
}
.labels-ar{
// font-size: 13px;
// margin-bottom: 0px;
// margin-top: -10px;
// color: #a9a5a5;
// font-family: 'WorkSans-bold';
text-align: right;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
// font-weight: 600;
line-height: 20px;
font-size: 13px;
// font: normal normal 600 13px/20px Poppins;
letter-spacing: -0.52px;
color: #A2A2A2;
opacity: 1;
padding-bottom: 3px;
}
.request-list-container {
position: relative;
padding-left: 37px;
clear: both;
min-height: 200px;
padding-top: 15px;
}
.request-list-container:before{
content: "";
position: absolute;
height: 100%;
width: 4px;
left: 7px;
top: 15px;
background-color: #f5f4f4;
}
.request-list-container-ar {
position: relative;
padding-left: 60px;
clear: both;
min-height: 200px;
// margin-bottom: 80px;
padding-top: 15px;
}
.request-list-container-ar:before{
content: "";
position: absolute;
height: 100%;
width: 4px;
left: 30px;
top: 15px;
right: 6px;
background-color: #dddddd;
}
.text-span {
position: relative;
display: block;
letter-spacing: -0.64px;
color: #2B353E;
opacity: 1;
// font-weight: 600;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 25px;
font-size: 16px;
}
.text-span:before{
content: "";
position: absolute;
left: -35px;
border-radius: 50%;
width: 15px;
height: 15px;
background-color: #024d71;
top: 1px;
}
.text-span-ar{
position: relative;
display: block;
letter-spacing: -0.64px;
color: #2B353E;
opacity: 1;
// font-weight: 600;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 25px;
font-size: 16px;
margin-right: 37px;
}
.text-span-ar:before{
content: "";
position: absolute;
right: -35px;
border-radius: 50%;
width: 15px;
height: 15px;
background-color: #024d71;
top: 1px;
}
.action-data{
background-color: white;
padding: 1px;
border-radius: 20px;
font-family: WorkSans-Regular;
// padding-left: 15px;
margin-right: 20px;
margin-bottom: 15px;
p{
// font-size: 14px;
text-align: left;
letter-spacing: -0.52px;
color: #535353;
opacity: 1;
//font-weight: 500;
font-family: var(--fontFamilyPoppins-Medium, inherit);
line-height: 18px;
font-size: 13px;
}
}
.action-data-ar{
background-color: white;
padding: 1px;
border-radius: 20px;
font-family: WorkSans-Regular;
// padding-left: 15px;
margin-right: 20px;
margin-bottom: 15px;
p{
// font-size: 14px;
text-align: right;
letter-spacing: -0.52px;
color: #535353;
opacity: 1;
//font-weight: 500;
font-family: var(--fontFamilyPoppins-Medium, inherit);
line-height: 18px;
font-size: 13px;
}
}
.date-span{
text-align: right;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
//font-weight: 600;
line-height: 20px;
font-size: 13px;
// font: normal normal 600 13px/20px Poppins;
letter-spacing: -0.52px;
color: #A2A2A2;
opacity: 1;
}
// @media screen and (min-width: 325px){
// .date-span{
// font-size: 13px;
// margin-bottom: 0px;
// margin-top: -10px;
// color: gray;
// margin-left: 160px;
// }}
// @media screen and (min-width: 1px) and (max-width:320px) {
// .date-span{
// font-size: 13px;
// margin-bottom: 0px;
// margin-top: -10px;
// color: gray;
// margin-left: 76px;
// }}
// @media screen and (min-width: 1px) and (max-width:320px) {
// .date-span-ar{
// font-size: 13px;
// margin-bottom: 0px; // margin-bottom: 0px;
// margin-top: -10px; // margin-top: -10px;
// color: gray; // color: #a9a5a5;
// margin-right: 60px; // font-family: 'WorkSans-bold';
// }} text-align: right;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
// @media screen and (min-width: 325px){ // font-weight: 600;
// .date-span-ar{ line-height: 20px;
// font-size: 13px; font-size: 13px;
// margin-bottom: 0px; // font: normal normal 600 13px/20px Poppins;
// margin-top: -10px; letter-spacing: -0.52px;
// color: gray; color: #A2A2A2;
// margin-right: 140px; opacity: 1;
// }} padding-bottom: 3px;
}
.New{ .request-list-container {
margin-top: 5px; position: relative;
color: #1FA169; padding-left: 37px;
font-family:'WorkSans-bold'; clear: both;
min-height: 200px;
padding-top: 15px;
}
.request-list-container:before {
content: "";
position: absolute;
height: 100%;
width: 4px;
left: 7px;
top: 15px;
background-color: #f5f4f4;
}
.request-list-container-ar {
position: relative;
padding-left: 60px;
clear: both;
min-height: 200px;
// margin-bottom: 80px;
padding-top: 15px;
}
.request-list-container-ar:before {
content: "";
position: absolute;
height: 100%;
width: 4px;
left: 30px;
top: 15px;
right: 6px;
background-color: #dddddd;
}
.text-span {
position: relative;
display: block;
letter-spacing: -0.64px;
color: #2B353E;
opacity: 1;
// font-weight: 600;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 25px;
font-size: 16px;
}
.text-span:before {
content: "";
position: absolute;
left: -35px;
border-radius: 50%;
width: 15px;
height: 15px;
background-color: #BE332F;
top: 1px;
}
.text-span-ar {
position: relative;
display: block;
letter-spacing: -0.64px;
color: #2B353E;
opacity: 1;
// font-weight: 600;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 25px;
font-size: 16px;
margin-right: 37px;
}
.text-span-ar:before {
content: "";
position: absolute;
right: -35px;
border-radius: 50%;
width: 15px;
height: 15px;
background-color: #BE332F;
top: 1px;
}
.action-data {
background-color: white;
padding: 1px;
border-radius: 20px;
font-family: WorkSans-Regular;
// padding-left: 15px;
margin-right: 20px;
margin-bottom: 15px;
p {
// font-size: 14px;
text-align: left;
letter-spacing: -0.52px;
color: #535353;
opacity: 1;
//font-weight: 500;
font-family: var(--fontFamilyPoppins-Medium, inherit);
line-height: 18px;
font-size: 13px;
} }
}
.action-data-ar {
background-color: white;
padding: 1px;
border-radius: 20px;
font-family: WorkSans-Regular;
// padding-left: 15px;
margin-right: 20px;
margin-bottom: 15px;
p {
// font-size: 14px;
text-align: right;
letter-spacing: -0.52px;
color: #535353;
opacity: 1;
//font-weight: 500;
font-family: var(--fontFamilyPoppins-Medium, inherit);
line-height: 18px;
font-size: 13px;
}
}
.date-span {
text-align: right;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
//font-weight: 600;
line-height: 20px;
font-size: 13px;
// font: normal normal 600 13px/20px Poppins;
letter-spacing: -0.52px;
color: #A2A2A2;
opacity: 1;
}
// @media screen and (min-width: 325px){
// .date-span{
// font-size: 13px;
// margin-bottom: 0px;
// margin-top: -10px;
// color: gray;
// margin-left: 160px;
// }}
// @media screen and (min-width: 1px) and (max-width:320px) {
// .date-span{
// font-size: 13px;
// margin-bottom: 0px;
// margin-top: -10px;
// color: gray;
// margin-left: 76px;
// }}
// @media screen and (min-width: 1px) and (max-width:320px) {
// .date-span-ar{
// font-size: 13px;
// margin-bottom: 0px;
// margin-top: -10px;
// color: gray;
// margin-right: 60px;
// }}
// @media screen and (min-width: 325px){
// .date-span-ar{
// font-size: 13px;
// margin-bottom: 0px;
// margin-top: -10px;
// color: gray;
// margin-right: 140px;
// }}
.New {
margin-top: 5px;
color: #1FA169;
font-family: 'WorkSans-bold';
}
.ReOpen {
margin-top: 5px;
color: #1FA169;
}
.ReOpen{ margin-top: 5px; .AssToManager {
color: #1FA169; margin-top: 5px;
} color: #259CB8;
.AssToManager{ margin-top: 5px; }
color: #259CB8;
} .AssToSpec {
.AssToSpec{ margin-top: 5px; margin-top: 5px;
color: #259CB8; color: #259CB8;
} }
.Pending{ margin-top: 5px;
color: #E29D03; .Pending {
} margin-top: 5px;
.BackToSpec{ margin-top: 5px; color: #E29D03;
color: #3A476E; }
}
.Closed{ margin-top: 5px; .BackToSpec {
color: #CA3332; margin-top: 5px;
} color: #3A476E;
.BackToManager{ margin-top: 5px; }
color: #3A476E;
} .Closed {
.AssignedToHR{ margin-top: 5px; margin-top: 5px;
color: #259CB8; color: #CA3332;
} }
// .card-content{ .BackToManager {
// margin-left: -3px; margin-right: -9px;} margin-top: 5px;
// .card-content-ar{ color: #3A476E;
// margin-left: -122px; }
// }
.AssignedToHR {
margin-top: 5px;
.status{ color: #259CB8;
text-align: left; }
/* font: normal normal 600 10px/16px Poppins; */
letter-spacing: -0.4px; // .card-content{
opacity: 1; // margin-left: -3px; margin-right: -9px;}
// .card-content-ar{
font-family: var(--fontFamilyPoppins-SemiBold, inherit); // margin-left: -122px;
// font-weight: 600; // }
line-height: 16px;
font-size: 10px;
color: #024d71; .status {
} text-align: left;
.postedDate{ /* font: normal normal 600 10px/16px Poppins; */
text-align: left !important; letter-spacing: -0.4px;
// font-weight: 600; opacity: 1;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 16px !important; font-family: var(--fontFamilyPoppins-SemiBold, inherit);
font-size: 10px !important; // font-weight: 600;
letter-spacing: -0.4px !important; line-height: 16px;
color: #969696 !important; font-size: 10px;
opacity: 1 !important; color: #BE332F;
} }
.DescrText{
text-align: left; .postedDate {
// font: normal normal medium 13px/18px Poppins; text-align: left !important;
letter-spacing: -0.52px; // font-weight: 600;
color: #535353; font-family: var(--fontFamilyPoppins-SemiBold, inherit);
opacity: 1; line-height: 16px !important;
// font-weight: 500; font-size: 10px !important;
font-family: var(--fontFamilyPoppins-Medium, inherit); letter-spacing: -0.4px !important;
line-height: 5px; color: #969696 !important;
font-size: 13px; opacity: 1 !important;
} }
.DescrText-ar{
text-align: right; .DescrText {
// font: normal normal medium 13px/18px Poppins; text-align: left;
letter-spacing: -0.52px; // font: normal normal medium 13px/18px Poppins;
color: #535353; letter-spacing: -0.52px;
opacity: 1; color: #535353;
// font-weight: 500; opacity: 1;
font-family: var(--fontFamilyPoppins-Medium, inherit); // font-weight: 500;
line-height: 5px; font-family: var(--fontFamilyPoppins-Medium, inherit);
font-size: 13px; line-height: 5px;
} font-size: 13px;
.div{ }
position: relative;
display: flex; .DescrText-ar {
justify-content: space-between; text-align: right;
margin-bottom: -12px; // font: normal normal medium 13px/18px Poppins;
} letter-spacing: -0.52px;
color: #535353;
opacity: 1;
// font-weight: 500;
font-family: var(--fontFamilyPoppins-Medium, inherit);
line-height: 5px;
font-size: 13px;
}
.div {
position: relative;
display: flex;
justify-content: space-between;
margin-bottom: -12px;
}

@ -36,7 +36,7 @@
<ion-row style="margin-top: 11px;"> <ion-row style="margin-top: 11px;">
<ion-col [size]="6"> <ion-col [size]="6">
<p class="subTitle">{{ts.trPK('userProfile','role')}}</p> <p class="subTitle">{{ts.trPK('userProfile','role')}}</p>
<span class="Boldtext">{{employee.POSITION_NAME}}</span> <span class="Boldtext">{{jobName}}</span>
</ion-col> </ion-col>
<ion-col [size]="6" style="border-left: 1px solid rgb(221 221 221);"> <ion-col [size]="6" style="border-left: 1px solid rgb(221 221 221);">
<p class="subTitle" style="line-height: 12px !important;">{{ts.trPK('userProfile','empNo')}}</p> <p class="subTitle" style="line-height: 12px !important;">{{ts.trPK('userProfile','empNo')}}</p>
@ -61,7 +61,7 @@
</ion-segment-button> </ion-segment-button>
</ion-col> </ion-col>
<ion-col> <ion-col>
<span [ngClass]="direction == 'en' ? 'btnTitle' : 'btnTitle_ar'">{{ts.trPK('myTeam','profile-details')}}</span> <span class="btnTitle">{{ts.trPK('myTeam','profile-details')}}</span>
</ion-col> </ion-col>
</ion-col> </ion-col>
<ion-col [size]="4" (click)="getMenuEntries(employee)"> <ion-col [size]="4" (click)="getMenuEntries(employee)">
@ -72,7 +72,7 @@
<img class="imgSize" src="../assets/imgs/create-req.svg"> <img class="imgSize" src="../assets/imgs/create-req.svg">
</ion-segment-button> </ion-segment-button>
</ion-col> </ion-col>
<ion-col > <span [ngClass]="direction == 'en' ? 'btnTitle' : 'btnTitle_ar'">{{ts.trPK('vacation-rule','create-request')}}</span></ion-col> <ion-col > <span class="btnTitle">{{ts.trPK('vacation-rule','create-request')}}</span></ion-col>
</ion-col> </ion-col>
<!-- <ion-col [size]="3"> <!-- <ion-col [size]="3">
<ion-col> <ion-col>
@ -93,7 +93,7 @@
<img class="imgSize" src="../assets/imgs/team-members.svg"> <img class="imgSize" src="../assets/imgs/team-members.svg">
</ion-segment-button> </ion-segment-button>
</ion-col> </ion-col>
<ion-col><span [ngClass]="direction == 'en' ? 'btnTitle' : 'btnTitle_ar'">{{ts.trPK('myTeam','team-members')}}</span></ion-col> <ion-col><span class="btnTitle">{{ts.trPK('myTeam','team-members')}}</span></ion-col>
</ion-col> </ion-col>
</ion-segment> </ion-segment>
@ -502,7 +502,7 @@
</ion-col> </ion-col>
<ion-col [size]="12"> <ion-col [size]="12">
<h2 [ngClass]="direction == 'en' ? 'label1':'label1-ar' ">{{ts.trPK('userProfile','job')}}</h2> <h2 [ngClass]="direction == 'en' ? 'label1':'label1-ar' ">{{ts.trPK('userProfile','job')}}</h2>
<p [ngClass]="direction == 'en' ? 'label2':'label2-ar' ">{{employee.POSITION_NAME}}</p> <p [ngClass]="direction == 'en' ? 'label2':'label2-ar' ">{{jobName}}</p>
</ion-col> </ion-col>
<ion-col [size]="12"> <ion-col [size]="12">
<h2 [ngClass]="direction == 'en' ? 'label1':'label1-ar' ">{{ts.trPK('userProfile','payrol')}}</h2> <h2 [ngClass]="direction == 'en' ? 'label1':'label1-ar' ">{{ts.trPK('userProfile','payrol')}}</h2>
@ -514,7 +514,7 @@
</ion-col> --> </ion-col> -->
<ion-col [size]="12"> <ion-col [size]="12">
<h2 [ngClass]="direction == 'en' ? 'label1':'label1-ar' ">{{ts.trPK('userProfile','position')}}</h2> <h2 [ngClass]="direction == 'en' ? 'label1':'label1-ar' ">{{ts.trPK('userProfile','position')}}</h2>
<p [ngClass]="direction == 'en' ? 'label2':'label2-ar' ">{{employee.POSITION_NAME}}</p> <p [ngClass]="direction == 'en' ? 'label2':'label2-ar' ">{{jobName}}</p>
</ion-col> </ion-col>
<ion-col [size]="12" style="border-bottom: none;"> <ion-col [size]="12" style="border-bottom: none;">
<h2 [ngClass]="direction == 'en' ? 'label1':'label1-ar' ">{{ts.trPK('userProfile','grade')}}</h2> <h2 [ngClass]="direction == 'en' ? 'label1':'label1-ar' ">{{ts.trPK('userProfile','grade')}}</h2>

@ -22,7 +22,7 @@ ion-title {
.contentBg:before { .contentBg:before {
position: absolute; position: absolute;
content: ""; content: "";
background: #024d71; background: #BE332F;
height: 140px; height: 140px;
width: 100%; width: 100%;
left: 0; left: 0;
@ -123,7 +123,7 @@ $actionBtnSize : 36px;
border-radius: $actionBtnSize; border-radius: $actionBtnSize;
margin: 0 auto; margin: 0 auto;
display: block; display: block;
background-color: #024d71; background-color: #BE332F;
line-height: $actionBtnSize; line-height: $actionBtnSize;
margin-bottom: 3px; margin-bottom: 3px;
font-family: var(--fontFamilyPoppins-SemiBold, inherit); font-family: var(--fontFamilyPoppins-SemiBold, inherit);
@ -195,9 +195,8 @@ $actionBtnSize : 36px;
border-radius: 50% !important; border-radius: 50% !important;
// margin-right: 22px; // margin-right: 22px;
// margin-left: 22px; // margin-left: 22px;
margin-left: 30px; margin-left: 19px;
margin-right: 30px; background-color: #BE332F;
background-color: #024d71;
display: flex; display: flex;
} }
} }
@ -205,7 +204,7 @@ $actionBtnSize : 36px;
@media screen and (min-width: 768px) and (max-width:1024px) { @media screen and (min-width: 768px) and (max-width:1024px) {
.active-Segment { .active-Segment {
background: #024d71 !important; background: #BE332F !important;
// padding-left: 17px; // padding-left: 17px;
// display: flex; // display: flex;
width: 11%; width: 11%;
@ -235,10 +234,10 @@ $actionBtnSize : 36px;
border-radius: 50% !important; border-radius: 50% !important;
// margin-right: 22px; // margin-right: 22px;
// margin-left: 22px; // margin-left: 22px;
margin-left: 30px; margin-left: 15px;
background: #414040 !important; background: #414040 !important;
display: flex; display: flex;
margin-right: 30px;
} }
} }
@ -312,7 +311,7 @@ $actionBtnSize : 36px;
} }
.search-dropdown { .search-dropdown {
background: #024d71; background: #BE332F;
ion-select { ion-select {
.select-text { .select-text {
@ -381,7 +380,7 @@ $actionBtnSize : 36px;
.activeArrow { .activeArrow {
height: 20px; height: 20px;
width: 20px; width: 20px;
color: #024d71; color: #BE332F;
} }
.disabledArrow { .disabledArrow {
@ -393,7 +392,7 @@ $actionBtnSize : 36px;
.activeArrow-ar { .activeArrow-ar {
height: 20px; height: 20px;
width: 20px; width: 20px;
color: #024d71; color: #BE332F;
margin-right: 275px; margin-right: 275px;
} }
@ -659,14 +658,14 @@ $actionBtnSize : 36px;
} }
.green-label-container { .green-label-container {
// border-top: 5px solid #024d71; // border-top: 5px solid #BE332F;
// padding: 1px 0px; // padding: 1px 0px;
// margin: 15px 0px // margin: 15px 0px
width: 12px; width: 12px;
height: 12px; height: 12px;
padding-right: -10px; padding-right: -10px;
border-radius: 100%; border-radius: 100%;
background-color: #024d71; background-color: #BE332F;
} }
@ -832,9 +831,8 @@ $actionBtnSize : 36px;
// color: black !important; // color: black !important;
// display: block !important; // display: block !important;
text-align: center; text-align: center;
letter-spacing: -0.52px; letter-spacing: -0.64px;
color: #5C6F79; color: #2B353E;
font-weight: bold;
opacity: 1; opacity: 1;
font-family: var(--fontFamilyPoppins-SemiBold, inherit); font-family: var(--fontFamilyPoppins-SemiBold, inherit);
font-size: 16px; font-size: 16px;
@ -881,7 +879,7 @@ $actionBtnSize : 36px;
width: 22px; width: 22px;
height: 20px; height: 20px;
border-radius: 100%; border-radius: 100%;
background-color: #024d71; background-color: #BE332F;
z-index: 9; z-index: 9;
margin-top: 25px; margin-top: 25px;
padding-left: 4px; padding-left: 4px;
@ -891,7 +889,7 @@ $actionBtnSize : 36px;
width: 22px; width: 22px;
height: 20px; height: 20px;
border-radius: 100%; border-radius: 100%;
background-color: #024d71; background-color: #BE332F;
z-index: 9; z-index: 9;
margin-top: 25px; margin-top: 25px;
padding-right: 4px; padding-right: 4px;
@ -940,17 +938,16 @@ $actionBtnSize : 36px;
.name { .name {
text-align: center; text-align: center;
letter-spacing: -0.84px; letter-spacing: -0.84px;
color: #004D71; color: #2B353E;
font-weight: bold;
opacity: 1; opacity: 1;
font-family: 'Inter' !important; font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 21px; line-height: 21px;
font-size: 21px; font-size: 21px;
} }
.email { .email {
text-align: center; text-align: center;
font-family: 'Inter' !important; font-family: var(--fontFamilyPoppins-SemiBold, inherit);
font-size: 13px; font-size: 13px;
line-height: 6px; line-height: 6px;
letter-spacing: -0.52px; letter-spacing: -0.52px;
@ -961,9 +958,8 @@ $actionBtnSize : 36px;
.subTitle { .subTitle {
text-align: center; text-align: center;
letter-spacing: -0.56px; letter-spacing: -0.52px;
color: #004D71; color: #A2A2A2;
font-weight: bold;
opacity: 1; opacity: 1;
font-family: var(--fontFamilyPoppins-SemiBold, inherit); font-family: var(--fontFamilyPoppins-SemiBold, inherit);
font-size: 13px; font-size: 13px;
@ -976,8 +972,7 @@ $actionBtnSize : 36px;
line-height: 20px; line-height: 20px;
font-size: 20px; font-size: 20px;
letter-spacing: -0.8px; letter-spacing: -0.8px;
color: #004D71; color: #2B353E;
font-weight: bold;
opacity: 1; opacity: 1;
margin-top: 20px; margin-top: 20px;
margin-bottom: 2px; margin-bottom: 2px;
@ -987,10 +982,9 @@ $actionBtnSize : 36px;
text-align: left; text-align: left;
font-family: var(--fontFamilyPoppins-SemiBold, inherit); font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 0px; line-height: 0px;
font-size: 14px; font-size: 13px;
letter-spacing: -0.56px; letter-spacing: -0.52px;
color: #5C6F79; color: #A2A2A2;
font-weight: bold;
opacity: 1; opacity: 1;
} }
@ -1000,8 +994,7 @@ $actionBtnSize : 36px;
line-height: 5px; line-height: 5px;
font-size: 16px; font-size: 16px;
letter-spacing: -0.64px; letter-spacing: -0.64px;
color: #004D71; color: #2B353E;
font-weight: bold;
opacity: 1; opacity: 1;
} }
@ -1011,37 +1004,30 @@ $actionBtnSize : 36px;
line-height: 20px; line-height: 20px;
font-size: 20px; font-size: 20px;
letter-spacing: -0.8px; letter-spacing: -0.8px;
color: #004D71; color: #2B353E;
font-weight: bold;
opacity: 1; opacity: 1;
margin-top: 20px; margin-top: 20px;
margin-bottom: 2px; margin-bottom: 2px;
padding: 5px;
font-weight: bold;
} }
.label1-ar { .label1-ar {
text-align: right; text-align: right;
font-family: var(--fontFamilyPoppins-SemiBold, inherit); font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 0px; line-height: 0px;
font-size: 18px; font-size: 13px;
letter-spacing: -0.56px; letter-spacing: -0.52px;
color: #5C6F79; color: #A2A2A2;
font-weight: bold;
opacity: 1; opacity: 1;
padding: 1px 5px 1px 5px;
} }
.label2-ar { .label2-ar {
text-align: right; text-align: right;
font-family: var(--fontFamilyPoppins-SemiBold, inherit); font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 5px; line-height: 5px;
font-size: 18px; font-size: 16px;
letter-spacing: -0.64px; letter-spacing: -0.64px;
color: #004D71; color: #2B353E;
font-weight: bold;
opacity: 1; opacity: 1;
padding: 1px 5px 1px 5px;
} }
@media screen and (min-width: 768px) and (max-width:1024px) { @media screen and (min-width: 768px) and (max-width:1024px) {
@ -1077,7 +1063,7 @@ $actionBtnSize : 36px;
width: 23px; width: 23px;
height: 23px; height: 23px;
border-radius: 100%; border-radius: 100%;
background-color: #024d71; background-color: #BE332F;
z-index: 9; z-index: 9;
margin-top: 25px; margin-top: 25px;
/* padding-left: 4px; */ /* padding-left: 4px; */
@ -1095,7 +1081,7 @@ $actionBtnSize : 36px;
width: 23px; width: 23px;
height: 23px; height: 23px;
border-radius: 100%; border-radius: 100%;
background-color: #024d71; background-color: #BE332F;
z-index: 9; z-index: 9;
margin-top: 25px; margin-top: 25px;
/* padding-left: 4px; */ /* padding-left: 4px; */
@ -1119,23 +1105,11 @@ $actionBtnSize : 36px;
text-align: center; text-align: center;
font-family: var(--fontFamilyPoppins-SemiBold, inherit); font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 10px; line-height: 10px;
font-size: 12px; font-size: 11px;
color: #4D4D4D;
margin-top: -13px;
font-weight: bold;
}
.btnTitle_ar {
text-align: center;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 10px;
font-size: 16px;
color: #4D4D4D; color: #4D4D4D;
margin-top: -13px; margin-top: -13px;
font-weight: bold;
} }
.btnDiv { .btnDiv {
position: relative; position: relative;
display: flex; display: flex;

@ -245,10 +245,10 @@ export class DetailsComponent implements OnInit {
this.employee = this.common.sharedService.getSharedData(MyTeamService.EMPLOYEE_SHARED_DATA, false); this.employee = this.common.sharedService.getSharedData(MyTeamService.EMPLOYEE_SHARED_DATA, false);
console.log(this.employee); console.log(this.employee);
let jobTitle = this.employee.POSITION_NAME; let jobTitle = this.employee.POSITION_NAME.split('.');
// if (jobTitle && jobTitle.length > 1) { if (jobTitle && jobTitle.length > 1) {
this.jobName = jobTitle; this.jobName = jobTitle[0] + " " + jobTitle[1];
// } }
const request = { const request = {
P_SELECTED_EMPLOYEE_NUMBER: this.employee.EMPLOYEE_NUMBER P_SELECTED_EMPLOYEE_NUMBER: this.employee.EMPLOYEE_NUMBER
@ -449,7 +449,7 @@ export class DetailsComponent implements OnInit {
data: [this.absentDays, this.attendedDays], data: [this.absentDays, this.attendedDays],
backgroundColor: [ backgroundColor: [
'black', 'black',
'#024d71' '#BE332F'
], ],
borderWidth: 1, borderWidth: 1,
// cutoutPrecentage:20 , // cutoutPrecentage:20 ,
@ -793,7 +793,7 @@ export class DetailsComponent implements OnInit {
selEmp.EMPLOYEE_DISPLAY_NAME = selEmp.EMPLOYEE_DISPLAY_NAME ? selEmp.EMPLOYEE_DISPLAY_NAME : selEmp.NAME; selEmp.EMPLOYEE_DISPLAY_NAME = selEmp.EMPLOYEE_DISPLAY_NAME ? selEmp.EMPLOYEE_DISPLAY_NAME : selEmp.NAME;
selEmp.EMPLOYEE_IMAGE = selEmp.EMPLOYEE_IMAGE ? selEmp.EMPLOYEE_IMAGE : ''; selEmp.EMPLOYEE_IMAGE = selEmp.EMPLOYEE_IMAGE ? selEmp.EMPLOYEE_IMAGE : '';
selEmp.EMAIL_ADDRESS = selEmp.EMAIL_ADDRESS ? selEmp.EMAIL_ADDRESS : ''; selEmp.EMAIL_ADDRESS = selEmp.EMAIL_ADDRESS ? selEmp.EMAIL_ADDRESS : '';
if(!this.isFavorite) { if (!this.isFavorite) {
let confirmBoxhtml = `<div> let confirmBoxhtml = `<div>
<h4>Do you want to add ` + selEmp.EMPLOYEE_DISPLAY_NAME + ` in your favorite list </h4> <h4>Do you want to add ` + selEmp.EMPLOYEE_DISPLAY_NAME + ` in your favorite list </h4>
<br/> <br/>
@ -817,31 +817,31 @@ export class DetailsComponent implements OnInit {
confirmBoxhtml confirmBoxhtml
, () => { , () => {
const request = const request =
[ [
{ {
"USER_NAME": this.employee.EMPLOYEE_NUMBER, "USER_NAME": this.employee.EMPLOYEE_NUMBER,
"EMPLOYEE_DISPLAY_NAME": this.employee.EMPLOYEE_DISPLAY_NAME, "EMPLOYEE_DISPLAY_NAME": this.employee.EMPLOYEE_DISPLAY_NAME,
"EMAIL_ADDRESS": this.employee.EMAIL_ADDRESS, "EMAIL_ADDRESS": this.employee.EMAIL_ADDRESS,
"EMPLOYEE_IMAGE": this.employee.EMPLOYEE_IMAGE, "EMPLOYEE_IMAGE": this.employee.EMPLOYEE_IMAGE,
"IsFavorite": true "IsFavorite": true
} }
]; ];
this.saveUserFavruiteList(request); this.saveUserFavruiteList(request);
}, },
() => {}); () => { });
} }
} else { } else {
const request = const request =
[ [
{ {
"USER_NAME": this.employee.EMPLOYEE_NUMBER, "USER_NAME": this.employee.EMPLOYEE_NUMBER,
"EMPLOYEE_DISPLAY_NAME": this.employee.EMPLOYEE_DISPLAY_NAME, "EMPLOYEE_DISPLAY_NAME": this.employee.EMPLOYEE_DISPLAY_NAME,
"EMAIL_ADDRESS": this.employee.EMAIL_ADDRESS, "EMAIL_ADDRESS": this.employee.EMAIL_ADDRESS,
"EMPLOYEE_IMAGE": this.employee.EMPLOYEE_IMAGE, "EMPLOYEE_IMAGE": this.employee.EMPLOYEE_IMAGE,
"IsFavorite": false "IsFavorite": false
} }
]; ];
this.saveUserFavruiteList(request); this.saveUserFavruiteList(request);
} }
} }

@ -1,5 +1,6 @@
<app-generic-header <app-generic-header
showBack="true" showBack="true"
subordinateLeave='true'
backLink="/home" backLink="/home"
[headerText]="'myTeam, myTeam-header' | translate"> [headerText]="'myTeam, myTeam-header' | translate">
</app-generic-header> </app-generic-header>
@ -39,11 +40,11 @@
<ion-row> <ion-row>
<ion-col > <ion-col >
<div (ionChange)="searchEmployee($event)" class="search-label"> <div (ionChange)="searchEmployee($event)" class="search-label">
<ion-input *ngIf="showEmailInput" [placeholder]="'myTeam, search-email' | translate" [(ngModel)]="searchEmail" pattern="email" ></ion-input> <ion-input *ngIf="showEmailInput" placeholder="Search by Email" [(ngModel)]="searchEmail" pattern="email" ></ion-input>
<ion-input *ngIf="showUserNameOrNameInput" [placeholder]="'myTeam, search-name' | translate" [(ngModel)]="searchNameOrUserName" ></ion-input> <ion-input *ngIf="showUserNameOrNameInput" placeholder ="Search by Name" [(ngModel)]="searchNameOrUserName" ></ion-input>
<ion-input *ngIf="showUserNameInput" [placeholder]="'myTeam, search-username' | translate" [(ngModel)]="searchUserName" ></ion-input> <ion-input *ngIf="showUserNameInput" placeholder ="Search by Username" [(ngModel)]="searchUserName" ></ion-input>
</div> </div>
<div *ngIf="isSearch" (click)="clearSearch()" [class]="direction =='en' ? 'search-container' : 'search-container-ar'"> <div *ngIf="isSearch" (click)="clearSearch()" class="search-container">
<ion-col style="float: right;" > <ion-col style="float: right;" >
<ion-icon name="close" ></ion-icon> <ion-icon name="close" ></ion-icon>
</ion-col> </ion-col>
@ -51,13 +52,85 @@
</ion-col> </ion-col>
</ion-row> </ion-row>
</div> </div>
<!-- <div class="result-text-container">
<h2>{{totalEmployees}}</h2>
<span>{{ts.trPK('myTeam','total')}} <br> {{ts.trPK('myTeam','team-members')}}</span>
</div> -->
</div> </div>
<div class="div"> <div class="div">
<div class="text" >{{ts.trPK('myTeam','my-team-members')}}</div> <div class="text" >{{ts.trPK('myTeam','my-team-members')}}</div>
<div [ngClass]="direction == 'en' ? 'numberEmp':'numberEmp-ar' ">{{EmployeeTotal}}</div> <div [ngClass]="direction == 'en' ? 'numberEmp':'numberEmp-ar' ">{{EmployeeTotal}}</div>
</div> </div>
<!-- <div>
<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 class="result-graph">
<div class="request-heading">
<span>{{ts.trPK('myTeam','team-stats')}}</span>
</div>
<div class="result-text-container">
<h2>{{totalEmployees}}</h2>
<span>{{ts.trPK('myTeam','total')}} <br> {{ts.trPK('myTeam','team-members')}}</span>
</div>
<p-chart class="today-graph" type="doughnut" [data]="data" [options]="options"></p-chart>
</div> -->
<!-- <ion-row class="filters-row">
<ion-slides [options]="slideOptsOne">
<ion-slide *ngFor="let filter of filters; let i=index">
<app-card-filter
[value]="filter.value"
[text]="filter.name"
[color]="filter.color"
[active]="filter.active"
(click)="activeFilter(i)"
></app-card-filter>
</ion-slide>
</ion-slides>
</ion-row> -->
<!-- <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 ="{{ts.trPK('general','search')}}" [(ngModel)]="searchNameOrUserName"></ion-input>
</ion-col>
<ion-col [size]="2" style="background: #ccc;text-align: center;" no-padding (click)="searchEmployee()">
<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)="clearSearch()">
<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"> <ng-container *ngFor="let subordinate of empSubordinate;let i=index">
<app-employee-information <app-employee-information
[name]="subordinate.EMPLOYEE_NAME" [name]="subordinate.EMPLOYEE_NAME"

@ -23,7 +23,7 @@ ion-title {
.contentBg:before { .contentBg:before {
position: absolute; position: absolute;
content: ""; content: "";
background: #024d71; background: #BE332F;
height: 140px; height: 140px;
width: 100%; width: 100%;
left: 0; left: 0;
@ -36,15 +36,20 @@ ion-content {
} }
.request-heading { .request-heading {
padding-left: 20px; padding-left: 15px;
margin-top: 10px; margin-top: 10px;
padding-right: 20px;
span { span {
// display: block;
// padding-top: 8px;
// padding-left: 15px;
// font-weight: bold;
// font-size: 12px;
// margin-top: 9px;
text-align: left; text-align: left;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 18px; line-height: 18px;
font-weight: bold; font-size: 12px;
letter-spacing: -0.48px; letter-spacing: -0.48px;
color: #2B353E; color: #2B353E;
opacity: 1; opacity: 1;
@ -52,7 +57,13 @@ ion-content {
} }
.search-label { .search-label {
// border: 1px solid #ccc;
// margin-left: 15px;
// margin-right: 15px;
// border-radius: 22px;
// margin-top: 24px;
// font-size: 11px;
// color: rgb(143, 141, 141);
border: 1px solid #ccc; border: 1px solid #ccc;
margin-left: 15px; margin-left: 15px;
margin-right: 15px; margin-right: 15px;
@ -62,7 +73,6 @@ ion-content {
color: #8f8d8d; color: #8f8d8d;
margin-right: 15px !important; margin-right: 15px !important;
padding: 10px; padding: 10px;
font-family: 'Inter' !important;
} }
.result-graph { .result-graph {
@ -126,7 +136,7 @@ ion-content {
} }
.search-dropdown { .search-dropdown {
background: #024d71; background: #BE332F;
ion-select { ion-select {
.select-text { .select-text {
@ -188,7 +198,9 @@ ion-content {
} }
.search-container { .search-container {
// margin-top: 15px;
// margin-top: -35px;
// margin-left: 262px;
width: 30px; width: 30px;
height: 30px; height: 30px;
position: absolute; position: absolute;
@ -197,6 +209,9 @@ ion-content {
z-index: 999999; z-index: 999999;
ion-col { ion-col {
// background: white;
// border-radius: 12px;
// padding-right: 10px;
flex: none; flex: none;
ion-icon { ion-icon {
@ -213,32 +228,12 @@ ion-content {
} }
} }
.search-container-ar { // .myClass .toggle-icon {
// background-color: purple; // this changes the background, ie the grey stripe.
width: 30px; // .toggle-inner {
height: 30px; // background-color: yellow; // this changes the backgroundcolor of the toggle dot.
position: absolute; // }
top: 45px; // }
left: 38px;
z-index: 999999;
ion-col {
flex: none;
ion-icon {
margin-right: 3px;
font-size: 14px;
margin-left: 3px;
vertical-align: middle;
}
span {
font-size: 12px;
vertical-align: middle;
}
}
}
@media only screen and (max-width: 375px) { @media only screen and (max-width: 375px) {
.text-label { .text-label {
@ -254,21 +249,34 @@ ion-content {
.text-label { .text-label {
// --color: black !important;
// font-size: 13px;
// margin-left: 15px;
// margin-right: 18px;
text-align: left; text-align: left;
// font: normal normal 600 12px/18px Poppins;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 18px; line-height: 18px;
font-size: 12px; font-size: 12px;
letter-spacing: -0.48px; letter-spacing: -0.48px;
color: #575757 !important; color: #575757 !important;
opacity: 1; opacity: 1;
margin-left: 5px; margin-left: 15px;
margin-right: 5px; margin-right: 18px;
font-weight: bold;
} }
.radio-list { .radio-list {
background: white; background: white;
// margin-left: 18px;
/* margin-right: 10px; */
// margin-top: 12px;
} }
// .selected .radio-icon {
// border-color: #0064D9;
// color: red;
// }
.radio-icon { .radio-icon {
.custom-radio .radio-icon { .custom-radio .radio-icon {
@ -283,8 +291,12 @@ ion-content {
} }
.text { .text {
// font-size: 16px;
// font-weight: bolder;
// font-family: 'WorkSans-Bold';
// margin-top: 27px;
text-align: left; text-align: left;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 11px; line-height: 11px;
font-size: 20px; font-size: 20px;
letter-spacing: -0.8px; letter-spacing: -0.8px;
@ -292,16 +304,31 @@ ion-content {
opacity: 1; opacity: 1;
margin-top: 30px; margin-top: 30px;
margin-bottom: 28px; margin-bottom: 28px;
font-weight: bold;
} }
// .number{
// width: 21px;
// height: 21px;
// padding-right: -10px;
// border-radius: 100%;
// background-color: #BE332F;
// z-index: 9;
// margin-top: 26px;
// }
// .numberEmp{
// color: white;
// font-size: 12px;
// font-weight: bolder;
// margin-left: 3px;
// padding-top: 2px;
// }
.number { .number {
width: 22px; width: 22px;
height: 20px; height: 20px;
border-radius: 100%; border-radius: 100%;
background-color: #024d71; background-color: #BE332F;
z-index: 9; z-index: 9;
margin-top: 25px; margin-top: 25px;
padding-left: 4px; padding-left: 4px;
@ -311,7 +338,7 @@ ion-content {
width: 22px; width: 22px;
height: 20px; height: 20px;
border-radius: 100%; border-radius: 100%;
background-color: #024d71; background-color: #BE332F;
z-index: 9; z-index: 9;
margin-top: 25px; margin-top: 25px;
padding-right: 4px; padding-right: 4px;
@ -324,52 +351,33 @@ ion-content {
/* padding-top: 5px; */ /* padding-top: 5px; */
/* padding-right: 20px; */ /* padding-right: 20px; */
margin-left: 13px; margin-left: 13px;
width: 25px; width: 23px;
height: 25px; height: 23px;
border-radius: 100%;
color: white;
font-size: 12px;
font-weight: bolder;
margin-left: 13px;
width: 25px;
height: 25px;
border-radius: 100%; border-radius: 100%;
background-color: #004D71; background-color: #BE332F;
z-index: 9;
margin-top: 25px;
text-align: center;
padding-top: 5px;
z-index: 9; z-index: 9;
margin-top: 25px; margin-top: 25px;
/* padding-left: 4px; */ /* padding-left: 4px; */
text-align: center; text-align: center;
padding-top: 5px; padding-top: 3px;
} }
.numberEmp-ar { .numberEmp-ar {
color: white;
font-size: 11px;
font-weight: bolder;
margin-right: 13px;
width: 25px;
height: 25px;
border-radius: 100%;
color: white; color: white;
font-size: 12px; font-size: 12px;
font-weight: bolder; font-weight: bolder;
margin-left: 13px; /* padding-top: 5px; */
width: 25px; /* padding-right: 20px; */
height: 25px; margin-right: 13px;
width: 23px;
height: 23px;
border-radius: 100%; border-radius: 100%;
background-color: #004D71; background-color: #BE332F;
z-index: 9;
margin-top: 25px;
text-align: center;
padding-top: 5px;
z-index: 9; z-index: 9;
margin-top: 25px; margin-top: 25px;
/* padding-left: 4px; */
text-align: center; text-align: center;
padding-top: 5px; padding-top: 3px;
} }
.div { .div {

@ -32,7 +32,7 @@ export class HomeComponent implements OnInit {
myColor: string = 'secondary'; myColor: string = 'secondary';
public EmpTotal = []; public EmpTotal = [];
public EmployeeTotal: any; public EmployeeTotal: any;
public direction:any; public direction: any;
public options = { public options = {
cutoutPercentage: 80, cutoutPercentage: 80,
@ -41,13 +41,13 @@ export class HomeComponent implements OnInit {
}; };
public data = { public data = {
datasets: [ datasets: [
{ {
data: [100], data: [100],
backgroundColor: [ backgroundColor: [
'#024d71' '#BE332F'
], ],
borderWidth: 5 borderWidth: 5
}] }]
}; };
// public filters = [ // public filters = [
// { // {
@ -104,15 +104,15 @@ export class HomeComponent implements OnInit {
} }
ngOnInit() { ngOnInit() {
this.common.sharedService.setSharedData( [], DetailsComponent.opendEmployeesARR); this.common.sharedService.setSharedData([], DetailsComponent.opendEmployeesARR);
this.setIntitial(); this.setIntitial();
// this.getSuborinatesAttStatus(); // this.getSuborinatesAttStatus();
} }
toggleColor() { toggleColor() {
this.myColor = 'secondary'; this.myColor = 'secondary';
// this.myColor = '#024d71' // this.myColor = '#BE332F'
} }
// activeFilter(index: number) { // activeFilter(index: number) {
// this.previousActiveIndex = this.currentActiveIndex; // this.previousActiveIndex = this.currentActiveIndex;
@ -144,23 +144,23 @@ export class HomeComponent implements OnInit {
this.empSubordinate = this.arrList; this.empSubordinate = this.arrList;
this.isSearch = false; this.isSearch = false;
} }
if(this.searchKeySelect === 'Name'){ if (this.searchKeySelect === 'Name') {
this.empSubordinate = this.arrList.filter((item) => { this.empSubordinate = this.arrList.filter((item) => {
this.isSearch = true; this.isSearch = true;
return (item.EMPLOYEE_NAME.toLowerCase().indexOf(val.toLowerCase()) > -1); return (item.EMPLOYEE_NAME.toLowerCase().indexOf(val.toLowerCase()) > -1);
}); });
} else if(this.searchKeySelect === 'User Name'){ } else if (this.searchKeySelect === 'User Name') {
this.empSubordinate = this.arrList.filter((item) => { this.empSubordinate = this.arrList.filter((item) => {
this.isSearch = true; this.isSearch = true;
return (item.EMPLOYEE_NUMBER.toLowerCase().indexOf(val.toLowerCase()) > -1); return (item.EMPLOYEE_NUMBER.toLowerCase().indexOf(val.toLowerCase()) > -1);
}); });
} else if(this.searchKeySelect === 'Email'){ } else if (this.searchKeySelect === 'Email') {
this.empSubordinate = this.arrList.filter((item) => { this.empSubordinate = this.arrList.filter((item) => {
this.isSearch = true; this.isSearch = true;
return (item.EMPLOYEE_EMAIL_ADDRESS.toLowerCase().indexOf(val.toLowerCase()) > -1); return (item.EMPLOYEE_EMAIL_ADDRESS.toLowerCase().indexOf(val.toLowerCase()) > -1);
}); });
} }
} }
getEmpSubordinate() { getEmpSubordinate() {
@ -186,57 +186,57 @@ export class HomeComponent implements OnInit {
}; };
this.getEmployeeSubordinatesRequestObject = body; this.getEmployeeSubordinatesRequestObject = body;
this.myTeamService.getEmployeeSubordinates(body).subscribe((result: any) => { this.myTeamService.getEmployeeSubordinates(body).subscribe((result: any) => {
if (this.common.validResponse(result)) { if (this.common.validResponse(result)) {
if (!this.pageFirstVisit) { if (!this.pageFirstVisit) {
this.pageFirstVisit = true; this.pageFirstVisit = true;
this.totalEmployees = result.P_NUM_OF_SUBORDINATES; this.totalEmployees = result.P_NUM_OF_SUBORDINATES;
}
this.handleEmpResult(result.GetEmployeeSubordinatesList);
} }
this.handleEmpResult(result.GetEmployeeSubordinatesList);
}
}); });
} }
handleEmpResult(result) { handleEmpResult(result) {
this.EmployeeTotal = result.length; this.EmployeeTotal = result.length;
const lastItemIndex = result.length - 1; const lastItemIndex = result.length - 1;
const lastItem = result[lastItemIndex]; const lastItem = result[lastItemIndex];
if (lastItem) { if (lastItem) {
if (lastItem.NO_OF_ROWS === lastItem.ROW_NUM) { if (lastItem.NO_OF_ROWS === lastItem.ROW_NUM) {
this.isReachEnd = true; this.isReachEnd = true;
if (this.infiniteScroll) { if (this.infiniteScroll) {
this.infiniteScroll.complete(); this.infiniteScroll.complete();
}
} else {
this.isReachEnd = false;
if (this.infiniteScroll) {
this.infiniteScroll.complete();
}
} }
} } else {
if (this.common.hasData(result)) { this.isReachEnd = false;
this.getEmployeeSubordinatesRequestObject.P_PAGE_NUM++; if (this.infiniteScroll) {
if (this.empSubordinate.length === 0) { this.infiniteScroll.complete();
this.empSubordinate = result;
} else {
this.empSubordinate = this.empSubordinate.concat(result);
} }
}
}
if (this.common.hasData(result)) {
this.getEmployeeSubordinatesRequestObject.P_PAGE_NUM++;
if (this.empSubordinate.length === 0) {
this.empSubordinate = result;
} else { } else {
this.empSubordinate = []; this.empSubordinate = this.empSubordinate.concat(result);
} }
this.arrList = this.empSubordinate; } else {
this.empSubordinate = [];
}
this.arrList = this.empSubordinate;
} }
doInfinite(infiniteScroll) { doInfinite(infiniteScroll) {
if (!this.isReachEnd) { if (!this.isReachEnd) {
this.myTeamService.getEmployeeSubordinates(this.getEmployeeSubordinatesRequestObject).subscribe((result: any) => { this.myTeamService.getEmployeeSubordinates(this.getEmployeeSubordinatesRequestObject).subscribe((result: any) => {
if (this.common.validResponse(result)) { if (this.common.validResponse(result)) {
this.handleEmpResult(result.GetEmployeeSubordinatesList); this.handleEmpResult(result.GetEmployeeSubordinatesList);
} }
this.infiniteScroll.complete(); this.infiniteScroll.complete();
}); });
} else { } else {
if (this.infiniteScroll) { if (this.infiniteScroll) {
this.infiniteScroll.complete(); this.infiniteScroll.complete();
} }
} }
} }
@ -283,7 +283,7 @@ export class HomeComponent implements OnInit {
} }
} }
// getSuborinatesAttStatus(){ // getSuborinatesAttStatus(){
// const request = { // const request = {
@ -295,7 +295,7 @@ export class HomeComponent implements OnInit {
// this.myTeamService.getSuborinatesAttStatus(request, ()=> {} , this.ts.trPK('general', 'retry')).subscribe((result)=> // this.myTeamService.getSuborinatesAttStatus(request, ()=> {} , this.ts.trPK('general', 'retry')).subscribe((result)=>
// { // {
// this.handleRespondSuborinatesAttStatusResult(result); // this.handleRespondSuborinatesAttStatusResult(result);
// }) // })
// } // }

@ -14,7 +14,7 @@
<ion-grid> <ion-grid>
<ion-row> <ion-row>
<ion-col size='6'> <ion-col size='6'>
<ion-label position='floating' style="margin: 15px;" class="colBold">{{ts.trPK('general','from')}} </ion-label> <ion-label position='floating' style="margin-left: 15px;" class="colBold">{{ts.trPK('general','from')}} </ion-label>
<ion-item class='dynamicField' lines='none'> <ion-item class='dynamicField' lines='none'>
<ion-datetime style="padding: 0px" [(ngModel)]="startDate" min="1900" max="2100" displayFormat="MMM/DD/YYYY" placeholder="MM/DD/YYYY" required <ion-datetime style="padding: 0px" [(ngModel)]="startDate" min="1900" max="2100" displayFormat="MMM/DD/YYYY" placeholder="MM/DD/YYYY" required
@ -24,7 +24,7 @@
</ion-item> </ion-item>
</ion-col> </ion-col>
<ion-col size='6'> <ion-col size='6'>
<ion-label position='floating' style="margin: 15px;" class="colBold">{{ts.trPK('general','to')}} </ion-label> <ion-label position='floating' style="margin-left: 15px;" class="colBold">{{ts.trPK('general','to')}} </ion-label>
<ion-item class='dynamicField' lines='none'> <ion-item class='dynamicField' lines='none'>
<ion-datetime style="padding: 0px" [(ngModel)]="endDate" min="1900" max="2100" displayFormat="MMM/DD/YYYY" placeholder="MM/DD/YYYY" required <ion-datetime style="padding: 0px" [(ngModel)]="endDate" min="1900" max="2100" displayFormat="MMM/DD/YYYY" placeholder="MM/DD/YYYY" required
cancelText="{{ts.trPK('general','cancel')}}" cancelText="{{ts.trPK('general','cancel')}}"

@ -1,16 +1,18 @@
.confirmEitOkButton{ .confirmEitOkButton {
white-space: normal !important; white-space: normal !important;
text-transform: capitalize !important; text-transform: capitalize !important;
min-height: 45px !important; min-height: 45px !important;
min-width: 5px !important; min-width: 5px !important;
margin: 8px !important; margin: 8px !important;
--background: #024d71; --background: #BE332F;
width: 80% !important; width: 80% !important;
color: white!important; color: white !important;
border-radius: 16px !important; border-radius: 16px !important;
} --border-radius: 16px !important;
--box-shadow: none;
}
.team-member-container{ .team-member-container {
// background: white; // background: white;
// border-radius: 100px 20px 20px 100px; // border-radius: 100px 20px 20px 100px;
// margin-top: 15px; // margin-top: 15px;
@ -50,7 +52,7 @@
// background-color: green !important; // background-color: green !important;
// } // }
// } // }
.user-image{ .user-image {
// overflow: hidden; // overflow: hidden;
// position: relative; // position: relative;
// display: block; // display: block;
@ -70,10 +72,11 @@
} }
} }
.employee-name{ .employee-name {
display: inline-block; display: inline-block;
width: 80%; width: 80%;
.name{
.name {
// font-size: 16px; // font-size: 16px;
// color: black; // color: black;
// // margin: 0; // // margin: 0;
@ -84,51 +87,52 @@
// margin-left: -10px; // margin-left: -10px;
// margin-top: -5px; // margin-top: -5px;
// font-family: 'WorkSans-Bold'; // font-family: 'WorkSans-Bold';
font-size: 16px; font-size: 16px;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
margin-left: -10px; margin-left: -10px;
margin-top: -5px; margin-top: -5px;
text-align: left; text-align: left;
font-family: var(--fontFamilyPoppins-SemiBold, inherit); font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 25px; line-height: 25px;
letter-spacing: -0.64px; letter-spacing: -0.64px;
color: #2B353E; color: #2B353E;
opacity: 1; opacity: 1;
} }
.title{ .title {
// font-size: 13px; // font-size: 13px;
// color: #888; // color: #888;
// 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: -6px; // margin-top: -6px;
// color: black; // color: black;
font-family: var(--fontFamilyPoppins-SemiBold, inherit); font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 12px; line-height: 12px;
letter-spacing: -0.56px; letter-spacing: -0.56px;
color: #575757; color: #575757;
opacity: 1; opacity: 1;
font-size: 14px; font-size: 14px;
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;
} }
} }
.employee-name-ar{ .employee-name-ar {
display: inline-block; display: inline-block;
width: 80%; width: 80%;
.name{
.name {
// font-size: 16px; // font-size: 16px;
// color: black; // color: black;
// // margin: 0; // // margin: 0;
@ -139,61 +143,64 @@
// margin-left: -10px; // margin-left: -10px;
// margin-top: -5px; // margin-top: -5px;
// font-family: 'WorkSans-Bold'; // font-family: 'WorkSans-Bold';
font-size: 16px; font-size: 16px;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
margin-left: -10px; margin-left: -10px;
margin-top: -5px; margin-top: -5px;
text-align: right; text-align: right;
font-family: var(--fontFamilyPoppins-SemiBold, inherit); font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 25px; line-height: 25px;
letter-spacing: -0.64px; letter-spacing: -0.64px;
color: #2B353E; color: #2B353E;
opacity: 1; opacity: 1;
} }
.title{ .title {
// font-size: 13px; // font-size: 13px;
// color: #888; // color: #888;
// 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: -6px; // margin-top: -6px;
// color: black; // color: black;
font-family: var(--fontFamilyPoppins-SemiBold, inherit); font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 12px; line-height: 12px;
letter-spacing: -0.56px; letter-spacing: -0.56px;
color: #575757; color: #575757;
opacity: 1; opacity: 1;
font-size: 14px; font-size: 14px;
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;
} }
} }
.image-container{
.image-container {
width: 20%; width: 20%;
display: inline-block; display: inline-block;
text-align: center; text-align: center;
vertical-align: top; vertical-align: top;
margin-top: 5px; margin-top: 5px;
} }
.swipe-information{
.swipe-information {
color: #888; color: #888;
font-size: 12px; font-size: 12px;
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
padding-top: 6px; padding-top: 6px;
margin-top: 6px; margin-top: 6px;
.check-in { .check-in {
font-size: 12px; font-size: 12px;
margin-right: 15px; margin-right: 15px;
} }
} }

@ -38,7 +38,7 @@
</ion-row> </ion-row>
<ion-row class="search-container"> <ion-row class="search-container">
<ion-col [ngClass]="direction == 'en'? 'float-r':'float-l'" size=[6] *ngIf="showSearchButton" (click)="clearSearch()"> <ion-col [ngClass]="direction == 'en'? 'float-l':'float-r'" size=[6] *ngIf="showSearchButton" (click)="clearSearch()">
<span style="margin-left: 5px;">{{ts.trPK('work-list','clear-search')}}</span> <span style="margin-left: 5px;">{{ts.trPK('work-list','clear-search')}}</span>
<ion-icon name="close" ></ion-icon> <ion-icon name="close" ></ion-icon>
</ion-col> </ion-col>
@ -60,7 +60,7 @@
</ion-col> </ion-col>
</ion-row> </ion-row>
<div [ngClass]="direction === 'ar' ? 'worklist-content-ar' : 'worklist-content'"> <div style="position: relative;">
<div [ngClass]="showFormattedData.length > 0 && direction == 'en'? 'work-list-container' : 'work-list-container-ar'" *ngIf='selectedFilter != "ITG" && showFormattedData.length > 0'> <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"> <div *ngFor="let formattedData of showFormattedData; let i = index">
<span [ngClass]="direction == 'en'? 'date-span':'date-span-ar'">{{formattedData.date}}</span> <span [ngClass]="direction == 'en'? 'date-span':'date-span-ar'">{{formattedData.date}}</span>

@ -32,7 +32,8 @@
height: 99%; height: 99%;
background: #e4e4e4; background: #e4e4e4;
z-index: 1; z-index: 1;
/* margin-left: -10px; */
/* z-index: 1; */
} }
.timelineMain .timelineMain-thumb { .timelineMain .timelineMain-thumb {
@ -41,6 +42,12 @@
width: 50px; width: 50px;
z-index: 2; z-index: 2;
position: absolute; position: absolute;
// :root[dir="ltr"]{
// left: 37px;
// }
// :root[dir="rtl"]{
// right: 37px;
// }
width: 50px; width: 50px;
float: right; float: right;
top: 0px; top: 0px;
@ -48,6 +55,9 @@
.timelineMain .timelineMain-thumb.timelineMain-icon { .timelineMain .timelineMain-thumb.timelineMain-icon {
height: 50px; height: 50px;
// text-align: center;
// color: white;
// border: 5px solid #CBD0D3;
transform: scale(0.3); transform: scale(0.3);
} }
@ -260,7 +270,7 @@ ion-title {
.contentBg:before { .contentBg:before {
position: absolute; position: absolute;
content: ""; content: "";
background: #024d71; background: #BE332F;
height: 140px; height: 140px;
width: 100%; width: 100%;
left: 0; left: 0;
@ -329,21 +339,12 @@ ion-content {
} }
.filters-row { .filters-row {
margin-top: 20px; margin-top: 10px;
margin-left: 20px; margin-left: 20px;
} }
.filters-row-ar { .filters-row-ar {
margin-top: 20px; margin-top: 15px;
margin-right: 20px;
}
.worklist-content {
position: relative;
}
.worklist-content-ar {
position: relative;
margin-right: 20px; margin-right: 20px;
} }
@ -373,6 +374,7 @@ ion-content {
min-height: 200px; min-height: 200px;
margin-bottom: 80px; margin-bottom: 80px;
padding-top: 15px; padding-top: 15px;
margin-right: 20px;
} }
.work-list-container-ar:before { .work-list-container-ar:before {
@ -399,8 +401,6 @@ ion-content {
// padding-right: 30px; // padding-right: 30px;
flex: none; flex: none;
box-shadow: 0px 0px 3px #cdcdcd;
ion-icon { ion-icon {
margin-right: 3px; margin-right: 3px;
font-size: 20px; font-size: 20px;
@ -429,7 +429,7 @@ ion-content {
border-radius: 50%; border-radius: 50%;
width: 15px; width: 15px;
height: 15px; height: 15px;
background-color: #004D71; background-color: #BE332F;
top: 1px; top: 1px;
} }
@ -448,7 +448,7 @@ ion-content {
border-radius: 50%; border-radius: 50%;
width: 15px; width: 15px;
height: 15px; height: 15px;
background-color: #024d71; background-color: #be332f;
top: 1px; top: 1px;
} }
@ -463,7 +463,6 @@ ion-content {
margin-right: 20px; margin-right: 20px;
margin-bottom: 15px; margin-bottom: 15px;
padding-right: 15px; padding-right: 15px;
box-shadow: 0px 0px 3px #cdcdcd;
p { p {
font-size: 14px; font-size: 14px;
@ -505,7 +504,7 @@ ion-content {
.text-span-active { .text-span-active {
font-size: 12px; font-size: 12px;
color: white; color: white;
background-color: #024d71; background-color: #BE332F;
width: auto; width: auto;
height: 40px; height: 40px;
border: 1px solid; border: 1px solid;
@ -525,8 +524,8 @@ ion-content {
.float-r { .float-r {
float: right; float: right;
} }
.float-l { .float-l {
float: left; float: left;
} }

@ -112,7 +112,7 @@ export class HomeComponent implements OnInit {
value: 0, value: 0,
name: 'HR', name: 'HR',
active: false, active: false,
color: '#18a169', color: '#c6903e',
key: 'HRSSA', key: 'HRSSA',
disable: false disable: false
}, },
@ -207,9 +207,7 @@ export class HomeComponent implements OnInit {
this.data = values.data; this.data = values.data;
this.filters = values.filters; this.filters = values.filters;
// const loadWorkList = this.common.sharedService.getSharedData('loadWorkList', false); const loadWorkList = this.common.sharedService.getSharedData('loadWorkList', false);
const loadWorkList = true;
if (loadWorkList) { if (loadWorkList) {
this.receivedITGCount = false; this.receivedITGCount = false;
this.showChart = false; this.showChart = false;
@ -229,9 +227,7 @@ export class HomeComponent implements OnInit {
this.direction = TranslatorService.getCurrentLanguageName(); this.direction = TranslatorService.getCurrentLanguageName();
this.worklistNotifications = this.common.sharedService.getSharedData('worklistNotifications', false); this.worklistNotifications = this.common.sharedService.getSharedData('worklistNotifications', false);
// var isWorklistChanged = this.common.sharedService.getSharedData(HomeComponent.COUNT_CHANGED); var isWorklistChanged = this.common.sharedService.getSharedData(HomeComponent.COUNT_CHANGED);
var isWorklistChanged = true;
if (isWorklistChanged) { if (isWorklistChanged) {
this.openNotificationsDashboard() this.openNotificationsDashboard()
} }

@ -5,10 +5,10 @@ export class WorkListSubmitterInfoRequest extends Request{
public P_NOTIFICATION_TYPE: string;//string public P_NOTIFICATION_TYPE: string;//string
public P_SELECTED_EMPLOYEE_NUMBER: string;//String public P_SELECTED_EMPLOYEE_NUMBER: string;//String
public P_SELECTED_RESP_ID: Number;//NUMBER public P_SELECTED_RESP_ID: Number;//NUMBER
// public P_PAGE_NUM : Number; public P_PAGE_NUM : Number;
// public P_PAGE_LIMIT : Number; public P_PAGE_LIMIT : Number;
// public P_SEARCH_USER_NAME:String; public P_SEARCH_USER_NAME:String;
// public P_SEARCH_EMPLOYEE_DISPLAY_NAME:String; public P_SEARCH_EMPLOYEE_DISPLAY_NAME:String;
// public P_SEARCH_EMAIL_ADDRESS:String; public P_SEARCH_EMAIL_ADDRESS:String;
} }

@ -43,8 +43,7 @@ export class WorklistMainService {
public static getPOItemHistory = "Services/ERP.svc/REST/GET_PO_ITEM_HISTORY"; public static getPOItemHistory = "Services/ERP.svc/REST/GET_PO_ITEM_HISTORY";
public static getMOItemHistory = "Services/ERP.svc/REST/GET_MO_ITEM_HISTORY"; public static getMOItemHistory = "Services/ERP.svc/REST/GET_MO_ITEM_HISTORY";
public static getNotificationButtons = "Services/ERP.svc/REST/GET_NOTIFICATION_BUTTONS"; public static getNotificationButtons = "Services/ERP.svc/REST/GET_NOTIFICATION_BUTTONS";
// public static getUserInfo = "Services/ERP.svc/REST/Get_UserInformation"; public static getUserInfo = "Services/ERP.svc/REST/Get_UserInformation";
public static getUserInfo = "Services/ERP.svc/REST/Get_Notification_UserInformation";
public static getNotificationAction = "Services/ERP.svc/REST/NOTIFICATION_ACTIONS"; public static getNotificationAction = "Services/ERP.svc/REST/NOTIFICATION_ACTIONS";
public static getNotificationRespondAtt = "Services/ERP.svc/REST/NOTIFICATION_GET_RESPOND_ATTRIBUTES"; public static getNotificationRespondAtt = "Services/ERP.svc/REST/NOTIFICATION_GET_RESPOND_ATTRIBUTES";
public static getQutationAnalysisUrl = "Services/ERP.svc/REST/GET_QUOTATION_ANALYSIS"; public static getQutationAnalysisUrl = "Services/ERP.svc/REST/GET_QUOTATION_ANALYSIS";

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save