Compare commits

...

2 Commits

Author SHA1 Message Date
c358a43bcf userHasPassword/userNoPassword colors 2024-11-06 16:04:24 +01:00
050a3e6dd4 better AbstractUuid::equals 2024-11-06 16:02:01 +01:00
3 changed files with 25 additions and 9 deletions

View File

@ -3,7 +3,15 @@
<div class="mainMenuItem" routerLinkActive="mainMenuItemActive" routerLink="/VoltageDrop">Kabel</div> <div class="mainMenuItem" routerLinkActive="mainMenuItemActive" routerLink="/VoltageDrop">Kabel</div>
<div class="mainMenuItem" routerLinkActive="mainMenuItemActive" routerLink="/Groups">Gruppen</div> <div class="mainMenuItem" routerLinkActive="mainMenuItemActive" routerLink="/Groups">Gruppen</div>
<ng-container *ngIf="userService.user !== null"> <ng-container *ngIf="userService.user !== null">
<div class="mainMenuItem mainMenuItemRight" routerLinkActive="mainMenuItemActive" routerLink="/Profile">{{ userService.user.name }}</div> <div
class="mainMenuItem mainMenuItemRight"
[class.userHasPassword]="userService.user.password"
[class.userNoPassword]="!userService.user.password"
routerLinkActive="mainMenuItemActive"
routerLink="/Profile"
>
{{ userService.user.name }}
</div>
</ng-container> </ng-container>
</div> </div>
<router-outlet (activate)="onActivate($event)"/> <router-outlet (activate)="onActivate($event)"/>

View File

@ -19,4 +19,12 @@
background-color: lightskyblue; background-color: lightskyblue;
} }
.userHasPassword {
color: green;
}
.userNoPassword {
color: indianred;
}
} }

View File

@ -27,17 +27,17 @@ public abstract class AbstractUuid {
return uuid; return uuid;
} }
@Override
public boolean equals(final Object obj) {
if (!this.getClass().equals(obj.getClass())) {
return false;
}
return uuid.equals(this.getClass().cast(obj).uuid);
}
@Override @Override
public int hashCode() { public int hashCode() {
return uuid.hashCode(); return uuid.hashCode();
} }
@Override
public boolean equals(final Object obj) {
if (obj instanceof final AbstractUuid casted) {
return uuid.equals(casted.uuid);
}
return false;
}
} }