Merge branch 'MOHEMM-HUAWEI-RELEASE' into enad-Q3

MOHEMM-HUAWEI-RELEASE
umasoodch 4 years ago
commit 20ab54d69e

@ -3,7 +3,7 @@
[headerText]="'submitAbsence, submitAbsence' | translate"> [headerText]="'submitAbsence, submitAbsence' | translate">
</app-generic-header> </app-generic-header>
<content padding> <ion-content padding>
<div [ngClass]=" direction === 'en' ? 'custom-text-area-element Field-en' : 'custom-text-area-element Field-ar'" > <div [ngClass]=" direction === 'en' ? 'custom-text-area-element Field-en' : 'custom-text-area-element Field-ar'" >
<label class="label" position='floating' class="colBold requiredClass">{{ts.trPK('submitAbsence','absenceType')}} </label> <label class="label" position='floating' class="colBold requiredClass">{{ts.trPK('submitAbsence','absenceType')}} </label>
@ -58,7 +58,7 @@
</ion-item> </ion-item>
<div id="dynamic-abs-container" > <div id="dynamic-abs-container" >
</div> </div>
</content> </ion-content>
<ion-footer> <ion-footer>
<div class="centerDiv"> <div class="centerDiv">
<ion-button class="confirmEitOkButton" (click)="validateAbcenseTransaction()">{{ts.trPK('general','next')}}</ion-button> <ion-button class="confirmEitOkButton" (click)="validateAbcenseTransaction()">{{ts.trPK('general','next')}}</ion-button>

@ -46,7 +46,7 @@
</welcome-login> </welcome-login>
<!-- </div> --> <!-- </div> -->
<div class="centerDiv" style="margin-top: 20px !important;"> <div *ngIf="!user" class="centerDiv" style="margin-top: 20px !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> <ion-button [ngClass]="{'disable-button-opacity': isValidForm()}" class="button-login" (click)="onLogin()" [disabled]="isValidForm()" style="width: 100% !important;">{{ts.trPK('login','login')}}</ion-button>
<!-- digital ID button --> <!-- digital ID button -->

@ -75,11 +75,11 @@ export class HMGUtils {
const long = Number(_res.split(',')[1]); const long = Number(_res.split(',')[1]);
const mockValue = _res.split(',')[2]; const mockValue = _res.split(',')[2];
if (mockValue == 'true') { // if (mockValue == 'true') {
mock = true; // mock = true;
} else { // } else {
mock = false; // mock = false;
} // }
callBack({"latitude":lat, "longitude":long, "isfake":mock}) callBack({"latitude":lat, "longitude":long, "isfake":mock})
} else { } else {
this.common.presentAlert(this.ts.trPK('general', 'invalid-huawei-location')); this.common.presentAlert(this.ts.trPK('general', 'invalid-huawei-location'));

@ -142,7 +142,7 @@ export class AuthenticationService {
} else { } else {
mobileType = 'android'; mobileType = 'android';
} }
request.VersionID = 3; request.VersionID = 3.1;
request.Channel = 31; request.Channel = 31;
request.LanguageID = TranslatorService.getCurrentLanguageCode(); request.LanguageID = TranslatorService.getCurrentLanguageCode();
request.MobileType = mobileType; request.MobileType = mobileType;

Loading…
Cancel
Save