{
+ return this.selectedRouteTriggered.asObservable();
+ }
+
+ private getRoute(event): string {
+ if (event === undefined) {
+ return this.checkUrl(this.router.url);
+ }
+ return this.checkUrl(event.url)
+ }
+
+ private checkUrl(url: string): string {
+ for (const routeDetail of this.detailRoutes) {
+ if (url.indexOf(routeDetail) !== -1) {
+ return routeDetail;
+ }
+ }
+ return '';
+ }
+}
diff --git a/web/src/app/services/workbasket/workbasketDefinition.service.ts b/web/src/app/services/workbasket-definition/workbasket-definition.service.ts
similarity index 100%
rename from web/src/app/services/workbasket/workbasketDefinition.service.ts
rename to web/src/app/services/workbasket-definition/workbasket-definition.service.ts
diff --git a/web/src/app/shared/classification-types-selector/classification-types-selector.component.html b/web/src/app/shared/classification-types-selector/classification-types-selector.component.html
new file mode 100644
index 000000000..a3b5fcc0f
--- /dev/null
+++ b/web/src/app/shared/classification-types-selector/classification-types-selector.component.html
@@ -0,0 +1,19 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web/src/app/shared/classification-types-selector/classification-types-selector.component.scss b/web/src/app/shared/classification-types-selector/classification-types-selector.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/web/src/app/shared/classification-types-selector/classification-types-selector.component.spec.ts b/web/src/app/shared/classification-types-selector/classification-types-selector.component.spec.ts
new file mode 100644
index 000000000..bbf4df7a3
--- /dev/null
+++ b/web/src/app/shared/classification-types-selector/classification-types-selector.component.spec.ts
@@ -0,0 +1,26 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ClassificationTypesSelectorComponent } from './classification-types-selector.component';
+import { MapValuesPipe } from 'app/pipes/mapValues/map-values.pipe';
+
+describe('ClassificationTypesSelectorComponent', () => {
+ let component: ClassificationTypesSelectorComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ ClassificationTypesSelectorComponent, MapValuesPipe ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(ClassificationTypesSelectorComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/web/src/app/shared/classification-types-selector/classification-types-selector.component.ts b/web/src/app/shared/classification-types-selector/classification-types-selector.component.ts
new file mode 100644
index 000000000..a7cdb1d57
--- /dev/null
+++ b/web/src/app/shared/classification-types-selector/classification-types-selector.component.ts
@@ -0,0 +1,27 @@
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+
+@Component({
+ selector: 'taskana-classification-types-selector',
+ templateUrl: './classification-types-selector.component.html',
+ styleUrls: ['./classification-types-selector.component.scss']
+})
+export class ClassificationTypesSelectorComponent implements OnInit {
+
+ @Input() classificationTypes: Map = new Map();
+ @Input()
+ classificationTypeSelected: string = undefined;
+ @Output()
+ classificationTypeSelectedChange = new EventEmitter();
+ @Output()
+ classificationTypeChanged = new EventEmitter();
+
+ constructor() { }
+
+ ngOnInit() {
+ }
+
+ select(value: string) {
+ this.classificationTypeSelected = value;
+ this.classificationTypeChanged.emit(value);
+ }
+}
diff --git a/web/src/app/shared/import-export/import-export.component.spec.ts b/web/src/app/shared/import-export/import-export.component.spec.ts
index 16f020ee5..9e1c1ec9d 100644
--- a/web/src/app/shared/import-export/import-export.component.spec.ts
+++ b/web/src/app/shared/import-export/import-export.component.spec.ts
@@ -2,8 +2,8 @@ import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import {ImportExportComponent} from './import-export.component';
import {WorkbasketService} from '../../services/workbasket/workbasket.service';
-import {ClassificationService} from '../../services/classification/classification.service';
-import {WorkbasketDefinitionService} from '../../services/workbasket/workbasketDefinition.service';
+import {ClassificationDefinitionService} from '../../services/classification-definition/classification-definition.service';
+import {WorkbasketDefinitionService} from '../../services/workbasket-definition/workbasket-definition.service';
import {AlertService} from '../../services/alert/alert.service';
import {HttpClientModule} from '@angular/common/http';
import {DomainService} from '../../services/domains/domain.service';
@@ -17,7 +17,7 @@ describe('ImportExportComponent', () => {
TestBed.configureTestingModule({
declarations: [ImportExportComponent],
imports: [HttpClientModule],
- providers: [WorkbasketService, ClassificationService, WorkbasketDefinitionService, AlertService, DomainService]
+ providers: [WorkbasketService, ClassificationDefinitionService, WorkbasketDefinitionService, AlertService, DomainService]
})
.compileComponents();
}));
diff --git a/web/src/app/shared/import-export/import-export.component.ts b/web/src/app/shared/import-export/import-export.component.ts
index 71b8c5a0f..033e5514e 100644
--- a/web/src/app/shared/import-export/import-export.component.ts
+++ b/web/src/app/shared/import-export/import-export.component.ts
@@ -1,6 +1,6 @@
import { Component, Input, OnInit } from '@angular/core';
-import { ClassificationService } from 'app/services/classification/classification.service';
-import { WorkbasketDefinitionService } from 'app/services/workbasket/workbasketDefinition.service';
+import { ClassificationDefinitionService } from 'app/services/classification-definition/classification-definition.service';
+import { WorkbasketDefinitionService } from 'app/services/workbasket-definition/workbasket-definition.service';
import { DomainService } from 'app/services/domains/domain.service';
import { ImportType } from 'app/models/import-type';
@@ -15,7 +15,7 @@ export class ImportExportComponent implements OnInit {
domains: string[] = [];
constructor(private domainService: DomainService, private workbasketDefinitionService: WorkbasketDefinitionService,
- private classificationService: ClassificationService) {
+ private classificationDefinitionService: ClassificationDefinitionService) {
}
ngOnInit() {
@@ -33,7 +33,7 @@ export class ImportExportComponent implements OnInit {
if (this.currentSelection === ImportType.WORKBASKETS) {
reader.onload = (e) => this.workbasketDefinitionService.importWorkbasketDefinitions(e.target.result);
} else {
- reader.onload = (e) => this.classificationService.importClassifications(e.target.result);
+ reader.onload = (e) => this.classificationDefinitionService.importClassifications(e.target.result);
}
reader.readAsText(file);
}
@@ -42,7 +42,7 @@ export class ImportExportComponent implements OnInit {
if (this.currentSelection === ImportType.WORKBASKETS) {
this.workbasketDefinitionService.exportWorkbaskets(domain);
} else {
- this.classificationService.exportClassifications(domain);
+ this.classificationDefinitionService.exportClassifications(domain);
}
}
}
diff --git a/web/src/app/shared/masterAndDetail/master-and-detail.component.html b/web/src/app/shared/master-and-detail/master-and-detail.component.html
similarity index 100%
rename from web/src/app/shared/masterAndDetail/master-and-detail.component.html
rename to web/src/app/shared/master-and-detail/master-and-detail.component.html
diff --git a/web/src/app/shared/masterAndDetail/master-and-detail.component.scss b/web/src/app/shared/master-and-detail/master-and-detail.component.scss
similarity index 100%
rename from web/src/app/shared/masterAndDetail/master-and-detail.component.scss
rename to web/src/app/shared/master-and-detail/master-and-detail.component.scss
diff --git a/web/src/app/shared/masterAndDetail/master-and-detail.component.spec.ts b/web/src/app/shared/master-and-detail/master-and-detail.component.spec.ts
similarity index 100%
rename from web/src/app/shared/masterAndDetail/master-and-detail.component.spec.ts
rename to web/src/app/shared/master-and-detail/master-and-detail.component.spec.ts
diff --git a/web/src/app/shared/masterAndDetail/master-and-detail.component.ts b/web/src/app/shared/master-and-detail/master-and-detail.component.ts
similarity index 98%
rename from web/src/app/shared/masterAndDetail/master-and-detail.component.ts
rename to web/src/app/shared/master-and-detail/master-and-detail.component.ts
index 53df25b91..943dcc643 100644
--- a/web/src/app/shared/masterAndDetail/master-and-detail.component.ts
+++ b/web/src/app/shared/master-and-detail/master-and-detail.component.ts
@@ -9,7 +9,7 @@ import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-
})
export class MasterAndDetailComponent implements OnInit {
- private detailRoutes: Array = ['/workbaskets/(detail', 'classifications'];
+ private detailRoutes: Array = ['/workbaskets/(detail', 'classifications/(detail'];
private sub: any;
showDetail: Boolean = false;
diff --git a/web/src/app/shared/tree/tree.component.html b/web/src/app/shared/tree/tree.component.html
new file mode 100644
index 000000000..3f23576cb
--- /dev/null
+++ b/web/src/app/shared/tree/tree.component.html
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+ {{ node.data.key }}
+
+ - {{ node.data.name }}
+
+
\ No newline at end of file
diff --git a/web/src/app/shared/tree/tree.component.scss b/web/src/app/shared/tree/tree.component.scss
new file mode 100644
index 000000000..313401d26
--- /dev/null
+++ b/web/src/app/shared/tree/tree.component.scss
@@ -0,0 +1,3 @@
+.text-top{
+ vertical-align: text-top;
+}
diff --git a/web/src/app/shared/tree/tree.component.spec.ts b/web/src/app/shared/tree/tree.component.spec.ts
new file mode 100644
index 000000000..bc813e8a4
--- /dev/null
+++ b/web/src/app/shared/tree/tree.component.spec.ts
@@ -0,0 +1,43 @@
+import { Input, Component } from '@angular/core';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TreeComponent } from './tree.component';
+
+import { AngularSvgIconModule } from 'angular-svg-icon';
+import { HttpClientModule } from '@angular/common/http';
+import { HttpModule } from '@angular/http';
+
+// tslint:disable:component-selector
+@Component({
+ selector: 'tree-root',
+ template: ''
+})
+class TreeVendorComponent {
+ @Input() options;
+ @Input() state;
+ @Input() nodes;
+}
+
+// tslint:enable:component-selector
+fdescribe('TreeComponent', () => {
+ let component: TreeComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ imports: [AngularSvgIconModule, HttpClientModule, HttpModule],
+ declarations: [TreeComponent, TreeVendorComponent]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(TreeComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/web/src/app/shared/tree/tree.component.ts b/web/src/app/shared/tree/tree.component.ts
new file mode 100644
index 000000000..a104f7500
--- /dev/null
+++ b/web/src/app/shared/tree/tree.component.ts
@@ -0,0 +1,42 @@
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { TreeNode } from 'app/models/tree-node';
+import { TREE_ACTIONS, KEYS, IActionMapping, ITreeOptions, ITreeState } from 'angular-tree-component';
+
+@Component({
+ selector: 'taskana-tree',
+ templateUrl: './tree.component.html',
+ styleUrls: ['./tree.component.scss']
+})
+export class TreeComponent implements OnInit {
+
+ @Input() treeNodes: TreeNode;
+ @Output() treeNodesChange = new EventEmitter>();
+
+ options: ITreeOptions = {
+ displayField: 'name',
+ idField: 'id',
+ actionMapping: {
+ keys: {
+ [KEYS.ENTER]: (tree, node, $event) => {
+ node.toggleExpanded();
+ }
+ }
+ },
+ animateExpand: true,
+ animateSpeed: 20,
+ levelPadding: 20
+ }
+
+ state: ITreeState = {
+ activeNodeIds: { ['']: true },
+ }
+
+ constructor() { }
+
+ ngOnInit() {
+
+ }
+
+}
+
+
diff --git a/web/src/assets/_colors.scss b/web/src/assets/_colors.scss
new file mode 100644
index 000000000..0a5666f87
--- /dev/null
+++ b/web/src/assets/_colors.scss
@@ -0,0 +1,6 @@
+$blue-green: #479ea9;
+$blue: #337ab7;
+$green: green;
+$grey: grey;
+$brown: #f0ad4e;
+$invalid: #a94442;
\ No newline at end of file
diff --git a/web/src/assets/_forms.scss b/web/src/assets/_forms.scss
index 856ce8a0f..c42dd0edf 100644
--- a/web/src/assets/_forms.scss
+++ b/web/src/assets/_forms.scss
@@ -1,11 +1,11 @@
.ng-invalid:not(form) {
- border-color: #a94442;
+ border-color: $invalid;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.required-text {
padding-left: 15px;
- color: #a94442;
+ color: $invalid;
}
\ No newline at end of file
diff --git a/web/src/assets/_site.scss b/web/src/assets/_site.scss
index 7ba283931..555cf8240 100644
--- a/web/src/assets/_site.scss
+++ b/web/src/assets/_site.scss
@@ -1,4 +1,3 @@
-
.placeholder {
margin-bottom: 20px;
}
@@ -70,38 +69,58 @@
}
.blue{
- color: #337ab7;
+ color: $blue;
& svg {
- fill: #337ab7;
+ fill: $blue;
}
}
.green {
- color: green;
+ color: $green;
& svg {
- fill: green;
+ fill: $green;
}
}
.grey {
- color:grey;
+ color:$grey;
& svg {
- fill: grey;
+ fill: $grey;
}
}
.brown {
- color: #f0ad4e;
+ color: $brown;
& svg {
- fill: #f0ad4e;
+ fill: $brown;
}
}
-
-.panel-default > .panel-heading .badge.warning {
- background-color: #f0ad4e;
+.red {
+ color: crimson;
+ & svg {
+ fill: crimson;
+ }
}
+.green-blue {
+ color: $blue-green;
+ & svg {
+ fill: $blue-green;
+ }
+}
+
+svg-icon.fa-fw > svg {
+ text-align: center;
+ width: 1.25em;
+}
+
+.panel-default > .panel-heading .badge.warning {
+ background-color: $brown;
+}
+.badge.priority {
+ background-color: #e1e1e1;
+}
/*
@@ -247,3 +266,8 @@ taskana-workbasket-information, taskana-workbasket-access-items, taskana-workbas
}
}
}
+
+tree-viewport {
+ border-top: 1px solid #ddd;
+ height: calc(100vh - 110px);
+}
diff --git a/web/src/assets/_styles.scss b/web/src/assets/_styles.scss
new file mode 100644
index 000000000..f5675116f
--- /dev/null
+++ b/web/src/assets/_styles.scss
@@ -0,0 +1,6 @@
+@import 'variables';
+@import '../../node_modules/bootstrap-sass/assets/stylesheets/_bootstrap';
+@import '../../node_modules/angular-tree-component/dist/angular-tree-component.css';
+@import 'site';
+@import 'forms';
+@import 'tree';
\ No newline at end of file
diff --git a/web/src/assets/_tree.scss b/web/src/assets/_tree.scss
new file mode 100644
index 000000000..bb7aa0ece
--- /dev/null
+++ b/web/src/assets/_tree.scss
@@ -0,0 +1,97 @@
+
+tree-node-expander {
+
+ & .toggle-children {
+ top: 2px;
+ @extend .glyphicon;
+ @extend .glyphicon-plus;
+ @extend .blue;
+ background: white;
+ background-image: none;
+ color: $blue-green;
+ padding-left:3px;
+ }
+}
+.toggle-children-wrapper {
+ padding: 0px;
+ font-size: 16px;
+}
+
+tree-node-expander .toggle-children-wrapper-expanded {
+ & .toggle-children {
+ @extend .glyphicon-minus ;
+ transform: none;
+ }
+}
+tree-node-collection > div > tree-node > .tree-node {
+ padding-left: 10px;
+}
+
+.node-content-wrapper {
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-size: 16px;
+ margin: 0px 10px;
+}
+
+.node-wrapper {
+ padding: 4px 0px;
+}
+
+.node-drop-slot {
+ height: 0px;
+}
+
+.node-content-wrapper, .tree-children {
+ position: relative;
+ }
+
+.node-content-wrapper::before, .tree-children::after {
+ content: "";
+ position: absolute;
+}
+
+.node-content-wrapper-active, .node-content-wrapper.node-content-wrapper-active:hover, .node-content-wrapper-active.node-content-wrapper-focused {
+ background-color: $blue;
+ & >tree-node-content{
+ color:white;
+ & >span >svg-icon{
+ @extend .white;
+ }
+ }
+}
+
+
+/* START Children branch lines*/
+ .node-content-wrapper::before {
+ border-bottom: 1px dotted $blue-green;
+ border-left: 1px dotted $blue-green;
+ height: 28px;
+ top: -17px;
+ width: 20px;
+ left: -28px;
+ }
+
+ .tree-node-level-1 > tree-node-wrapper > .node-wrapper > .node-content-wrapper::before {
+ display: none;
+ }
+
+ .tree-node-leaf > .node-wrapper > .node-content-wrapper::before {
+ width: 25px;
+ }
+
+ .tree-children::after {
+ border-left: 1px dotted $blue-green;
+
+ height: 100%;
+ top: -15px;
+ left: -15px;
+ }
+
+ tree-node:last-child > .tree-node > .tree-children::after {
+ border-left: none;
+ }
+
+ .toggle-children {
+ z-index: 1;
+ }
+/* END children branch lines */
diff --git a/web/src/assets/_variables.scss b/web/src/assets/_variables.scss
new file mode 100644
index 000000000..b9d79002c
--- /dev/null
+++ b/web/src/assets/_variables.scss
@@ -0,0 +1,2 @@
+@import '_colors';
+$icon-font-path: '../../node_modules/bootstrap-sass/assets/fonts/bootstrap/';
diff --git a/web/src/assets/icons/automatic.svg b/web/src/assets/icons/automatic.svg
new file mode 100644
index 000000000..8aa998082
--- /dev/null
+++ b/web/src/assets/icons/automatic.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/web/src/assets/icons/closed.svg b/web/src/assets/icons/closed.svg
new file mode 100644
index 000000000..e12791604
--- /dev/null
+++ b/web/src/assets/icons/closed.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/web/src/assets/icons/external.svg b/web/src/assets/icons/external.svg
new file mode 100644
index 000000000..50924c96f
--- /dev/null
+++ b/web/src/assets/icons/external.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/web/src/assets/icons/manual.svg b/web/src/assets/icons/manual.svg
new file mode 100644
index 000000000..b1312d608
--- /dev/null
+++ b/web/src/assets/icons/manual.svg
@@ -0,0 +1 @@
+
\ No newline at end of file