TSK-489 Fix application general bugs.

web/.angular-cli.json

@@ -9,7 +9,6 @@
 			"outDir": "dist",
 			"assets": [
 				"assets",
-				"taskana.ico",
 				"environments/data-sources"
 			],
 			"index": "index.html",

web/src/app/administration/workbasket/master/list/pagination/pagination.component.html

@@ -6,11 +6,14 @@
 	<li *ngFor="let pageNumber of workbasketsResource?.page?.totalPages |
 				spreadNumber:  workbasketsResource?.page?.number: maxPagesAvailable:  workbasketsResource?.page?.totalPages">
 		<a *ngIf="pageNumber + 1 !== workbasketsResource?.page?.number" (click)="changeToPage(pageNumber+1)">{{pageNumber + 1}}</a>
-		<a *ngIf="pageNumber + 1 === workbasketsResource?.page?.number"  class="pagination">
+		<a *ngIf="pageNumber + 1 === workbasketsResource?.page?.number" class="pagination">
 			<input [(ngModel)]="pageSelected" (keyup.enter)="changeToPage(pageSelected)" type="text" (blur)="changeToPage(pageSelected)">
 		</a>
 	</li>
 	<li>
 		<a (click)="changeToPage(workbasketsResource?.page.totalPages)" aria-label="Last">Last</a>
 	</li>
-</ul>
+</ul>
+<span class="footer pull-right">
+	<i [innerHTML]="getPagesTextToShow()"></i>
+</span>

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;
+}

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');
+	});
+
 });

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`;
+	}
 }

web/src/app/components/nav-bar/nav-bar.component.html

@@ -36,7 +36,7 @@
       <ul class="nav">
         <svg-icon class="logo white visible-xs" src="./assets/icons/logo.svg"></svg-icon>
         <h2 class="navbar-brand no-margin logo visible-xs"> {{title}}</h2>
-        <button type="button" class="btn btn-default logout navbar-toggle show pull-right" data-toggle="tooltip" title="logout" (click)="logout()" aria-expanded="true"
+        <button type="button" class="btn btn-default logout navbar-toggle logout show pull-right" data-toggle="tooltip" title="logout" (click)="logout()" aria-expanded="true"
           aria-controls="logout">
           <span class="glyphicon glyphicon-share white"></span>
         </button>

web/src/app/components/nav-bar/nav-bar.component.scss

@@ -9,7 +9,12 @@ $selected-border-color: #22a39f;
 }
 
 .navbar-toggle{
-    margin-right: 0px;
+    margin: 5px 0px;
+    font-size: 20px;
+    &.logout{
+        font-size: 20px;
+        padding: 12px 12px 0 0;
+    }
     
 }
 button.navbar-toggle:hover > span{
@@ -68,7 +73,6 @@ h2.navbar-brand{
     }
 }
 
-
 .nav-content{
     margin-top: 5px;
 }

web/src/app/components/nav-bar/nav-bar.component.spec.ts

@@ -72,7 +72,8 @@ describe('NavBarComponent', () => {
     expect(component).toBeTruthy();
   });
 
-  it(`should have as title 'Administration'`, (() => {
+  it(`should have as title ''`, (() => {
-    expect(navBar.title).toEqual('Administration');
+    expect(navBar.title).toEqual('');
   }));
+
 });

web/src/app/components/nav-bar/nav-bar.component.ts

@@ -28,10 +28,13 @@ export class NavBarComponent implements OnInit, OnDestroy {
 
   selectedRoute = '';
   route: string;
+  title = '';
+
   titleAdministration = 'Administration';
+  titleWorkbaskets = 'Workbaskets';
+  titleClassifications = 'Classifications';
   titleMonitor = 'Monitor';
   titleWorkplace = 'Workplace';
-  title = 'Administration';
   showNavbar = false;
   domains: Array<string> = [];
   selectedDomain: string;
@@ -87,8 +90,10 @@ export class NavBarComponent implements OnInit, OnDestroy {
   }
 
   private setTitle(value: string = 'workbaskets') {
-    if (value.indexOf('workbaskets') === 0 || value.indexOf('classifications') === 0) {
+    if (value.indexOf('workbaskets') === 0) {
-      this.title = this.titleAdministration;
+      this.title = this.titleWorkbaskets;
+    } else if (value.indexOf('classifications') === 0) {
+      this.title = this.titleClassifications;
     } else if (value.indexOf('monitor') === 0) {
       this.title = this.titleMonitor;
     } else if (value.indexOf('workplace') === 0) {

web/src/index.html

@@ -3,10 +3,10 @@
 
 <head>
   <meta charset="utf-8">
-  <title>Administration</title>
+  <title>Taskana</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="./logo.ico">
+  <link rel="icon" type="image/x-icon" href="assets/icons/taskana.png">
 </head>
 <body>
   <taskana-root></taskana-root>