diff --git a/web/src/app/workplace/components/task-status-details/task-status-details.component.html b/web/src/app/workplace/components/task-status-details/task-status-details.component.html new file mode 100644 index 000000000..531cefa68 --- /dev/null +++ b/web/src/app/workplace/components/task-status-details/task-status-details.component.html @@ -0,0 +1,76 @@ +
+ + +
+ + + + Modification Date + + + + + + + + Completion Date + + + + + + + State + + + + + + + Task read + + + + +
+ + +
+ + + + Claim Date + + + + + + + Planned Date + + + + + + + Creation Date + + + + + + + Transferred + + + + +
+
diff --git a/web/src/app/workplace/components/task-status-details/task-status-details.component.scss b/web/src/app/workplace/components/task-status-details/task-status-details.component.scss new file mode 100644 index 000000000..c5326e566 --- /dev/null +++ b/web/src/app/workplace/components/task-status-details/task-status-details.component.scss @@ -0,0 +1,26 @@ +.task-status-details { + display: flex; + flex-direction: row; + + &__column--left { + display: flex; + flex-direction: column; + width: 50%; + margin-right: 16px; + } + + &__column--right { + display: flex; + flex-direction: column; + width: 50%; + } +} + + +.mat-input-element:disabled { + color: gray; +} + +::ng-deep .mat-form-field-outline { + color: lightgray !important; +} diff --git a/web/src/app/workplace/components/task-status-details/task-status-details.component.spec.ts b/web/src/app/workplace/components/task-status-details/task-status-details.component.spec.ts new file mode 100644 index 000000000..5b88fc13b --- /dev/null +++ b/web/src/app/workplace/components/task-status-details/task-status-details.component.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TaskStatusDetailsComponent } from './task-status-details.component'; + +xdescribe('TaskStatusDetailsComponent', () => { + let component: TaskStatusDetailsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [TaskStatusDetailsComponent] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(TaskStatusDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create component', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/web/src/app/workplace/components/taskdetails-general-fields-extension/general-fields-extension.component.ts b/web/src/app/workplace/components/task-status-details/task-status-details.component.ts similarity index 51% rename from web/src/app/workplace/components/taskdetails-general-fields-extension/general-fields-extension.component.ts rename to web/src/app/workplace/components/task-status-details/task-status-details.component.ts index e651f6d7e..2133660d4 100644 --- a/web/src/app/workplace/components/taskdetails-general-fields-extension/general-fields-extension.component.ts +++ b/web/src/app/workplace/components/task-status-details/task-status-details.component.ts @@ -2,11 +2,11 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { Task } from 'app/workplace/models/task'; @Component({ - selector: 'taskana-task-details-general-fields-extension', - templateUrl: './general-fields-extension.component.html', - styleUrls: ['./general-fields-extension.component.scss'] + selector: 'taskana-task-status-details', + templateUrl: './task-status-details.component.html', + styleUrls: ['./task-status-details.component.scss'] }) -export class GeneralFieldsExtensionComponent implements OnInit { +export class TaskStatusDetailsComponent implements OnInit { @Input() task: Task; @Output() taskChange: EventEmitter = new EventEmitter(); diff --git a/web/src/app/workplace/components/taskdetails-general-fields-extension/general-fields-extension.component.html b/web/src/app/workplace/components/taskdetails-general-fields-extension/general-fields-extension.component.html deleted file mode 100644 index d1d64c047..000000000 --- a/web/src/app/workplace/components/taskdetails-general-fields-extension/general-fields-extension.component.html +++ /dev/null @@ -1,45 +0,0 @@ - -
-
- - -
-
- - -
-
- - -
-
- - -
-
-
-
- - -
-
- - -
-
- - -
-
- - -
-
-
diff --git a/web/src/app/workplace/components/taskdetails-general-fields-extension/general-fields-extension.component.scss b/web/src/app/workplace/components/taskdetails-general-fields-extension/general-fields-extension.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/src/app/workplace/components/taskdetails-general-fields-extension/general-fields-extension.component.spec.ts b/web/src/app/workplace/components/taskdetails-general-fields-extension/general-fields-extension.component.spec.ts deleted file mode 100644 index 7e1ff3f2f..000000000 --- a/web/src/app/workplace/components/taskdetails-general-fields-extension/general-fields-extension.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { GeneralFieldsExtensionComponent } from './general-fields-extension.component'; - -xdescribe('GeneralFieldsExtensionComponent', () => { - let component: GeneralFieldsExtensionComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [GeneralFieldsExtensionComponent] - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(GeneralFieldsExtensionComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/web/src/app/workplace/components/taskdetails/taskdetails.component.html b/web/src/app/workplace/components/taskdetails/taskdetails.component.html index dff1b1835..e0e88c110 100644 --- a/web/src/app/workplace/components/taskdetails/taskdetails.component.html +++ b/web/src/app/workplace/components/taskdetails/taskdetails.component.html @@ -48,7 +48,7 @@ {{accordion2State ? 'expand_more' : 'expand_less'}} - + diff --git a/web/src/app/workplace/workplace.module.ts b/web/src/app/workplace/workplace.module.ts index 9cb051255..a0ff59e2a 100644 --- a/web/src/app/workplace/workplace.module.ts +++ b/web/src/app/workplace/workplace.module.ts @@ -17,7 +17,7 @@ import { TaskdetailsGeneralFieldsComponent } from './components/taskdetails-gene import { TaskdetailsCustomFieldsComponent } from './components/taskdetails-custom-fields/custom-fields.component'; import { TaskdetailsAttributeComponent } from './components/taskdetails-attribute/attribute.component'; import { TaskComponent } from './components/task/task.component'; -import { GeneralFieldsExtensionComponent } from './components/taskdetails-general-fields-extension/general-fields-extension.component'; +import { TaskStatusDetailsComponent } from './components/task-status-details/task-status-details.component'; import { TaskListComponent } from './components/task-list/task-list.component'; import { TaskService } from './services/task.service'; @@ -58,7 +58,7 @@ const DECLARATIONS = [ TaskdetailsCustomFieldsComponent, TaskdetailsAttributeComponent, TaskComponent, - GeneralFieldsExtensionComponent, + TaskStatusDetailsComponent, TaskListComponent ];