Merge branch 'DEVELOP_FE' of ssh://172.18.22.160:29418/oK/PlannedGridMeasures/Frontend into DEVELOP_FE
# Conflicts:
# src/app/common-components/main-navigation/main-navigation.component.html
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 c0d28ae..301bac5 100644
--- a/src/app/common-components/main-navigation/main-navigation.component.html
+++ b/src/app/common-components/main-navigation/main-navigation.component.html
@@ -37,13 +37,12 @@
<div class="btn btn-link navbar-btn">
<a href="/userDocumentation.html" title="Hilfe" target="_blank">
- <span class="glyphicon glyphicon-question-sign"></span>
+ <img src="./../assets/img/question mark_openK_color_is_infoColor_RegularSvg.svg" alt="question mark" height="16px">
</a>
</div>
<div class="dropdown-open nav-user nav-overview-user" style="padding-top: 10px">
- <a class="btn btn-logout dropdown-toggle" style="min-width: 160px;" type="button" data-toggle="dropdown" href="#"
- aria-expanded="true">
+ <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>
diff --git a/src/app/common/globals.ts b/src/app/common/globals.ts
index 9852efa..e369b66 100644
--- a/src/app/common/globals.ts
+++ b/src/app/common/globals.ts
@@ -51,7 +51,7 @@
static NO_FORCE_UNLOCK = 'NO_FORCE';
static APPOINTMENT_NUMBER_OF_MAX_VALUE = 999;
static MAX_NUMBER_OF_TABS = 10;
-
+ static GRID_ROW_HEIGHT = 32;
static AUTH_AND_AUTH_SERVICE_NAME = 'authNauth.openK';
static OAUTH2CONF_SUPERUSER_ROLE = 'planned-policies-superuser';
diff --git a/src/app/lists/common-components/abstract-list/abstract-list.component.ts b/src/app/lists/common-components/abstract-list/abstract-list.component.ts
index 0270d7f..b2c7e54 100644
--- a/src/app/lists/common-components/abstract-list/abstract-list.component.ts
+++ b/src/app/lists/common-components/abstract-list/abstract-list.component.ts
@@ -69,16 +69,17 @@
roleAccessDefinition: RoleAccess;
gridApi: any;
gridColumnApi: any;
+ calculatedPaginationPageSize: number;
protected globalGridOptions: any = <GridOptions>{
context: {
componentParent: this
},
pagination: true,
- paginationPageSize: 15,
+ // paginationPageSize: this.calculatePaginationPageSize(),
enableSorting: true,
enableColResize: true,
floatingFilter: true,
- rowHeight: 32,
+ rowHeight: Globals.GRID_ROW_HEIGHT,
localeText: {
equals: 'ist gleich',
contains: 'enthält',
@@ -254,7 +255,8 @@
}
-
+ protected calculatePaginationPageSize(gridMeasure: number) {
+ }
protected onRowDragEnd(e) {
console.log('onRowDragEnd', e);
diff --git a/src/app/lists/grid-measures/grid-measures.component.ts b/src/app/lists/grid-measures/grid-measures.component.ts
index 7f40afa..051c497 100644
--- a/src/app/lists/grid-measures/grid-measures.component.ts
+++ b/src/app/lists/grid-measures/grid-measures.component.ts
@@ -87,10 +87,21 @@
calcGridHeight(): number {
const gridOffset = document.getElementsByTagName('ag-grid-angular')[0].getBoundingClientRect().top;
- const appOffset = 130;
-
- return this.windowHeight - appOffset - gridOffset;
+ const appOffset = 80;
+ const gridHeight = this.windowHeight - appOffset - gridOffset;
+ this.calculatePaginationPageSize(gridHeight);
+ return gridHeight;
}
+
+ calculatePaginationPageSize(gridHeight: number) {
+ const headerAndBottomRows = 4;
+ this.calculatedPaginationPageSize = Math.round(gridHeight / Globals.GRID_ROW_HEIGHT - headerAndBottomRows);
+ const localGridOptions = <GridOptions>{
+ paginationPageSize: this.calculatedPaginationPageSize
+ };
+ this.gridOptions = Object.assign(this.globalGridOptions, localGridOptions);
+ }
+
changeAllSelection(): void {
if (this.selectAll) {
for (const info of this.gridmeasures) {
diff --git a/src/assets/css/custom.css b/src/assets/css/custom.css
index 09b65cb..ce4e296 100644
--- a/src/assets/css/custom.css
+++ b/src/assets/css/custom.css
@@ -23,7 +23,7 @@
body {
padding-top: 20px;
/* Margin bottom by footer height*/
- margin-bottom: 80px;
+ margin-bottom: 30px;
}
.voffset {
diff --git a/src/assets/img/question mark_openK_color_is_infoColor_RegularSvg.svg b/src/assets/img/question mark_openK_color_is_infoColor_RegularSvg.svg
new file mode 100644
index 0000000..f35b489
--- /dev/null
+++ b/src/assets/img/question mark_openK_color_is_infoColor_RegularSvg.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ id="svg8"
+ version="1.1"
+ viewBox="0 0 10 10"
+ height="10mm"
+ width="10mm">
+ <defs
+ id="defs2" />
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ transform="translate(0,-287)"
+ id="layer1">
+ <g
+ transform="translate(-19.82831,259.35891)"
+ id="g4533">
+ <g
+ id="g4527">
+ <circle
+ r="5"
+ style="fill:#0080c0;fill-opacity:1;stroke-width:0.26458332"
+ cy="32.641087"
+ cx="24.82831"
+ id="path3713" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="22.631325"
+ y="35.5704"
+ id="text4522"><tspan
+ id="tspan4520"
+ x="22.631325"
+ y="35.5704"
+ style="font-size:8.46666622px;fill:#ffffff;fill-opacity:1;stroke-width:0.26458332">?</tspan></text>
+ </g>
+ </g>
+</svg>
