Compare commits
No commits in common. "c358a43bcf20babd5cc0cdb225c7d409159302f4" and "5987330089c517d073990d73c0269f9c3a5715c2" have entirely different histories.
c358a43bcf
...
5987330089
@ -3,15 +3,7 @@
|
|||||||
<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
|
<div class="mainMenuItem mainMenuItemRight" routerLinkActive="mainMenuItemActive" routerLink="/Profile">{{ userService.user.name }}</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)"/>
|
||||||
|
|||||||
@ -19,12 +19,4 @@
|
|||||||
background-color: lightskyblue;
|
background-color: lightskyblue;
|
||||||
}
|
}
|
||||||
|
|
||||||
.userHasPassword {
|
|
||||||
color: green;
|
|
||||||
}
|
|
||||||
|
|
||||||
.userNoPassword {
|
|
||||||
color: indianred;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user