Merge branch 'DEVELOP_FE' of ssh://git.eclipse.org:29418/elogbook/elogbookFE into DEVELOP_FE
diff --git a/src/app/common-components/main-navigation/main-navigation.component.css b/src/app/common-components/main-navigation/main-navigation.component.css
index 35bbfbf..b356a98 100644
--- a/src/app/common-components/main-navigation/main-navigation.component.css
+++ b/src/app/common-components/main-navigation/main-navigation.component.css
@@ -36,10 +36,19 @@
.navbar-default .navbar-nav > .open > a,
.navbar-default .navbar-nav > .open > a:focus {
- color: #0b325c;
- background: transparent;
+ filter: brightness(95%);
}
.dropdown-menu>li>a {
cursor: pointer;
-}
\ No newline at end of file
+}
+
+.btn-logout {
+ background-color: #ccdbe6;
+ color: #0080c0;
+ border: none;
+}
+
+.btn-logout:hover {
+ filter: brightness(95%);
+}
diff --git a/src/app/common-components/main-navigation/main-navigation.component.html b/src/app/common-components/main-navigation/main-navigation.component.html
index 5238468..f642725 100644
--- a/src/app/common-components/main-navigation/main-navigation.component.html
+++ b/src/app/common-components/main-navigation/main-navigation.component.html
@@ -37,11 +37,11 @@
<span class="glyphicon glyphicon-question-sign"></span>
</a>
</div>
- <div class="nav-overview-user">
- <a class="dropdown-open dropdown-toggle " data-toggle="dropdown" href="#" aria-expanded="true">
+ <div class="dropdown-open nav-user nav-overview-user">
+ <a class="btn btn-logout dropdown-toggle" style="min-width: 160px;" type="button" data-toggle="dropdown" href="#" aria-expanded="true">
{{sessionContext.getAccessTokenDecoded()?.name}}<span class="caret"></span>
</a>
- <ul class="dropdown-menu">
+ <ul class="dropdown-menu" style="left: auto; right: auto;">
<li class="dropdown">
<a (click)="openDialogShiftChange()">Schicht übergeben</a>
</li>
diff --git a/src/app/dialogs/shift-change/shift-change.component.html b/src/app/dialogs/shift-change/shift-change.component.html
index d3d36a5..449b2a6 100644
--- a/src/app/dialogs/shift-change/shift-change.component.html
+++ b/src/app/dialogs/shift-change/shift-change.component.html
@@ -6,88 +6,86 @@
<div>
<div class="dialog">
- <div class="panel panel-default ">
-
- <div *ngIf="bannerMessage.isActive" [ngClass]="{'alert':true,
- 'alert-danger':bannerMessage.status===bannerMessageStatus.error,
- 'alert-info':bannerMessage.status===bannerMessageStatus.info,
- 'alert-warning':bannerMessage.status===bannerMessageStatus.warning,
- 'alert-success':bannerMessage.status===bannerMessageStatus.success}">
- <div class="close" (click)="bannerMessage.hide()">x</div>
- {{bannerMessage.text}}
+ <div class="panel panel-default ">
+ <div *ngIf="sessionContext.bannerMessage.isActive" [ngClass]="{ 'alert':true,
+ 'alert-danger': sessionContext.bannerMessage.status === bannerMessageStatus.error,
+ 'alert-info': sessionContext.bannerMessage.status === bannerMessageStatus.info,
+ 'alert-warning': sessionContext.bannerMessage.status === bannerMessageStatus.warning,
+ 'alert-success': bannerMessageStatus.success }">
+ <div class="close" (click)="sessionContext.bannerMessage.hide()">x</div>
+ {{sessionContext.bannerMessage.text}}
</div>
-
- <div class="panel-body" style="max-width: 450px;">
- <multiselect class="customMultiSelect" [data]="allUsersButLoggedIn" [(ngModel)]="preSelectedUsers" [settings]="dropdownSettings"
- ngDefaultControl></multiselect>
- </div>
- <form #shiftForm="ngForm" novalidate>
- <div class="panel-body">
- <fieldset [disabled]="!preSelectedUsers || preSelectedUsers.length===0">
- <table class="table table-bordered responsibility-column-striped">
- <thead>
- <tr>
- <th style="border: 0"></th>
- <th>Strom</th>
- <th>Gas</th>
- <th>FW</th>
- <th>Wasser</th>
- </tr>
- </thead>
- <tbody>
- <tr *ngFor="let responsibilityContainer of responsibilityContainers">
- <td class="shc-table-col">{{ responsibilityContainer.gridTerritoryDescription }}</td>
- <td class="shc-table-col">
- <div class="form-group">
- <select [(ngModel)]="getResponsiblity(responsibilityContainer,'S').newResponsibleUser" *ngIf="responsibilityContainer && getResponsiblity(responsibilityContainer,'S')"
- style="height:30px !important" class="form-control shc-table-select" name="'responsibleUserSelectionS_{{getResponsiblity(responsibilityContainer,'S').id}}'"
- (change)="checkIfPersonSelected()">
+ <div class="panel-body" style="max-width: 450px;">
+ <multiselect class="customMultiSelect" [data]="allUsersButLoggedIn" [(ngModel)]="preSelectedUsers" [settings]="dropdownSettings"
+ ngDefaultControl></multiselect>
+ </div>
+ <form #shiftForm="ngForm" novalidate>
+ <div class="panel-body">
+ <fieldset [disabled]="!preSelectedUsers || preSelectedUsers.length===0">
+ <table class="table table-bordered responsibility-column-striped">
+ <thead>
+ <tr>
+ <th style="border: 0"></th>
+ <th>Strom</th>
+ <th>Gas</th>
+ <th>FW</th>
+ <th>Wasser</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr *ngFor="let responsibilityContainer of responsibilityContainers">
+ <td class="shc-table-col">{{ responsibilityContainer.gridTerritoryDescription }}</td>
+ <td class="shc-table-col">
+ <div class="form-group">
+ <select [(ngModel)]="getResponsiblity(responsibilityContainer,'S').newResponsibleUser" *ngIf="responsibilityContainer && getResponsiblity(responsibilityContainer,'S')"
+ style="height:30px !important" class="form-control shc-table-select" name="'responsibleUserSelectionS_{{getResponsiblity(responsibilityContainer,'S').id}}'"
+ (change)="checkIfPersonSelected()">
<option></option>
<option *ngFor="let user of preSelectedUsers" value="{{user.username}}">{{user.itemName}}</option>
</select>
- </div>
- </td>
- <td class="shc-table-col">
- <div class="form-group">
- <select [(ngModel)]="getResponsiblity(responsibilityContainer,'G').newResponsibleUser" *ngIf="responsibilityContainer && getResponsiblity(responsibilityContainer,'G')"
- style="height:30px !important" class="form-control shc-table-select" name="'responsibleUserSelectionG_{{getResponsiblity(responsibilityContainer,'G').id}}'"
- (change)="checkIfPersonSelected()">
+ </div>
+ </td>
+ <td class="shc-table-col">
+ <div class="form-group">
+ <select [(ngModel)]="getResponsiblity(responsibilityContainer,'G').newResponsibleUser" *ngIf="responsibilityContainer && getResponsiblity(responsibilityContainer,'G')"
+ style="height:30px !important" class="form-control shc-table-select" name="'responsibleUserSelectionG_{{getResponsiblity(responsibilityContainer,'G').id}}'"
+ (change)="checkIfPersonSelected()">
<option></option>
<option *ngFor="let user of preSelectedUsers" value="{{user.username}}">{{user.itemName}}</option>
</select>
- </div>
- </td>
- <td class="shc-table-col">
- <div class="form-group">
- <select [(ngModel)]="getResponsiblity(responsibilityContainer,'F').newResponsibleUser" *ngIf="responsibilityContainer && getResponsiblity(responsibilityContainer,'F')"
- style="height:30px !important" class="form-control shc-table-select" name="'responsibleUserSelectionF_{{getResponsiblity(responsibilityContainer,'F').id}}'"
- (change)="checkIfPersonSelected()">
+ </div>
+ </td>
+ <td class="shc-table-col">
+ <div class="form-group">
+ <select [(ngModel)]="getResponsiblity(responsibilityContainer,'F').newResponsibleUser" *ngIf="responsibilityContainer && getResponsiblity(responsibilityContainer,'F')"
+ style="height:30px !important" class="form-control shc-table-select" name="'responsibleUserSelectionF_{{getResponsiblity(responsibilityContainer,'F').id}}'"
+ (change)="checkIfPersonSelected()">
<option></option>
<option *ngFor="let user of preSelectedUsers" value="{{user.username}}" >{{user.itemName}}</option>
</select>
- </div>
- </td>
- <td class="shc-table-col">
- <div class="form-group">
- <select [(ngModel)]="getResponsiblity(responsibilityContainer,'W').newResponsibleUser" *ngIf="responsibilityContainer && getResponsiblity(responsibilityContainer,'W')"
- style="height:30px !important" class="form-control shc-table-select" name="'responsibleUserSelectionW_{{getResponsiblity(responsibilityContainer,'W').id}}'"
- (change)="checkIfPersonSelected()">
+ </div>
+ </td>
+ <td class="shc-table-col">
+ <div class="form-group">
+ <select [(ngModel)]="getResponsiblity(responsibilityContainer,'W').newResponsibleUser" *ngIf="responsibilityContainer && getResponsiblity(responsibilityContainer,'W')"
+ style="height:30px !important" class="form-control shc-table-select" name="'responsibleUserSelectionW_{{getResponsiblity(responsibilityContainer,'W').id}}'"
+ (change)="checkIfPersonSelected()">
<option></option>
<option *ngFor="let user of preSelectedUsers" value="{{user.username}}" >{{user.itemName}}</option>
</select>
- </div>
- </td>
- </tr>
- </tbody>
- </table>
- </fieldset>
- </div>
- </form>
- </div>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </fieldset>
+ </div>
+ </form>
+ </div>
</div>
<div class="margin-top">
<button class="btn btn-primary btn-sm" [disabled]="shiftChangeFormInValid" (click)="shiftChange(true)" autofocus>Übergeben</button>
- <button class="btn btn-primary btn-sm" (click)="cancelChange()" autofocus>Stornieren</button>
+ <button class="btn btn-primary btn-sm" (click)="cancelChange()" autofocus>Stornieren</button>
<button class="btn btn-primary btn-sm " (click)="dialogRef.close()">Abbrechen</button>
</div>
</div>
\ No newline at end of file
diff --git a/src/app/dialogs/shift-change/shift-change.component.ts b/src/app/dialogs/shift-change/shift-change.component.ts
index 14bba52..136bef2 100644
--- a/src/app/dialogs/shift-change/shift-change.component.ts
+++ b/src/app/dialogs/shift-change/shift-change.component.ts
@@ -35,7 +35,7 @@
private responsibilityService: ResponsibilityService,
private messageService: MessageService,
private userService: UserService,
- private sessionContext: SessionContext) { }
+ public sessionContext: SessionContext) { }
ngOnInit() {
this.getUsers();
diff --git a/src/styles.css b/src/styles.css
index fffe858..1ac62eb 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -185,25 +185,24 @@
}
.dropdown-open:hover {
-
- background: #b6cbdb;
+ background: #b7cbda;
}
.navbar-default .navbar-nav > .open > a,
.navbar-default .navbar-nav > .open > a:focus {
- color: #0b325c;
- background: #b6cbdb;
+ color: #0080c0;
+ background: #b7cbda;
}
.dropdown-menu{
- top:35px;
- min-width: 128px;
- margin: 2px 20px 0;
- padding: 5px 7px;
-}
+ top:43px;
+ min-width: 160px;
+ background: #e9f0f9;
+}
.dropdown-menu > .dropdown > a:hover {
- background: #f5f8fc;
+ background: #b7cbda;
+ color: #0080c0;
}
