Haroon6138
/
mohemm_srca
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing srca branch

Browse Source
SRCA_DEV_2
umasoodch 4 years ago
parent 4064939d4c
commit 7d26b1373f
218 changed files with 8031 additions and 8475 deletions
Show Stats Download Patch File Download Diff File

25
Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss
Unescape Escape View File

@ -7,10 +7,12 @@
height: 20px;
width: 20px;
}
.rowAH ion-col {
border: 1px solid #d9d9d9;
font-size: 13px;
}
.titleH {
font-size: 13px;
border: 1px solid #d9d9d9;
@ -18,14 +20,17 @@
border-top-left-radius: 5px;
border-bottom: 0px;
}
.gridAH {
text-align: center;
padding: 5px 5px !important;
border-radius: 5px;
}
ion-card-content.confirm-details {
padding: 0;
}
.confirm-details label {
font-size: 13px;
}
@ -42,7 +47,7 @@ ion-card-content.confirm-details{
.Header {
font-weight: bold;
color: #1a586d !important;
color: #c6903e !important;
font-size: 10px;
}
@ -74,6 +79,7 @@ ion-card-content.confirm-details{
margin: 10px;
border-radius: 5px;
}
.submitNote {
background: #ffffff;
height: 80px;
@ -98,11 +104,13 @@ ion-card-content.confirm-details{
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;
@ -116,7 +124,9 @@ ion-card-content.confirm-details{
left: 0;
top: 12%;
}
ion-label , [item-end]{
ion-label,
[item-end] {
white-space: normal;
font-size: 14px;
@ -204,6 +214,7 @@ ion-card-content.confirm-details{
border: #dedede solid 1px;
}
.empImgeRep {
border-radius: 50% !important;
width: 80px;
@ -219,7 +230,7 @@ ion-card-content.confirm-details{
position: absolute;
top: 0px;
z-index: 0;
background: #44A7A1;
background: #30b8c6;
color: #fff;
border-radius: 50%;
border: 0px;
@ -256,8 +267,9 @@ ion-card-content.confirm-details{
--border-radius: 20px;
}
.header-toolbar-new {
--background: #024d71;
--background: #BE332F;
}
.confirmEitOkButton {
@ -266,10 +278,12 @@ ion-card-content.confirm-details{
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
--background: #0ca2de;
--background: #BE332F;
width: 80% !important;
color: white !important;
border-radius: 16px !important;
--border-radius: 16px !important;
--box-shadow: none;
}
.approvalTitle-ar {
@ -278,6 +292,7 @@ ion-card-content.confirm-details{
text-align: right;
}
.approvalTitle {
font-weight: bold;
font-size: 16px;

4
Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.html
Unescape Escape View File

@ -123,10 +123,10 @@
<ion-footer>
<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>
<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>
</div>
</ion-footer>

16
Mohem/src/app/absence/home/home.component.html
Unescape Escape View File

@ -145,7 +145,7 @@
<div>
<ion-row>
<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>
<label class="label" style="color:black;" for=""> {{item.START_DATE}}</label>
<br>
@ -154,7 +154,7 @@
</ion-row>
<ion-row>
<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>
<label class="label" style="color:black;" for=""> {{item.END_DATE}}</label>
<br>
@ -163,7 +163,7 @@
</ion-row>
<ion-row>
<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>
<label class="label" style="color:black;" for="">{{item.ABSENCE_TYPE}}</label>
<br>
@ -172,7 +172,7 @@
</ion-row>
<ion-row>
<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>
<label class="label" style="color:black;" for="">{{item.ABSENCE_CATEGORY}}</label>
<br>
@ -181,7 +181,7 @@
</ion-row>
<ion-row>
<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>
<label class="label" style="color:black;" for="">{{item.ABSENCE_DAYS}}</label>
<br>
@ -190,7 +190,7 @@
</ion-row>
<ion-row>
<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>
<label class="label" style="color:black;" for="">{{item.ABSENCE_HOURS}}</label>
<br>
@ -199,7 +199,7 @@
</ion-row>
<ion-row>
<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>
<label class="label" style="color:black;" for="">{{item.APPROVAL_STATUS}}</label>
<br>
@ -208,7 +208,7 @@
</ion-row>
<ion-row>
<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>
<label class="label" style="color:black;" for="">{{item.ABSENCE_STATUS}}</label>
<br>

50
Mohem/src/app/absence/home/home.component.scss
Unescape Escape View File

@ -9,7 +9,7 @@
}
.addClass {
background-color: #024d71;
background-color: #BE332F;
width: 80px;
height: 80px;
right: 8%;
@ -47,7 +47,7 @@
margin-top: 0;
margin-bottom: 0;
/* border-radius: 12px !important; */
background: #024d71;
background: #BE332F;
border-bottom: 1px solid #a7a4a4;
border-top: 1px solid #cac8c8;
margin-left: -13px;
@ -56,13 +56,13 @@
.header-div {
background-color: #024d71;
background-color: #BE332F;
text-transform: capitalize;
height: 100px;
}
.header-toolbar-new {
--background: #024d71;
--background: #BE332F;
}
@ -104,11 +104,13 @@
margin-top: -19px;
}
.datelabel {
margin-left: 150px;
color: black !important;
font-family: WorkSans-Bold;
}
.iconCalendar {
// margin-left: -241px;
// margin-top: 5px;
@ -118,6 +120,7 @@
margin-top: -50px !important;
margin-bottom: 23px !important;
}
// .today-graph{
// display: block !important;
@ -149,10 +152,12 @@
margin-bottom: 10px;
}
.header {
margin-top: -126px;
}
.result-text-container {
padding: 0;
margin: 0;
@ -183,6 +188,7 @@
font-family: workSans-Regular;
}
}
.green-label {
font-size: 12px;
margin-top: -13px;
@ -223,13 +229,14 @@ margin-top: -13px;
.contentEit:before {
position: absolute;
content: "";
// background: #024d71;
// background: #BE332F;
height: 140px;
width: 100%;
left: 0;
top: 0px;
z-index: 1;
}
.div-green {
position: relative;
left: 82%;
@ -251,6 +258,7 @@ margin-top: -13px;
right: 16px;
}
// .div-red-ar{
// position: relative;
// bottom: 131px;
@ -266,7 +274,7 @@ margin-top: -13px;
// bottom: 146px;
// color: black;
// background-color: #CB3232;
// // background-color: #024d71;
// // background-color: #BE332F;
// width: 11%;
// height: 6px;
// }
@ -281,6 +289,7 @@ margin-top: -13px;
width: 11%;
height: 6px;
}
.div-green-ar {
position: relative;
bottom: 124px;
@ -291,6 +300,7 @@ margin-top: -13px;
height: 6px;
right: 16px;
}
.subTitle {
margin-top: -10px;
margin-left: 10px;
@ -330,6 +340,7 @@ max-height: 4cm;
position: relative;
margin-top: -98px;
}
// .label-container{
// position: absolute;
// // width: 20%;
@ -342,20 +353,25 @@ max-height: 4cm;
.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;
margin-top: 20px;
margin-right: 12px;
}
.black-label-container {
margin-left: 12px;
}
.black-label-container-ar {
margin-right: 12px;
}
.used-label-container {
// border-top: 5px solid #292F42;
// padding: 1px 0px;
@ -367,6 +383,7 @@ max-height: 4cm;
background-color: #b60c0c;
margin-top: 30px;
}
.current-label-container {
width: 12px;
height: 12px;
@ -375,21 +392,23 @@ max-height: 4cm;
background-color: black;
margin-top: 21px;
}
.current-label {
width: 12px;
height: 12px;
padding-right: -10px;
border-radius: 100%;
background-color: #024d71;
background-color: #BE332F;
// margin-top: 30px;
}
.span-one {
// display: block;
// font-size: 12px;
// color: black;
display: block;
font-size: 12px;
color: #024d71;
color: #BE332F;
margin-left: 6px;
margin-top: -2px;
font-weight: bold;
@ -399,7 +418,7 @@ max-height: 4cm;
.span-one-ar {
display: block;
font-size: 12px;
color: #024d71;
color: #BE332F;
margin-right: 6px;
margin-top: -2px;
font-weight: bold;
@ -411,7 +430,7 @@ max-height: 4cm;
// font-size: 22px;
display: block;
font-size: 12px;
color: #024d71;
color: #BE332F;
margin-left: 6px;
margin-top: -2px;
font-weight: bold;
@ -431,6 +450,7 @@ max-height: 4cm;
font-weight: bold;
}
.black-span1-ar {
// display: block;
// font-size: 12px;
@ -443,6 +463,7 @@ max-height: 4cm;
font-weight: bold;
}
.black-span2 {
// display: block;
// font-size: 22px;
@ -455,6 +476,7 @@ max-height: 4cm;
font-family: WorkSans-Bold;
}
.red-span1 {
// display: block;
// font-size: 12px;
@ -467,6 +489,7 @@ max-height: 4cm;
font-weight: bold;
}
.red-span1-ar {
// display: block;
// font-size: 12px;
@ -479,6 +502,7 @@ max-height: 4cm;
font-weight: bold;
}
.red-span2 {
// display: block;
// font-size: 22px;
@ -491,6 +515,7 @@ max-height: 4cm;
font-family: WorkSans-Bold;
}
.yearLabel {
font-size: 13px;
color: gray;
@ -498,6 +523,7 @@ max-height: 4cm;
margin-left: 29px;
margin-top: 5px;
}
.yearLabel-ar {
font-size: 13px;
color: gray;

4
Mohem/src/app/absence/home/home.component.ts
Unescape Escape View File

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

11
Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.scss
Unescape Escape View File

@ -8,7 +8,8 @@
.Header {
color: black !important;
font-size: 25px !important;
font-weight: bold !important;;
font-weight: bold !important;
;
margin: 0;
text-align: center;
margin-bottom: 20px;
@ -32,22 +33,20 @@
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
--background:: #024d71;
--background: #BE332F;
width: 100% !important;
color: white !important;
border-radius: 16px !important;
}
.submitCancelButton {
white-space: normal !important;
text-transform: capitalize !important;
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
--background:: #024d71;
--background: #BE332F;
width: 100% !important;
color: white !important;
border-radius: 16px !important;
}

11
Mohem/src/app/absence/submit-absence/submit-absence.component.scss
Unescape Escape View File

@ -5,7 +5,7 @@
}
.header-toolbar-new {
--background: #024d71;
--background: #BE332F;
}
.confirmEitOkButton {
@ -14,11 +14,12 @@
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
--background: #44A7A1;
--background: #BE332F;
width: 80% !important;
color: white !important;
border-radius: 16px !important;
--border-radius: 16px !important;
--box-shadow: none;
}
@ -55,6 +56,7 @@
background-repeat: no-repeat;
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);
background-position: calc(1em - 10px) calc(100% - 8px), calc(1em - 4px) calc(100% - 8px), 0 100%;
@ -82,9 +84,11 @@
padding: 5px 0px;
padding-left: 10px !important;
margin: 10px auto;
:root[dir="ltr"] {
font-family: var(--fontFamilySemiBoldEN) !important;
}
:root[dir="rtl"] {
font-family: var(--fontFamilyIOSAR) !important;
font-weight: bold;
@ -110,6 +114,3 @@
padding-top: 6px !important;
color: #999999 !important;
}

30
Mohem/src/app/absence/submit-absence/submit-absence.component.ts
Unescape Escape View File

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

2
Mohem/src/app/absence/view-attachments/view-attachments.component.scss
Unescape Escape View File

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

79
Mohem/src/app/app.component.html
Unescape Escape View File

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

128
Mohem/src/app/app.component.scss
Unescape Escape View File

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

9
Mohem/src/app/app.component.ts
Unescape Escape View File

@ -152,6 +152,7 @@ export class AppComponent implements OnInit {
if (user) {
console.log(user);
this.userInfo = JSON.parse(localStorage.getItem('bussiness-card-info'));
console.log('ENAD TEST')
console.log(this.userInfo)
localStorage.setItem("digitalIDUser", 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_Job_name = user.JOB_NAME;
let jobTitle = user.POSITION_NAME;
// if (jobTitle && jobTitle.length > 1) {
this.User_Job_name = jobTitle;
// }
let jobTitle = user.POSITION_NAME.split('.');
if (jobTitle && jobTitle.length > 1) {
this.User_Job_name = jobTitle[0] + " " + jobTitle[1];
}
//erm channel
// if (!CommonService.SKIP)
// this.cs.navigateForward('/erm-channel/survey');

18
Mohem/src/app/app.module.ts
Unescape Escape View File

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

54
Mohem/src/app/attendance/home/home.component.ts
Unescape Escape View File

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

4
Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.html
Unescape Escape View File

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

16
Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.scss
Unescape Escape View File

@ -1,8 +1,9 @@
.colorBG {
--background: #f0efef;
}
.header-div {
background: #024d71;
background: #BE332F;
color: var(--light);
text-transform: capitalize;
display: block;
@ -24,7 +25,7 @@
.navbar {
font-size: 10px !important;
--background: #024d71 !important;
--background: #BE332F !important;
color: aliceblue !important;
// margin-top: 10px !important;
@ -34,7 +35,7 @@
// margin-left:330px !important;
margin-top: 0px !important;
font-size: 35px !important;
background: #024d71;
background: #BE332F;
color: aliceblue;
margin-left: 0px !important;
@ -45,7 +46,7 @@
margin-left: 100px !important;
margin-top: 0px !important;
font-size: 23px !important;
background: #024d71 !important;
background: #BE332F !important;
color: aliceblue !important;
}
@ -79,6 +80,7 @@ height: 250px !important;
border-radius: 20px !important;
height: 270px !important;
}
.labelGrid {
margin-top: -30px !important;
background-color: white !important;
@ -99,6 +101,7 @@ height: 250px !important;
color: black !important;
}
.dateLable {
margin-left: 90px !important;
@ -106,6 +109,7 @@ height: 250px !important;
font-size: small !important;
margin-top: 15px !important;
}
// h1{
// font-size: 15px !important;
// text-align: center !important;
@ -117,6 +121,7 @@ height: 250px !important;
margin-top: 15px !important;
}
.arrowDropleft {
font-size: 20px !important;
margin-left: 10px !important;
@ -139,7 +144,7 @@ height: 250px !important;
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: #BE332F;
// background: linear-gradient(90deg, #85C48D 0%, #85C48D 13%, #2BB5C6 98%, #2BB5C6 100%);
color: var(--light);
text-transform: capitalize;
@ -239,4 +244,3 @@ height: 250px !important;
font-family: workSans-Regular;
}
}

4
Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.ts
Unescape Escape View File

@ -50,9 +50,9 @@ public data = {
backgroundColor: [
'#024d71',
'#BE332F',
'#024d71',
'#BE332F',
],
borderWidth: 2

4
Mohem/src/app/authentication/app-update/app-update.component.html
Unescape Escape View File

@ -3,7 +3,7 @@
<img src="assets/icon/update_rocket_image.png" style="width: 100%;" />
</div>
<div style="text-align: center;">
<img style="height: 75px" src="assets/icon/moe-logo.png" />
<img src="assets/imgs/CSLogo.png" />
</div>
<h1 style="text-align: center; font-weight: bold"> {{ 'general,app-update' | translate }}</h1>
@ -15,7 +15,7 @@
<ion-grid>
<ion-row class="ion-justify-content-center">
<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()'>
{{ 'general,update-now' | translate }}
</ion-button>

4
Mohem/src/app/authentication/check-user/check-user.component.scss
Unescape Escape View File

@ -1,5 +1,5 @@
.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 {
@ -11,6 +11,7 @@
.login-input {
border: none;
}
.item-input {
--min-height: 1.0cm !important;
--border-radius: 12px;
@ -38,4 +39,5 @@
--min-height: 1.6cm !important;
width: 315px;
}
///////////////////////////////////////////

7
Mohem/src/app/authentication/confirm-login/confirm-login.component.html
Unescape Escape View File

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

9
Mohem/src/app/authentication/confirm-login/confirm-login.component.scss
Unescape Escape View File

@ -2,6 +2,10 @@
height: 25vh;
}
.rowOutside{
// margin-top: -37px;
}
.button-digital-id{
--background: white !important;
@ -31,8 +35,3 @@
left: 20px;
width: 10%;
}
.p-color {
color: #004D71;
font-weight: bold;
}

35
Mohem/src/app/authentication/confirm-login/confirm-login.component.ts
Unescape Escape View File

@ -17,7 +17,7 @@ import { CheckUserAuthenticationResponse } from 'src/app/hmg-common/services/aut
import { LoginModel } from '../models/LoginModel';
import * as moment from 'moment';
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 { AppUpdateComponent } from '../app-update/app-update.component';
import { Password } from '../models/password';
@ -69,7 +69,7 @@ export class ConfirmLoginComponent implements OnInit {
public platform: Platform,
public modalController: ModalController,
public alertController: AlertController,
// private nfc: NFC,
private nfc: NFC,
private smsRetriever: SmsRetriever
) {
this.loginData = this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false);
@ -307,7 +307,7 @@ export class ConfirmLoginComponent implements OnInit {
private presentBiometricDialog() {
this.faio.show({
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
fallbackButtonTitle: this.ts.trPK('general', 'use-pin'), // optional | When disableBackup is false defaults to "Use Pin".
disableBackup: true, // optional | default: false
@ -353,20 +353,20 @@ export class ConfirmLoginComponent implements OnInit {
}
async checkNFCStatus() {
// try {
// let nfcStatus = await this.nfc.enabled();
// console.log("nfc status >>>>>>>>>>" + nfcStatus);
// this.isNFCAvailable = true;
// } catch (err) {
// console.log("Error reading tag", err);
// if (err === "NO_NFC") {
// this.isNFCAvailable = false;
// } else if (err === "NFC_DISABLED") {
// this.isNFCAvailable = true;
// } else {
// this.isNFCAvailable = false;
// }
// }
try {
let nfcStatus = await this.nfc.enabled();
console.log("nfc status >>>>>>>>>>" + nfcStatus);
this.isNFCAvailable = true;
} catch (err) {
console.log("Error reading tag", err);
if (err === "NO_NFC") {
this.isNFCAvailable = false;
} else if (err === "NFC_DISABLED") {
this.isNFCAvailable = true;
} else {
this.isNFCAvailable = false;
}
}
}
public checkSMS() {
@ -380,7 +380,6 @@ export class ConfirmLoginComponent implements OnInit {
this.authService.checkSMS(request, () => { }, this.ts.trPK('general', 'ok'))
.subscribe((result: SMSCheckResponse) => {
if (this.cs.validResponse(result)) {
this.cs.sharedService.setSharedData(result.MemberLoginList.P_ORACLE_USER_NAME, 'oracle-user-name');
this.businessInfo = {
show_business: result.BusinessCardPrivilege,
name_en: result.MemberInformationList[0].EMPLOYEE_NAME_En,

34
Mohem/src/app/authentication/login/login.component.html
Unescape Escape View File

@ -7,9 +7,7 @@
<div class="last-circle"></div>
</div>
</ion-row>
</ion-grid>
<div class="login-container">
<ion-grid>
<ion-row>
<ion-col *ngIf="!user">
<P class="pageTitle text-caps">{{ts.trPK('login','login')}}</P>
@ -18,13 +16,13 @@
</ion-grid>
<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 />
<ion-input class="login-input" required type="text" [(ngModel)]="username" placeholder="{{ts.trPK('login','username')}}">
</ion-input>
</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 />
<ion-input class="login-input" required [type]="inputType" [(ngModel)]="password" placeholder="{{ts.trPK('login','password')}}">
</ion-input>
@ -36,20 +34,20 @@
<a>{{ts.trPK('login','signup')}}</a>
</div>
<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 arTxt border-moe-left" ion-button (click)="changeLanguage('1')" [ngClass]="{'active':currentLang ==1}">عربي</button>
<button class="gridBtn" ion-button (click)="changeLanguage('2')" [ngClass]="{'active':currentLang ==2}">English</button>
<button class="gridBtn arTxt" ion-button (click)="changeLanguage('1')" [ngClass]="{'active':currentLang ==1}">عربي</button>
</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"> -->
<welcome-login (onLogin)="login()" (loginWithUser)="loginWithUser()" *ngIf="user">
</welcome-login>
<!-- </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 -->
<!-- <ion-button *ngIf="userInfo" class="button-digital-id" (click)="openDigitalId()">
@ -64,20 +62,10 @@
</div>
</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>
<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 class="colPad">
<img class="centerDiv logoFotor" src="../assets/imgs/CSLogo.png" />
</ion-col>
</div>
</ion-row>
<div class="menuFooter" >
<p class="companyTxt">{{companyDesc}}</p>
</div>
</ion-footer>

80
Mohem/src/app/authentication/login/login.component.scss
Unescape Escape View File

@ -23,7 +23,6 @@
text-align: center;
padding: 0px;
margin: 0px;
font-weight: bold;
}
.TxtPlace {
@ -98,12 +97,10 @@ img.centerDiv {
}
button.arTxt {
font-family: var(--fontFamilyIOSAR) !important;
:root[dir="rtl"] {
float: right;
color: var(--customnavy) !important;
font-family: var(--fontFamilyIOSAR) !important;
font-weight: bold;
border-radius: 2px 0px 0px 2px !important;
}
@ -121,11 +118,10 @@ img.centerDiv {
.login-input {
border: none;
margin-right: 5px;
font-family: 'Kufi';
}
.item-input {
--min-height: 1.5cm !important;
--min-height: 1.0cm !important;
--border-radius: 12px;
--ion-color-base: white !important;
// --background: color: var(--darkgray) !important;
@ -145,7 +141,7 @@ img.centerDiv {
white-space: normal;
color: var(--light);
text-transform: capitalize;
min-height: 1.3cm;
min-height: 1.0cm;
--border-radius: 33px !important;
border-radius: 33px !important;
--min-height: 1.6cm !important;
@ -174,10 +170,10 @@ img.centerDiv {
}
.first-circle {
background: #024D71 !important;
background: var(--newgreen) !important;
border-radius: 50%;
height: 310px;
width: 310px;
height: 292px;
width: 288px;
float: left;
margin-left: -55px;
margin-top: -140px;
@ -186,27 +182,27 @@ img.centerDiv {
.middle-circle {
position: relative;
background: #44A7A1 !important;
background: #c6903e !important;
border-radius: 50%;
height: 160px;
width: 190px;
width: 170px;
margin: -115px 0px 0px 179px;
}
.last-circle {
position: inherit;
background: #D5E2E8 !important;
background: #91692d !important;
border-radius: 50%;
height: 166px;
width: 140px;
margin: -147px 0px 0px 274px;
}
// .logoFotor {
// width: 45px !important;
// height: 45px !important;
.logoFotor {
width: 45px !important;
height: 45px !important;
// }
}
.welcomeText {
justify-content: center;
@ -276,53 +272,3 @@ img.centerDiv {
left: 20px;
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;
}

64
Mohem/src/app/authentication/login/login.component.ts
Unescape Escape View File

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

2
Mohem/src/app/authentication/sms-page/sms-page.page.html
Unescape Escape View File

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

5
Mohem/src/app/authentication/sms-page/sms-page.page.scss
Unescape Escape View File

@ -1,5 +1,5 @@
.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 {
@ -56,9 +56,8 @@ ion-input {
outline: none;
width: 20%;
transition: all .2s ease-in-out;
border-radius: 15px;
border-radius: 3px;
display: inline-block;
--padding-start: 8px;
&:focus {
border-color: var(--ion-color-secondary) !important;

34
Mohem/src/app/authentication/sms-page/sms-page.page.ts
Unescape Escape View File

@ -24,7 +24,7 @@ import { GetLoginInfoRequest } from 'src/app/hmg-common/services/authentication/
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';
@ -125,7 +125,7 @@ export class SmsPageComponent implements OnInit {
public platform: Platform,
// private nfc: NFC,
private nfc: NFC,
private smsRetriever: SmsRetriever
@ -367,33 +367,33 @@ export class SmsPageComponent implements OnInit {
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)) {
this.common.sharedService.setSharedData(result.MemberLoginList.P_ORACLE_USER_NAME, 'oracle-user-name')
//save business card info

3
Mohem/src/app/eit/add-attach/add-attach.component.scss
Unescape Escape View File

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

7
Mohem/src/app/eit/add-cei/add-cei.component.scss
Unescape Escape View File

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

30
Mohem/src/app/eit/add-cei/add-cei.component.ts
Unescape Escape View File

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

6
Mohem/src/app/eit/add-eit/add-eit.component.scss
Unescape Escape View File

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

74
Mohem/src/app/eit/add-eit/add-eit.component.ts
Unescape Escape View File

@ -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 { MenuResponse } from "src/app/hmg-common/services/menu/models/menu-response";
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 { EITTransactionsRequest } from "../models/EITTransactionsReq";
import { EitService } from "../services/eit.service";
@ -73,8 +73,7 @@ export class AddEitComponent implements OnInit {
public cs: CommonService,
private ts: TranslatorService,
private eitService: EitService,
public datePicker: DatePicker,
public platform: Platform
public datePicker: DatePicker
) {
this.direction = TranslatorService.getCurrentLanguageName();
this.selEmp = this.cs.sharedService.getSharedData(
@ -123,10 +122,6 @@ export class AddEitComponent implements OnInit {
EITTransactionsRequest.SUBMIT_EIT_ACTION
);
}
// window.addEventListener('keyboardDidShow', () => {
// document.activeElement.scrollIntoView(false);
// });
}
ngOnInit() {}
@ -186,8 +181,7 @@ export class AddEitComponent implements OnInit {
defaultValText,
feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG,
feildsList[i].REQ_COL_TIP
feildsList[i].REQUIRED_FLAG
);
// }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);
@ -202,8 +196,7 @@ export class AddEitComponent implements OnInit {
containerId,
feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG,
feildsList[i].REQ_COL_TIP
feildsList[i].REQUIRED_FLAG
);
// }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);
@ -225,8 +218,7 @@ export class AddEitComponent implements OnInit {
feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG,
this.direction,
feildsList[i].REQ_COL_TIP
this.direction
);
} else {
this.dateInput = new DateInput(
@ -237,8 +229,7 @@ export class AddEitComponent implements OnInit {
feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG,
this.direction,
feildsList[i].REQ_COL_TIP,
this.direction
);
}
// else if(feildsList[i].DEFAULT_TYPE=="D"){//current date
@ -264,8 +255,7 @@ export class AddEitComponent implements OnInit {
feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG,
this.direction,
feildsList[i].REQ_COL_TIP
this.direction
);
} else {
this.datetimeInput = new DateTimeInput(
@ -276,8 +266,7 @@ export class AddEitComponent implements OnInit {
feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG,
this.direction,
feildsList[i].REQ_COL_TIP
this.direction
);
}
const elem = document.getElementById(
@ -312,8 +301,7 @@ export class AddEitComponent implements OnInit {
feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG,
this.direction,
feildsList[i].REQ_COL_TIP
this.direction
);
} else {
this.timeInput = new TimeInput(
@ -324,8 +312,7 @@ export class AddEitComponent implements OnInit {
feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG,
this.direction,
feildsList[i].REQ_COL_TIP
this.direction
);
}
}
@ -339,8 +326,7 @@ export class AddEitComponent implements OnInit {
defaultValText,
feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG,
feildsList[i].REQ_COL_TIP
feildsList[i].REQUIRED_FLAG
);
} else {
// dropdown list missing open in differnt page
@ -353,8 +339,7 @@ export class AddEitComponent implements OnInit {
containerId,
feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG,
feildsList[i].REQ_COL_TIP
feildsList[i].REQUIRED_FLAG
);
// }else{
// 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) {
this.fillEITStructure();
}
this.bindToolTip();
}
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) {
const isIOS = this.platform.is('ios');
const elem = document.getElementById(id);
console.log(elem);
console.log(obj);
@ -568,18 +540,6 @@ export class AddEitComponent implements OnInit {
if (elemType == "SELECT") changeEvent = "change";
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(changeEvent, e => {
//console.log("elem change "+elem.id);
@ -588,13 +548,6 @@ export class AddEitComponent implements OnInit {
// if(!x.value)
// isEmpty=true;
//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");
if (
obj.CHILD_SEGMENTS_VS_Splited &&
@ -1278,7 +1231,6 @@ export class AddEitComponent implements OnInit {
}
if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !elemVal) {
elem.classList.add("requiredClassElm");
this.cs.redToastPK("eit", "required-text");
//this.common.showRequiredMsg();
return false;
} else {
@ -1317,7 +1269,6 @@ export class AddEitComponent implements OnInit {
}
if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !varcharValue) {
x.classList.add("requiredClassElm");
this.cs.redToastPK("eit", "required-text");
//this.common.showRequiredMsg();
return false;
} else {
@ -1349,7 +1300,6 @@ export class AddEitComponent implements OnInit {
if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !val) {
x.classList.add("requiredClassElm");
this.cs.redToastPK("eit", "required-text");
//this.common.showRequiredMsg();
return false;
} else {

2
Mohem/src/app/eit/cei-homepage/cei-homepage.component.html
Unescape Escape View File

@ -63,7 +63,7 @@
<!-- <ion-footer style="background: #f5f5f5 !important;">
<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>
</div>
</ion-footer> -->

2
Mohem/src/app/eit/cei-list/cei-list.component.html
Unescape Escape View File

@ -22,7 +22,7 @@
<div *ngFor="let item of EITTransactionList.Collection_Transaction">
<ion-row *ngIf="item.DISPLAY_FLAG != 'N' " class="">
<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>
<label class="label" style="color:black;" for="">{{item.SEGMENT_VALUE_DSP}} </label>
<br>

44
Mohem/src/app/eit/cei-list/cei-list.component.scss
Unescape Escape View File

@ -12,6 +12,7 @@
margin-top: -19px;
}
.iconCalendar {
margin-left: 30px !important;
width: 22% !important;
@ -19,11 +20,13 @@
margin-top: -69px !important;
margin-bottom: 20px !important;
}
h4 {
font-size: 2.2rem;
text-align: center;
color: #000000;
}
.grids {
border-radius: 20px !important;
background: white;
@ -47,12 +50,13 @@
margin-top: 0;
margin-bottom: 0;
/* border-radius: 12px !important; */
background: #024d71;
background: #BE332F;
border-bottom: 1px solid #a7a4a4;
border-top: 1px solid #cac8c8;
margin-left: -13px;
margin-right: -13px;
}
.colEit {
border-right: 1px solid #cac8c8;
border-bottom-left-radius: -10px !important;
@ -64,7 +68,7 @@
.header-div {
background-color: #024d71;
background-color: #BE332F;
text-transform: capitalize;
height: 160px;
// position: relative;
@ -73,11 +77,11 @@
}
.header-toolbar-new {
--background: #024d71;
--background: #BE332F;
}
.addClass {
background-color: #024d71;
background-color: #BE332F;
width: 80px;
height: 80px;
right: 8%;
@ -94,7 +98,7 @@
.contentEit:before {
position: absolute;
content: "";
// background: #024d71;
// background: #BE332F;
height: 140px;
width: 100%;
left: 0;
@ -114,7 +118,7 @@
.content:before {
position: absolute;
content: "";
background: #024d71;
background: #BE332F;
height: 140px;
width: 100%;
left: 0;
@ -133,12 +137,14 @@
margin-top: -33px;
font-size: 17px;
}
.title {
text-align: center;
color: black;
margin-top: 5px;
font-size: 17px;
}
.today-graph {
display: block !important;
height: 196px;
@ -160,6 +166,7 @@
border-radius: 20px;
margin-top: 17px;
}
.result-graph {
font-size: 14px;
margin-left: -48px;
@ -175,21 +182,25 @@
margin-left: 7px !important;
margin-right: 42px;
}
.green-label-ar {
font-size: 15px !important;
margin-left: 7px !important;
margin-right: 15px;
}
.blue-label {
font-size: 15px !important;
margin-left: 7px !important;
margin-right: 13px;
}
.light-label {
font-size: 15px !important;
margin-left: 7px !important;
margin-right: -26px;
}
.light-label-ar {
font-size: 15px !important;
margin-right: 7px !important;
@ -203,14 +214,16 @@
border-radius: 50% !important;
display: inline-block;
}
.blue-dote {
background-color: #024d71;
background-color: #BE332F;
width: 12px;
height: 12px;
border-radius: 50% !important;
display: inline-block;
}
.green-dote {
background-color: #1FA269;
width: 12px;
@ -219,6 +232,7 @@
display: inline-block;
margin-right: -1px;
}
.col {
text-align: right;
}
@ -232,6 +246,7 @@
margin-right: 14px;
}
.columns {
margin: 3px;
margin-bottom: 13px;
@ -251,6 +266,7 @@
letter-spacing: 1px;
font-weight: bold;
}
.services {
font-size: 12px;
@ -276,9 +292,10 @@
margin-right: 0px;
margin-left: 5px;
}
.child-dote {
background-color: #024d71;
background-color: #BE332F;
width: 15px;
height: 15px;
border-radius: 50% !important;
@ -286,8 +303,9 @@
margin-left: -17px;
margin-right: 5px;
}
.child-dote-ar {
background-color: #024d71;
background-color: #BE332F;
width: 15px;
height: 15px;
border-radius: 50% !important;
@ -295,6 +313,7 @@
margin-right: 1px;
margin-left: 5px;
}
.infants-dote {
background-color: #1FA269;
width: 15px;
@ -315,16 +334,17 @@
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: #024d71;
background-color: #BE332F;
width: 80% !important;
color: white !important;
border-radius: 16px !important;
--border-radius: 16px !important;
--box-shadow: none;
}

24
Mohem/src/app/eit/confirm-add-cei/confirm-add-cei.component.scss
Unescape Escape View File

@ -12,7 +12,7 @@
.Header {
font-weight: bold;
color: #1a586d !important;
color: #c6903e !important;
font-size: 10px;
}
@ -44,6 +44,7 @@
margin: 10px;
border-radius: 5px;
}
.submitNote {
background: #ffffff;
height: 80px;
@ -68,11 +69,13 @@
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;
@ -86,7 +89,9 @@
left: 0;
top: 12%;
}
ion-label , [item-end]{
ion-label,
[item-end] {
white-space: normal;
font-size: 14px;
@ -174,6 +179,7 @@
border: #dedede solid 1px;
}
.empImgeRep {
border-radius: 50% !important;
width: 80px;
@ -189,7 +195,7 @@
position: absolute;
top: 0px;
z-index: 0;
background: #44A7A1;
background: #30b8c6;
color: #fff;
border-radius: 50%;
border: 0px;
@ -226,27 +232,33 @@
--border-radius: 20px;
}
.header-toolbar-new {
--background: #024d71;
--background: #BE332F;
}
.title {
margin-top: -37px;
margin-left: 85px;
}
.title-ar {
margin-top: -37px;
margin-right: 101px;
}
.confirmEitOkButton {
white-space: normal !important;
text-transform: capitalize !important;
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
background-color: #0ca2de;
background-color: #BE332F;
width: 80% !important;
color: white !important;
border-radius: 16px !important;
--border-radius: 16px !important;
--box-shadow: none;
}
.approvalTitle-ar {
@ -255,9 +267,9 @@
text-align: right;
}
.approvalTitle {
font-weight: bold;
font-size: 16px;
text-align: left;
}

17
Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html
Unescape Escape View File

@ -1,14 +1,9 @@
<!-- <ion-header>
<ion-header>
<ion-toolbar class="header-toolbar-new">
<nav-buttons></nav-buttons>
<ion-title [ngClass]=" direction === 'en' ? 'title' : 'title-ar'" color="light">{{headerTitle}}</ion-title>
</ion-toolbar>
</ion-header> -->
<app-generic-header
[showBack]="true"
[headerText]="headerTitle">
</app-generic-header>
</ion-header>
<ion-content>
@ -16,14 +11,10 @@
<ion-grid>
<ion-row style="margin-top: 20px;margin-left: 12px;">
<ion-col>
<div style="position: relative" size="10" [ngClass]=" direction === 'en' ? 'approvalTitle' : 'approvalTitle-ar'" >
{{'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>
<div size="10" [ngClass]=" direction === 'en' ? 'approvalTitle' : 'approvalTitle-ar'" >{{'general, addAttach' | translate}} <span *ngIf="isAttachment ==='Y'">*</span></div>
</ion-col>
<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"
(change)="onFileSelected($event)" (click)="onFileSelectedclick($event)" />
<label end for="file" class="attachLable">

31
Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss
Unescape Escape View File

@ -12,7 +12,7 @@
.Header {
font-weight: bold;
color: #1a586d !important;
color: #c6903e !important;
font-size: 10px;
}
@ -44,6 +44,7 @@
margin: 10px;
border-radius: 5px;
}
.submitNote {
background: #ffffff;
height: 80px;
@ -68,11 +69,13 @@
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;
@ -86,7 +89,9 @@
left: 0;
top: 12%;
}
ion-label , [item-end]{
ion-label,
[item-end] {
white-space: normal;
font-size: 14px;
@ -174,6 +179,7 @@
border: #dedede solid 1px;
}
.empImgeRep {
border-radius: 50% !important;
width: 80px;
@ -189,7 +195,7 @@
position: absolute;
top: 0px;
z-index: 0;
background: #44A7A1;
background: #c6903e;
color: #fff;
border-radius: 50%;
border: 0px;
@ -226,28 +232,33 @@
--border-radius: 20px;
}
.header-toolbar-new {
--background: #024d71;
--background: #BE332F;
}
.title {
margin-top: -37px;
margin-left: 85px;
}
.title-ar {
margin-top: -37px;
margin-right: 101px;
}
.confirmEitOkButton {
white-space: normal !important;
text-transform: capitalize !important;
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
background-color: #44A7A1;
background-color: #BE332F;
width: 80% !important;
color: white !important;
border-radius: 16px !important;
--border-radius: 16px !important;
--box-shadow: none;
}
.approvalTitle-ar {
@ -256,17 +267,9 @@
text-align: right;
}
.approvalTitle {
font-weight: bold;
font-size: 16px;
text-align: left;
}
.fileDiv-en {
// float: right;
}
.fileDiv-ar {
float: left;
}

11
Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts
Unescape Escape View File

@ -62,8 +62,7 @@ export class ConfirmAddEitComponent implements OnInit {
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'];
direction: string;
isAttachment: string = 'N';
isAttachmentGET_MENU: string = 'N';
isAttachment: string;
constructor(public modalController: ModalController, public cs: CommonService, private ts: TranslatorService, private eitService: EitService) {
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.eitRequest = this.cs.sharedService.getSharedData(EitRequest.SHARED_DATA, false);
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) {
this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); //WARINING **
// console.log("this.getPassNotificationDetails: " + this.getPassNotificationDetails);
@ -103,7 +102,7 @@ export class ConfirmAddEitComponent implements OnInit {
this.itemKey = this.addrespList.SubmitEITTransactionList.P_ITEM_KEY;
this.P_TransactionID = this.addrespList.SubmitEITTransactionList.P_TRANSACTION_ID;
this.isDelete = this.isResubmitEIT = this.cs.sharedService.getSharedData('confirmAddEITData', false).isDelete;
this.isAttachment = this.addrespList.SubmitEITTransactionList.P_ATTACHMENT_REQUIRED;
this.getApproversList();
// this.confirmAddEit.submitEit(this.eitRequest).subscribe((result: AddEitResponse) => {
@ -570,9 +569,5 @@ export class ConfirmAddEitComponent implements OnInit {
// }
showToolTip(toolTip: any) {
this.cs.yellowToast(toolTip);
}
}

18
Mohem/src/app/eit/eit-list/eit-list.component.html
Unescape Escape View File

@ -181,9 +181,6 @@
</ion-row>
<h4> {{'general, noData' | translate}}</h4>
</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> -->
<div *ngIf="getResEITTransactionList && getResEITTransactionList[0]?.Collection_Transaction.length > 0 ">
<!-- <div> -->
@ -203,20 +200,17 @@
<ion-grid>
<!-- <div>
<ion-row>
<div>
<!-- <ion-row>
<ion-col class="colBold">
<label for="">status</label>
</ion-col>
<ion-col>
<label for="">{{EITTransactionList.status}}</label>
</ion-col>
</ion-row>
</div> -->
</ion-row> -->
</div>
<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">
<!-- <ion-row *ngIf="item.DISPLAY_FLAG != 'N' ">
<ion-col class="colBold">
@ -229,7 +223,7 @@
<ion-row *ngIf="item.DISPLAY_FLAG != 'N' " class="">
<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>
<label class="label" style="color:black;" for="">{{item.SEGMENT_VALUE_DSP}} </label>
<br>
@ -252,7 +246,7 @@
</ion-infinite-scroll>
</div>
</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>
<div class="centerDiv"> -->

57
Mohem/src/app/eit/eit-list/eit-list.component.scss
Unescape Escape View File

@ -15,6 +15,7 @@
margin-top: -19px;
}
.iconCalendar {
// margin-left: -241px;
// margin-top: 5px;
@ -24,11 +25,13 @@
margin-top: -69px !important;
margin-bottom: 20px !important;
}
h4 {
font-size: 2.2rem;
text-align: center;
color: #000000;
}
.grids {
border-radius: 20px !important;
background: white;
@ -52,12 +55,13 @@ h4 {
margin-top: 0;
margin-bottom: 0;
/* border-radius: 12px !important; */
background: #024d71;
background: #BE332F;
border-bottom: 1px solid #a7a4a4;
border-top: 1px solid #cac8c8;
margin-left: -13px;
margin-right: -13px;
}
.colEit {
border-right: 1px solid #cac8c8;
border-bottom-left-radius: -10px !important;
@ -69,7 +73,7 @@ h4 {
.header-div {
background-color: #024d71;
background-color: #BE332F;
text-transform: capitalize;
height: 160px;
// position: relative;
@ -78,11 +82,11 @@ h4 {
}
.header-toolbar-new {
--background: #024d71;
--background: #BE332F;
}
.addClass {
background-color: #024d71;
background-color: #BE332F;
width: 80px;
height: 80px;
right: 8%;
@ -99,7 +103,7 @@ h4 {
.contentEit:before {
position: absolute;
content: "";
// background: #024d71;
// background: #BE332F;
height: 140px;
width: 100%;
left: 0;
@ -119,7 +123,7 @@ z-index: 1;
.content:before {
position: absolute;
content: "";
background: #024d71;
background: #BE332F;
height: 140px;
width: 100%;
left: 0;
@ -138,12 +142,14 @@ z-index: 1;
margin-top: -33px;
font-size: 17px;
}
.title {
text-align: center;
color: black;
margin-top: 5px;
font-size: 17px;
}
.today-graph {
display: block !important;
height: 196px;
@ -176,6 +182,7 @@ z-index: 1;
border-radius: 20px;
margin-top: 17px;
}
.result-graph {
font-size: 14px;
margin-left: -48px;
@ -191,21 +198,25 @@ z-index: 1;
margin-left: 7px !important;
margin-right: 42px;
}
.green-label-ar {
font-size: 15px !important;
margin-left: 7px !important;
margin-right: 15px;
}
.blue-label {
font-size: 15px !important;
margin-left: 7px !important;
margin-right: 13px;
}
.light-label {
font-size: 15px !important;
margin-left: 7px !important;
margin-right: -26px;
}
.light-label-ar {
font-size: 15px !important;
margin-right: 7px !important;
@ -219,14 +230,16 @@ z-index: 1;
border-radius: 50% !important;
display: inline-block;
}
.blue-dote {
background-color: #024d71;
background-color: #BE332F;
width: 12px;
height: 12px;
border-radius: 50% !important;
display: inline-block;
}
.green-dote {
background-color: #1FA269;
width: 12px;
@ -235,6 +248,7 @@ z-index: 1;
display: inline-block;
margin-right: -1px;
}
.col {
text-align: right;
}
@ -248,6 +262,7 @@ z-index: 1;
margin-right: 14px;
}
.columns {
margin: 3px;
margin-bottom: 13px;
@ -267,6 +282,7 @@ z-index: 1;
letter-spacing: 1px;
font-weight: bold;
}
.services {
font-size: 12px;
@ -292,9 +308,10 @@ z-index: 1;
margin-right: 0px;
margin-left: 5px;
}
.child-dote {
background-color: #024d71;
background-color: #BE332F;
width: 15px;
height: 15px;
border-radius: 50% !important;
@ -302,8 +319,9 @@ z-index: 1;
margin-left: -17px;
margin-right: 5px;
}
.child-dote-ar {
background-color: #024d71;
background-color: #BE332F;
width: 15px;
height: 15px;
border-radius: 50% !important;
@ -311,6 +329,7 @@ z-index: 1;
margin-right: 1px;
margin-left: 5px;
}
.infants-dote {
background-color: #1FA269;
width: 15px;
@ -331,23 +350,3 @@ z-index: 1;
margin-right: 1px;
margin-left: 5px;
}
.icon-img {
width: 20px;
height: 20px;
float: right;
margin-top: 20px;
}
.icon-img-ar {
width: 20px;
height: 20px;
float: left;
margin-top: 20px;
}
.terms {
text-align: center;
color: #004D71;
font-weight: bold;
}

13
Mohem/src/app/eit/eit-list/eit-list.component.ts
Unescape Escape View File

@ -49,12 +49,12 @@ export class EitListComponent implements OnInit {
accrualNetInfants: any;
accrualUNetChild: any;
accrualNetAdult: any;
addButton: string = 'Y';
public options = {
cutoutPercentage: 80,
tooltips: { enabled: false },
legend: { display: false }};
legend: { display: false }
};
gaugeType = 'full';
accrualBalancesList: any;
common: any;
@ -81,7 +81,6 @@ export class EitListComponent implements OnInit {
ngOnInit() {
/////////////
this.addButton = this.selMenu.GetMenuEntriesList.ADD_BUTTON;
this.Sdate = new Date().toISOString();
this.getUserDetails();
////////////////up
@ -99,10 +98,11 @@ export class EitListComponent implements OnInit {
this.data = {
// labels: ['earingTotal', 'deductionTotal'],
datasets: [
{ data: [this.accrualNetInfants, this.accrualUNetChild, this.accrualNetAdult],
{
data: [this.accrualNetInfants, this.accrualUNetChild, this.accrualNetAdult],
backgroundColor: [
'#1FA269',
'#024d71',
'#BE332F',
'#3CB9D5',],
borderWidth: 2
}
@ -229,6 +229,9 @@ export class EitListComponent implements OnInit {
this.pAction = EIT_ACTION.UPDATE;
this.cs.sharedService.setSharedData(this.getResEITTransactionList[i].Collection_Transaction, EITTransactionsRequest.SHARED_DATA);
this.cs.sharedService.setSharedData(this.pAction, EITTransactionsRequest.SUBMIT_EIT_ACTION);
// this.fillEitTransactionTable(i);
// this.navCtrl.push("AddEitPage");
// this.openEit(i);
this.openEitNew(i);
}
deleteEIT(i) {

20
Mohem/src/app/eit/eit-update-list/eit-update-list.component.html
Unescape Escape View File

@ -1,27 +1,27 @@
<app-generic-header
showBack="true"
[headerText]="'eit, update-title' | translate">
</app-generic-header>
<ion-header>
<ion-toolbar class="header-toolbar-new">
<nav-buttons></nav-buttons>
<ion-title color="light">{{'eit, update-title' | translate}}</ion-title>
</ion-toolbar>
</ion-header>
<ion-content padding>
<!-- <button ion-button (click)="resubmitEit()">next</button> -->
<div *ngIf="notificationBodyRes?.length > 0 ">
<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>
<!-- <button ion-button icon-only *ngIf="item.Collection_Notification[0].ACTION!='DELETE_ROW'" (click)="updateEitNot(i)">
<ion-icon name="create"></ion-icon>
</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)">
<img class="imgSize" src="../assets/imgs/profile-icons/editingWhite.png"></button>
<div class="editIconDiv"><button ion-button *ngIf="item.Collection_Notification[0].ACTION!='DELETE_ROW'" (click)="updateEitNot(i)">
<img class="imgSize" src="../assets/imgs/edit.png"></button>
</div>
</ion-card-header>
<ion-card-content>
@ -29,7 +29,7 @@
<div *ngFor="let notificationBody of item.Collection_Notification ">
<ion-row *ngIf=" notificationBody.DISPLAY_FLAG != 'N' ">
<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 class="colBold"> -->
<br>

12
Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss
Unescape Escape View File

@ -4,10 +4,12 @@
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
background-color: #024d71;
background-color: #BE332F;
width: 80% !important;
color: white !important;
border-radius: 16px !important;
--border-radius: 16px !important;
--box-shadow: none;
}
.editIconDiv {
@ -15,11 +17,3 @@
position: absolute;
top: 10px;
}
.editIconDiv-ar{
left: 10px;
position: absolute;
top: 10px;
}

18
Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts
Unescape Escape View File

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

8
Mohem/src/app/eit/home/home.component.scss
Unescape Escape View File

@ -13,7 +13,7 @@ ion-item.custCollabs.item.item-block.item-ios {
}
.header-toolbar-new {
--background: #024d71;
--background: #BE332F;
}
ion-item.item.item-block {
@ -25,6 +25,7 @@ ion-item.item.item-block {
ion-item.childItem.item.item-block {
padding: 0px 5px;
width: 100%;
ion-label.label.label-md,
ion-label.label.label-ios {
-webkit-box-shadow: none;
@ -46,9 +47,11 @@ ion-item.item.item-block {
padding: 0px 10px;
min-height: 40px;
}
div.notSelected {
padding: 0px 10px;
}
// ion-label.label.label-md,
// ion-label.label.label-ios {
}
@ -56,11 +59,13 @@ ion-item.item.item-block {
ion-icon::before {
line-height: 2;
}
.arrow-down {
position: absolute;
top: 0;
right: 0;
}
// .list-md > .item-block:last-child .item-inner,
// .list-ios > .item-block:last-child .item-inner{
@ -86,6 +91,7 @@ ion-icon::before {
font-size: 25px;
color: grey;
}
.arrow-forward-ar {
float: left;
font-size: 25px;

11
Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.scss
Unescape Escape View File

@ -8,7 +8,8 @@
.Header {
color: black !important;
font-size: 25px !important;
font-weight: bold !important;;
font-weight: bold !important;
;
margin: 0;
text-align: center;
margin-bottom: 20px;
@ -32,22 +33,20 @@
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
--background:: #024d71;
--background: #BE332F;
width: 100% !important;
color: white !important;
border-radius: 16px !important;
}
.submitCancelButton {
white-space: normal !important;
text-transform: capitalize !important;
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
--background:: #024d71;
--background: #BE332F;
width: 100% !important;
color: white !important;
border-radius: 16px !important;
}

16
Mohem/src/app/hmg-common/hmg-common.module.ts
Unescape Escape View File

@ -21,7 +21,7 @@ import { TranslatePipe } from './pipes/translate/translate.pipe';
import { DatePipeTransform } from './pipes/date/date.pipe';
import { AlertControllerService } from './ui/alert/alert-controller.service';
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 { SafeHtmlPipe } from './pipes/safe-html/safe-html.pipe';
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 { AppRate } from '@ionic-native/app-rate/ngx';
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 { MenuService } from './services/menu/menuservice.service';
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 { FabButtonComponent } from './ui/fab-button/fab-button.component'
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 { CardFilterComponent } from './ui/card-filter/card-filter.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 { ChartModule } from 'primeng/chart';
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 { CardCalendarComponent } from './ui/card-calendar/card-calendar.component';
import { WorklistSettingComponent } from '../notification/worklist-setting/worklist-setting.component';
@ -287,7 +287,7 @@ import { SanitizeHtmlPipe } from '../itemforsale/services/domsafe';
Globalization,
SharedDataService,
AlertControllerService,
// ThemeableBrowser,
ThemeableBrowser,
LaunchNavigator,
ProjectsService,
NationalityService,
@ -309,14 +309,14 @@ import { SanitizeHtmlPipe } from '../itemforsale/services/domsafe';
Diagnostic,
AppRate,
RatingService,
// InAppBrowser,
InAppBrowser,
RateService,
Camera,
File,
MenuService,
OpenNativeSettings,
// BarcodeScanner,
// BackgroundGeolocation,
BarcodeScanner,
BackgroundGeolocation,
FileOpener,
FilePath,
FileChooser,

54
Mohem/src/app/hmg-common/hmg_utils.ts
Unescape Escape View File

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

48
Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts
Unescape Escape View File

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

10
Mohem/src/app/hmg-common/services/authentication/authentication.service.ts
Unescape Escape View File

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

1
Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts
Unescape Escape View File

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

127
Mohem/src/app/hmg-common/services/common/common.service.ts
Unescape Escape View File

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

122
Mohem/src/app/hmg-common/services/common/models/browser-config.ts
Unescape Escape View File

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

10
Mohem/src/app/hmg-common/services/connector/connector.service.ts
Unescape Escape View File

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

140
Mohem/src/app/hmg-common/services/hmg-browser/hmg-browser.service.ts
Unescape Escape View File

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

1
Mohem/src/app/hmg-common/services/menu/models/menu.entry.ts
Unescape Escape View File

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

28
Mohem/src/app/hmg-common/services/translator/translator.service.ts
Unescape Escape View File

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

6
Mohem/src/app/hmg-common/ui/button/button.component.scss
Unescape Escape View File

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

2
Mohem/src/app/hmg-common/ui/card-calendar/card-calendar.component.html
Unescape Escape View File

@ -2,5 +2,5 @@
<div class="main-container" [ngStyle]="active === true ? {'color': color} : {}">
<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>

2
Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html
Unescape Escape View File

@ -1,7 +1,7 @@
<div class="main-container" [ngStyle]="active === true ? {'background': color} : {}">
<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 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>

11
Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.ts
Unescape Escape View File

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

11
Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss
Unescape Escape View File

@ -8,14 +8,14 @@
.navbar {
font-size: 10px !important;
--background: #024d71 !important;
--background: #BE332F !important;
color: aliceblue !important;
}
.menu {
margin-top: 0px !important;
font-size: 35px !important;
background: #024d71;
background: #BE332F;
color: aliceblue;
margin-left: 0px !important;
@ -25,7 +25,7 @@
margin-left: 100px !important;
margin-top: 0px !important;
font-size: 23px !important;
background: #024d71 !important;
background: #BE332F !important;
color: aliceblue !important;
}
@ -52,6 +52,7 @@
color: black !important;
}
.dateLable {
margin-left: 90px !important;
@ -59,6 +60,7 @@
font-size: small !important;
margin-top: 15px !important;
}
// h1{
// font-size: 15px !important;
// text-align: center !important;
@ -70,6 +72,7 @@
margin-top: 15px !important;
}
.arrowDropleft {
font-size: 20px !important;
margin-left: 10px !important;
@ -92,7 +95,7 @@
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: #BE332F;
// background: linear-gradient(90deg, #85C48D 0%, #85C48D 13%, #2BB5C6 98%, #2BB5C6 100%);
color: var(--light);
text-transform: capitalize;

32
Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss
Unescape Escape View File

@ -7,12 +7,14 @@
display: block;
text-align: center;
transform: translate(-50%, -50%);
h2 {
font-size: 25px;
font-weight: bold;
margin: 0 auto;
line-height: 36px;
}
span {
width: 125px;
display: block;
@ -61,18 +63,21 @@
color: rgb(163, 163, 163) !important;
}
}
.today-graph {
display: block;
height: 127px;
width: 270px;
margin-left: -60px;
}
.today-graph-ar {
display: block;
height: 127px;
width: 270px;
margin-right: -70px;
}
.amountlabel {
color: black !important;
font-weight: bold !important;
@ -82,6 +87,7 @@
display: block;
text-align: center;
}
.rowlabel {
color: #a3a3a3 !important;
font-size: 13px !important;
@ -91,15 +97,18 @@
text-align: center;
padding: 1px;
}
.grid {
padding-bottom: -20px !important;
padding-top: -20px !important;
height: 360px !important;
}
.liftcol {
border-right: 1px solid rgb(163, 163, 163) !important;
}
.liftcol-ar {
border-left: 1px solid rgb(163, 163, 163) !important;
@ -110,6 +119,7 @@ height: 360px !important;
margin-left: 5px !important;
}
.gridrow {
border-top: 1px solid rgb(163, 163, 163) !important;
margin-left: 19px;
@ -121,12 +131,14 @@ height: 360px !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;
@ -137,6 +149,7 @@ height: 360px !important;
display: block;
width: 100%;
}
.p1 {
margin-bottom: -7px !important;
color: black !important;
@ -147,6 +160,7 @@ height: 360px !important;
display: block;
width: 100%;
}
.p2 {
font-weight: bold !important;
font-size: 17px !important;
@ -158,6 +172,7 @@ height: 360px !important;
display: block;
width: 100%;
}
.p3 {
color: black !important;
font-weight: bold !important;
@ -168,7 +183,8 @@ height: 360px !important;
width: 100%;
}
.p2-ar{ font-weight: bold !important;
.p2-ar {
font-weight: bold !important;
font-size: 17px !important;
margin-bottom: 43px !important;
margin-top: 0px !important;
@ -176,22 +192,27 @@ height: 360px !important;
font-weight: bold !important;
margin-right: 33px;
}
.p3-ar{ /* margin-bottom: -72px !important; */
.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;
.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;
background-color: #BE332F;
color: white;
margin-top: -13px;
margin-bottom: -3px;
@ -206,12 +227,13 @@ height: 360px !important;
.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);
}

2
Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts
Unescape Escape View File

@ -94,7 +94,7 @@ export class DateInfoModalComponent implements OnInit {
{
data: [this.percChart],
backgroundColor: [
'#024d71'
'#BE332F'
],
borderWidth: 2
}]

118
Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.scss
Unescape Escape View File

@ -1,32 +1,76 @@
.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;
/* margin-top: 2px; */
font-family: WorkSans-Regular;
border: 1px solid #ccc;
border-radius: 15px;
padding-bottom: 5px;
margin-bottom: 15px;
box-shadow: 0px 1px 5px #cdcdcd;
padding-bottom: 8px;
margin-bottom: 7px;
}
// .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 {
width: 60px;
height: 60px;
border-radius: 30px;
margin: 5px;
// width: 100%;
// max-height: 100%;
width: 74%;
max-height: 74%;
margin-top: 4px;
margin-left: 6px;
}
}
.employee-name{
display: inline-block;
width: 80%;
.name{
// font-size: 16px;
// color: black;
// // margin: 0;
// width: 100%;
// text-overflow: ellipsis;
// white-space: nowrap;
// overflow: hidden;
// margin-left: -10px;
// margin-top: -5px;
// font-family: 'WorkSans-Bold';
font-size: 16px;
text-overflow: ellipsis;
white-space: nowrap;
@ -34,17 +78,25 @@
margin-left: -10px;
margin-top: -5px;
text-align: left;
font-weight: bold;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 25px;
letter-spacing: -0.64px;
color: #2B353E;
opacity: 1;
font-family: 'Inter' !important;
}
.title{
font-family: 'Inter' !important;
// 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;
@ -53,7 +105,7 @@
width: 100%;
text-overflow: ellipsis;
white-space: nowrap;
// overflow: hidden;
overflow: hidden;
display: block;
margin-left: -10px;
margin-top: -10px;
@ -63,8 +115,17 @@
.employee-name-ar{
display: inline-block;
width: 80%;
.name{
// font-size: 16px;
// color: black;
// // margin: 0;
// width: 100%;
// text-overflow: ellipsis;
// white-space: nowrap;
// overflow: hidden;
// margin-left: -10px;
// margin-top: -5px;
// font-family: 'WorkSans-Bold';
font-size: 16px;
text-overflow: ellipsis;
white-space: nowrap;
@ -72,17 +133,25 @@
margin-left: -10px;
margin-top: -5px;
text-align: right;
font-family: 'Inter' !important;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 25px;
letter-spacing: -0.64px;
color: #2B353E;
opacity: 1;
font-weight: bold;
}
.title{
font-family: 'Inter' !important;
// 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;
@ -91,30 +160,25 @@
width: 100%;
text-overflow: ellipsis;
white-space: nowrap;
// overflow: hidden;
overflow: hidden;
display: block;
margin-left: -10px;
margin-top: -10px;
}
}
.image-container{
width: 20%;
display: inline-block;
text-align: center;
vertical-align: top;
margin-top: 5px;
position: relative;
top: 12px;
}
.swipe-information{
color: #888;
font-size: 12px;
border-top: 1px solid #ccc;
padding-top: 6px;
margin-top: 6px;
.check-in {
font-size: 12px;
margin-right: 15px;

8
Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss
Unescape Escape View File

@ -7,11 +7,12 @@
-ms-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
}
.btnImge {
// button{
border-color: transparent !important;
--background: #024d71 !important;
background: #024d71 !important;
--background: #BE332F !important;
background: #BE332F !important;
height: 57px !important;
width: 60px !important;
@ -19,9 +20,10 @@
// }
}
//test
.changeIcon {
background: #024d71 !important;
background: #BE332F !important;
border-radius: 50% !important;
width: 73px;
height: 55px;

8
Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html
Unescape Escape View File

@ -12,11 +12,6 @@
<img [src]="userImage"/>
</div>
</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" -->
<ion-col *ngIf="updateDirection" [size]="2" style="padding: 0;" (click)="closeModal()">
@ -24,8 +19,7 @@
<img style="
width: 20px;
height: 20px;
position: absolute;
top: -30px;"
margin-top: 5px;"
[src]="close"
/>
</div>

6
Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.scss
Unescape Escape View File

@ -6,12 +6,14 @@
border-radius: 100%;
overflow: hidden;
text-align: center;
img {
display: block;
margin: 0 auto;
max-width: 100%;
}
}
.ion-title {
color: white;
font-size: 0.5cm;
@ -21,9 +23,11 @@
text-align: center;
line-height: 46px;
}
.header-toolbar-new {
--background: #024d71;
--background: #BE332F;
}
.setting-conatainer {
height: 40px !important;
width: 40px !important;

1
Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts
Unescape Escape View File

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

3
Mohem/src/app/hmg-common/ui/nav-buttons/nav-buttons.component.scss
Unescape Escape View File

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

18
Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss
Unescape Escape View File

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

4
Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.html
Unescape Escape View File

@ -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'">
<img [src]="icon" class="icon">
</div>
@ -6,7 +6,7 @@
<ion-icon class="iconFab" name="finger-print"></ion-icon>
</div>
<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>
</div>
</div>

31
Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss
Unescape Escape View File

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

4
Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.html
Unescape Escape View File

@ -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-row>
<ion-col [size]="12">
@ -13,7 +13,7 @@
<ion-row style="margin-top: 50px;">
<ion-row>
<ion-col [size]="12">
<h1 class="heading1">{{welcome}} </h1>
<p *ngIf="!user" class="text1">{{welcome_txt}} </p>

4
Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.scss
Unescape Escape View File

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

118
Mohem/src/app/home/attendance-options/attendance-options.component.ts
Unescape Escape View File

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

4
Mohem/src/app/home/home.module.ts
Unescape Escape View File

@ -5,7 +5,7 @@ import { Routes, RouterModule } from '@angular/router';
import { HmgCommonModule } from '../hmg-common/hmg-common.module';
import { IonicModule } from '@ionic/angular';
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 { AttendanceOptionsComponent } from './attendance-options/attendance-options.component';
import { NfcModalComponent } from './nfc-modal/nfc-modal.component';
@ -36,7 +36,7 @@ const routes: Routes = [
WifiModalComponent
],
providers: [
// BarcodeScanner,
BarcodeScanner,
WorklistMainService
],
entryComponents: [

90
Mohem/src/app/home/home.page.html
Unescape Escape View File

@ -25,7 +25,7 @@
</ion-slides>
</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-label class="menu-label">{{menuItem.PROMPT}}</ion-label>
</ion-col>
@ -61,94 +61,6 @@
</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-col size="12">
<ion-label> {{'general,other-services' | translate}} </ion-label>

38
Mohem/src/app/home/home.page.scss
Unescape Escape View File

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

153
Mohem/src/app/home/home.page.ts
Unescape Escape View File

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

22
Mohem/src/app/home/nfc-modal/nfc-modal.component.ts
Unescape Escape View File

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

126
Mohem/src/app/home/wifi-model/wifi-modal.component.ts
Unescape Escape View File

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

63
Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.scss
Unescape Escape View File

@ -1,7 +1,5 @@
.header-toolbar-new {
--background: #024d71;
--background: #BE332F;
}
.contentBg {
@ -11,7 +9,7 @@
.contentBg:before {
position: absolute;
content: "";
background: #024d71;
background: #BE332F;
height: 140px;
width: 100%;
left: 0;
@ -32,7 +30,8 @@
border-radius: 20px;
border: 1px solid #ccc;
padding-top: 12px;
}}
}
}
@media screen and (min-width: 768px) and (max-width:1024px) {
.result-graph {
@ -47,11 +46,13 @@
border-radius: 20px;
border: 1px solid #ccc;
padding-top: 114px !important;
}}
}
}
.user-info {
text-align: center;
margin-bottom: 3px;
.user-image-container {
position: relative;
width: 100%;
@ -60,7 +61,8 @@
display: flex;
margin: 0 auto;
align-items: center;
}}
}
}
.Boldtext {
font-size: 13px;
@ -85,10 +87,12 @@
margin-bottom: 15px;
border-radius: 20px;
border: 1px solid #ccc;
ion-col {
padding: 15px;
// border-bottom: 1px solid #ccc;
}
h2 {
font-size: 13px;
// font-family: WorkSans-Bold;
@ -96,6 +100,7 @@
font-weight: bold;
color: rgb(128, 124, 124);
}
p {
font-size: 13px;
margin: 0;
@ -114,7 +119,9 @@
/* border: 1px solid #ccc; */
margin-top: -125px;
}}
}
}
@media screen and (min-width: 768px) and (max-width:1024px) {
.user-image {
position: relative;
@ -123,7 +130,8 @@
height: 100%;
border-radius: 80px;
margin-bottom: 371px;
}}
}
}
.img {
width: 100px;
@ -137,7 +145,7 @@
}
.sendCodeBtn {
--background: #024d71;
--background: #BE332F;
color: white;
text-align: center;
text-decoration: none;
@ -186,6 +194,7 @@ ion-input {
transition: all .2s ease-in-out;
border-radius: 3px;
display: inline-block;
&:focus {
border-color: var(--ion-color-secondary) !important;
box-shadow: 0 0 5px var(--ion-color-secondary) !important;
@ -197,7 +206,7 @@ ion-input {
}
.sendVerifyBtn {
--background: #024d71;
--background: #BE332F;
color: white;
text-align: center;
text-decoration: none;
@ -221,7 +230,8 @@ ion-input {
border-color: #dcdcdc;
margin-top: 6px !important;
border-color: #d8d4d4 !important;
margin-bottom: 18px;}
margin-bottom: 18px;
}
.text-label {
color: black !important;
@ -229,7 +239,8 @@ ion-input {
margin-left: 2px;
margin-right: 2px;
font-family: 'WorkSans-Bold';
} }
}
}
@media screen and (min-width: 325px) {
.custom-radio .radio-icon {
@ -240,7 +251,8 @@ ion-input {
border-color: #dcdcdc;
margin-top: 6px !important;
border-color: #d8d4d4 !important;
margin-bottom: 18px;}
margin-bottom: 18px;
}
.text-label {
color: black !important;
@ -248,7 +260,8 @@ ion-input {
margin-left: 15px;
margin-right: 13px;
font-family: 'WorkSans-Bold';
} }
}
}
// .radio-list{
// background: white;
@ -301,6 +314,7 @@ ion-input {
font-size: 13px;
text-align: start;
}
.filedDesc-ar {
border-radius: 30px;
border: 1px solid #d3d5d5 !important;
@ -413,7 +427,8 @@ ion-input {
font-family: 'WorkSans-bold';
font-size: 16px;
min-height: 1.0cm;
--background: #19a163 !important;}
--background: #19a163 !important;
}
.filed-container {
@ -442,6 +457,7 @@ ion-input {
--min-height: 1.6cm !important;
width: 315px;
}
.footer {
padding: 15px 0px 0px 0px;
background-color: var(--light) !important;
@ -449,9 +465,13 @@ ion-input {
box-shadow: none !important;
-webkit-box-shadow: none;
}
.Btn {
margin: auto; text-align: center; display: block;
margin: auto;
text-align: center;
display: block;
}
.footer2 {
padding: 15px 0px 0px 24px;
background-color: var(--light) !important;
@ -464,13 +484,16 @@ ion-input {
--background: #259CB8;
width: 80%;
}
@media screen and (min-width: 325px) {
.fileUpload {
position: relative;
overflow: hidden;
margin: 10px;
margin-left: -233px;
}}
}
}
@media screen and (min-width: 1px) and (max-width:320px) {
.fileUpload {
position: relative;
@ -478,7 +501,8 @@ ion-input {
margin: 10px;
margin-left: -158px;
}}
}
}
.fileUpload input.upload {
position: absolute;
@ -527,6 +551,7 @@ select option[data-default] {
.button-native {
box-shadow: none !important;
}
.gridAH {
text-align: justify;
}

66
Mohem/src/app/mowadhafi/hr-request/hr-request.component.scss
Unescape Escape View File

@ -1,11 +1,11 @@
.header-toolbar-new {
--background: #024d71;
--background: #BE332F;
}
ion-content {
--ion-background-color: whitesmoke;
}
.contentBg {
padding: 0px 20px;
}
@ -13,7 +13,7 @@
.contentBg:before {
position: absolute;
content: "";
background: #024d71;
background: #BE332F;
height: 140px;
width: 100%;
left: 0;
@ -34,7 +34,8 @@
border-radius: 20px;
border: 1px solid #ccc;
padding-top: 12px;
}}
}
}
@media screen and (min-width: 768px) and (max-width:1024px) {
.result-graph {
@ -49,11 +50,13 @@
border-radius: 20px;
border: 1px solid #ccc;
padding-top: 114px !important;
}}
}
}
.user-info {
text-align: center;
margin-bottom: 3px;
.user-image-container {
position: relative;
width: 100%;
@ -62,7 +65,8 @@
display: flex;
margin: 0 auto;
align-items: center;
}}
}
}
.Boldtext {
// font-size: 13px;
@ -79,6 +83,7 @@
line-height: 19px;
}
.p {
text-align: center;
// font: normal normal 600 13px/0px Poppins;
@ -89,6 +94,7 @@
font-size: 13px;
line-height: 0px;
}
.p1 {
text-align: center;
// font: normal normal 600 13px/6px Poppins;
@ -99,6 +105,7 @@
color: #A2A2A2;
opacity: 1;
}
.Nametext {
// font-size: 15px;
// font-family: WorkSans-Bold;
@ -146,10 +153,12 @@
// margin-bottom: 15px;
border-radius: 20px;
border: 1px solid #ccc;
ion-col {
padding: 15px;
// border-bottom: 1px solid #ccc;
}
h2 {
// font-size: 13px;
// margin: 0;
@ -163,6 +172,7 @@
color: #A2A2A2;
opacity: 1;
}
p {
// font-size: 13px;
// margin: 0;
@ -189,10 +199,12 @@
// margin-bottom: 15px;
border-radius: 20px;
border: 1px solid #ccc;
ion-col {
padding: 15px;
// border-bottom: 1px solid #ccc;
}
h2 {
// font-size: 13px;
// margin: 0;
@ -206,6 +218,7 @@
color: #A2A2A2;
opacity: 1;
}
p {
// font-size: 13px;
// margin: 0;
@ -234,7 +247,9 @@
/* border: 1px solid #ccc; */
margin-top: -125px;
}}
}
}
@media screen and (min-width: 768px) and (max-width:1024px) {
.user-image {
position: relative;
@ -243,7 +258,8 @@
height: 100%;
border-radius: 80px;
margin-bottom: 371px;
}}
}
}
.img {
width: 100px;
@ -257,7 +273,7 @@
}
.sendCodeBtn {
--background: #024d71;
--background: #BE332F;
color: white;
text-align: center;
text-decoration: none;
@ -306,6 +322,7 @@ ion-input {
transition: all .2s ease-in-out;
border-radius: 3px;
display: inline-block;
&:focus {
border-color: var(--ion-color-secondary) !important;
box-shadow: 0 0 5px var(--ion-color-secondary) !important;
@ -317,7 +334,7 @@ ion-input {
}
.sendVerifyBtn {
--background: #024d71;
--background: #BE332F;
color: white;
text-align: center;
text-decoration: none;
@ -340,7 +357,8 @@ ion-input {
border-color: #dcdcdc;
margin-top: 6px !important;
border-color: #d8d4d4 !important;
margin-bottom: 18px;}
margin-bottom: 18px;
}
.text-label {
color: black !important;
@ -390,6 +408,7 @@ ion-input {
// padding-right: 252px;
padding-right: 115px;
}
.filed2 {
border-radius: 30px;
border: 1px solid #d3d5d5 !important;
@ -401,6 +420,7 @@ ion-input {
// padding-right: 252px;
padding-right: 153px;
}
.filed3 {
border-radius: 30px;
border: 1px solid #d3d5d5 !important;
@ -412,6 +432,7 @@ ion-input {
// padding-right: 252px;
padding-right: 61px;
}
.filedDesc {
border-radius: 30px;
border: 1px solid #d3d5d5 !important;
@ -423,6 +444,7 @@ ion-input {
font-size: 13px;
text-align: start;
}
.filedDesc-ar {
border-radius: 30px;
border: 1px solid #d3d5d5 !important;
@ -525,7 +547,8 @@ ion-input {
color: white;
// margin-left: 15px;
// margin-right: 5px;
font-family: 'WorkSans-bold';}
font-family: 'WorkSans-bold';
}
.filed-container {
@ -542,7 +565,8 @@ ion-input {
font-family: 'WorkSans-Bold';
}
@media screen and (min-width: 325px) { .CreateBtn{
@media screen and (min-width: 325px) {
.CreateBtn {
--background: var(--newgreen) !important;
background: var(--newgreen) !important;
white-space: normal;
@ -554,7 +578,9 @@ ion-input {
--min-height: 1.6cm !important;
width: 315px;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
}}
}
}
@media screen and (min-width: 1px) and (max-width:320px) {
.CreateBtn {
--background: var(--newgreen) !important;
@ -568,7 +594,8 @@ ion-input {
--min-height: 1.6cm !important;
width: 231px;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
}}
}
}
.footer {
@ -578,9 +605,13 @@ ion-input {
box-shadow: none !important;
-webkit-box-shadow: none;
}
.Btn {
margin: auto; text-align: center; display: block;
margin: auto;
text-align: center;
display: block;
}
.footer2 {
padding: 15px 0px 0px 24px;
background-color: var(--light) !important;
@ -600,6 +631,7 @@ ion-input {
margin: 10px;
margin-left: -233px;
}
.fileUpload input.upload {
position: absolute;
top: 0;

71
Mohem/src/app/mowadhafi/request-details/request-details.component.scss
Unescape Escape View File

@ -1,10 +1,9 @@
ion-content {
--ion-background-color: whitesmoke;
}
.sendCodeBtn {
--background: #024d71;
--background: #BE332F;
color: white;
text-align: center;
text-decoration: none;
@ -27,6 +26,7 @@
font-family: WorkSans-Bold;
margin: 50px 0px 0px 100px;
}
.empty-ar {
color: black;
text-align: center;
@ -63,6 +63,7 @@
border-radius: 10px;
opacity: 1;
}
.text {
text-align: left;
/* font-family: var(--fontFamilyPoppins-Medium, inherit); */
@ -86,13 +87,15 @@
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 {
@ -100,7 +103,8 @@
margin-right: -49px;
color: gray;
font-size: 12px;
}}
}
}
@media screen and (min-width: 1px) and (max-width:320px) {
.date-ar {
@ -108,7 +112,8 @@
color: gray;
font-size: 10px;
margin-left: 58px;
}}
}
}
@media screen and (min-width: 325px) {
.date-ar {
@ -116,7 +121,8 @@
margin-right: -49px;
color: gray;
font-size: 12px;
}}
}
}
.labels {
// font-size: 13px;
@ -135,6 +141,7 @@
opacity: 1;
padding-bottom: 3px;
}
.labels-ar {
// font-size: 13px;
// margin-bottom: 0px;
@ -152,6 +159,7 @@
opacity: 1;
padding-bottom: 3px;
}
.request-list-container {
position: relative;
padding-left: 37px;
@ -159,6 +167,7 @@
min-height: 200px;
padding-top: 15px;
}
.request-list-container:before {
content: "";
position: absolute;
@ -168,6 +177,7 @@
top: 15px;
background-color: #f5f4f4;
}
.request-list-container-ar {
position: relative;
padding-left: 60px;
@ -176,6 +186,7 @@
// margin-bottom: 80px;
padding-top: 15px;
}
.request-list-container-ar:before {
content: "";
position: absolute;
@ -198,6 +209,7 @@
line-height: 25px;
font-size: 16px;
}
.text-span:before {
content: "";
position: absolute;
@ -205,7 +217,7 @@
border-radius: 50%;
width: 15px;
height: 15px;
background-color: #024d71;
background-color: #BE332F;
top: 1px;
}
@ -221,6 +233,7 @@
font-size: 16px;
margin-right: 37px;
}
.text-span-ar:before {
content: "";
position: absolute;
@ -228,7 +241,7 @@
border-radius: 50%;
width: 15px;
height: 15px;
background-color: #024d71;
background-color: #BE332F;
top: 1px;
}
@ -240,6 +253,7 @@
// padding-left: 15px;
margin-right: 20px;
margin-bottom: 15px;
p {
// font-size: 14px;
text-align: left;
@ -261,6 +275,7 @@
// padding-left: 15px;
margin-right: 20px;
margin-bottom: 15px;
p {
// font-size: 14px;
text-align: right;
@ -273,6 +288,7 @@
font-size: 13px;
}
}
.date-span {
text-align: right;
@ -285,6 +301,7 @@
color: #A2A2A2;
opacity: 1;
}
// @media screen and (min-width: 325px){
// .date-span{
// font-size: 13px;
@ -329,28 +346,43 @@
font-family: 'WorkSans-bold';
}
.ReOpen{ margin-top: 5px;
.ReOpen {
margin-top: 5px;
color: #1FA169;
}
.AssToManager{ margin-top: 5px;
.AssToManager {
margin-top: 5px;
color: #259CB8;
}
.AssToSpec{ margin-top: 5px;
.AssToSpec {
margin-top: 5px;
color: #259CB8;
}
.Pending{ margin-top: 5px;
.Pending {
margin-top: 5px;
color: #E29D03;
}
.BackToSpec{ margin-top: 5px;
.BackToSpec {
margin-top: 5px;
color: #3A476E;
}
.Closed{ margin-top: 5px;
.Closed {
margin-top: 5px;
color: #CA3332;
}
.BackToManager{ margin-top: 5px;
.BackToManager {
margin-top: 5px;
color: #3A476E;
}
.AssignedToHR{ margin-top: 5px;
.AssignedToHR {
margin-top: 5px;
color: #259CB8;
}
@ -371,8 +403,9 @@
// font-weight: 600;
line-height: 16px;
font-size: 10px;
color: #024d71;
color: #BE332F;
}
.postedDate {
text-align: left !important;
// font-weight: 600;
@ -383,6 +416,7 @@
color: #969696 !important;
opacity: 1 !important;
}
.DescrText {
text-align: left;
// font: normal normal medium 13px/18px Poppins;
@ -394,6 +428,7 @@
line-height: 5px;
font-size: 13px;
}
.DescrText-ar {
text-align: right;
// font: normal normal medium 13px/18px Poppins;
@ -405,10 +440,10 @@
line-height: 5px;
font-size: 13px;
}
.div {
position: relative;
display: flex;
justify-content: space-between;
margin-bottom: -12px;
}

12
Mohem/src/app/my-team/details/details.component.html
Unescape Escape View File

@ -36,7 +36,7 @@
<ion-row style="margin-top: 11px;">
<ion-col [size]="6">
<p class="subTitle">{{ts.trPK('userProfile','role')}}</p>
<span class="Boldtext">{{employee.POSITION_NAME}}</span>
<span class="Boldtext">{{jobName}}</span>
</ion-col>
<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>
@ -61,7 +61,7 @@
</ion-segment-button>
</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 [size]="4" (click)="getMenuEntries(employee)">
@ -72,7 +72,7 @@
<img class="imgSize" src="../assets/imgs/create-req.svg">
</ion-segment-button>
</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 [size]="3">
<ion-col>
@ -93,7 +93,7 @@
<img class="imgSize" src="../assets/imgs/team-members.svg">
</ion-segment-button>
</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-segment>
@ -502,7 +502,7 @@
</ion-col>
<ion-col [size]="12">
<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 [size]="12">
<h2 [ngClass]="direction == 'en' ? 'label1':'label1-ar' ">{{ts.trPK('userProfile','payrol')}}</h2>
@ -514,7 +514,7 @@
</ion-col> -->
<ion-col [size]="12">
<h2 [ngClass]="direction == 'en' ? 'label1':'label1-ar' ">{{ts.trPK('userProfile','position')}}</h2>
<p [ngClass]="direction == 'en' ? 'label2':'label2-ar' ">{{employee.POSITION_NAME}}</p>
<p [ngClass]="direction == 'en' ? 'label2':'label2-ar' ">{{jobName}}</p>
</ion-col>
<ion-col [size]="12" style="border-bottom: none;">
<h2 [ngClass]="direction == 'en' ? 'label1':'label1-ar' ">{{ts.trPK('userProfile','grade')}}</h2>

96
Mohem/src/app/my-team/details/details.component.scss
Unescape Escape View File

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

10
Mohem/src/app/my-team/details/details.component.ts
Unescape Escape View File

@ -245,10 +245,10 @@ export class DetailsComponent implements OnInit {
this.employee = this.common.sharedService.getSharedData(MyTeamService.EMPLOYEE_SHARED_DATA, false);
console.log(this.employee);
let jobTitle = this.employee.POSITION_NAME;
// if (jobTitle && jobTitle.length > 1) {
this.jobName = jobTitle;
// }
let jobTitle = this.employee.POSITION_NAME.split('.');
if (jobTitle && jobTitle.length > 1) {
this.jobName = jobTitle[0] + " " + jobTitle[1];
}
const request = {
P_SELECTED_EMPLOYEE_NUMBER: this.employee.EMPLOYEE_NUMBER
@ -449,7 +449,7 @@ export class DetailsComponent implements OnInit {
data: [this.absentDays, this.attendedDays],
backgroundColor: [
'black',
'#024d71'
'#BE332F'
],
borderWidth: 1,
// cutoutPrecentage:20 ,

81
Mohem/src/app/my-team/home/home.component.html
Unescape Escape View File

@ -1,5 +1,6 @@
<app-generic-header
showBack="true"
subordinateLeave='true'
backLink="/home"
[headerText]="'myTeam, myTeam-header' | translate">
</app-generic-header>
@ -39,11 +40,11 @@
<ion-row>
<ion-col >
<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="showUserNameOrNameInput" [placeholder]="'myTeam, search-name' | translate" [(ngModel)]="searchNameOrUserName" ></ion-input>
<ion-input *ngIf="showUserNameInput" [placeholder]="'myTeam, search-username' | translate" [(ngModel)]="searchUserName" ></ion-input>
<ion-input *ngIf="showEmailInput" placeholder="Search by Email" [(ngModel)]="searchEmail" pattern="email" ></ion-input>
<ion-input *ngIf="showUserNameOrNameInput" placeholder ="Search by Name" [(ngModel)]="searchNameOrUserName" ></ion-input>
<ion-input *ngIf="showUserNameInput" placeholder ="Search by Username" [(ngModel)]="searchUserName" ></ion-input>
</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-icon name="close" ></ion-icon>
</ion-col>
@ -51,12 +52,84 @@
</ion-col>
</ion-row>
</div>
<!-- <div class="result-text-container">
<h2>{{totalEmployees}}</h2>
<span>{{ts.trPK('myTeam','total')}} <br> {{ts.trPK('myTeam','team-members')}}</span>
</div> -->
</div>
<div class="div">
<div class="text" >{{ts.trPK('myTeam','my-team-members')}}</div>
<div [ngClass]="direction == 'en' ? 'numberEmp':'numberEmp-ar' ">{{EmployeeTotal}}</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">
<app-employee-information

156
Mohem/src/app/my-team/home/home.component.scss
Unescape Escape View File

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

4
Mohem/src/app/my-team/home/home.component.ts
Unescape Escape View File

@ -44,7 +44,7 @@ export class HomeComponent implements OnInit {
{
data: [100],
backgroundColor: [
'#024d71'
'#BE332F'
],
borderWidth: 5
}]
@ -111,7 +111,7 @@ export class HomeComponent implements OnInit {
}
toggleColor() {
this.myColor = 'secondary';
// this.myColor = '#024d71'
// this.myColor = '#BE332F'
}
// activeFilter(index: number) {

4
Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.html
Unescape Escape View File

@ -14,7 +14,7 @@
<ion-grid>
<ion-row>
<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-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-col>
<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-datetime style="padding: 0px" [(ngModel)]="endDate" min="1900" max="2100" displayFormat="MMM/DD/YYYY" placeholder="MM/DD/YYYY" required
cancelText="{{ts.trPK('general','cancel')}}"

11
Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.scss
Unescape Escape View File

@ -4,10 +4,12 @@
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
--background: #024d71;
--background: #BE332F;
width: 80% !important;
color: white !important;
border-radius: 16px !important;
--border-radius: 16px !important;
--box-shadow: none;
}
.team-member-container {
@ -73,6 +75,7 @@
.employee-name {
display: inline-block;
width: 80%;
.name {
// font-size: 16px;
// color: black;
@ -128,6 +131,7 @@
.employee-name-ar {
display: inline-block;
width: 80%;
.name {
// font-size: 16px;
// color: black;
@ -173,12 +177,13 @@
width: 100%;
text-overflow: ellipsis;
white-space: nowrap;
// overflow: hidden;
overflow: hidden;
display: block;
margin-left: -10px;
margin-top: -10px;
}
}
.image-container {
width: 20%;
display: inline-block;
@ -186,12 +191,14 @@
vertical-align: top;
margin-top: 5px;
}
.swipe-information {
color: #888;
font-size: 12px;
border-top: 1px solid #ccc;
padding-top: 6px;
margin-top: 6px;
.check-in {
font-size: 12px;
margin-right: 15px;

4
Mohem/src/app/notification/home/home.component.html
Unescape Escape View File

@ -38,7 +38,7 @@
</ion-row>
<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>
<ion-icon name="close" ></ion-icon>
</ion-col>
@ -60,7 +60,7 @@
</ion-col>
</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 *ngFor="let formattedData of showFormattedData; let i = index">
<span [ngClass]="direction == 'en'? 'date-span':'date-span-ar'">{{formattedData.date}}</span>

37
Mohem/src/app/notification/home/home.component.scss
Unescape Escape View File

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

10
Mohem/src/app/notification/home/home.component.ts
Unescape Escape View File

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

10
Mohem/src/app/notification/models/WorklistsubmitterInfoReq.ts
Unescape Escape View File

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

3
Mohem/src/app/notification/service/work-list.main.service.ts
Unescape Escape View File

@ -43,8 +43,7 @@ export class WorklistMainService {
public static getPOItemHistory = "Services/ERP.svc/REST/GET_PO_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 getUserInfo = "Services/ERP.svc/REST/Get_UserInformation";
public static getUserInfo = "Services/ERP.svc/REST/Get_Notification_UserInformation";
public static getUserInfo = "Services/ERP.svc/REST/Get_UserInformation";
public static getNotificationAction = "Services/ERP.svc/REST/NOTIFICATION_ACTIONS";
public static getNotificationRespondAtt = "Services/ERP.svc/REST/NOTIFICATION_GET_RESPOND_ATTRIBUTES";
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

Write Preview
Loading…
Cancel
Save