diff --git a/apps/maarch_entreprise/Views/password-modification.component.html b/apps/maarch_entreprise/Views/password-modification.component.html
index 716dc857aecbde7c6ec097fd18d089d812275f8e..3204c50e2e75032839c6a80028848c7b2921e444 100644
--- a/apps/maarch_entreprise/Views/password-modification.component.html
+++ b/apps/maarch_entreprise/Views/password-modification.component.html
@@ -25,6 +25,7 @@
<mat-icon matSuffix (click)="hidePassword = !hidePassword" class="fa fa-2x" [ngClass]="[hidePassword ? 'fa-eye-slash' : 'fa-eye']"></mat-icon>
<mat-error *ngIf="firstFormGroup.controls['currentPasswordCtrl'].hasError('required')">{{lang.requiredField}}</mat-error>
</mat-form-field>
+ <div style="text-align:center;color: rgba(0,0,0,0.54);font-size: 75%;">{{this.ruleText}}</div>
<mat-form-field style="padding:10px;">
<input matInput #inputPasswd placeholder="{{lang.typeNewPassword}}" formControlName="newPasswordCtrl" required
[type]="hidePassword ? 'password' : 'text'">
@@ -33,7 +34,6 @@
<i color="accent" class="fa fa-check"></i>
<span color="accent">{{lang.passwordValid}}</span>
</mat-hint>
- <mat-hint *ngIf="!validPassword">{{this.ruleText}}</mat-hint>
<mat-error>{{getErrorMessage()}}</mat-error>
</mat-form-field>
<mat-form-field style="padding:10px;">
@@ -51,7 +51,7 @@
<button mat-raised-button type="button"color="default" (click)="logout()">{{lang.logout}}</button>
</div>
</form>
- <div *ngIf="passwordRules.renewal.enabled" class="alert alert-warning" role="alert" [innerHTML]="OtherRuleText" style="text-align:center;left:0px;bottom: 0px;position: absolute;width: 100%;margin: 0;"></div>
+ <div *ngIf="passwordRules.renewal.enabled || passwordRules.historyLastUse.enabled" class="alert alert-warning" role="alert" [innerHTML]="otherRuleText" style="text-align:center;left:0px;bottom: 0px;position: absolute;width: 100%;margin: 0;"></div>
</mat-card>
</mat-sidenav-content>
<mat-sidenav #snav2 [mode]="mobileQuery.matches ? 'over' : 'side'" [fixedInViewport]="mobileQuery.matches" fixedTopGap="56"
diff --git a/apps/maarch_entreprise/Views/profile.component.html b/apps/maarch_entreprise/Views/profile.component.html
index 5eed0871f81f332aa78316c35df3c955bdae02ff..761d5362bf4ba5736ba6fb95aeff7c0cdc37845a 100755
--- a/apps/maarch_entreprise/Views/profile.component.html
+++ b/apps/maarch_entreprise/Views/profile.component.html
@@ -55,6 +55,7 @@
</mat-form-field>
</div>
<div class="form-group">
+ <div style="text-align:center;color: rgba(0,0,0,0.54);font-size: 75%;">{{this.ruleText}}</div>
<div class="col-sm-6" style="padding-left:0px;padding-right: 0px;">
<mat-form-field style="padding:10px;">
<input matInput #inputPasswd placeholder="{{lang.typeNewPassword}}" formControlName="newPasswordCtrl" required [type]="hidePassword ? 'password' : 'text'">
@@ -63,7 +64,6 @@
<i color="accent" class="fa fa-check"></i>
<span color="accent">{{lang.passwordValid}}</span>
</mat-hint>
- <mat-hint *ngIf="!validPassword">{{this.ruleText}}</mat-hint>
<mat-error>{{getErrorMessage()}}</mat-error>
</mat-form-field>
</div>
@@ -80,6 +80,11 @@
</mat-form-field>
</div>
</div>
+ <div *ngIf="passwordRules.renewal.enabled || passwordRules.historyLastUse.enabled" class="form-group">
+ <div class="col-sm-12" style="padding-left:0px;padding-right:0px;">
+ <div class="alert alert-warning" role="alert" [innerHTML]="otherRuleText" style="text-align:center;"></div>
+ </div>
+ </div>
<div class="form-group">
<div style="text-align:center;">
<button mat-raised-button color="primary" type="button" (click)="updatePassword()" [disabled]="!firstFormGroup.valid">{{lang.update}}</button>
diff --git a/apps/maarch_entreprise/js/angular/app/password-modification.component.ts b/apps/maarch_entreprise/js/angular/app/password-modification.component.ts
index adad08cb23089f883515ffc347f02ceddf890db6..524d019d689b0627f9f98c7e4f6b220417a1473f 100644
--- a/apps/maarch_entreprise/js/angular/app/password-modification.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/password-modification.component.ts
@@ -24,7 +24,7 @@ export class PasswordModificationComponent implements OnInit {
config : any = {};
coreUrl: string;
ruleText: string = '';
- OtherRuleText: string;
+ otherRuleText: string;
lang: any = LANG;
loading: boolean = false;
user: any = {};
@@ -99,6 +99,7 @@ export class PasswordModificationComponent implements OnInit {
.subscribe((data: any) => {
let valArr : ValidatorFn[] = [];
let ruleTextArr: String[] = [];
+ let otherRuleTextArr: String[] = [];
valArr.push(Validators.required);
@@ -144,16 +145,19 @@ export class PasswordModificationComponent implements OnInit {
} else if (rule.label == 'renewal') {
this.passwordRules.renewal.enabled = rule.enabled;
this.passwordRules.renewal.value = rule.value;
- this.OtherRuleText = this.lang['password' + rule.label] + ' <b>' + rule.value + ' ' + this.lang.days + '</b>. ' + this.lang['password2' + rule.label];
+ if (rule.enabled) {
+ otherRuleTextArr.push(this.lang['password' + rule.label] + ' <b>' + rule.value + ' ' + this.lang.days + '</b>. ' + this.lang['password2' + rule.label]+'.');
+ }
} else if (rule.label == 'historyLastUse') {
this.passwordRules.historyLastUse.enabled = rule.enabled;
this.passwordRules.historyLastUse.value = rule.value
if (rule.enabled) {
- ruleTextArr.push(this.lang['passwordhistoryLastUseDesc'] + ' ' + rule.value + ' ' + this.lang['passwordhistoryLastUseDesc2']);
+ otherRuleTextArr.push(this.lang['passwordhistoryLastUseDesc'] + ' <b>' + rule.value + '</b> ' + this.lang['passwordhistoryLastUseDesc2']+'.');
}
}
});
this.ruleText = ruleTextArr.join(', ');
+ this.otherRuleText = otherRuleTextArr.join('<br/>');
this.firstFormGroup.controls["newPasswordCtrl"].setValidators(valArr);
}, (err) => {
this.notify.error(err.error.errors);
diff --git a/apps/maarch_entreprise/js/angular/app/profile.component.ts b/apps/maarch_entreprise/js/angular/app/profile.component.ts
index 14584f812e764b8f42f900a9b57015ccbb5dd6f9..c3d6558d29ac6d650a89be103f7eb2a0959967f4 100755
--- a/apps/maarch_entreprise/js/angular/app/profile.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/profile.component.ts
@@ -41,7 +41,7 @@ export class ProfileComponent extends AutoCompletePlugin implements OnInit {
};
firstFormGroup: FormGroup;
ruleText: string = '';
- OtherRuleText: string;
+ otherRuleText: string;
validPassword: Boolean = false;
matchPassword: Boolean = false;
hidePassword: Boolean = true;
@@ -747,6 +747,10 @@ export class ProfileComponent extends AutoCompletePlugin implements OnInit {
.subscribe((data: any) => {
let valArr : ValidatorFn[] = [];
let ruleTextArr: String[] = [];
+ let otherRuleTextArr: String[] = [];
+
+ valArr.push(Validators.required);
+
data.rules.forEach((rule: any) => {
if (rule.label == 'minLength') {
this.passwordRules.minLength.enabled = rule.enabled;
@@ -782,22 +786,23 @@ export class ProfileComponent extends AutoCompletePlugin implements OnInit {
if (rule.enabled) {
ruleTextArr.push(this.lang['password' + rule.label]);
}
-
-
} else if (rule.label == 'renewal') {
this.passwordRules.renewal.enabled = rule.enabled;
this.passwordRules.renewal.value = rule.value;
- this.OtherRuleText = this.lang['password' + rule.label] + ' <b>' + rule.value + ' ' + this.lang.days + '</b>. ' + this.lang['password2' + rule.label];
+ if (rule.enabled) {
+ otherRuleTextArr.push(this.lang['password' + rule.label] + ' <b>' + rule.value + ' ' + this.lang.days + '</b>. ' + this.lang['password2' + rule.label]+'.');
+ }
} else if (rule.label == 'historyLastUse') {
this.passwordRules.historyLastUse.enabled = rule.enabled;
this.passwordRules.historyLastUse.value = rule.value
if (rule.enabled) {
- ruleTextArr.push(this.lang['passwordhistoryLastUseDesc'] + ' ' + rule.value + ' ' + this.lang['passwordhistoryLastUseDesc2']);
+ otherRuleTextArr.push(this.lang['passwordhistoryLastUseDesc'] + ' <b>' + rule.value + '</b> ' + this.lang['passwordhistoryLastUseDesc2']+'.');
}
}
});
this.ruleText = ruleTextArr.join(', ');
+ this.otherRuleText = otherRuleTextArr.join('<br/>');
this.firstFormGroup.controls["newPasswordCtrl"].setValidators(valArr);
}, (err) => {
this.notify.error(err.error.errors);