fixed sprint2 issues

MOE-PHASE-2-SPRINT-1
umasoodch 3 years ago
parent e473a3cfd1
commit f5f2fc5356

@ -7,7 +7,7 @@
[dateFormatter]="calendar.dateFormatter" [dateFormatter]="calendar.dateFormatter"
(onTimeSelected)="onDayClicked($event)"> (onTimeSelected)="onDayClicked($event)">
</calendar> </calendar>
<div class="description-box" [ngStyle]="direction === 'ltr' ? {'left': '-15px'} : {'right': '15px'}"> <div class="description-box" [ngStyle]="direction == 'en' ? {'left': '15px'} : {'right': '15px'}">
<ion-row> <ion-row>
<ion-col size="4"> <ion-col size="4">
<div class="icon absence"></div><ion-label class="label-text">{{ts.trPK('home','absence-name')}}</ion-label> <div class="icon absence"></div><ion-label class="label-text">{{ts.trPK('home','absence-name')}}</ion-label>

@ -38,7 +38,7 @@
<ion-col [size]="12" [ngClass]="direction == 'ltr'? 'col':'col-ar'"> <ion-col [size]="12" [ngClass]="direction == 'ltr'? 'col':'col-ar'">
<ion-row class="amountlabel"> <p>{{TODAYDATE.HOLIDAY_TYPE}}</p> </ion-row> <ion-row class="amountlabel"> <p>{{TODAYDATE.LEAVE_DESCRIPTION}}</p> </ion-row>
<ion-row class="rowlabel"> <ion-row class="rowlabel">
<p >{{ts.trPK('attendance-tracking','shift-time')}}</p> <p >{{ts.trPK('attendance-tracking','shift-time')}}</p>
</ion-row> </ion-row>

@ -79,7 +79,7 @@
<ion-label> <ion-label>
<ion-badge [ngClass]=" direction === 'rtl' ? 'end-badge' : 'start-badge'" slot="end" color="danger" class="main-badge">{{notBadge}}</ion-badge> <ion-badge [ngClass]=" direction === 'rtl' ? 'end-badge' : 'start-badge'" slot="end" color="danger" class="main-badge">{{notBadge}}</ion-badge>
<p [ngClass]="item.RULE_STATUS === 'Inactive' || item.RULE_STATUS === 'غير ساري' ? 'red-status' : 'green-status' ">{{item.RULE_STATUS}}</p><br/> <p [ngClass]="item.RULE_STATUS === 'Inactive' || item.RULE_STATUS === 'غير فعال' ? 'red-status' : 'green-status' ">{{item.RULE_STATUS}}</p><br/>
<p class="textBold" > {{item.RULE_NAME}} | {{item.ITEM_TYPE_DISPLAY_NAME}}</p><br/> <p class="textBold" > {{item.RULE_NAME}} | {{item.ITEM_TYPE_DISPLAY_NAME}}</p><br/>
<p class="label">{{item.BEGIN_DATE | dateString }} - {{item.END_DATE | dateString}}</p> <p class="label">{{item.BEGIN_DATE | dateString }} - {{item.END_DATE | dateString}}</p>
<!-- <br/> <!-- <br/>

@ -116,6 +116,7 @@ button.item-button.button.button-md.button-clear.button-clear-md {
.filterInput-ar{ .filterInput-ar{
border: solid var(--gray) 1px; border: solid var(--gray) 1px;
border-radius: 21px; border-radius: 21px;
padding-right: 10px !important;
// margin-left: 115px; // margin-left: 115px;
// margin-right: -132px; // margin-right: -132px;
@ -134,8 +135,8 @@ button.item-button.button.button-md.button-clear.button-clear-md {
border-radius: 50%; border-radius: 50%;
height: 60px; height: 60px;
width: 60px; width: 60px;
margin-left: -201px; margin-left: 8px;
margin-right: 282px; margin-right: 20px;
} }
*{ *{
@ -188,3 +189,4 @@ button.item-button.button.button-md.button-clear.button-clear-md {
opacity:.5; opacity:.5;
} }

@ -32,8 +32,8 @@
</div> </div>
<!-- //// okText='{{"general, ok" | translate }}' cancelText='{{"general, cancel" | translate }}'/// --> <!-- //// okText='{{"general, ok" | translate }}' cancelText='{{"general, cancel" | translate }}'/// -->
<div class="selectItem"> <div class="selectItem">
<label class="label">{{'vacation-rule, itemType' | translate}}</label> <label class="label" [ngClass]="direction == 'ar' ? 'label-ar' : '' ">{{'vacation-rule, itemType' | translate}}</label>
<select class="label-Select" name="selectAbsenceType" #selectAbsenceType="ngModel" [(ngModel)]="index" (change)="vacationRuleSel()" required> <select class="label-Select" [ngClass]="direction == 'ar' ? 'label-Select-ar' : '' " name="selectAbsenceType" #selectAbsenceType="ngModel" [(ngModel)]="index" (change)="vacationRuleSel()" required>
<option value="noType" selected hidden selected><p>{{ts.trPK('absenceList','selectType')}}</p></option> <option value="noType" selected hidden selected><p>{{ts.trPK('absenceList','selectType')}}</p></option>
<option value="{{i}}" *ngFor="let x of ruleTypeList; let i=index;"> <option value="{{i}}" *ngFor="let x of ruleTypeList; let i=index;">
{{x.ITEM_TYPE_DISPLAY_NAME}} </option> {{x.ITEM_TYPE_DISPLAY_NAME}} </option>
@ -43,7 +43,7 @@
</ion-row> </ion-row>
<ion-row> <ion-row>
<p class="smallTip"> <p class="smallTip" [ngClass]="direction == 'ar' ? 'smallTip-ar' : '' ">
{{'vacation-rule, skip-step-3' | translate}} {{'vacation-rule, skip-step-3' | translate}}
</p> </p>
</ion-row> </ion-row>

@ -21,6 +21,11 @@ p.smallTip {
font-size: 12px; font-size: 12px;
color: #acacac; color: #acacac;
padding: 1px 6px; padding: 1px 6px;
margin-left: 20px;
}
p.smallTip-ar {
margin-right: 20px;
} }
.footer-button { .footer-button {
@ -90,6 +95,7 @@ color: black !important;
} }
.stepHeaderLebal{ .stepHeaderLebal{
margin:0; margin:0;
color: #024d71;
} }
// .progcontainer { // .progcontainer {
@ -163,6 +169,9 @@ color: black !important;
// background-color: #209a83; // background-color: #209a83;
// } // }
.label-Select-ar {
margin-right: 25px !important;
}
.label-Select{ .label-Select{
color: var(--dark); color: var(--dark);
@ -206,6 +215,10 @@ color: black !important;
} }
} }
.label-ar {
margin-right: 25px !important;
}
.label{ .label{
font-size: 16px; font-size: 16px;
// margin-left: 15px; // margin-left: 15px;

Loading…
Cancel
Save