Compare commits

..

No commits in common. "c358a43bcf20babd5cc0cdb225c7d409159302f4" and "5987330089c517d073990d73c0269f9c3a5715c2" have entirely different histories.

3 changed files with 9 additions and 25 deletions

View File

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

View File

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

View File

@ -27,17 +27,17 @@ public abstract class AbstractUuid {
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
public int hashCode() {
return uuid.hashCode();
}
@Override
public boolean equals(final Object obj) {
if (obj instanceof final AbstractUuid casted) {
return uuid.equals(casted.uuid);
}
return false;
}
}