fixed moe issues

MOE_DEV_NEW_TEMPORARY_DESIGN
umasoodch 3 years ago
parent ae5bc591eb
commit 9d639c24cd

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

@ -27,10 +27,10 @@ export class ConnectorService {
public static retryTimes = 0;
public static timeOut = 180 * 1000;
public static host = 'https://uat.hmgwebservices.com/';
// public static host = 'https://uat.hmgwebservices.com/';
// public static host = 'https://hmgwebservices.com/';
// public static host = 'http://riyt-mohemm1.mopm.gov.sa:1010/' // MOE vpn
// public static host = 'https://hrmsys.moenergy.gov.sa/'
public static host = 'https://hrmsys.moenergy.gov.sa/'

@ -25,7 +25,7 @@
</ion-slides>
</ion-row>
<ion-row *ngFor="let menuItem of menuEntries; let i=index">
<ion-row *ngFor="let menuItem of menuEntries; let i=index" class="dynamic-form">
<ion-col [size]="12">
<ion-label class="menu-label">{{menuItem.PROMPT}}</ion-label>
</ion-col>

@ -81,6 +81,8 @@ ion-label {
width: 100%;
margin-top: 25px;
margin-bottom: 0px;
margin-right: 10px !important;
margin-left: 10px !important;
h3 {
font-size: 18px;

@ -256,14 +256,14 @@
<!-- <br>{{employee.USER_NAME}}<br>
{{employee.EMAIL_ADDRESS}} -->
</ion-label>
<div *ngIf='!employee.IsFavorite' [ngClass]="direction == 'en' ? 'star-fav-left':'star-fav'"
<!-- <div *ngIf='!employee.IsFavorite' [ngClass]="direction == 'en' ? 'star-fav-left':'star-fav'"
(click)="setFavorite(employee)">
<img src="assets/imgs/fav.svg" />
</div>
<div *ngIf='employee.IsFavorite' [ngClass]="direction == 'en' ? 'star-fav-left':'star-fav'"
</div> -->
<!-- <div *ngIf='employee.IsFavorite' [ngClass]="direction == 'en' ? 'star-fav-left':'star-fav'"
(click)="setFavorite(employee)">
<img src="assets/imgs/fav filled.svg" />
</div>
</div> -->
</div>
<!-- <ion-infinite-scroll (ionInfinite)="doInfinite($event)">
<ion-infinite-scroll-content></ion-infinite-scroll-content>
@ -290,14 +290,14 @@
<span (click)="select(employee,i)">{{employee.Name}}</span>
</ion-label>
<div *ngIf='!employee.IsFavorite' [ngClass]="direction == 'en' ? 'star-fav-left':'star-fav'"
<!-- <div *ngIf='!employee.IsFavorite' [ngClass]="direction == 'en' ? 'star-fav-left':'star-fav'"
(click)="setFavorite(employee)">
<img src="assets/imgs/fav.svg" />
</div>
<div *ngIf='employee.IsFavorite' [ngClass]="direction == 'en' ? 'star-fav-left':'star-fav'"
</div> -->
<!-- <div *ngIf='employee.IsFavorite' [ngClass]="direction == 'en' ? 'star-fav-left':'star-fav'"
(click)="setFavorite(employee)">
<img src="assets/imgs/fav filled.svg" />
</div>
</div> -->
</div>
</div>
</div>
@ -324,14 +324,14 @@
<span (click)="select(employee,i)">{{employee.EMPLOYEE_DISPLAY_NAME}}</span>
</ion-label>
<div *ngIf='!employee.IsFavorite' [ngClass]="direction == 'en' ? 'star-fav-left':'star-fav'"
<!-- <div *ngIf='!employee.IsFavorite' [ngClass]="direction == 'en' ? 'star-fav-left':'star-fav'"
(click)="setFavorite(employee)">
<img src="assets/imgs/fav.svg" />
</div>
<div *ngIf='employee.IsFavorite' [ngClass]="direction == 'en' ? 'star-fav-left':'star-fav'"
(click)="setFavorite(employee)">
<img src="assets/imgs/fav filled.svg" />
</div>
</div> -->
</div>
</div>
</div>

@ -180,14 +180,14 @@
<span (click)="select(employee,i)">{{employee.NAME}}</span>
</ion-label>
<div *ngIf='!employee.IsFavorite' [ngClass]="direction == 'en' ? 'star-fav' : 'star-fav-left'"
<!-- <div *ngIf='!employee.IsFavorite' [ngClass]="direction == 'en' ? 'star-fav' : 'star-fav-left'"
(click)="setFavorite(employee)">
<img src="assets/imgs/fav.svg" />
</div>
<div *ngIf='employee.IsFavorite' [ngClass]="direction == 'en' ? 'star-fav' : 'star-fav-left'"
(click)="setFavorite(employee)">
<img src="assets/imgs/fav filled.svg" />
</div>
</div> -->
</div>
</div>
</div>
@ -214,14 +214,14 @@
<span (click)="select(employee,i)">{{employee.EMPLOYEE_DISPLAY_NAME}}</span>
</ion-label>
<div *ngIf='!employee.IsFavorite' [ngClass]="direction == 'en' ? 'star-fav' : 'star-fav-left'"
<!-- <div *ngIf='!employee.IsFavorite' [ngClass]="direction == 'en' ? 'star-fav' : 'star-fav-left'"
(click)="setFavorite(employee)">
<img src="assets/imgs/fav.svg" />
</div>
<div *ngIf='employee.IsFavorite' [ngClass]="direction == 'en' ? 'star-fav' : 'star-fav-left'"
(click)="setFavorite(employee)">
<img src="assets/imgs/fav filled.svg" />
</div>
</div> -->
</div>
</div>
</div>
@ -263,14 +263,14 @@
<!-- <br>{{employee.USER_NAME}}<br>
{{employee.EMAIL_ADDRESS}} -->
</ion-label>
<div *ngIf='!employee.IsFavorite' [ngClass]="direction == 'en' ? 'star-fav' : 'star-fav-left'"
<!-- <div *ngIf='!employee.IsFavorite' [ngClass]="direction == 'en' ? 'star-fav' : 'star-fav-left'"
(click)="setFavorite(employee)">
<img src="assets/imgs/fav.svg" />
</div>
<div *ngIf='employee.IsFavorite' [ngClass]="direction == 'en' ? 'star-fav' : 'star-fav-left'"
(click)="setFavorite(employee)">
<img src="assets/imgs/fav filled.svg" />
</div>
</div> -->
</div>
@ -310,16 +310,16 @@
<br />
<div class="centerDiv">
<ion-button *ngIf="userSelected ==true" class="footer-button"
style="background: var(--newgreen)!important;border-radius: 10px; --background: transparent; " ion-button
style="background: var(--newgreen)!important;border-radius: 10px; --background: transparent; --border-radius: 10px; " ion-button
(click)="submitAction()">
{{'general, submit' | translate}}</ion-button>
<ion-button *ngIf="isAnswer" class="footer-button"
style="background: var(--newgreen)!important;border-radius: 10px; --background: transparent; " ion-button
style="background: var(--newgreen)!important;border-radius: 10px; --background: transparent; --border-radius: 10px; " ion-button
(click)="submitAction()">
{{'general, submit' | translate}}</ion-button>
<ion-button class="footer-button" style="border-radius: 10px; --background: transparent; " ion-button
<ion-button class="footer-button" style="border-radius: 10px; --background: transparent; --border-radius: 10px; " ion-button
(click)="closeModal()">
{{'general, cancel' | translate}}</ion-button>
</div>

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

@ -93,9 +93,9 @@
<ion-footer>
<div class="centerDiv">
<ion-button *ngIf="!transactionDetails" class="footer-button" style="background: var(--newgreen)!important;border-radius: 10px; --background: transparent; width:80%" ion-button [disabled]="!isValid()" (click)="getPendingRequestDetails()">
<ion-button *ngIf="!transactionDetails" class="footer-button" style="background: var(--newgreen)!important;border-radius: 10px; --background: transparent; width:80%; --border-radius: 10px;" ion-button [disabled]="!isValid()" (click)="getPendingRequestDetails()">
{{'general, submit' | translate}}</ion-button>
<ion-button *ngIf="transactionDetails && transactionDetails.length>0" class="footer-button" style="background: var(--newgreen)!important;border-radius: 10px; --background: transparent; width:80%" ion-button (click)="transactionDetails=null">
<ion-button *ngIf="transactionDetails && transactionDetails.length>0" class="footer-button" style="background: var(--newgreen)!important;border-radius: 10px; --background: transparent; width:80%; --border-radius: 10px;" ion-button (click)="transactionDetails=null">
{{'general, reset' | translate}}</ion-button>
</div>
</ion-footer>

@ -45,7 +45,7 @@
</ion-content>
<ion-footer>
<div class="centerDiv">
<ion-button class="footer-button" style="background: var(--newgreen)!important;border-radius: 10px; --background: transparent; width:80%" ion-button [disabled]="phoneNumbers.length==0" (click)="updatePhone()">
<ion-button class="footer-button" style="background: var(--newgreen)!important;border-radius: 10px; --background: transparent; width:80%; --border-radius: 10px;" ion-button [disabled]="phoneNumbers.length==0" (click)="updatePhone()">
{{'userProfile, update' | translate}}</ion-button>
</div>

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

@ -1279,11 +1279,13 @@ div.no-dataDiv {
// min-width: 200px;
min-height: 45px !important;
border-radius: 5px !important;
--border-radius: 5px !important;
width: 125px !important;
min-width: 5px !important;
width: 10px !important;
margin: 8px !important;
--background: transparent;
--box-shadow: none;
}
@ -1295,11 +1297,13 @@ div.no-dataDiv {
// min-width: 200px;
min-height: 45px !important;
border-radius: 5px !important;
--border-radius: 5px !important;
width: 125px !important;
min-width: 5px !important;
width: 10px !important;
margin: 8px !important;
--background: transparent;
--box-shadow: none;
}
.checkOutOkBtn {
@ -1308,6 +1312,7 @@ div.no-dataDiv {
margin-top: 10px !important;
margin-bottom: 10px !important;
border-radius: 5px !important;
--border-radius: 5px !important;
height: 40px !important;
min-height: 40px !important;
background: var(--lightblue) !important;
@ -1319,7 +1324,7 @@ div.no-dataDiv {
border: none !important;
width: 80%;
--background: var(--lightblue) !important;
--box-shadow: none;
}
.checkOutCancelBtn {
@ -1328,6 +1333,7 @@ div.no-dataDiv {
margin-top: 10px !important;
margin-bottom: 10px !important;
border-radius: 5px !important;
--border-radius: 5px !important;
height: 40px !important;
min-height: 40px !important;
background: var(--darkblue) !important;
@ -1339,6 +1345,7 @@ div.no-dataDiv {
border: none !important;
width: 80%;
--background: var(--darkblue) !important;
--box-shadow: none;
}
.buttonClassWhite {
@ -1903,7 +1910,7 @@ ion-app[dir="rtl"] {
}
.pClass {
font-size: 11px;
font-size: 10px;
}
}
@ -1914,8 +1921,8 @@ ion-app[dir="rtl"] {
ion-app[dir="ltr"] {
.slideFullWidth .swiper-container .swiper-wrapper .swiper-slide:first-child {
// margin-left: 15px !important;
.dynamic-form .swiper-container .swiper-wrapper .swiper-slide:first-child {
margin-left: 5px !important;
}
@ -1930,6 +1937,20 @@ ion-app[dir="ltr"] {
ion-app[dir="rtl"] {
.slideFullWidth .swiper-container .swiper-wrapper .swiper-slide:first-child {
margin-right: 10px;
}
.dynamic-form .swiper-container .swiper-wrapper .swiper-slide:first-child {
margin-right: 10px !important;
}
.attendance-module {
ion-button {
height: 40px !important;
}
}
.slideFullWidth {
margin-right: 0px !important;
}

Loading…
Cancel
Save