fixed issues for urgent release

MOHEMM-Q3-URGENT-RELEASE
umasoodch 4 years ago
parent e7755c1ef4
commit c73cc08c64

@ -65,14 +65,14 @@
</ion-item> </ion-item>
</div> </div>
<ion-item (click)="oepnTransaction()"> <!-- <ion-item (click)="oepnTransaction()">
<ion-thumbnail slot="start" class="menu-thumb"> <ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 14px !important;" src="../assets/imgs/my_team_icon.png" item-left> <img style= "height: 14px !important;" src="../assets/imgs/my_team_icon.png" item-left>
</ion-thumbnail> </ion-thumbnail>
<ion-label class="profile"> <ion-label class="profile">
{{ts.trPK('general','pending-transaction')}} {{ts.trPK('general','pending-transaction')}}
</ion-label> </ion-label>
</ion-item> </ion-item> -->
<!-- <ion-item (click)="openChangePassword()"> --> <!-- <ion-item (click)="openChangePassword()"> -->
<ion-item (click)="openChangePassword()"> <ion-item (click)="openChangePassword()">

@ -52,7 +52,7 @@
<div style="height: 300px; width: 300px; transform: rotate(90deg) !important;"> <div style="height: 300px; width: 300px; transform: rotate(90deg) !important;">
<img style="width: 100px; margin-left: 20px; margin-top: 26px;" [src]='userInfo.company_logo' alt="https://hmgwebservices.com/images/Moheem/CS.jpg"/> <img style="width: 100px; margin-left: 20px; margin-top: 26px;" [src]='userInfo.company_logo' alt="https://hmgwebservices.com/images/Moheem/CS.jpg"/>
<h1 class='font-text-style' style="font-size: 25px !important; margin-left: 20px; margin-top: 5px; margin-bottom: 0px;">{{userInfo.name_en}}</h1> <h1 class='font-text-style' style="font-size: 25px !important; margin-left: 20px; margin-top: 5px; margin-bottom: 0px;">{{userInfo.name_en}}</h1>
<h5 class='font-text-style' style="margin-left: 20px; margin-top: 0px; ">{{userInfo.job_en}}</h5> <h5 class='font-text-style' style="margin-left: 20px; margin-top: 0px; ">{{jobName}}</h5>
<h5 class='font-text-style' style="margin-left: 20px; font-size: 18px; margin-bottom: 0px;">{{userInfo.mobile}}</h5> <h5 class='font-text-style' style="margin-left: 20px; font-size: 18px; margin-bottom: 0px;">{{userInfo.mobile}}</h5>
<h5 class='font-text-style' style="margin-left: 20px; margin-top: 5px; font-size: 12px; margin-bottom: 5px;">{{userInfo.email}}</h5> <h5 class='font-text-style' style="margin-left: 20px; margin-top: 5px; font-size: 12px; margin-bottom: 5px;">{{userInfo.email}}</h5>
<h5 class='font-text-style' style="margin-left: 20px; margin-top: 0px;">{{userInfo.company_url}}</h5> <h5 class='font-text-style' style="margin-left: 20px; margin-top: 0px;">{{userInfo.company_url}}</h5>
@ -114,7 +114,7 @@
<img style="width: 300px; margin-left: 185px; margin-top: 26px;" [alt]='userInfo.company_logo' src="../assets/icon/HMG_LOGO.png"/> <img style="width: 300px; margin-left: 185px; margin-top: 26px;" [alt]='userInfo.company_logo' src="../assets/icon/HMG_LOGO.png"/>
<div style="margin-top: 30px;"> <div style="margin-top: 30px;">
<h1 class='font-text-style' style="font-size: 25px !important; margin-left: 20px; margin-top: 5px; margin-bottom: 0px;">{{userInfo.name_en}}</h1> <h1 class='font-text-style' style="font-size: 25px !important; margin-left: 20px; margin-top: 5px; margin-bottom: 0px;">{{userInfo.name_en}}</h1>
<h5 class='font-text-style' style="margin-left: 20px; margin-top: 0px; ">{{userInfo.job_en}}</h5> <h5 class='font-text-style' style="margin-left: 20px; margin-top: 0px; ">{{jobName}}</h5>
<h5 class='font-text-style' style="margin-left: 20px; font-size: 18px; margin-bottom: 0px;">{{userInfo.mobile}}</h5> <h5 class='font-text-style' style="margin-left: 20px; font-size: 18px; margin-bottom: 0px;">{{userInfo.mobile}}</h5>
<h5 class='font-text-style' style="margin-left: 20px; margin-top: 5px; font-size: 12px; margin-bottom: 5px;">{{userInfo.email}}</h5> <h5 class='font-text-style' style="margin-left: 20px; margin-top: 5px; font-size: 12px; margin-bottom: 5px;">{{userInfo.email}}</h5>
<h5 class='font-text-style' style="margin-left: 20px; margin-top: 0px;">{{userInfo.company_url}}</h5> <h5 class='font-text-style' style="margin-left: 20px; margin-top: 0px;">{{userInfo.company_url}}</h5>

@ -2,6 +2,8 @@ import { Component, OnInit, Input } from '@angular/core';
import { ModalController } from '@ionic/angular'; import { ModalController } from '@ionic/angular';
import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { CommonService } from 'src/app/hmg-common/services/common/common.service';
import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
import { AuthenticationService } from 'src/app/hmg-common/services/authentication/authentication.service';
import { AuthenticatedUser } from 'src/app/hmg-common/services/authentication/models/authenticated-user';
@Component({ @Component({
selector: 'app-business-card', selector: 'app-business-card',
@ -12,15 +14,27 @@ export class BusinessCardComponent implements OnInit {
public userInfo: any; public userInfo: any;
public userJobName: any; public userJobName: any;
public jobName: any;
constructor( constructor(
public modalCtrl: ModalController, public modalCtrl: ModalController,
public ts: TranslatorService, public ts: TranslatorService,
public common: CommonService public common: CommonService,
public authService: AuthenticationService,
) { } ) { }
ngOnInit() { ngOnInit() {
this.userInfo = JSON.parse(localStorage.getItem('bussiness-card-info')); this.userInfo = JSON.parse(localStorage.getItem('bussiness-card-info'));
console.log(this.userInfo);
this.authService
.loadAuthenticatedUser()
.subscribe((user: AuthenticatedUser) => {
if (user) {
let jobTitle = user.POSITION_NAME.split('.');
if (jobTitle && jobTitle.length > 1) {
this.jobName = jobTitle[0] + " " + jobTitle[1];
}
}
});
} }

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

@ -27,8 +27,8 @@ export class ConnectorService {
public static retryTimes = 0; public static retryTimes = 0;
public static timeOut = 120 * 1000; public static timeOut = 120 * 1000;
public static host = 'https://uat.hmgwebservices.com/'; // public static host = 'https://uat.hmgwebservices.com/';
// public static host = 'https://hmgwebservices.com/'; public static host = 'https://hmgwebservices.com/';
constructor(public httpClient: HttpClient, constructor(public httpClient: HttpClient,
public cs: CommonService, public cs: CommonService,

@ -63,10 +63,10 @@
<ion-label> {{'general,other-services' | translate}} </ion-label> <ion-label> {{'general,other-services' | translate}} </ion-label>
</ion-col> </ion-col>
<ion-slides [options]="slideOptsTwo" > <ion-slides [options]="slideOptsTwo" >
<ion-slide > <ion-slide style="pointer-events: none; opacity: .3">
<app-services-button (click)="itemForSale()" [title]="'general,items-sales' | translate" > <app-services-button (click)="itemForSale()" [title]="'general,items-sales' | translate" >
</app-services-button> </app-services-button>
</ion-slide> </ion-slide>
<ion-slide> <ion-slide>
<app-services-button (click)="offersDiscount()" [title]="'general,offers-discount' | translate" > <app-services-button (click)="offersDiscount()" [title]="'general,offers-discount' | translate" >

@ -118,7 +118,7 @@
<p *ngIf="direction =='rtl'">{{getDotted(item.description_Ar, 30)}}</p> <p *ngIf="direction =='rtl'">{{getDotted(item.description_Ar, 30)}}</p>
<ion-row> <ion-row>
<ion-col size="8"> <ion-col size="8">
<p [class]="isApproved ? 'green' : 'yellow'">{{isApproved ? "Appoved" :"Pending"}}</p> <!-- <p [class]="isApproved ? 'green' : 'yellow'">{{isApproved ? "Appoved" :"Pending"}}</p> -->
</ion-col> </ion-col>
<ion-col> <ion-col>

@ -1,7 +1,7 @@
<app-generic-header <app-generic-header
showBack="true" showBack="true"
backLink="/home" backLink="/home"
[worklistSetting] ='true' [worklistSetting] ='false'
[headerText]="'home, worklist' | translate"> [headerText]="'home, worklist' | translate">
</app-generic-header> </app-generic-header>

@ -45,7 +45,7 @@
<ion-label>{{ 'general,to-date' | translate}}</ion-label> <ion-label>{{ 'general,to-date' | translate}}</ion-label>
<ion-datetime <ion-datetime
[placeholder]="Select" placeholder="Select"
display-format="DD/MM/YYYY" display-format="DD/MM/YYYY"
[min]="1900" [min]="1900"
[max]="2100" [max]="2100"

@ -58,7 +58,7 @@
<span class="btnTitle">{{ts.trPK('userProfile','contact-details')}} </span> <span class="btnTitle">{{ts.trPK('userProfile','contact-details')}} </span>
</div> </div>
</ion-col> </ion-col>
<ion-col [size]="3" (click)="selectedSegment('family')"> <ion-col style="pointer-events: none; opacity: .3;" [size]="3" (click)="selectedSegment('family')">
<div class="action-button col-button"> <div class="action-button col-button">
<img *ngIf="!familyMemberSegment" style="width: 40px;" src="../assets/imgs/profile-icons/family.svg"> <img *ngIf="!familyMemberSegment" style="width: 40px;" src="../assets/imgs/profile-icons/family.svg">
<img *ngIf="familyMemberSegment" style="width: 40px;" src="../assets/imgs/profile-icons/family-g.svg"> <img *ngIf="familyMemberSegment" style="width: 40px;" src="../assets/imgs/profile-icons/family-g.svg">
@ -118,14 +118,14 @@
</div> </div>
<br><br> <br><br>
<div style="display: flex; justify-content: center;"> <!-- <div style="display: flex; justify-content: center;">
<div [ngClass]='profileProgress > 0 && profileProgress >= 25 ? "profile-green":"profile-gray"'></div> <div [ngClass]='profileProgress > 0 && profileProgress >= 25 ? "profile-green":"profile-gray"'></div>
<div [ngClass]='profileProgress >= 25 && profileProgress >= 50 ? "profile-green":"profile-gray"'></div> <div [ngClass]='profileProgress >= 25 && profileProgress >= 50 ? "profile-green":"profile-gray"'></div>
<div [ngClass]='profileProgress >= 50 && profileProgress >= 75? "profile-green":"profile-gray"'></div> <div [ngClass]='profileProgress >= 50 && profileProgress >= 75? "profile-green":"profile-gray"'></div>
<div [ngClass]='profileProgress >= 85 ? "profile-green":"profile-gray"'></div> <div [ngClass]='profileProgress >= 85 ? "profile-green":"profile-gray"'></div>
</div> </div> -->
<div [ngClass]='direction === "ltr"? "profile-compilation-en":"profile-compilation-ar"'>{{ts.trPK('userProfile','profile-compitation')}} {{profileProgress}}%</div> <!-- <div [ngClass]='direction === "ltr"? "profile-compilation-en":"profile-compilation-ar"'>{{ts.trPK('userProfile','profile-compitation')}} {{profileProgress}}%</div> -->
<div *ngIf="familyMemberSegment" [ngClass]='direction === "ltr"? "profile-note-en":"profile-note-ar"'>{{ts.trPK('userProfile','note-part-1')}}<br> <div style="pointer-events: none; opacity: .3;" *ngIf="familyMemberSegment" [ngClass]='direction === "ltr"? "profile-note-en":"profile-note-ar"'>{{ts.trPK('userProfile','note-part-1')}}<br>
{{ts.trPK('userProfile','note-part-2')}}</div> {{ts.trPK('userProfile','note-part-2')}}</div>
<ion-card *ngIf="personalInfoSegment" [ngClass]="direction === 'ltr'? 'card-size-info-en': 'card-size-info-ar' "> <ion-card *ngIf="personalInfoSegment" [ngClass]="direction === 'ltr'? 'card-size-info-en': 'card-size-info-ar' ">
@ -209,7 +209,7 @@
</ion-card-content> </ion-card-content>
</ion-card> </ion-card>
<ion-card *ngIf="contactSegment" [ngClass]="direction === 'ltr'? 'card-size-info-en': 'card-size-info-ar' "> <!-- <ion-card *ngIf="contactSegment" [ngClass]="direction === 'ltr'? 'card-size-info-en': 'card-size-info-ar' ">
<ion-card-content *ngIf="!editAddress && employeeAdress"> <ion-card-content *ngIf="!editAddress && employeeAdress">
<ion-grid> <ion-grid>
<ion-row style="width: 113%;"> <ion-row style="width: 113%;">
@ -241,7 +241,7 @@
</div> </div>
</ion-card-content> </ion-card-content>
</ion-card> </ion-card> -->
<ion-card *ngIf="addressSegment" [ngClass]="direction === 'ltr'? 'card-size-info-en': 'card-size-info-ar' "> <ion-card *ngIf="addressSegment" [ngClass]="direction === 'ltr'? 'card-size-info-en': 'card-size-info-ar' ">
<ion-card-content *ngIf="!editAddress && employeeAdress"> <ion-card-content *ngIf="!editAddress && employeeAdress">

@ -86,6 +86,7 @@ export class HomeComponent implements OnInit {
this.basicDetailsSegment = false; this.basicDetailsSegment = false;
this.addressSegment = false; this.addressSegment = false;
this.familyMemberSegment = false; this.familyMemberSegment = false;
this.contactSegment = false;
} else if (this.targetValue === 'basicDetails') { } else if (this.targetValue === 'basicDetails') {
this.personalInfoSegment = false; this.personalInfoSegment = false;
this.basicDetailsSegment = true; this.basicDetailsSegment = true;
@ -95,6 +96,7 @@ export class HomeComponent implements OnInit {
this.personalInfoSegment = false; this.personalInfoSegment = false;
this.basicDetailsSegment = false; this.basicDetailsSegment = false;
this.addressSegment = true; this.addressSegment = true;
this.contactSegment = true;
this.familyMemberSegment = false; this.familyMemberSegment = false;
} else if (this.targetValue === 'fmaily') { } else if (this.targetValue === 'fmaily') {
this.personalInfoSegment = false; this.personalInfoSegment = false;
@ -105,6 +107,7 @@ export class HomeComponent implements OnInit {
this.personalInfoSegment = true; this.personalInfoSegment = true;
this.basicDetailsSegment = false; this.basicDetailsSegment = false;
this.addressSegment = false; this.addressSegment = false;
this.contactSegment = false;
this.familyMemberSegment = false; this.familyMemberSegment = false;
} }
}); });
@ -172,8 +175,8 @@ export class HomeComponent implements OnInit {
if (user) { if (user) {
console.log(user); console.log(user);
this.personalInfo = user; this.personalInfo = user;
this.getPhoneNumbers(); // this.getPhoneNumbers();
this.getContactInfo(); // this.getContactInfo();
let jobTitle = user.POSITION_NAME.split('.'); let jobTitle = user.POSITION_NAME.split('.');
if (jobTitle && jobTitle.length > 1) { if (jobTitle && jobTitle.length > 1) {
this.jobName = jobTitle[0] + " " + jobTitle[1]; this.jobName = jobTitle[0] + " " + jobTitle[1];
@ -321,7 +324,7 @@ export class HomeComponent implements OnInit {
case "contact": case "contact":
this.personalInfoSegment = false; this.personalInfoSegment = false;
this.basicDetailsSegment = false; this.basicDetailsSegment = false;
this.addressSegment = false; this.addressSegment = true;
this.editBasic = false; this.editBasic = false;
this.editAddress = false; this.editAddress = false;
this.familyMemberSegment = false; this.familyMemberSegment = false;
@ -343,13 +346,15 @@ export class HomeComponent implements OnInit {
this.cs.sharedService.setSharedData({ dirfromNotificationPage: false, submitEITObjList: undefined, transNo: this.transactionNo }, 'AddEITData'); this.cs.sharedService.setSharedData({ dirfromNotificationPage: false, submitEITObjList: undefined, transNo: this.transactionNo }, 'AddEITData');
this.openAddBasicDetails(); this.openAddBasicDetails();
} else if (allowVal == 'contact') { } else if (allowVal == 'contact') {
// this.openAddAddress();
this.openContact() this.openContact()
} else if ('add-update-contact') { }
this.transactionNo++; // else if ('add-update-contact') {
this.cs.sharedService.setSharedData({ dirfromNotificationPage: false, submitEITObjList: undefined, transNo: this.transactionNo }, 'AddEITData'); // this.transactionNo++;
this.cs.openAddUpdateContact(); // this.cs.sharedService.setSharedData({ dirfromNotificationPage: false, submitEITObjList: undefined, transNo: this.transactionNo }, 'AddEITData');
} else { // this.cs.openAddUpdateContact();
// }
else {
this.openAddAddress(); this.openAddAddress();
} }
} }

@ -12,7 +12,7 @@
<ion-footer> <ion-footer>
<div class="centerDiv"> <div class="centerDiv">
<ion-button class="addEitOkButton" color="customnavy" ion-button (click)="validateTransaction()"> <ion-button class="addEitOkButton" color="customnavy" ion-button >
{{'vacation-rule, next-label' | translate}}</ion-button> {{'vacation-rule, next-label' | translate}}</ion-button>
</div> </div>
</ion-footer> </ion-footer>
Loading…
Cancel
Save