eduardo
/
datasurvey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

modificacion perfil passwords fix

This commit is contained in:
Paola 2021-07-15 22:07:23 -06:00
parent 167ff39036
commit f349ee6020
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/webapp/app/account/settings/settings.component.html
View File

@ -333,6 +333,7 @@
placeholder="Su contraseña actual" placeholder="Su contraseña actual"
[readOnly]="isGoogle" [readOnly]="isGoogle"
/> />
<div <div
*ngIf=" *ngIf="
passwordForm.get('password')!.invalid && passwordForm.get('password')!.invalid &&

21
src/main/webapp/app/account/settings/settings.component.ts
View File

@ -1,10 +1,9 @@
import { Component, OnInit } from '@angular/core'; import { Component, ContentChild, OnInit } from '@angular/core';
import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
import { FormBuilder, Validators } from '@angular/forms'; import { FormBuilder, Validators } from '@angular/forms';
import { ActivatedRoute } from '@angular/router'; import { Router, NavigationEnd, ActivatedRoute } from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { finalize, map } from 'rxjs/operators'; import { finalize, map } from 'rxjs/operators';
import * as dayjs from 'dayjs'; import * as dayjs from 'dayjs';
import { DATE_FORMAT, DATE_TIME_FORMAT } from 'app/config/input.constants'; import { DATE_FORMAT, DATE_TIME_FORMAT } from 'app/config/input.constants';
import { IUser } from 'app/entities/user/user.model'; import { IUser } from 'app/entities/user/user.model';
@ -23,6 +22,7 @@ import { PasswordService } from '../password/password.service';
templateUrl: './settings.component.html', templateUrl: './settings.component.html',
}) })
export class SettingsComponent implements OnInit { export class SettingsComponent implements OnInit {
currentUrl = this.router.url;
isSaving = false; isSaving = false;
success = false; success = false;
successPassword = false; successPassword = false;
@ -31,6 +31,7 @@ export class SettingsComponent implements OnInit {
doNotMatch = false; doNotMatch = false;
usersSharedCollection: IUser[] = []; usersSharedCollection: IUser[] = [];
plantillasSharedCollection: IPlantilla[] = []; plantillasSharedCollection: IPlantilla[] = [];
showPassword = false;
isGoogle = this.localStorageService.retrieve('IsGoogle'); isGoogle = this.localStorageService.retrieve('IsGoogle');
@ -86,6 +87,8 @@ export class SettingsComponent implements OnInit {
{ name: 'C28' }, { name: 'C28' },
]; ];
/* @ContentChild(IonInput) input: IonInput;*/
constructor( constructor(
protected usuarioExtraService: UsuarioExtraService, protected usuarioExtraService: UsuarioExtraService,
protected userService: UserService, protected userService: UserService,
@ -94,7 +97,8 @@ export class SettingsComponent implements OnInit {
protected fb: FormBuilder, protected fb: FormBuilder,
protected accountService: AccountService, protected accountService: AccountService,
private localStorageService: LocalStorageService, private localStorageService: LocalStorageService,
protected passwordService: PasswordService protected passwordService: PasswordService,
private router: Router
) {} ) {}
ngOnInit(): void { ngOnInit(): void {
@ -136,8 +140,6 @@ export class SettingsComponent implements OnInit {
console.log(usuarioExtra.fechaNacimiento); console.log(usuarioExtra.fechaNacimiento);
this.subscribeToSaveResponse(this.usuarioExtraService.update(usuarioExtra)); this.subscribeToSaveResponse(this.usuarioExtraService.update(usuarioExtra));
//reload
} }
savePassword(): void { savePassword(): void {
@ -173,7 +175,12 @@ export class SettingsComponent implements OnInit {
protected subscribeToSaveResponse(result: Observable<HttpResponse<IUsuarioExtra>>): void { protected subscribeToSaveResponse(result: Observable<HttpResponse<IUsuarioExtra>>): void {
result.pipe(finalize(() => this.onSaveFinalize())).subscribe( result.pipe(finalize(() => this.onSaveFinalize())).subscribe(
() => (this.success = true), () => (
(this.success = true),
this.router.navigate(['account/settings']).then(() => {
window.location.reload();
})
),
response => this.processError(response) response => this.processError(response)
); );
} }