diff --git a/web/.angular-cli.json b/web/.angular-cli.json index debf28c4c..9f7eb5184 100644 --- a/web/.angular-cli.json +++ b/web/.angular-cli.json @@ -9,7 +9,6 @@ "outDir": "dist", "assets": [ "assets", - "taskana.ico", "environments/data-sources" ], "index": "index.html", diff --git a/web/src/app/administration/workbasket/master/list/pagination/pagination.component.html b/web/src/app/administration/workbasket/master/list/pagination/pagination.component.html index e16c64db5..68e07e1b4 100644 --- a/web/src/app/administration/workbasket/master/list/pagination/pagination.component.html +++ b/web/src/app/administration/workbasket/master/list/pagination/pagination.component.html @@ -6,11 +6,14 @@
  • {{pageNumber + 1}} -
  • Last
    • - \ No newline at end of file + + + + \ No newline at end of file diff --git a/web/src/app/administration/workbasket/master/list/pagination/pagination.component.scss b/web/src/app/administration/workbasket/master/list/pagination/pagination.component.scss index ba1e09f2e..8ac57a738 100644 --- a/web/src/app/administration/workbasket/master/list/pagination/pagination.component.scss +++ b/web/src/app/administration/workbasket/master/list/pagination/pagination.component.scss @@ -1,3 +1,7 @@ +$blue: #66afe9; +.pagination{ + margin: 15px 0 0 0; +} a.pagination{ width: 35px; height: 35px; @@ -13,7 +17,7 @@ a.pagination{ border: none; outline: none; &:focus{ - border-color: #66afe9; + border-color: $blue; outline: 0; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); @@ -25,3 +29,8 @@ ul.pagination{ cursor: pointer; overflow: hidden; } + +.footer{ + margin: 5px 5px 0 0; + color: $blue; +} \ No newline at end of file diff --git a/web/src/app/administration/workbasket/master/list/pagination/pagination.component.spec.ts b/web/src/app/administration/workbasket/master/list/pagination/pagination.component.spec.ts index 2d7bc5756..5eddc4912 100644 --- a/web/src/app/administration/workbasket/master/list/pagination/pagination.component.spec.ts +++ b/web/src/app/administration/workbasket/master/list/pagination/pagination.component.spec.ts @@ -94,4 +94,19 @@ describe('PaginationComponent', () => { }); + it('should getPagesTextToShow return 7 of 13 with size < totalElements', () => { + component.workbasketsResource = new WorkbasketSummaryResource(undefined, undefined, new Page(7, 13, 3, 2)); + expect(component.getPagesTextToShow()).toBe('7 of 13 workbaskets'); + }); + + it('should getPagesTextToShow return 6 of 6 with size > totalElements', () => { + component.workbasketsResource = new WorkbasketSummaryResource(undefined, undefined, new Page(7, 6, 3, 2)); + expect(component.getPagesTextToShow()).toBe('6 of 6 workbaskets'); + }); + + it('should getPagesTextToShow return of with totalElements = 0', () => { + component.workbasketsResource = new WorkbasketSummaryResource(undefined, undefined, new Page(7, 0, 0, 0)); + expect(component.getPagesTextToShow()).toBe('0 of 0 workbaskets'); + }); + }); diff --git a/web/src/app/administration/workbasket/master/list/pagination/pagination.component.ts b/web/src/app/administration/workbasket/master/list/pagination/pagination.component.ts index 3be5ff89d..7caa76bba 100644 --- a/web/src/app/administration/workbasket/master/list/pagination/pagination.component.ts +++ b/web/src/app/administration/workbasket/master/list/pagination/pagination.component.ts @@ -37,4 +37,16 @@ export class PaginationComponent implements OnInit, OnChanges { this.previousPageSelected = page; } } + + getPagesTextToShow(): string { + if (!this.workbasketsResource) { + return ''; + } + let text = this.workbasketsResource.page.totalElements + ''; + if (this.workbasketsResource.page && this.workbasketsResource.page.totalElements && + this.workbasketsResource.page.totalElements >= this.workbasketsResource.page.size) { + text = this.workbasketsResource.page.size + ''; + } + return `${text} of ${this.workbasketsResource.page.totalElements} workbaskets`; + } } diff --git a/web/src/app/components/nav-bar/nav-bar.component.html b/web/src/app/components/nav-bar/nav-bar.component.html index f7f042255..dbbf20056 100644 --- a/web/src/app/components/nav-bar/nav-bar.component.html +++ b/web/src/app/components/nav-bar/nav-bar.component.html @@ -36,7 +36,7 @@