GNM-1100 FE Feld Ebene inaktiv machen, wenn keine Auswahlmöglichkeit besteht
GNM-1098 z-Ebene für Logout anpassen
GNM-1099 Bei "Logout" und "Tab schließen" auto-focus auf button setzen.
diff --git a/src/app/common-components/message-banner/message-banner.component.css b/src/app/common-components/message-banner/message-banner.component.css
index 3660236..1952fd3 100644
--- a/src/app/common-components/message-banner/message-banner.component.css
+++ b/src/app/common-components/message-banner/message-banner.component.css
@@ -14,7 +14,7 @@
margin-top: 37px;
position: fixed;
width: 100%;
- z-index: 999;
+ z-index: 900;
}
.actions {
diff --git a/src/app/pages/grid-measure-detail-header/grid-measure-detail-header.component.ts b/src/app/pages/grid-measure-detail-header/grid-measure-detail-header.component.ts
index a35e8a5..43e61f5 100644
--- a/src/app/pages/grid-measure-detail-header/grid-measure-detail-header.component.ts
+++ b/src/app/pages/grid-measure-detail-header/grid-measure-detail-header.component.ts
@@ -50,10 +50,10 @@
ngOnInit() {
this.getBranchLevelsByBranch(this.gridMeasureDetail.branchId);
-
+
this.inactiveFields = this.sessionContext.getInactiveFields();
this.statusList = this.sessionContext.getStatuses();
- this.brancheList = this.sessionContext.getBranches();
+ this.brancheList = this.sessionContext.getBranches();
this.areaOfSwitchingList = this.sessionContext.getTerritories().map(ter => ter.name);
this.departmentList = this.sessionContext.getAllUserDepartments();
this.costCenters = this.sessionContext.getCostCenters();
@@ -115,12 +115,7 @@
this.baseDataService.getBranchLevels(branchId)
.subscribe(branchLevels => {
this.branchLevelList = branchLevels,
- // deactivates branch level, if no branch is selected.
- this.isBranchLevelActive = (!branchId) ? false : true;
- // // What is vizualized, if there is no level in the branch.
- // if (this.branchLevelList === undefined || this.branchLevelList.length < 1) {
- // this.branchLevelList.push('[keine Einträge]');
- // }
+ this.isBranchLevelActive = (!branchId || branchLevels.length === 0) ? false : true;
},
error => {
console.log(error);
diff --git a/src/app/pages/loggedout/loggedout.component.html b/src/app/pages/loggedout/loggedout.component.html
index b1aa318..e83d505 100644
--- a/src/app/pages/loggedout/loggedout.component.html
+++ b/src/app/pages/loggedout/loggedout.component.html
@@ -16,7 +16,9 @@
<div>
<h2>Sie wurden ausgeloggt ...</h2>
<h4>Über das Portal können Sie sich erneut einloggen</h4>
- <button style="margin-top: 10%" type="button" class="btn btn-primary" onclick="window.close()">Browser-Tab schließen</button>
+ <button #tabCloseBtn style="margin-top: 10%" type="button" class="btn btn-primary" onclick="window.close()">Browser-Tab
+ schließen
+ </button>
</div>
</div>
<!-- <app-version-info>...Loading Version-Info...</app-version-info> -->
diff --git a/src/app/pages/loggedout/loggedout.component.ts b/src/app/pages/loggedout/loggedout.component.ts
index a812aea..64b816d 100644
--- a/src/app/pages/loggedout/loggedout.component.ts
+++ b/src/app/pages/loggedout/loggedout.component.ts
@@ -9,7 +9,7 @@
*
******************************************************************************
*/
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild, ElementRef } from '@angular/core';
@Component({
selector: 'app-loggedout',
@@ -21,7 +21,10 @@
constructor(
) { }
+ @ViewChild('tabCloseBtn') button: ElementRef;
+
ngOnInit() {
+ this.button.nativeElement.focus();
}
}
diff --git a/src/app/pages/logout/logout.component.html b/src/app/pages/logout/logout.component.html
index 8f7d4d8..5be9805 100644
--- a/src/app/pages/logout/logout.component.html
+++ b/src/app/pages/logout/logout.component.html
@@ -16,8 +16,8 @@
<h3>Wollen Sie sich abmelden?</h3>
</div>
<div class="center-margin">
- <button id="logoutbutton" class="btn btn-primary" (click)="logout()" autofocus>Ja</button>
+ <button #yesBtn id="logoutbutton" class="btn btn-primary" type="button" (click)="logout()">Ja</button>
<button id="homebutton" class=" btn btn-primary " (click)="goToOverview() ">Nein</button>
</div>
</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/pages/logout/logout.component.ts b/src/app/pages/logout/logout.component.ts
index f7b1bfd..a17db57 100644
--- a/src/app/pages/logout/logout.component.ts
+++ b/src/app/pages/logout/logout.component.ts
@@ -9,7 +9,7 @@
*
******************************************************************************
*/
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild, ElementRef } from '@angular/core';
import { Router } from '@angular/router';
import { MessageDefines, MessageService } from '../../services/message.service';
import { AuthenticationService } from '../../services/authentication.service';
@@ -21,9 +21,12 @@
styleUrls: ['./logout.component.css']
})
export class LogoutPageComponent implements OnInit {
+
+ @ViewChild('yesBtn') button: ElementRef;
loggedOut = false;
ngOnInit() {
+ this.button.nativeElement.focus();
}
