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

TSK-505

This commit is contained in:
Lars Leo Grätz 2018-05-22 17:23:29 +02:00 committed by Martin Rojas Miguel Angel
parent e731f78282
commit 99e3c15e89
20 changed files with 29 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@ import { SortComponent } from './components/sort/sort.component';
/**
* Services
*/
import { WorkbasketService } from './services/workbasket/workbasket.service';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service';
import { SavingWorkbasketService } from './services/saving-workbaskets/saving-workbaskets.service';
import { ClassificationDefinitionService } from './services/classification-definition/classification-definition.service';
import { WorkbasketDefinitionService } from './services/workbasket-definition/workbasket-definition.service';

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

@ -17,7 +17,7 @@ import { ClassificationTypesSelectorComponent } from 'app/shared/classification-
import { IconTypeComponent } from 'app/administration/components/type-icon/icon-type.component';
import { MapValuesPipe } from 'app/shared/pipes/mapValues/map-values.pipe';
import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service';
import { WorkbasketDefinitionService } from 'app/administration/services/workbasket-definition/workbasket-definition.service';
import { AlertService } from 'app/services/alert/alert.service';
import { ClassificationsService } from 'app/administration/services/classifications/classifications.service';

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

@ -1,7 +1,7 @@
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import {ImportExportComponent} from './import-export.component';
import {WorkbasketService} from '../../services/workbasket/workbasket.service';
import {WorkbasketService} from 'app/services/workbasket/workbasket.service';
import {ClassificationDefinitionService} from 'app/administration/services/classification-definition/classification-definition.service';
import {WorkbasketDefinitionService} from '../../services/workbasket-definition/workbasket-definition.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

@ -19,7 +19,7 @@ import { GeneralMessageModalComponent } from 'app/shared/general-message-modal/g
import { ErrorModalService } from 'app/services/errorModal/error-modal.service';
import { SavingWorkbasketService, SavingInformation } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service';
import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service';
import { AlertService } from 'app/services/alert/alert.service';
import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
import { DomainService } from 'app/services/domain/domain.service';

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

@ -10,7 +10,7 @@ import { AlertModel, AlertType } from 'app/models/alert';
import { SavingWorkbasketService, SavingInformation } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service';
import { ErrorModalService } from 'app/services/errorModal/error-modal.service';
import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service';
import { AlertService } from 'app/services/alert/alert.service';
import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
import { TitlesService } from 'app/services/titles/titles.service';

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

@ -13,7 +13,7 @@ import { FilterModel } from 'app/models/filter';
import { Workbasket } from 'app/models/workbasket';
import { WorkbasketDistributionTargetsResource } from 'app/models/workbasket-distribution-targets-resource';
import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service';
import { AlertService } from 'app/services/alert/alert.service';
import { ErrorModalService } from 'app/services/errorModal/error-modal.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

@ -10,7 +10,7 @@ import { ErrorModel } from 'app/models/modal-error';
import { ACTION } from 'app/models/action';
import { AlertModel, AlertType } from 'app/models/alert';
import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service';
import { AlertService } from 'app/services/alert/alert.service';
import { SavingWorkbasketService, SavingInformation } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service';
import { ErrorModalService } from 'app/services/errorModal/error-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, fakeAsync, tick } from '@angular/core/testing';
import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service';
import { WorkbasketInformationComponent } from './workbasket-information.component';
import { FormsModule, ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
import { AngularSvgIconModule } from 'angular-svg-icon';

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

@ -14,7 +14,7 @@ import { TaskanaDate } from 'app/shared/util/taskana.date';
import { AlertService } from 'app/services/alert/alert.service';
import { ErrorModalService } from 'app/services/errorModal/error-modal.service';
import { SavingWorkbasketService, SavingInformation } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service';
import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service';
import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
import { TitlesService } from 'app/services/titles/titles.service';
import { CustomFieldsService } from 'app/services/custom-fields/custom-fields.service';

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

@ -18,7 +18,7 @@ import { Links } from 'app/models/links';
import { WorkbasketAccessItems } from 'app/models/workbasket-access-items';
import { LinksWorkbasketSummary } from 'app/models/links-workbasket-summary';
import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service';
import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service';
import { AlertService } from 'app/services/alert/alert.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

@ -10,7 +10,7 @@ import { ErrorModel } from 'app/models/modal-error';
import { ACTION } from 'app/models/action';
import { ErrorModalService } from 'app/services/errorModal/error-modal.service';
import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service'
import { WorkbasketService } from 'app/services/workbasket/workbasket.service'
import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service'
import { DomainService } from 'app/services/domain/domain.service';

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

@ -22,7 +22,7 @@ import { IconTypeComponent } from 'app/administration/components/type-icon/icon-
import { WorkbasketListToolbarComponent } from './workbasket-list-toolbar.component';
import { ImportExportComponent } from 'app/administration/components/import-export/import-export.component';
import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service';
import { ClassificationDefinitionService } from 'app/administration/services/classification-definition/classification-definition.service';
import { WorkbasketDefinitionService } from 'app/administration/services/workbasket-definition/workbasket-definition.service';

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

@ -11,7 +11,7 @@ import { AlertModel, AlertType } from 'app/models/alert';
import { ErrorModalService } from 'app/services/errorModal/error-modal.service';
import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service';
import { AlertService } from 'app/services/alert/alert.service';
import { ImportType } from 'app/models/import-type';

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

@ -24,7 +24,7 @@ import { ImportExportComponent } from 'app/administration/components/import-expo
import { WorkbasketDefinitionService } from 'app/administration/services/workbasket-definition/workbasket-definition.service';
import { ClassificationDefinitionService } from 'app/administration/services/classification-definition/classification-definition.service';
import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service';
import { WorkbasketService } from 'app/services/workbasket/workbasket.service';
@Component({
selector: 'taskana-dummy-detail',

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

@ -11,7 +11,7 @@ import { FilterModel } from 'app/models/filter'
import { SortingModel } from 'app/models/sorting';
import { Orientation } from 'app/models/orientation';
import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service'
import { WorkbasketService } from 'app/services/workbasket/workbasket.service'
import { OrientationService } from 'app/services/orientation/orientation.service';
@Component({

12
web/src/app/administration/services/workbasket/workbasket.service.ts → web/src/app/services/workbasket/workbasket.service.ts
View File

@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import { environment } from 'app/../environments/environment';
import { environment } from 'environments/environment';
import { Workbasket } from 'app/models/workbasket';
import { WorkbasketAccessItems } from 'app/models/workbasket-access-items';
import { WorkbasketSummaryResource } from 'app/models/workbasket-summary-resource';
@ -12,10 +12,14 @@ import { Direction } from 'app/models/sorting';
import { DomainService } from 'app/services/domain/domain.service';
import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
import {WorkbasketResource} from '../../models/workbasket-resource';
@Injectable()
export class WorkbasketService {
workbasketKey: string;
workbasketName: string;
public workBasketSelected = new Subject<string>();
public workBasketSaved = new Subject<number>();
@ -92,6 +96,12 @@ export class WorkbasketService {
getWorkBasket(id: string): Observable<Workbasket> {
return this.httpClient.get<Workbasket>(`${environment.taskanaRestUrl}/v1/workbaskets/${id}`);
}
// GET
getAllWorkBaskets(): Observable<WorkbasketResource> {
return this.httpClient.get<WorkbasketResource>(`${environment.taskanaRestUrl}/v1/workbaskets?required-permission=OPEN`);
}
// POST
createWorkbasket(workbasket: Workbasket): Observable<Workbasket> {
return this.httpClient

20
web/src/app/workplace/services/workbasket.service.ts
View File

@ -1,20 +0,0 @@
import { Injectable } from '@angular/core';
import { environment } from 'app/../environments/environment';
import { Observable } from 'rxjs/Observable';
import { HttpClient } from '@angular/common/http';
import {WorkbasketResource} from 'app/models/workbasket-resource';
@Injectable()
export class WorkbasketService {
url = `${environment.taskanaRestUrl}/v1/workbaskets`;
workbasketKey: string;
workbasketName: string;
constructor(private httpClient: HttpClient) {
}
getAllWorkBaskets(): Observable<WorkbasketResource> {
return this.httpClient.get<WorkbasketResource>(`${this.url}?required-permission=OPEN`);
}
}

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

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

2
web/src/app/workplace/workbasket-selector/workbasket-selector.component.ts
View File

@ -2,7 +2,7 @@ import {Component, EventEmitter, OnInit, Output} from '@angular/core';
import {Task} from 'app/workplace/models/task';
import {Workbasket} from 'app/models/workbasket';
import {TaskService} from 'app/workplace/services/task.service';
import {WorkbasketService} from 'app/workplace/services/workbasket.service';
import {WorkbasketService} from 'app/services/workbasket/workbasket.service';
@Component({
selector: 'taskana-workbasket-selector',

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

@ -18,7 +18,7 @@ import { CodeComponent } from './components/code/code.component';
import { OrderTasksByPipe } from './util/orderTasksBy.pipe';
import {TaskService} from './services/task.service';
import {WorkbasketService} from './services/workbasket.service';
import {WorkbasketService} from 'app/services/workbasket/workbasket.service';
import {SharedModule} from '../shared/shared.module';
import {CustomHttpClientInterceptor} from './services/custom-http-interceptor/custom-http-interceptor.service';