fixed issues

MOHEMM-HUAWEI-RELEASE
umasoodch 4 years ago
parent 23dc5814ef
commit bfb683fe1d

@ -5,19 +5,19 @@
<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>
<select class="label-Select" [(ngModel)]="absenceType" (change)="onTypeAbsenceChange()" required>
<option value= "{{item.ABSENCE_ATTENDANCE_TYPE_ID}}" *ngFor="let item of absenceTypeList; let i=index;">{{item.ABSENCE_ATTENDANCE_TYPE_NAME}} </option>
</select>
</div>
<!-- <ion-item class='dynamicField'>
</div> -->
<ion-item class='dynamicField'>
<ion-label position='floating' class="colBold requiredClass">{{ts.trPK('submitAbsence','absenceType')}} </ion-label>
<ion-select (ionChange)="calcDay()" okText="{{ts.trPK('general','ok')}}" cancelText="{{ts.trPK('general','cancel')}}" [(ngModel)]="absenceType" (ionChange)="onTypeAbsenceChange()" required> -->
<ion-select (ionChange)="calcDay()" okText="{{ts.trPK('general','ok')}}" cancelText="{{ts.trPK('general','cancel')}}" [(ngModel)]="absenceType" (ionChange)="onTypeAbsenceChange()" required>
<!-- let item of AbsenceType; let i=index; -->
<!-- <ion-select-option value= "{{item.ABSENCE_ATTENDANCE_TYPE_ID}}" *ngFor="let item of absenceTypeList; let i=index;">{{item.ABSENCE_ATTENDANCE_TYPE_NAME}} </ion-select-option>
<ion-select-option value= "{{item.ABSENCE_ATTENDANCE_TYPE_ID}}" *ngFor="let item of absenceTypeList; let i=index;">{{item.ABSENCE_ATTENDANCE_TYPE_NAME}} </ion-select-option>
</ion-select>
</ion-item> -->
</ion-item>
<ion-item class='dynamicField'>
<ion-label position='floating' class="colBold requiredClass">{{ts.trPK('submitAbsence','startDate')}} </ion-label>

@ -59,7 +59,7 @@
</ion-row>
<ion-row>
<ion-col>
<ion-button *ngIf="userBusiness?.show_business" class="button-digital-id" (click)="openBusinessCard()">
<ion-button *ngIf="userBusiness?.show_business && showBusinessCard" class="button-digital-id" (click)="openBusinessCard()">
<p style="color: black;">{{ts.trPK('general','business-card')}}</p>
<img [ngClass]=" direction === 'en' ? 'digital-id-en' : 'digital-id-ar'" src="../assets/imgs/ID_ico.png">
</ion-button>

@ -76,6 +76,7 @@ export class WelcomeComponent implements OnInit, AfterViewInit, OnDestroy {
user_name: string;
userInfo: any;
userBusiness: any;
showBusinessCard = false;
constructor(
public ts: TranslatorService,
@ -94,7 +95,13 @@ export class WelcomeComponent implements OnInit, AfterViewInit, OnDestroy {
false
);
console.log( "this.user in welcome login"+ this.user);
console.log( "this.user in welcome login"+ JSON.stringify(this.user));
// if (this.user && this.user.BusinessCardPrivilege) {
// this.showBusinessCard = true
// } else {
// this.showBusinessCard = false;
// }
this.userName = localStorage.getItem("user");
this.password = localStorage.getItem("password");

@ -119,7 +119,7 @@ export class HomeComponent implements OnInit {
},
{
value: 0,
name: 'MO',
name: 'MR',
active: false,
color: '#3cb9d5',
key: 'INVMOA',

Loading…
Cancel
Save