bug fixes

SRCA_DEV
Sultan Khan 4 years ago
parent 720abf8efc
commit 9aae74223f

@ -4,10 +4,13 @@
<ion-content class="sidebar-menu">
<div class="header-div">
<div>
<ion-button class="closeIcon" (click)="closeMenu()">
<img style= "height: 18px !important;" src="../assets/imgs/close_menu_icon.png "></ion-button>
</div>
<img class="closeIcon" (click)="closeMenu()" style= "height: 18px !important;" src="../assets/imgs/close_menu_icon.png ">
</div>
<div >
<img class="mohemmLogo" src="../assets/imgs/menu_mohemm_logo.png" >
</div>
<hr>
</div>
<div class="centerDiv homeBox">
@ -32,14 +35,14 @@
{{ts.trPK('userProfile','title')}}
</ion-label>
</ion-item>
<!-- <ion-item (click)="performanceEvaluation()">
<ion-item (click)="performanceEvaluation()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 24px !important;" src="../assets/icon/bar-chart.svg" item-left>
</ion-thumbnail>
<ion-label class="profile">
{{ts.trPK('userProfile','performance-evaluation')}}
</ion-label>
</ion-item> -->
</ion-item>
<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>
@ -49,17 +52,16 @@
</ion-label>
</ion-item>
<!-- <ion-item (click)="openMyRequestPage()">
<ion-item (click)="openMyRequestPage()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 20px !important;" src="../assets/imgs/hr-request.png" item-left>
</ion-thumbnail>
<ion-label class="profile">
{{ts.trPK('userProfile','HR-Request')}}
</ion-label>
</ion-item> -->
</ion-item>
<div *ngFor="let menu of menuList">
<ion-item (click)="oepnMyRequest(menu)" *ngIf="menu.MENU_TYPE =='E'">
<ion-item (click)="oepnMyRequest(menu)" *ngIf="menu.REQUEST_GROUP_NAME =='MBL_RG_01'">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 20px !important;" src="../assets/imgs/my-request.png" item-left>
</ion-thumbnail>
@ -69,17 +71,17 @@
</ion-item>
</div>
<!-- <ion-item (click)="oepnTransaction()">
<ion-item (click)="oepnTransaction()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 20px !important;" src="../assets/imgs/pending-transaction.png" item-left>
</ion-thumbnail>
<ion-label class="profile">
{{ts.trPK('general','pending-transaction')}}
</ion-label>
</ion-item> -->
</ion-item>
<!-- <ion-item (click)="openChangePassword()"> -->
<!-- <ion-item (click)="openChangePassword()">
<ion-item (click)="openChangePassword()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 25px !important;" src="../assets/imgs/lock_icon.png" item-left>
</ion-thumbnail>
@ -87,9 +89,9 @@
{{ts.trPK('login','changepassword')}}
<ion-badge class="start-badge main-badge" slot="end" color="danger">{{notBadge}}</ion-badge>
</ion-label>
</ion-item> -->
</ion-item>
<!-- <ion-item (click)="openDigitalId()">
<ion-item (click)="openDigitalId()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 25px !important;" src="../assets/imgs/ID_ico_menu.png" item-left>
</ion-thumbnail>
@ -97,9 +99,9 @@
{{ts.trPK('general','digital-id')}}
<ion-badge class="start-badge main-badge" slot="end" color="danger">{{notBadge}}</ion-badge>
</ion-label>
</ion-item> -->
</ion-item>
<!-- <ion-item *ngIf='userInfo?.show_business' (click)="openBusinessCard()">
<ion-item *ngIf='userInfo?.show_business' (click)="openBusinessCard()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 25px !important;" src="../assets/imgs/business-card-design.png" item-left>
</ion-thumbnail>
@ -107,7 +109,7 @@
{{ts.trPK('general','business-card')}}
<ion-badge class="start-badge main-badge" slot="end" color="danger">{{notBadge}}</ion-badge>
</ion-label>
</ion-item> -->
</ion-item>
</ion-list>
@ -126,10 +128,9 @@
<ion-content class="sidebar-menu">
<div class="header-div">
<div>
<ion-button class="closeIcon" (click)="closeMenu()">
<img style= "height: 18px !important;" src="../assets/imgs/close_menu_icon.png "></ion-button>
<img class="closeIcon" (click)="closeMenu()" style= "height: 18px !important; margin-right: 15px;" src="../assets/imgs/close_menu_icon.png ">
</div>
<div style="border-bottom: rgb(190, 186, 186) solid 1px;" >
<div>
<img class="mohemmLogo-ar" src="../assets/imgs/menu_mohemm_logo.png" >
</div>
<hr>
@ -156,14 +157,14 @@
{{ts.trPK('userProfile','title')}}
</ion-label>
</ion-item>
<!-- <ion-item (click)="performanceEvaluation()">
<ion-item (click)="performanceEvaluation()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 24px !important;" src="../assets/icon/bar-chart.svg" item-left>
</ion-thumbnail>
<ion-label class="profile">
{{ts.trPK('userProfile','performance-evaluation')}}
</ion-label>
</ion-item> -->
</ion-item>
<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>
@ -172,17 +173,16 @@
{{ts.trPK('myTeam','myTeam-header')}}
</ion-label>
</ion-item>
<!-- <ion-item (click)="openMyRequestPage()">
<ion-item (click)="openMyRequestPage()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 14px !important;" src="../assets/imgs/my_team_icon.png" item-left>
</ion-thumbnail>
<ion-label class="profile">
{{ts.trPK('userProfile','HR-Request')}}
</ion-label>
</ion-item> -->
</ion-item>
<div *ngFor="let menu of menuList">
<ion-item (click)="oepnMyRequest(menu)" *ngIf="menu.MENU_TYPE =='E'">
<ion-item (click)="oepnMyRequest(menu)" *ngIf="menu.REQUEST_GROUP_NAME =='MBL_RG_01'">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 20px !important;" src="../assets/imgs/my-request.png" item-left>
</ion-thumbnail>
@ -192,15 +192,15 @@
</ion-item>
</div>
<!-- <ion-item (click)="oepnTransaction()">
<ion-item (click)="oepnTransaction()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 20px !important;" src="../assets/imgs/pending-transaction.png" item-left>
</ion-thumbnail>
<ion-label class="profile">
{{ts.trPK('general','pending-transaction')}}
</ion-label>
</ion-item> -->
<!-- <ion-item (click)="openChangePassword()">
</ion-item>
<ion-item (click)="openChangePassword()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 25px !important;" src="../assets/imgs/lock_icon.png" item-left>
</ion-thumbnail>
@ -208,15 +208,15 @@
{{ts.trPK('login','changepassword')}}
<ion-badge [ngClass]=" direction === 'rtl' ? 'end-badge' : 'start-badge'" slot="end" color="danger" class="main-badge">{{notBadge}}</ion-badge>
</ion-label> -->
</ion-label>
<!-- <button class="menu-item" ion-item menuClose ion-item (click)="goToWorkListPage()" >
</button> -->
<!-- </ion-item> -->
</ion-item>
<!-- <ion-item (click)="openDigitalId()">
<ion-item (click)="openDigitalId()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 25px !important;" src="../assets/imgs/ID_ico_menu.png" item-left>
</ion-thumbnail>
@ -224,9 +224,9 @@
{{ts.trPK('general','digital-id')}}
<ion-badge class="start-badge main-badge" slot="end" color="danger">{{notBadge}}</ion-badge>
</ion-label>
</ion-item> -->
</ion-item>
<!-- <ion-item *ngIf='userInfo?.show_business' (click)="openBusinessCard()">
<ion-item *ngIf='userInfo?.show_business' (click)="openBusinessCard()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 25px !important;" src="../assets/imgs/business-card-design.png" item-left>
</ion-thumbnail>
@ -234,7 +234,7 @@
{{ts.trPK('general','business-card')}}
<ion-badge class="start-badge main-badge" slot="end" color="danger">{{notBadge}}</ion-badge>
</ion-label>
</ion-item> -->
</ion-item>
<!-- <ion-item (click)="profile()">
<ion-thumbnail slot="start" class="menu-thumb">

@ -34,7 +34,8 @@ header
margin-top: 0px !important;
background: transparent;
--background: white !important;
position: relative;
top: 10px;
}

@ -27,8 +27,8 @@ 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 = 'https://uat.hmgwebservices.com/';
public static host = 'https://hmgwebservices.com/';
// public static host = 'http://riyt-mohemm1:1010/' //MOE
constructor(public httpClient: HttpClient,
public cs: CommonService,

@ -34,7 +34,7 @@
font-size: 25px;
font-weight: bold;
color: black;
text-align: left;
text-align: -webkit-auto;
display: block;
}
}
@ -48,7 +48,7 @@ ion-app[dir="rtl"] .titleBox {
width: 85%;
margin-top: 5px;
font-weight: bold;
text-align: left;
text-align: -webkit-auto;
display: block;
font-size: 14px !important;
}

@ -1,9 +1,11 @@
.bar-stable {
background-color: var(--cusgray) !important;
}
.tabs {
background-color: var(--cusgray) !important;
}
.icon-size-lg {
font-size: 40px;
}
@ -96,11 +98,13 @@
.notification-list {
background: none;
ion-item {
// margin-top: 5px;
// margin-bottom: 5px;
background-color: transparent;
.item-date {
width: 100%;
font-size: 16px;
@ -114,7 +118,9 @@ ion-item{
left: 0;
top: 12%;
}
ion-label , [item-end]{
ion-label,
[item-end] {
white-space: normal;
font-size: 14px;
@ -130,35 +136,46 @@ ion-item{
}
}
.input-wrapper {
--flex: none;
}
ion-input ,ion-datetime{
ion-input,
ion-datetime {
border-bottom: #dedede 1px solid;
}
.left {
--background: #f0efef;
.timelineMain:before {
left: 21px;
}
.notification-list ion-item {
padding-left: 3px;
margin-left: -12%;
}
.timelineMain-thumb {
left: 9%;
top: 30%;
}
}
.right {
--background: #f0efef;
.timelineMain:before {
right: 62px;
}
.notification-list ion-item {
padding-right: 3px;
}
.timelineMain-thumb {
right: 37px;
}
@ -169,6 +186,7 @@ margin-left: -40px;
height: 160%;
padding-top: 370%;
}
.colorBG {
--background: #f0efef;
}
@ -177,16 +195,19 @@ padding-top: 370%;
padding-left: 50px;
margin-left: -33px;
}
.menuListItem {
padding-top: 9%;
margin: -20%;
padding-left: 13%;
}
.menuListBtn {
width: 100%;
background: white;
--background: white;
}
.activeTabMenu {
--background: #ff726f;
}
@ -195,6 +216,7 @@ background: white;
margin-left: 5%;
margin-top: 6%;
}
.itemListNotification {
padding-bottom: 18px;
}
@ -223,6 +245,7 @@ padding-left: 10%;
.profile-image-container {
position: relative;
z-index: 999;
img {
width: 32px;
float: right;
@ -231,6 +254,7 @@ img {
margin-right: 10px;
}
}
ion-title {
color: white;
position: absolute;
@ -253,9 +277,11 @@ left: 0;
top: 0px;
z-index: 1;
}
ion-content {
--ion-background-color: whitesmoke;
}
.request-heading {
span {
text-align: center;
@ -275,6 +301,7 @@ padding-bottom: 20px;
border-radius: 20px;
z-index: 1;
}
.result-text-container {
padding: 0;
margin: 0;
@ -284,12 +311,14 @@ top: 50%;
display: block;
text-align: center;
transform: translate(-50%, -50%);
h2 {
font-size: 38px;
font-family: WorkSans-Bold;
margin: 0 auto;
line-height: 36px;
}
span {
width: 125px;
display: block;
@ -298,6 +327,7 @@ span {
font-family: workSans-Regular;
}
}
.today-graph {
width: 100%;
max-height: 4cm;
@ -307,10 +337,12 @@ max-height: 4cm;
margin: 0 !important;
width: 100% !important;
}
.filters-row {
margin-top: 10px;
margin-left: 20px;
}
.work-list-container {
position: relative;
padding-left: 60px;
@ -319,6 +351,7 @@ min-height: 200px;
margin-bottom: 80px;
padding-top: 15px;
}
.work-list-container:before {
content: "";
position: absolute;
@ -328,6 +361,7 @@ left: 30px;
top: 15px;
background-color: #dddddd;
}
.work-list-container-ar {
position: relative;
padding-left: 60px;
@ -336,6 +370,7 @@ background-color: #dddddd;
margin-bottom: 80px;
padding-top: 15px;
}
.work-list-container-ar:before {
content: "";
position: absolute;
@ -346,23 +381,27 @@ background-color: #dddddd;
right: 6px;
background-color: #dddddd;
}
.search-container {
margin-top: 15px;
display: block;
padding: 0 20px;
position: relative;
z-index: 99;
ion-col {
background: white;
border-radius: 12px;
// padding-right: 30px;
flex: none;
ion-icon {
margin-right: 3px;
font-size: 20px;
margin-left: 3px;
vertical-align: middle;
}
span {
font-size: 14px;
vertical-align: middle;
@ -370,11 +409,13 @@ ion-col{
}
}
}
.date-span {
position: relative;
display: block;
margin-bottom: 10px;
}
.date-span:before {
content: "";
position: absolute;
@ -393,6 +434,7 @@ top: 1px;
/* margin-top: 10px; */
margin-right: 30px;
}
.date-span-ar:before {
content: "";
position: absolute;
@ -414,10 +456,13 @@ font-family: WorkSans-Regular;
padding-left: 15px;
margin-right: 20px;
margin-bottom: 15px;
padding-right: 15px;
p {
font-size: 14px;
}
}
.no-data-available {
background: white;
font-family: WorkSans-Regular;
@ -426,16 +471,19 @@ p{
left: 85px;
bottom: 20%;
}
.disable-filter {
pointer-events: none;
opacity: .3;
}
.total-result {
margin-top: 55px;
padding-left: 20px;
color: #888;
font-size: 15px;
}
.text-span {
font-size: 12px;
color: #888;
@ -457,6 +505,7 @@ border: 1px solid;
border-radius: 30px;
padding: 10px 30px;
}
.slideCss {
width: auto !important;
}

@ -107,7 +107,7 @@
[value]="gaugeValue"
[label]="gaugeLabel">
</ngx-gauge> -->
<div [ngClass]="direction == 'en'? 'result-graph':'result-graph-ar'">
<div class="result-graph">
<!-- <div class="request-heading">
@ -115,13 +115,13 @@
</div> -->
<div [ngClass]="direction == 'en'? 'result-text-container':'result-text-container-ar'">
<div class="result-text-container">
<h2>{{GetSummaryOfPaymentList.TOTAL_PAY_AMOUNT}}</h2>
<!-- <span>TOTAL <br> OPEN REQUEST</span> -->
<span>{{ts.trPK('payslip','total')}} <br> {{ts.trPK('payslip','salary')}}</span>
</div>
<p-chart #chart [ngClass]="direction == 'en'? 'today-graph':'today-graph-ar'" type="doughnut" [data]="data" [options]="options"></p-chart>
<p-chart #chart class="today-graph" type="doughnut" [data]="data" [options]="options"></p-chart>
</div>
<div [ngClass]=" direction == 'en' ? 'div-green':'div-green-ar'">

@ -1,6 +1,7 @@
.rowAccordin {
border: none;
}
.gridAccordin {
margin: 10px;
background: #ffffff;
@ -15,6 +16,7 @@
margin-left: 8px;
font-size: 12px !important;
}
.colPayslip-ar {
border-left: 1px solid #cac8c8;
border-bottom-left-radius: -10px !important;
@ -39,12 +41,14 @@
margin-bottom: 1px;
margin-left: 8px;
}
.label-bold {
font-size: 13px !important;
// font-weight: bold !important;
font-family: WorkSans-Bold;
margin-left: 8px;
}
.earingTotH {
text-align: right;
font-weight: bold;
@ -69,9 +73,11 @@
color: var(--red);
}
.header-toolbar-new {
--background: #269DB8;
}
.colorBG {
--background: #f0efef;
}
@ -84,6 +90,7 @@
display: block;
margin-bottom: -28px;
}
.Title {
text-align: center;
color: white;
@ -95,6 +102,7 @@
padding-top: -38px;
margin-top: -32px;
}
.Imgsrc {
width: 23px;
height: 24px;
@ -120,6 +128,7 @@
margin-left: 10px;
background: transparent;
}
.activeArrow {
height: 26px;
width: 26px;
@ -129,6 +138,7 @@
}
.activeArrow-ar {
height: 26px;
width: 26px;
@ -142,12 +152,14 @@
margin-right: 38px;
margin-left: -45px;
}
.slidbtn {
background: transparent;
margin-bottom: -59px;
margin-top: 8px;
margin-left: 65px;
}
.disabledArrow {
height: 26px;
width: 26px;
@ -155,6 +167,7 @@
background: transparent !important;
--background: transparent !important;
}
.disabledArrow-ar {
height: 26px;
width: 26px;
@ -169,12 +182,13 @@
-o-transform: scaleX(-1);
transform: scaleX(-1);
}
.today-graph {
display: block !important;
height: 162px;
width: 335px;
/* padding-left: 51px; */
margin-left: 3px !important;
// margin-left: 3px !important;
}
.today-graph-ar {
@ -187,41 +201,35 @@
.result-graph {
font-size: 14px;
margin-left: -48px;
margin-right: 3px;
position: relative;
}
.result-graph-ar {
font-size: 14px;
margin-right: -48px;
margin-left: 3px;
position: relative;
}
.headerGrid {
background-color: white !important;
border: 1px solid #cac8c8 !important;
border-radius: 20px !important;
padding-top: 13px;
padding-bottom: 14px;
// margin-left: 26px;
// margin-right: 28px;
margin-left: 19px;
margin-right: 19px;
margin-top: -2px;
margin-left: 15px;
margin-right: 15px;
margin-bottom: 10px;
padding-right: 21px;
padding-right: 25px;
}
.result-text-container-ar {
.result-text-container {
padding: 0;
margin: 0;
margin: 0px -5px 0px -5px;
position: absolute;
// left: 54%;
left: 45%;
top: 50%;
top: 30%;
display: block;
text-align: center;
transform: translate(-50%, -50%);
width: 100%;
h2 {
@ -244,14 +252,7 @@
.result-text-container {
padding: 0;
margin: 0;
position: absolute;
left: 40%;
top: 50%;
display: block;
text-align: center;
transform: translate(-50%, -50%);
h2 {
@ -271,6 +272,7 @@
font-family: workSans-Regular;
}
}
.green-label {
font-size: 10px;
margin-top: -13px;
@ -310,6 +312,7 @@
margin-top: -119px;
}
.bgcolor {
color: white;
@ -337,6 +340,7 @@
margin-right: -13px;
}
.rowtables {
padding-top: 0;
padding-bottom: 0;
@ -346,22 +350,26 @@
margin-right: -13px;
}
.col {
font-size: 15px;
font-family: WorkSans-Bold;
}
.hrTitle {
margin-left: 11px !important;
margin-left: 20px !important;
font-size: 15px !important;
margin-right: 11px !important;
margin-right: 20px !important;
}
.date {
font-size: 15px !important;
margin-left: 58px;
margin-bottom: 12px;
padding-right: 5px;
}
.div-green {
// left: 77%;
// width: 20%; height: 6px;
@ -373,6 +381,7 @@
width: 16%;
height: 6px;
}
.div-green-ar {
// position: relative;
// left: 77%;
@ -388,6 +397,7 @@
width: 15%;
height: 6px;
}
.div-blue {
// left: 77%;
// width: 20%; height: 6px;
@ -399,6 +409,7 @@
width: 16%;
height: 6px;
}
.div-blue-ar {
//position: relative;
// left: 77%;

Loading…
Cancel
Save