nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

task/808 fix services dependencies in angular modules

This commit is contained in:
Martin Rojas Miguel Angel 2019-04-02 15:33:20 +02:00 committed by holgerhagen
parent a8baa2fc28
commit 6bc4b6d3b4
32 changed files with 64 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/src/app/administration/administration.module.ts
View File

@ -21,17 +21,14 @@ import {ClassificationListComponent} from './classification/master/list/classifi
import {ClassificationDetailsComponent} from './classification/details/classification-details.component'; import {ClassificationDetailsComponent} from './classification/details/classification-details.component';
import {ImportExportComponent} from './components/import-export/import-export.component'; import {ImportExportComponent} from './components/import-export/import-export.component';
import {ClassificationTypesSelectorComponent} from 'app/shared/classification-types-selector/classification-types-selector.component'; import {ClassificationTypesSelectorComponent} from 'app/shared/classification-types-selector/classification-types-selector.component';
/** /**
* Services * Services
*/ */
import {WorkbasketService} from 'app/services/workbasket/workbasket.service';
import {SavingWorkbasketService} from './services/saving-workbaskets/saving-workbaskets.service'; import {SavingWorkbasketService} from './services/saving-workbaskets/saving-workbaskets.service';
import {ClassificationDefinitionService} from './services/classification-definition/classification-definition.service'; import {ClassificationDefinitionService} from './services/classification-definition/classification-definition.service';
import {WorkbasketDefinitionService} from './services/workbasket-definition/workbasket-definition.service'; import {WorkbasketDefinitionService} from './services/workbasket-definition/workbasket-definition.service';
import {ClassificationsService} from '../services/classifications/classifications.service'; import {ClassificationCategoriesService} from 'app/shared/services/classifications/classification-categories.service';
import {ClassificationCategoriesService} from 'app/services/classifications/classification-categories.service'; import {ImportExportService} from './services/import-export/import-export.service';
import { ImportExportService } from './services/import-export/import-export.service';
import {AccessItemsManagementComponent} from 'app/administration/access-items-management/access-items-management.component'; import {AccessItemsManagementComponent} from 'app/administration/access-items-management/access-items-management.component';
const MODULES = [ const MODULES = [
@ -65,11 +62,9 @@ const DECLARATIONS = [
declarations: DECLARATIONS, declarations: DECLARATIONS,
imports: MODULES, imports: MODULES,
providers: [ providers: [
WorkbasketService,
ClassificationDefinitionService, ClassificationDefinitionService,
WorkbasketDefinitionService, WorkbasketDefinitionService,
SavingWorkbasketService, SavingWorkbasketService,
ClassificationsService,
ClassificationCategoriesService, ClassificationCategoriesService,
ImportExportService, ImportExportService,
] ]

4
web/src/app/administration/classification/details/classification-details.component.spec.ts
View File

@ -15,11 +15,11 @@ import { LinksClassification } from 'app/models/links-classfication';
import { Pair } from 'app/models/pair'; import { Pair } from 'app/models/pair';
// tslint:disable:max-line-length // tslint:disable:max-line-length
import { ClassificationCategoriesService } from 'app/services/classifications/classification-categories.service'; import { ClassificationCategoriesService } from 'app/shared/services/classifications/classification-categories.service';
// tslint:enable:max-line-length // tslint:enable:max-line-length
import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service'; import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service';
import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
import { ClassificationsService } from 'app/services/classifications/classifications.service'; import { ClassificationsService } from 'app/shared/services/classifications/classifications.service';
import { TreeNodeModel } from 'app/models/tree-node'; import { TreeNodeModel } from 'app/models/tree-node';
import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; import { GeneralModalService } from 'app/services/general-modal/general-modal.service';
import { AlertService } from 'app/services/alert/alert.service'; import { AlertService } from 'app/services/alert/alert.service';

4
web/src/app/administration/classification/details/classification-details.component.ts
View File

@ -10,7 +10,7 @@ import { AlertModel, AlertType } from 'app/models/alert';
import { highlight } from 'app/shared/animations/validation.animation'; import { highlight } from 'app/shared/animations/validation.animation';
import { TaskanaDate } from 'app/shared/util/taskana.date'; import { TaskanaDate } from 'app/shared/util/taskana.date';
import { ClassificationsService } from 'app/services/classifications/classifications.service'; import { ClassificationsService } from 'app/shared/services/classifications/classifications.service';
import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service'; import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service';
import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; import { GeneralModalService } from 'app/services/general-modal/general-modal.service';
import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
@ -19,7 +19,7 @@ import { TreeService } from 'app/services/tree/tree.service';
import { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service'; import { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service';
// tslint:disable:max-line-length // tslint:disable:max-line-length
import { ClassificationCategoriesService } from 'app/services/classifications/classification-categories.service'; import { ClassificationCategoriesService } from 'app/shared/services/classifications/classification-categories.service';
// tslint:enable:max-line-length // tslint:enable:max-line-length
import { DomainService } from 'app/services/domain/domain.service'; import { DomainService } from 'app/services/domain/domain.service';
import { CustomFieldsService } from '../../../services/custom-fields/custom-fields.service'; import { CustomFieldsService } from '../../../services/custom-fields/custom-fields.service';

4
web/src/app/administration/classification/master/list/classification-list.component.spec.ts
View File

@ -15,7 +15,7 @@ import { ClassificationTypesSelectorComponent } from 'app/shared/classification-
import { WorkbasketDefinitionService } from 'app/administration/services/workbasket-definition/workbasket-definition.service'; import { WorkbasketDefinitionService } from 'app/administration/services/workbasket-definition/workbasket-definition.service';
import { AlertService } from 'app/services/alert/alert.service'; import { AlertService } from 'app/services/alert/alert.service';
import { ClassificationsService } from 'app/services/classifications/classifications.service'; import { ClassificationsService } from 'app/shared/services/classifications/classifications.service';
import { ClassificationDefinitionService } from 'app/administration/services/classification-definition/classification-definition.service'; import { ClassificationDefinitionService } from 'app/administration/services/classification-definition/classification-definition.service';
import { DomainService } from 'app/services/domain/domain.service'; import { DomainService } from 'app/services/domain/domain.service';
import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; import { GeneralModalService } from 'app/services/general-modal/general-modal.service';
@ -23,7 +23,7 @@ import { RequestInProgressService } from 'app/services/requestInProgress/request
import { configureTests } from 'app/app.test.configuration'; import { configureTests } from 'app/app.test.configuration';
import { import {
ClassificationCategoriesService ClassificationCategoriesService
} from 'app/services/classifications/classification-categories.service'; } from 'app/shared/services/classifications/classification-categories.service';
import { Pair } from 'app/models/pair'; import { Pair } from 'app/models/pair';
import { TreeService } from 'app/services/tree/tree.service'; import { TreeService } from 'app/services/tree/tree.service';
import { ImportExportService } from 'app/administration/services/import-export/import-export.service'; import { ImportExportService } from 'app/administration/services/import-export/import-export.service';

4
web/src/app/administration/classification/master/list/classification-list.component.ts
View File

@ -6,10 +6,10 @@ import { TaskanaType } from 'app/models/taskana-type';
import { Classification } from 'app/models/classification'; import { Classification } from 'app/models/classification';
import { TreeNodeModel } from 'app/models/tree-node'; import { TreeNodeModel } from 'app/models/tree-node';
import { ClassificationsService } from 'app/services/classifications/classifications.service'; import { ClassificationsService } from 'app/shared/services/classifications/classifications.service';
import { import {
ClassificationCategoriesService ClassificationCategoriesService
} from 'app/services/classifications/classification-categories.service'; } from 'app/shared/services/classifications/classification-categories.service';
import { Pair } from 'app/models/pair'; import { Pair } from 'app/models/pair';
import { ClassificationDefinition } from '../../../../models/classification-definition'; import { ClassificationDefinition } from '../../../../models/classification-definition';
import { ImportExportService } from 'app/administration/services/import-export/import-export.service'; import { ImportExportService } from 'app/administration/services/import-export/import-export.service';

2
web/src/app/administration/components/import-export/import-export.component.spec.ts
View File

@ -1,7 +1,7 @@
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ImportExportComponent } from './import-export.component'; import { ImportExportComponent } from './import-export.component';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
import { ClassificationDefinitionService } from 'app/administration/services/classification-definition/classification-definition.service'; import { ClassificationDefinitionService } from 'app/administration/services/classification-definition/classification-definition.service';
import { WorkbasketDefinitionService } from '../../services/workbasket-definition/workbasket-definition.service'; import { WorkbasketDefinitionService } from '../../services/workbasket-definition/workbasket-definition.service';
import { AlertService } from 'app/services/alert/alert.service'; import { AlertService } from 'app/services/alert/alert.service';

2
web/src/app/administration/workbasket/details/access-items/access-items.component.spec.ts
View File

@ -17,7 +17,7 @@ import { AccessItemsComponent } from './access-items.component';
import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; import { GeneralModalService } from 'app/services/general-modal/general-modal.service';
import { SavingWorkbasketService } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service'; import { SavingWorkbasketService } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
import { AlertService } from 'app/services/alert/alert.service'; import { AlertService } from 'app/services/alert/alert.service';
import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
import { CustomFieldsService } from 'app/services/custom-fields/custom-fields.service'; import { CustomFieldsService } from 'app/services/custom-fields/custom-fields.service';

2
web/src/app/administration/workbasket/details/access-items/access-items.component.ts
View File

@ -11,7 +11,7 @@ import { AlertModel, AlertType } from 'app/models/alert';
import { SavingWorkbasketService, SavingInformation } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service'; import { SavingWorkbasketService, SavingInformation } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service';
import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; import { GeneralModalService } from 'app/services/general-modal/general-modal.service';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
import { AlertService } from 'app/services/alert/alert.service'; import { AlertService } from 'app/services/alert/alert.service';
import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
import { CustomFieldsService } from 'app/services/custom-fields/custom-fields.service'; import { CustomFieldsService } from 'app/services/custom-fields/custom-fields.service';

2
web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.spec.ts
View File

@ -12,7 +12,7 @@ import { FilterModel } from 'app/models/filter';
import { Workbasket } from 'app/models/workbasket'; import { Workbasket } from 'app/models/workbasket';
import { WorkbasketDistributionTargetsResource } from 'app/models/workbasket-distribution-targets-resource'; import { WorkbasketDistributionTargetsResource } from 'app/models/workbasket-distribution-targets-resource';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
import { AlertService } from 'app/services/alert/alert.service'; import { AlertService } from 'app/services/alert/alert.service';
import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; import { GeneralModalService } from 'app/services/general-modal/general-modal.service';
import { SavingWorkbasketService, SavingInformation } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service'; import { SavingWorkbasketService, SavingInformation } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service';

2
web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.ts
View File

@ -9,7 +9,7 @@ import { MessageModal } from 'app/models/message-modal';
import { ACTION } from 'app/models/action'; import { ACTION } from 'app/models/action';
import { AlertModel, AlertType } from 'app/models/alert'; import { AlertModel, AlertType } from 'app/models/alert';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
import { AlertService } from 'app/services/alert/alert.service'; import { AlertService } from 'app/services/alert/alert.service';
import { SavingWorkbasketService, SavingInformation } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service'; import { SavingWorkbasketService, SavingInformation } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service';
import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; import { GeneralModalService } from 'app/services/general-modal/general-modal.service';

2
web/src/app/administration/workbasket/details/information/workbasket-information.component.spec.ts
View File

@ -1,5 +1,5 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
import { WorkbasketInformationComponent } from './workbasket-information.component'; import { WorkbasketInformationComponent } from './workbasket-information.component';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import { AngularSvgIconModule } from 'angular-svg-icon'; import { AngularSvgIconModule } from 'angular-svg-icon';

2
web/src/app/administration/workbasket/details/information/workbasket-information.component.ts
View File

@ -24,7 +24,7 @@ import {
SavingWorkbasketService, SavingWorkbasketService,
SavingInformation SavingInformation
} from 'app/administration/services/saving-workbaskets/saving-workbaskets.service'; } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
import { CustomFieldsService } from 'app/services/custom-fields/custom-fields.service'; import { CustomFieldsService } from 'app/services/custom-fields/custom-fields.service';
import { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service'; import { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service';

2
web/src/app/administration/workbasket/details/workbasket-details.component.spec.ts
View File

@ -16,7 +16,7 @@ import { Links } from 'app/models/links';
import { WorkbasketAccessItems } from 'app/models/workbasket-access-items'; import { WorkbasketAccessItems } from 'app/models/workbasket-access-items';
import { LinksWorkbasketSummary } from 'app/models/links-workbasket-summary'; import { LinksWorkbasketSummary } from 'app/models/links-workbasket-summary';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service'; import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service';
import { AlertService } from 'app/services/alert/alert.service'; import { AlertService } from 'app/services/alert/alert.service';
import { SavingWorkbasketService } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service'; import { SavingWorkbasketService } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service';

2
web/src/app/administration/workbasket/details/workbasket-details.component.ts
View File

@ -6,7 +6,7 @@ import { Workbasket } from 'app/models/workbasket';
import { ACTION } from 'app/models/action'; import { ACTION } from 'app/models/action';
import { MessageModal } from '../../../models/message-modal'; import { MessageModal } from '../../../models/message-modal';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service' import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'
import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service' import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service'
import { DomainService } from 'app/services/domain/domain.service'; import { DomainService } from 'app/services/domain/domain.service';
import { GeneralModalService } from '../../../services/general-modal/general-modal.service'; import { GeneralModalService } from '../../../services/general-modal/general-modal.service';

2
web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts
View File

@ -18,7 +18,7 @@ import { SortingModel } from 'app/models/sorting';
import { WorkbasketListToolbarComponent } from './workbasket-list-toolbar.component'; import { WorkbasketListToolbarComponent } from './workbasket-list-toolbar.component';
import { ImportExportComponent } from 'app/administration/components/import-export/import-export.component'; import { ImportExportComponent } from 'app/administration/components/import-export/import-export.component';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
import { ClassificationDefinitionService } from 'app/administration/services/classification-definition/classification-definition.service'; import { ClassificationDefinitionService } from 'app/administration/services/classification-definition/classification-definition.service';
import { WorkbasketDefinitionService } from 'app/administration/services/workbasket-definition/workbasket-definition.service'; import { WorkbasketDefinitionService } from 'app/administration/services/workbasket-definition/workbasket-definition.service';
import { configureTests } from 'app/app.test.configuration'; import { configureTests } from 'app/app.test.configuration';

2
web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.ts
View File

@ -6,7 +6,7 @@ import { FilterModel } from 'app/models/filter';
import { Subscription } from 'rxjs'; import { Subscription } from 'rxjs';
import { WorkbasketSummary } from 'app/models/workbasket-summary'; import { WorkbasketSummary } from 'app/models/workbasket-summary';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
import { TaskanaType } from 'app/models/taskana-type'; import { TaskanaType } from 'app/models/taskana-type';
import { expandDown } from 'app/shared/animations/expand.animation'; import { expandDown } from 'app/shared/animations/expand.animation';

2
web/src/app/administration/workbasket/master/list/workbasket-list.component.spec.ts
View File

@ -18,7 +18,7 @@ import { ImportExportComponent } from 'app/administration/components/import-expo
import { WorkbasketDefinitionService } from 'app/administration/services/workbasket-definition/workbasket-definition.service'; import { WorkbasketDefinitionService } from 'app/administration/services/workbasket-definition/workbasket-definition.service';
import { ClassificationDefinitionService } from 'app/administration/services/classification-definition/classification-definition.service'; import { ClassificationDefinitionService } from 'app/administration/services/classification-definition/classification-definition.service';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
import { OrientationService } from 'app/services/orientation/orientation.service'; import { OrientationService } from 'app/services/orientation/orientation.service';
import { configureTests } from 'app/app.test.configuration'; import { configureTests } from 'app/app.test.configuration';
import { Page } from 'app/models/page'; import { Page } from 'app/models/page';

2
web/src/app/administration/workbasket/master/list/workbasket-list.component.ts
View File

@ -8,7 +8,7 @@ import {FilterModel} from 'app/models/filter'
import {SortingModel} from 'app/models/sorting'; import {SortingModel} from 'app/models/sorting';
import {Orientation} from 'app/models/orientation'; import {Orientation} from 'app/models/orientation';
import {WorkbasketService} from 'app/services/workbasket/workbasket.service' import {WorkbasketService} from 'app/shared/services/workbasket/workbasket.service'
import {OrientationService} from 'app/services/orientation/orientation.service'; import {OrientationService} from 'app/services/orientation/orientation.service';
import {TaskanaQueryParameters} from 'app/shared/util/query-parameters'; import {TaskanaQueryParameters} from 'app/shared/util/query-parameters';
import { ImportExportService } from 'app/administration/services/import-export/import-export.service'; import { ImportExportService } from 'app/administration/services/import-export/import-export.service';

0
web/src/app/services/classifications/classification-categories.service.ts → web/src/app/shared/services/classifications/classification-categories.service.ts
View File

0
web/src/app/services/classifications/classifications.service.ts → web/src/app/shared/services/classifications/classifications.service.ts
View File

2
web/src/app/services/workbasket/workbasket.service.ts → web/src/app/shared/services/workbasket/workbasket.service.ts
View File

@ -10,7 +10,7 @@ import { WorkbasketDistributionTargetsResource } from 'app/models/workbasket-dis
import { Direction } from 'app/models/sorting'; import { Direction } from 'app/models/sorting';
import { DomainService } from 'app/services/domain/domain.service'; import { DomainService } from 'app/services/domain/domain.service';
import { WorkbasketResource } from '../../models/workbasket-resource'; import { WorkbasketResource } from '../../../models/workbasket-resource';
import { TaskanaQueryParameters } from 'app/shared/util/query-parameters'; import { TaskanaQueryParameters } from 'app/shared/util/query-parameters';
import { mergeMap, tap, catchError } from 'rxjs/operators'; import { mergeMap, tap, catchError } from 'rxjs/operators';
import { QueryParametersModel } from 'app/models/query-parameters'; import { QueryParametersModel } from 'app/models/query-parameters';

5
web/src/app/shared/shared.module.ts
View File

@ -7,6 +7,9 @@ import {RouterModule} from '@angular/router';
import {TreeModule} from 'angular-tree-component'; import {TreeModule} from 'angular-tree-component';
import {AlertModule, TypeaheadModule, BsDatepickerModule} from 'ngx-bootstrap'; import {AlertModule, TypeaheadModule, BsDatepickerModule} from 'ngx-bootstrap';
import {AccordionModule} from 'ngx-bootstrap/accordion'; import {AccordionModule} from 'ngx-bootstrap/accordion';
import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
import { ClassificationsService } from 'app/shared/services/classifications/classifications.service';
/** /**
* Components * Components
@ -98,6 +101,8 @@ const DECLARATIONS = [
multi: true multi: true
}, },
AccessIdsService, AccessIdsService,
ClassificationsService,
WorkbasketService
] ]
}) })
export class SharedModule { export class SharedModule {

2
web/src/app/shared/tree/tree.component.spec.ts
View File

@ -8,7 +8,7 @@ import { TaskanaTreeComponent } from './tree.component';
import { TreeService } from 'app/services/tree/tree.service'; import { TreeService } from 'app/services/tree/tree.service';
import { import {
ClassificationCategoriesService ClassificationCategoriesService
} from 'app/services/classifications/classification-categories.service'; } from 'app/shared/services/classifications/classification-categories.service';
import { configureTests } from 'app/app.test.configuration'; import { configureTests } from 'app/app.test.configuration';
import { Pair } from 'app/models/pair'; import { Pair } from 'app/models/pair';

2
web/src/app/shared/tree/tree.component.ts
View File

@ -8,7 +8,7 @@ import { KEYS, ITreeOptions, TreeComponent, TreeNode } from 'angular-tree-compon
import { TreeService } from '../../services/tree/tree.service'; import { TreeService } from '../../services/tree/tree.service';
import { import {
ClassificationCategoriesService ClassificationCategoriesService
} from 'app/services/classifications/classification-categories.service'; } from 'app/shared/services/classifications/classification-categories.service';
import { Pair } from 'app/models/pair'; import { Pair } from 'app/models/pair';
import { Subscription } from 'rxjs'; import { Subscription } from 'rxjs';

4
web/src/app/workplace/task/task.component.spec.ts
View File

@ -7,13 +7,13 @@ import { FormsModule } from '@angular/forms';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { TaskService } from '../services/task.service'; import { TaskService } from '../services/task.service';
import { HttpClient, HttpClientModule } from '@angular/common/http'; import { HttpClient, HttpClientModule } from '@angular/common/http';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { DomainService } from 'app/services/domain/domain.service'; import { DomainService } from 'app/services/domain/domain.service';
import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
import { SelectedRouteService } from 'app/services/selected-route/selected-route'; import { SelectedRouteService } from 'app/services/selected-route/selected-route';
import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; import { GeneralModalService } from 'app/services/general-modal/general-modal.service';
import { ClassificationsService } from 'app/services/classifications/classifications.service'; import { ClassificationsService } from 'app/shared/services/classifications/classifications.service';
@Component({ @Component({
selector: 'taskana-dummy-detail', selector: 'taskana-dummy-detail',

4
web/src/app/workplace/task/task.component.ts
View File

@ -4,9 +4,9 @@ import { Task } from 'app/workplace/models/task';
import { Workbasket } from 'app/models/workbasket'; import { Workbasket } from 'app/models/workbasket';
import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser'; import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
import { TaskService } from 'app/workplace/services/task.service'; import { TaskService } from 'app/workplace/services/task.service';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
import { Subscription } from 'rxjs'; import { Subscription } from 'rxjs';
import { ClassificationsService } from 'app/services/classifications/classifications.service'; import { ClassificationsService } from 'app/shared/services/classifications/classifications.service';
@Component({ @Component({

34
web/src/app/workplace/taskdetails/general/general-fields.component.spec.ts
View File

@ -1,21 +1,21 @@
import {ComponentFixture, TestBed} from '@angular/core/testing'; import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import {TaskdetailsGeneralFieldsComponent} from './general-fields.component'; import { TaskdetailsGeneralFieldsComponent } from './general-fields.component';
import {FormsModule} from '@angular/forms'; import { FormsModule } from '@angular/forms';
import {HttpClient, HttpClientModule} from '@angular/common/http'; import { ClassificationsService } from 'app/shared/services/classifications/classifications.service';
import {ClassificationCategoriesService} from 'app/services/classifications/classification-categories.service'; import { HttpClient, HttpClientModule } from '@angular/common/http';
import {CustomFieldsService} from 'app/services/custom-fields/custom-fields.service'; import { ClassificationCategoriesService } from 'app/shared/services/classifications/classification-categories.service';
import {DomainService} from 'app/services/domain/domain.service'; import { CustomFieldsService } from 'app/services/custom-fields/custom-fields.service';
import {RouterTestingModule} from '@angular/router/testing'; import { DomainService } from 'app/services/domain/domain.service';
import {Routes} from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing';
import {Component} from '@angular/core'; import { Routes } from '@angular/router';
import {RequestInProgressService} from 'app/services/requestInProgress/request-in-progress.service'; import { Component } from '@angular/core';
import {SelectedRouteService} from 'app/services/selected-route/selected-route'; import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
import {ClassificationsService} from '../../../services/classifications/classifications.service'; import { SelectedRouteService } from 'app/services/selected-route/selected-route';
import {configureTests} from '../../../app.test.configuration'; import { configureTests } from 'app/app.test.configuration';
import {Classification} from '../../../models/classification'; import { ClassificationResource } from 'app/models/classification-resource';
import {Links} from '../../../models/links'; import { Classification } from 'app/models/classification';
import {ClassificationResource} from '../../../models/classification-resource'; import { Links } from 'app/models/links';
@Component({ @Component({
selector: 'taskana-dummy-detail', selector: 'taskana-dummy-detail',

16
web/src/app/workplace/taskdetails/general/general-fields.component.ts
View File

@ -1,11 +1,11 @@
import {Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild} from '@angular/core'; import { Component, EventEmitter, Input, OnInit, Output, ViewChild, SimpleChanges, OnChanges, HostListener } from '@angular/core';
import {Task} from 'app/workplace/models/task'; import { Task } from 'app/workplace/models/task';
import {Classification} from '../../../models/classification'; import { Classification } from '../../../models/classification';
import {ClassificationsService} from '../../../services/classifications/classifications.service'; import { ClassificationsService } from '../../../shared/services/classifications/classifications.service';
import {CustomFieldsService} from 'app/services/custom-fields/custom-fields.service'; import { CustomFieldsService } from 'app/services/custom-fields/custom-fields.service';
import {FormsValidatorService} from 'app/shared/services/forms/forms-validator.service'; import { FormsValidatorService } from 'app/shared/services/forms/forms-validator.service';
import {NgForm} from '@angular/forms'; import { NgForm } from '@angular/forms';
import {DomainService} from '../../../services/domain/domain.service'; import { DomainService } from 'app/services/domain/domain.service';
@Component({ @Component({
selector: 'taskana-task-details-general-fields', selector: 'taskana-task-details-general-fields',

2
web/src/app/workplace/taskmaster/task-list-toolbar/task-list-toolbar.component.spec.ts
View File

@ -9,7 +9,7 @@ import { IconTypeComponent } from 'app/administration/components/type-icon/icon-
import { SvgIconComponent } from 'angular-svg-icon'; import { SvgIconComponent } from 'angular-svg-icon';
import { TaskService } from 'app/workplace/services/task.service'; import { TaskService } from 'app/workplace/services/task.service';
import { HttpClient, HttpClientModule } from '@angular/common/http'; import { HttpClient, HttpClientModule } from '@angular/common/http';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
import { DomainService } from 'app/services/domain/domain.service'; import { DomainService } from 'app/services/domain/domain.service';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { Routes } from '@angular/router'; import { Routes } from '@angular/router';

2
web/src/app/workplace/taskmaster/task-list-toolbar/task-list-toolbar.component.ts
View File

@ -2,7 +2,7 @@ import { Component, EventEmitter, OnInit, Output } from '@angular/core';
import { Task } from 'app/workplace/models/task'; import { Task } from 'app/workplace/models/task';
import { Workbasket } from 'app/models/workbasket'; import { Workbasket } from 'app/models/workbasket';
import { TaskService } from 'app/workplace/services/task.service'; import { TaskService } from 'app/workplace/services/task.service';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
import { SortingModel } from 'app/models/sorting'; import { SortingModel } from 'app/models/sorting';
import { FilterModel } from 'app/models/filter'; import { FilterModel } from 'app/models/filter';
import { TaskanaType } from 'app/models/taskana-type'; import { TaskanaType } from 'app/models/taskana-type';

2
web/src/app/workplace/taskmaster/task-master.component.spec.ts
View File

@ -18,7 +18,7 @@ import { HttpClient, HttpClientModule } from '@angular/common/http';
import { WorkplaceService } from '../services/workplace.service'; import { WorkplaceService } from '../services/workplace.service';
import { AlertService } from 'app/services/alert/alert.service'; import { AlertService } from 'app/services/alert/alert.service';
import { OrientationService } from 'app/services/orientation/orientation.service'; import { OrientationService } from 'app/services/orientation/orientation.service';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
import { DomainService } from 'app/services/domain/domain.service'; import { DomainService } from 'app/services/domain/domain.service';
import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
import { SelectedRouteService } from 'app/services/selected-route/selected-route'; import { SelectedRouteService } from 'app/services/selected-route/selected-route';

6
web/src/app/workplace/workplace.module.ts
View File

@ -22,11 +22,9 @@ import { TaskListComponent } from './taskmaster/task-list/task-list.component';
import { OrderTasksByPipe } from './util/orderTasksBy.pipe'; import { OrderTasksByPipe } from './util/orderTasksBy.pipe';
import { TaskService } from './services/task.service'; import { TaskService } from './services/task.service';
import { ClassificationsService } from 'app/services/classifications/classifications.service';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service';
import { SharedModule } from 'app/shared/shared.module'; import { SharedModule } from 'app/shared/shared.module';
import { CustomHttpClientInterceptor } from './services/custom-http-interceptor/custom-http-interceptor.service'; import { CustomHttpClientInterceptor } from './services/custom-http-interceptor/custom-http-interceptor.service';
import { ClassificationCategoriesService } from 'app/services/classifications/classification-categories.service'; import { ClassificationCategoriesService } from 'app/shared/services/classifications/classification-categories.service';
import { WorkplaceService } from './services/workplace.service'; import { WorkplaceService } from './services/workplace.service';
const MODULES = [ const MODULES = [
@ -61,10 +59,8 @@ const DECLARATIONS = [
imports: MODULES, imports: MODULES,
providers: [ providers: [
TaskService, TaskService,
ClassificationsService,
ClassificationCategoriesService, ClassificationCategoriesService,
WorkplaceService, WorkplaceService,
WorkbasketService,
{ {
provide: HTTP_INTERCEPTORS, provide: HTTP_INTERCEPTORS,
useClass: CustomHttpClientInterceptor, useClass: CustomHttpClientInterceptor,