Merge branch 'Branch_Design_Adjusted' 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 e405dde..35bbfbf 100644
--- a/src/app/common-components/main-navigation/main-navigation.component.css
+++ b/src/app/common-components/main-navigation/main-navigation.component.css
@@ -1,6 +1,7 @@
.navbar-nav{
display: inline-flex;
}
+
.overview-navbar {
z-index: 1;
}
@@ -9,15 +10,36 @@
float: right;
vertical-align: middle;
padding-top: 13px;
- padding-right: 20px;
+ padding-right: 20px;
}
-.divider-right{
+
+.divider-right {
border-right: 1px solid #ccc;
margin-right: 25px;
}
-.active-navitem{
+
+.active-navitem {
border-bottom: 2px solid;
padding-bottom: 3px;
- width: 16px;
+ width: auto;
+}
+.glyphicon:hover {
+ border-bottom: 2px solid;
+ padding-bottom: 3px;
+ width: auto;
+}
+
+.dropdown-open:hover {
+ background-color: transparent;
+}
+
+.navbar-default .navbar-nav > .open > a,
+.navbar-default .navbar-nav > .open > a:focus {
+ color: #0b325c;
+ background: transparent;
+}
+
+.dropdown-menu>li>a {
+ cursor: pointer;
}
\ No newline at end of file
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 11297aa..d670ee2 100644
--- a/src/app/common-components/main-navigation/main-navigation.component.html
+++ b/src/app/common-components/main-navigation/main-navigation.component.html
@@ -7,33 +7,35 @@
<div>
<button style="float: right" type="button" class="btn btn-link navbar-btn" *ngIf="(router.url === '/overview' || router.url === '/reminders')"
data-toggle="collapse" href="#collapse9" (click)="setFilterExpansionState()">
- <span class="glyphicon glyphicon-filter" ></span>
- </button>
+ <span class="glyphicon glyphicon-filter" data-toggle="tooltip" data-placement="bottom" data-delay='{"show":"1500", "hide":"300"}' data-html="true" title="Filterung nach<br>Verantwortlichkeiten"></span>
+ </button>
</div>
<div *ngIf="router.url === '/overview' || router.url === '/reminders'" style="border-right: solid 1px #c3c3c3; margin: 10px 0 10px 0">
</div>
<div>
<button style="float: right" type="button" class="btn btn-link navbar-btn" (click)="goToOverview()">
- <span class="glyphicon glyphicon-home" [ngClass]="{'active-navitem': router.url === '/overview'}"></span>
+ <span class="glyphicon glyphicon-home active-navitem-hover" [ngClass]="{'active-navitem': router.url === '/overview'}"></span>
</button>
</div>
<div>
- <button style="float: right" type="button" class="btn btn-link navbar-btn" (click)="goToSearchPage()">
+ <button style="float: right" type="button" class="btn btn-link navbar-btn" data-toggle="tooltip" data-placement="bottom" data-delay='{"show":"1500", "hide":"300"}' title="Suche" (click)="goToSearchPage()">
<span class="glyphicon glyphicon-search" [ngClass]="{'active-navitem': router.url === '/search'}"></span>
</button>
</div>
<div>
- <button type="button" class="btn btn-link navbar-btn" (click)="goToReminderPage()">
+ <button type="button" class="btn btn-link navbar-btn" data-toggle="tooltip" data-placement="bottom" data-delay='{"show":"1500", "hide":"300"}' title="Aktuelle Erinnerungen" (click)="goToReminderPage()">
<span class="glyphicon glyphicon-calendar" [ngClass]="{'active-navitem': router.url.startsWith('/reminders'), 'text-danger': sessionContext.reminderAvailable }"></span>
</button>
</div>
<div style="overflow: hidden" *ngIf="goToShiftChangeOverview">
- <button type="button" class="btn btn-link navbar-btn" (click)="goToShiftChangeOverview()">
+ <button type="button" class="btn btn-link navbar-btn" data-toggle="tooltip" data-placement="bottom" data-delay='{"show":"1500", "hide":"300"}' data-html="true" title="Bereits übernommene<br>Schichtübergaben" (click)="goToShiftChangeOverview()">
<span class="glyphicon glyphicon glyphicon-time" [ngClass]="{'active-navitem': router.url === '/shiftChangeOverview'}"></span>
</button>
</div>
<div class="nav-overview-user">
- <a class="dropdown-open dropdown-toggle " data-toggle="dropdown" href="#" aria-expanded="true">{{sessionContext.getCurrUser()?.name}}<span class="caret"></span></a>
+ <a class="dropdown-open dropdown-toggle " data-toggle="dropdown" href="#" aria-expanded="true">
+ {{sessionContext.getCurrUser()?.name}}<span class="caret"></span>
+ </a>
<ul class="dropdown-menu">
<li class="dropdown">
<a (click)="openDialogLogout()">Abmelden</a>
diff --git a/src/app/lists/search-result-list/search-result-list.component.css b/src/app/lists/search-result-list/search-result-list.component.css
index 75ce308..ed1823b 100644
--- a/src/app/lists/search-result-list/search-result-list.component.css
+++ b/src/app/lists/search-result-list/search-result-list.component.css
@@ -34,6 +34,6 @@
.incident-id-change {
border-top-width: 1px;
- border-top-color: #26425E;
+ border-top-color: #239095;
border-top-style: solid;
}
\ No newline at end of file
diff --git a/src/app/lists/search-result-list/search-result-list.component.html b/src/app/lists/search-result-list/search-result-list.component.html
index 1163b0a..5b6f487 100644
--- a/src/app/lists/search-result-list/search-result-list.component.html
+++ b/src/app/lists/search-result-list/search-result-list.component.html
@@ -39,51 +39,51 @@
</tr>
</thead>
<tbody>
- <tr *ngFor="let notification of notifications">
+ <tr *ngFor="let notification of notifications; let idx = index">
<td colspan="9" style="padding:0px;" border=3>
<table style="width:100%">
<tbody>
<tr [ngClass]="{'sameIncident' : isIncidentIdChange(notification)}">
- <td *ngIf="withCheckboxes" class="notification-check-col" [ngClass]="{'incident-id-change' : incidentIdChange}">
+ <td *ngIf="withCheckboxes" class="notification-check-col" [ngClass]="{'incident-id-change' : idx!==0 && incidentIdChange}">
<input type="checkbox" [(ngModel)]="notification.selected" (change)="selectionChanged()">
</td>
- <td class="search-result-tab-first-col" [ngClass]="{'incident-id-change' : incidentIdChange}">{{ notification.beginDate | formattedTimestamp: 'DD.MM.YYYY HH:mm' }}
+ <td class="search-result-tab-first-col" [ngClass]="{'incident-id-change' : idx!==0 && incidentIdChange}">{{ notification.beginDate | formattedTimestamp: 'DD.MM.YYYY HH:mm' }}
</td>
- <td class="search-result-tab-version-col" [ngClass]="{'incident-id-change' : incidentIdChange}">{{notification.version}}</td>
- <td class="notification-tab-branch" [ngClass]="{'incident-id-change' : incidentIdChange,
+ <td class="search-result-tab-version-col" [ngClass]="{'incident-id-change' : idx!==0 && incidentIdChange}">{{notification.version}}</td>
+ <td class="notification-tab-branch" [ngClass]="{'incident-id-change' : idx!==0 && incidentIdChange,
'gas' : isBranchGas(notification.fkRefBranch), 'power' : isBranchPower(notification.fkRefBranch),
'water' : isBranchWater(notification.fkRefBranch), 'heating' : isBranchHeating(notification.fkRefBranch)}">
<span>
{{ sessionContext.getBrancheById(notification.fkRefBranch)?.name }}
</span>
</td>
- <td class="notification-tab-grid-territory" [ngClass]="{'incident-id-change' : incidentIdChange}">
+ <td class="notification-tab-grid-territory" [ngClass]="{'incident-id-change' : idx!==0 && incidentIdChange}">
<span>
{{ sessionContext.getGridTerritoryById(notification.fkRefGridTerritory)?.name }}
</span>
</td>
- <td class="notification-tab-description" [ngClass]="{'incident-id-change' : incidentIdChange}" data-toggle="tooltip" [attr.data-original-title]="notification.notificationText"
+ <td class="notification-tab-description" [ngClass]="{'incident-id-change' : idx!==0 && incidentIdChange}" data-toggle="tooltip" [attr.data-original-title]="notification.notificationText"
style="overflow:hidden;text-overflow: ellipsis;">
<span>
{{ notification.notificationText }}
</span>
</td>
- <td class="notification-tab-status" [ngClass]="{'finished' : isStatusClassFinished(notification.fkRefNotificationStatus), 'incident-id-change' : incidentIdChange}">
+ <td class="notification-tab-status" [ngClass]="{'finished' : isStatusClassFinished(notification.fkRefNotificationStatus), 'incident-id-change' : idx!==0 && incidentIdChange}">
<span>
{{ sessionContext.getStatusById(notification.fkRefNotificationStatus)?.name }}
</span>
</td>
- <td class="notification-tab-moduser" [ngClass]="{'incident-id-change' : incidentIdChange}">
+ <td class="notification-tab-moduser" [ngClass]="{'incident-id-change' : idx!==0 && incidentIdChange}">
<span>
{{ notification.responsibilityControlPoint }}
</span>
</td>
- <td class="notification-tab-responsibility-forwarding" [ngClass]="{'incident-id-change' : incidentIdChange}">
+ <td class="notification-tab-responsibility-forwarding" [ngClass]="{'incident-id-change' : idx!==0 && incidentIdChange}">
<span>
{{ notification.responsibilityForwarding }}
</span>
</td>
- <td class="notification-tab-edit-buttons" [ngClass]="{'incident-id-change' : incidentIdChange}" >
+ <td class="notification-tab-edit-buttons" [ngClass]="{'incident-id-change' : idx!==0 && incidentIdChange}" >
<button type="button" class="btn btn-default btn-sm" (click)="lookUpNotification(notification)">
<span class="glyphicon glyphicon-eye-open"></span>
</button>
diff --git a/src/app/pages/shift-change-overview/shift-change-overview.component.html b/src/app/pages/shift-change-overview/shift-change-overview.component.html
index 8b8b72c..3c70b6c 100644
--- a/src/app/pages/shift-change-overview/shift-change-overview.component.html
+++ b/src/app/pages/shift-change-overview/shift-change-overview.component.html
@@ -10,8 +10,9 @@
</div>
<div class="maincontent" >
<div class="row">
- <div class="col-xs-3">
- <span style="font-size: 30px">Historische Schichtübergaben</span>
+ <div class="col-xs-3" style="width: 80%">
+ <span style="font-size: 30px">Übernommene Schichtübergaben</span>
+ <!-- <span style="font-size: 30px">Historische Schichtübergaben</span> -->
</div>
</div>
<div class="panel-group" style="width:50%;">
diff --git a/src/styles.css b/src/styles.css
index 721d55e..59d48d0 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -194,8 +194,12 @@
color: #0b325c;
background: #b6cbdb;
}
-.dropdown-menu{
+
+.dropdown-menu{
top:35px;
+ min-width: 128px;
+ margin: 2px 20px 0;
+ padding: 5px 7px;
}
.dropdown-menu > .dropdown > a:hover {
