Haroon6138
/
sfh-mohemm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed bugs #:

Browse Source 
MM-742
MM-743
and added show my password in forgot password and change password
MOHEMM-Q3-DEV-LATEST
enadhilal 4 years ago
parent 490c525e08
commit b60fd8be8a
7 changed files with 77 additions and 7 deletions
Show Stats Download Patch File Download Diff File

8
Mohem/src/app/app.component.html
Unescape Escape View File

@ -159,6 +159,14 @@
{{ts.trPK('userProfile','title')}}
</ion-label>
</ion-item>
<ion-item (click)="performanceEvaluation()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 24px !important;" src="../assets/icon/bar-chart.svg" item-left>
</ion-thumbnail>
<ion-label class="profile">
{{ts.trPK('userProfile','performance-evaluation')}}
</ion-label>
</ion-item>
<ion-item [hidden]="TeamFlag!='true'" (click)="openMyTeamPage()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 14px !important;" src="../assets/imgs/my_team_icon.png" item-left>

3
Mohem/src/app/authentication/business-card/business-card.component.html
Unescape Escape View File

@ -51,7 +51,8 @@
</ion-grid> -->
<div style="height: 320px; width: 320px; 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"/>
<h1 class='font-text-style' style="font-size: 25px !important; margin-left: 20px; margin-top: 5px; margin-bottom: 0px;">{{userInfo.name_en}}</h1>
<h1 *ngIf="direction === 'en'" class='font-text-style' style="font-size: 25px !important; margin-left: 20px; margin-top: 5px; margin-bottom: 0px;">{{userInfo.name_en}}</h1>
<h1 *ngIf="direction === 'ar'" class='font-text-style' style="font-size: 25px !important; margin-left: 20px; margin-top: 5px; margin-bottom: 0px;">{{userInfo.name_ar}}</h1>
<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; margin-top: 5px; font-size: 12px; margin-bottom: 5px; white-space: nowrap;">{{userInfo.email}}</h5>

3
Mohem/src/app/authentication/business-card/business-card.component.ts
Unescape Escape View File

@ -15,6 +15,7 @@ export class BusinessCardComponent implements OnInit {
public userInfo: any;
public userJobName: any;
public jobName: any;
direction: string;
constructor(
public modalCtrl: ModalController,
public ts: TranslatorService,
@ -24,6 +25,8 @@ export class BusinessCardComponent implements OnInit {
ngOnInit() {
this.userInfo = JSON.parse(localStorage.getItem('bussiness-card-info'));
this.direction = TranslatorService.getCurrentLanguageName();
console.log(this.userInfo);
this.authService
.loadAuthenticatedUser()

12
Mohem/src/app/authentication/change-password/change-password.component.html
Unescape Escape View File

@ -17,9 +17,11 @@
<ion-item class="item-input-login">
<img class="item-icon" src="assets/imgs/password.png" item-start />
<!-- <ion-label>{{'changePassword,currentPassword' | translate}}</ion-label> -->
<ion-input class="login-input" required type="password"
<ion-input class="login-input" required [type]="currentPasswordIcon"
placeholder="{{ts.trPK('changePassword','currentPassword')}}" [(ngModel)]="P_OLD_PASSWORD" minLength="8"
min="8" (ionChange)="onChangeOP()"></ion-input>
<ion-icon *ngIf='currentPasswordIcon === "text"' name="ios-eye" (click)="showPassword(3)"></ion-icon>
<ion-icon *ngIf='currentPasswordIcon === "password"' name="ios-eye-off" (click)="hidePassword(3)"></ion-icon>
</ion-item>
<p class="headerTxt" color="light"> {{'changePassword,newPassword' | translate}}</p>
@ -27,19 +29,23 @@
<ion-item class="item-input-login">
<img class="item-icon" src="assets/imgs/password.png" item-start />
<!-- <ion-label>{{'changePassword,newPassword' | translate}}</ion-label> -->
<ion-input (ionChange)="onChangeNP()" class="login-input" required type="password"
<ion-input (ionChange)="onChangeNP()" class="login-input" required [type]="newPasswordIcon"
placeholder="{{ts.trPK('changePassword','newPassword')}}" [(ngModel)]="P_NEW_PASSWORD" minLength="8"
min="8">
</ion-input>
<ion-icon *ngIf='newPasswordIcon === "text"' name="ios-eye" (click)="showPassword(1)"></ion-icon>
<ion-icon *ngIf='newPasswordIcon === "password"' name="ios-eye-off" (click)="hidePassword(1)"></ion-icon>
</ion-item>
<ion-item class="item-input-login">
<img class="item-icon" src="assets/imgs/password.png" item-start />
<!-- <ion-label>{{'changePassword,confirmPassword' | translate}}</ion-label> -->
<ion-input (ionChange)="onChangeCNP()" class="login-input" required type="password"
<ion-input (ionChange)="onChangeCNP()" class="login-input" required [type]="confirmPasswordIcon"
placeholder="{{ts.trPK('changePassword','confirmPassword')}}" [(ngModel)]="P_Confirm_NEW_PASSWORD"
minLength="8" min="8">
</ion-input>
<ion-icon *ngIf='confirmPasswordIcon === "text"' name="ios-eye" (click)="showPassword(2)"></ion-icon>
<ion-icon *ngIf='confirmPasswordIcon === "password"' name="ios-eye-off" (click)="hidePassword(2)"></ion-icon>
</ion-item>
<ion-item lines='none'>

25
Mohem/src/app/authentication/change-password/change-password.component.ts
Unescape Escape View File

@ -33,6 +33,9 @@ export class ChangePasswordComponent implements OnInit {
public NEW_PASSWORD: boolean = false;
public Confirm_NEW_PASSWORD: boolean = false;
public OLD_PASSWORD: boolean = false;
public currentPasswordIcon = 'password';
public newPasswordIcon = 'password';
public confirmPasswordIcon = 'password';
public recentPasswordNote = {
yellowImg: '../assets/imgs/mohemm-action/info.png',
@ -345,4 +348,26 @@ export class ChangePasswordComponent implements OnInit {
} else { return true; }
}
showPassword(val) {
if (val === 1)
this.newPasswordIcon = 'password';
else if (val === 2) {
this.confirmPasswordIcon = 'password'
}
else {
this.currentPasswordIcon = 'password';
}
}
hidePassword(val) {
if (val === 1)
this.newPasswordIcon = 'text';
else if (val === 2) {
this.confirmPasswordIcon = 'text'
}
else {
this.currentPasswordIcon = 'text';
}
}
}

12
Mohem/src/app/authentication/forgot/forgot.component.html
Unescape Escape View File

@ -25,19 +25,23 @@
<ion-item class="item-input-login">
<img class="item-icon" src="assets/imgs/password.png" item-start />
<!-- <ion-label>{{'changePassword,newPassword' | translate}}</ion-label> -->
<ion-input class="login-input" required type="password"
<ion-input class="login-input" required [type]="newPasswordIcon"
placeholder="{{ts.trPK('changePassword','newPassword')}}"
[(ngModel)]="P_NEW_PASSWORD">
</ion-input>
<ion-icon *ngIf='newPasswordIcon === "text"' name="ios-eye" (click)="showPassword(1)"></ion-icon>
<ion-icon *ngIf='newPasswordIcon === "password"' name="ios-eye-off" (click)="hidePassword(1)"></ion-icon>
</ion-item>
<ion-item class="item-input-login">
<img class="item-icon" src="assets/imgs/password.png" item-start />
<!-- <ion-label>{{'changePassword,confirmPassword' | translate}}</ion-label> -->
<ion-input class="login-input" required type="password"
<ion-input class="login-input" required [type]="confirmPasswordIcon"
placeholder="{{ts.trPK('changePassword','confirmPassword')}}"
[(ngModel)]="P_Confirm_NEW_PASSWORD">
</ion-input>
<ion-icon *ngIf='confirmPasswordIcon === "text"' name="ios-eye" (click)="showPassword(2)"></ion-icon>
<ion-icon *ngIf='confirmPasswordIcon === "password"' name="ios-eye-off" (click)="hidePassword(2)"></ion-icon>
</ion-item>
<ion-item lines='none'>
@ -52,6 +56,10 @@
<img class="item-icon" [src]="checkerFuncation(2)" item-start />
<ion-label><p>{{isUpperCase.text}}</p></ion-label>
</ion-item> -->
<ion-item lines='none'>
<img class="item-icon" [src]="checkerFuncation(1)" item-start />
<ion-label><p>{{isLetterCase.text}}</p></ion-label>
</ion-item>
<ion-item lines='none'>
<img class="item-icon" [src]="checkerFuncation(3)" item-start />
<ion-label><p style="white-space: pre-wrap;">{{isHasDigit.text}}</p></ion-label>

21
Mohem/src/app/authentication/forgot/forgot.component.ts
Unescape Escape View File

@ -22,6 +22,8 @@ export class ForgotComponent implements OnInit {
public P_Confirm_NEW_PASSWORD = '';
public P_USER_NAME: string;
public logo = 'assets/icon/login/lock.png';
public newPasswordIcon = "password";
public confirmPasswordIcon = "password";
public recentPasswordNote = {
yellowImg: '../assets/imgs/mohemm-action/info.png',
text: this.ts.trPK('login', 'current-password-validation')
@ -261,8 +263,25 @@ export class ForgotComponent implements OnInit {
disabledSubmitBtn() {
if (this.isLetterCase.isMatch && this.isHasDigit.isMatch && this.isMinLength.isMatch
&& this.isRepeatedLetter.isMatch && this.P_NEW_PASSWORD !== '' && this.P_NEW_PASSWORD
&& this.P_Confirm_NEW_PASSWORD && this.isContainSpecialChar && this.confirmMatchNew.isMatch) {
&& this.P_Confirm_NEW_PASSWORD && this.isContainSpecialChar.isMatch && this.confirmMatchNew.isMatch) {
return false;
} else { return true; }
}
showPassword(val) {
if (val == 1)
this.newPasswordIcon = 'password';
else {
this.confirmPasswordIcon = 'password'
}
}
hidePassword(val) {
if (val == 1)
this.newPasswordIcon = 'text';
else {
this.confirmPasswordIcon = 'text'
}
}
}

Write Preview
Loading…
Cancel
Save