fuzi_fauzia
/
hemat_solution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perbaikan profil, update password dan master

This commit is contained in:
Fuzi_fauzia 2024-07-11 14:39:06 +07:00
parent 28067d1704
commit a9034c1a32
9 changed files with 76 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/_layout/footer/footer.component.html
View File

@ -13,7 +13,7 @@
href="https://allbestsistem.com/"
target="_blank"
style="background-color: #000000 !important;"
>Smart Building Management Systems (V@2024-07-11.02)
>Smart Building Management Systems (V@2024-07-11.03)
</a></span
>
</p>

2
src/app/content/hemat-app/master/master-type/master-type.component.html
View File

@ -91,7 +91,7 @@
let-value="value"
>
<p style="color: #ffffff">
{{ value === "2" ? "Aktif" : "Nonaktif" }}
{{ value }}
</p>
</ng-template>
</ngx-datatable-column>

2
src/app/content/hemat-app/master/master-voltage/master-voltage.component.html
View File

@ -91,7 +91,7 @@
let-value="value"
>
<p style="color: #ffffff">
{{ value === "2" ? "Aktif" : "Nonaktif" }}
{{ value }}
</p>
</ng-template>
</ngx-datatable-column>

28
src/app/content/hemat-app/master/master-voltage/master-voltage.component.ts
View File

@ -5,6 +5,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
import { Router } from '@angular/router';
import { BuildingService } from '../../service/monitoring-api.service';
import { LoginService } from '../../service/login.service';
import { ToastrService } from 'ngx-toastr';
@Component({
selector: 'app-master-voltage',
@ -24,7 +25,8 @@ export class MasterVoltageComponent {
private modalService: NgbModal,
private router: Router,
private monitoringApiService: BuildingService,
private authService: LoginService
private authService: LoginService,
private toastr: ToastrService,
) {}
ngOnInit() {
@ -88,8 +90,13 @@ export class MasterVoltageComponent {
modalRef.componentInstance.mode = "add";
modalRef.result.then(
(result) => {
console.log(result);
if (result) {
if (this.filteredRows.some(value => value.name.toLowerCase() === result.name.toLowerCase())) {
this.toastr.error("Warning", "Data yang anda masukan double.", {
timeOut: 5000,
closeButton: true,
});
} else {
this.monitoringApiService
.postHeaderDetailParam(result)
.subscribe((res) => {
@ -97,6 +104,7 @@ export class MasterVoltageComponent {
this.fetchData();
});
}
}
},
(reason) => {
console.log(`Dismissed: ${reason}`);
@ -117,14 +125,14 @@ export class MasterVoltageComponent {
modalRef.result.then(
(result) => {
console.log(result);
if (result) {
this.monitoringApiService
.putHeaderDetailParam(result, row.id)
.subscribe((res) => {
console.log(res);
this.fetchData();
});
}
// if (result) {
// this.monitoringApiService
// .putHeaderDetailParam(result, row.id)
// .subscribe((res) => {
// console.log(res);
// this.fetchData();
// });
// }
},
(reason) => {
console.log(`Dismissed: ${reason}`);

4
src/app/content/hemat-app/user-profile/profil-information/profil-information.component.html
View File

@ -16,7 +16,6 @@
class="form-control"
formControlName="firstName"
maxlength="20"
placeholder="John Vander"
[ngClass]="{'is-invalid': profilInfo.get('firstName').invalid && profilInfo.get('firstName').touched}"
/>
<div *ngIf="profilInfo.get('firstName').invalid && profilInfo.get('firstName').touched" class="text-danger">
@ -31,7 +30,6 @@
class="form-control"
formControlName="lastName"
maxlength="20"
placeholder="John Vander"
[ngClass]="{'is-invalid': profilInfo.get('lastName').invalid && profilInfo.get('lastName').touched}"
/>
<div *ngIf="profilInfo.get('firstName').invalid && profilInfo.get('firstName').touched" class="text-danger">
@ -45,7 +43,6 @@
id="email"
class="form-control"
formControlName="email"
placeholder="email@email.com"
maxlength="50"
[ngClass]="{'is-invalid': profilInfo.get('email').invalid && profilInfo.get('email').touched}"
/>
@ -61,7 +58,6 @@
class="form-control"
formControlName="phone"
maxlength="13"
placeholder="08**************"
pattern="^[0-9]*$"
[ngClass]="{'is-invalid': profilInfo.get('phone').invalid && profilInfo.get('phone').touched}"
/>

2
src/app/content/hemat-app/user-profile/profil-information/profil-information.component.ts
View File

@ -52,7 +52,7 @@ export class ProfilInformationComponent {
lastName: ["", Validators.required],
email: ["", [Validators.required, Validators.pattern(/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/)]],
phone: ["", [Validators.required, Validators.pattern(/^[0-9]{10,15}$/)]],
image: [null],
image: [null, Validators.required],
});
this.dataProfil(this.storedData.sub);
this.profilInfo.valueChanges.subscribe(() => {

41
src/app/content/hemat-app/user-profile/update-password/update-password.component.html
View File

@ -49,7 +49,9 @@
</button>
</div> -->
<div class="form-group">
<label for="newPass" style="color: #ffffff">New Password</label>
<label for="newPass" style="color: #ffffff"
>New Password</label
>
<div class="input-group">
<input
[type]="showNewPass ? 'text' : 'password'"
@ -67,29 +69,38 @@
type="button"
class="btn btn-link"
(click)="toggleNewPassVisibility()"
style="color: #c3f164 !important;"
style="color: #c3f164 !important"
>
<i [class]="showNewPass ? 'fa fa-eye-slash' : 'fa fa-eye'"></i>
<i
[class]="
showNewPass ? 'fa fa-eye-slash' : 'fa fa-eye'
"
></i>
</button>
</div>
</div>
<small
class="form-text text-muted danger"
*ngIf="submitted && f.newPass.errors"
class="invalid-feedback"
>
<div *ngIf="f.newPass.errors.required">New Password is required</div>
<div *ngIf="f.newPass.errors.required">
New Password is required
</div>
<div *ngIf="f.newPass.errors.minlength">
New Password must be at least 8 characters long
</div>
<div *ngIf="f.newPass.errors.pattern">
New Password must contain at least one uppercase letter, one lowercase letter, and one number
New Password must contain at least one uppercase
letter, one lowercase letter, and one number
</div>
</small>
</div>
</div>
<div class="form-group">
<label for="confirmPass" style="color: #ffffff">Confirm Password</label>
<label for="confirmPass" style="color: #ffffff"
>Confirm Password</label
>
<div class="input-group">
<input
[type]="showConfirmPass ? 'text' : 'password'"
@ -107,18 +118,25 @@
type="button"
class="btn btn-link"
(click)="toggleConfirmPassVisibility()"
style="color: #c3f164 !important;"
style="color: #c3f164 !important"
>
<i [class]="showConfirmPass ? 'fa fa-eye-slash' : 'fa fa-eye'"></i>
<i
[class]="
showConfirmPass
? 'fa fa-eye-slash'
: 'fa fa-eye'
"
></i>
</button>
</div>
</div>
<small
class="form-text text-muted danger"
*ngIf="submitted && f.confirmPass.errors"
class="invalid-feedback"
>
<div *ngIf="f.confirmPass.errors.required">Confirm Password is required</div>
<div *ngIf="f.confirmPass.errors.required">
Confirm Password is required
</div>
<div *ngIf="f.confirmPass.errors.matchPassword">
Confirm Password must match the New Password
</div>
@ -127,6 +145,7 @@
</div>
</div>
</div>
</div>
<div class="form-actions text-right">
<button
type="button"

5
src/app/content/hemat-app/user-profile/update-password/update-password.component.ts
View File

@ -93,8 +93,6 @@ export class UpdatePasswordComponent {
if (this.profilInfo.invalid) {
return;
}
// Handle form submission
}
cancel() {
@ -114,6 +112,7 @@ export class UpdatePasswordComponent {
}
saveEdit() {
this.submitted = true;
if (this.profilInfo.valid) {
const dataPassword = {
userid: this.profilInfo.value.userid,
@ -135,6 +134,8 @@ export class UpdatePasswordComponent {
});
}
);
} else {
}
}

2
src/app/login/login.component.html
View File

@ -138,7 +138,7 @@
<p
class="card-subtitle line-on-side text-muted text-center font-small-3 mx-2 my-1"
>
<span>(v@2024.07.11.02)</span>
<span>(v@2024.07.11.03)</span>
</p>
<!-- <div class="card-body">
<a