Skip to content
Snippets Groups Projects
Commit 18e56d53 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-6989 7278 archive menue item

parent a670acb6
No related branches found
No related tags found
No related merge requests found
Showing
with 211 additions and 74 deletions
<ozgcloud-button-with-spinner
dataTestId="archive-vorgang"
[showSpinner]="(archiveStateResource$ | async)?.loading"
(clickEmitter)="archive()"
text="Herunterladen"
icon="save_alt"
/>
\ No newline at end of file
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { createEmptyStateResource, createStateResource, StateResource } from '@alfa-client/tech-shared';
import { mock } from '@alfa-client/test-utils';
import { OzgcloudButtonWithSpinnerComponent } from '@alfa-client/ui';
import { VorgangService } from '@alfa-client/vorgang-shared';
import { MockComponent } from 'ng-mocks';
import { describe } from 'node:test';
import { of } from 'rxjs';
import { VorgangArchiveContainerComponent } from './vorgang-archive-container.component';
describe('VorgangArchiveContainerComponent', () => {
let component: VorgangArchiveContainerComponent;
let fixture: ComponentFixture<VorgangArchiveContainerComponent>;
const vorgangArchiveState: StateResource<boolean> = createStateResource(true);
const vorgangService = {
...mock(VorgangService),
getVorgangArchive: jest.fn().mockReturnValue(of(createStateResource(vorgangArchiveState))),
};
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [VorgangArchiveContainerComponent, MockComponent(OzgcloudButtonWithSpinnerComponent)],
providers: [
{
provide: VorgangService,
useValue: vorgangService,
},
],
}).compileComponents();
fixture = TestBed.createComponent(VorgangArchiveContainerComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
describe('component', () => {
describe('ngOnInit', () => {
it('should get archive', () => {
vorgangService.getVorgangArchive.mockReturnValueOnce(of(createEmptyStateResource<boolean>()));
component.ngOnInit();
expect(vorgangService.getVorgangArchive).toHaveBeenCalled();
});
});
describe('archiveDoneHandler', () => {
it('should closeMenu if archive is done', () => {
jest.spyOn(component.closeMenu, 'emit');
component.archiveDoneHandler(vorgangArchiveState);
expect(component.closeMenu.emit).toHaveBeenCalled();
});
});
describe('archive', () => {
it('should call archive', () => {
component.archive();
expect(vorgangService.archive).toHaveBeenCalled();
});
});
});
});
import { StateResource } from '@alfa-client/tech-shared';
import { VorgangService, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
import { Component, EventEmitter, inject, Input, OnInit, Output } from '@angular/core';
import { Observable, tap } from 'rxjs';
@Component({
selector: 'alfa-vorgang-archive-container',
templateUrl: './vorgang-archive-container.component.html',
})
export class VorgangArchiveContainerComponent implements OnInit {
private vorgangService = inject(VorgangService);
@Input() vorgangWithEingang: VorgangWithEingangResource;
@Output() public closeMenu: EventEmitter<void> = new EventEmitter();
public archiveStateResource$: Observable<StateResource<boolean>>;
ngOnInit(): void {
this.archiveStateResource$ = this.vorgangService
.getVorgangArchive()
.pipe(tap((vorgangArchiveStateResource) => this.archiveDoneHandler(vorgangArchiveStateResource)));
}
archiveDoneHandler(vorgangArchiveStateResource: StateResource<boolean>): void {
if (vorgangArchiveStateResource.resource) this.closeMenu.emit();
}
public archive(): void {
this.vorgangService.archive(this.vorgangWithEingang);
}
}
...@@ -8,6 +8,20 @@ ...@@ -8,6 +8,20 @@
<ozgcloud-icon icon="more_horiz"></ozgcloud-icon> <ozgcloud-icon icon="more_horiz"></ozgcloud-icon>
</button> </button>
<ozgcloud-menu #moreMenu data-test-id="more-menu"> <ozgcloud-menu #moreMenu data-test-id="more-menu">
<ozgcloud-menu-item
*ngIf="vorgangWithEingang | hasLink: vorgangWithEingangLinkRel.ARCHIVE"
data-test-id="vorgang-archive-button"
headline="Vorgang im DMS archivieren"
text="Alle Informationen und Anhänge werden zur Archivierung ins DMS gesendet. Der Vorgang wird nach der Archivierung in Alfa gelöscht."
icon="xdomea_file"
[iconSizeBig]="true"
(click)="$event.stopPropagation()"
>
<alfa-vorgang-archive-container
[vorgangWithEingang]="vorgangWithEingang"
(closeMenu)="closeMenu()"
></alfa-vorgang-archive-container>
</ozgcloud-menu-item>
<ozgcloud-menu-item <ozgcloud-menu-item
data-test-id="vorgang-exportieren-button" data-test-id="vorgang-exportieren-button"
headline="Vorgang exportieren" headline="Vorgang exportieren"
......
import { import { getElementFromDomRoot, getElementFromFixture, getMockComponent, getMockComponents } from '@alfa-client/test-utils';
getElementFromDomRoot,
getElementFromFixture,
getMockComponent,
getMockComponents,
} from '@alfa-client/test-utils';
import { MenuItemComponent, OzgcloudIconComponent, UiModule } from '@alfa-client/ui'; import { MenuItemComponent, OzgcloudIconComponent, UiModule } from '@alfa-client/ui';
import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared'; import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
import { ChangeDetectorRef, SimpleChanges } from '@angular/core'; import { ChangeDetectorRef, SimpleChanges } from '@angular/core';
...@@ -12,6 +7,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; ...@@ -12,6 +7,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test'; import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang'; import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks'; import { MockComponent } from 'ng-mocks';
import { VorgangArchiveContainerComponent } from './vorgang-archive-container/vorgang-archive-container.component';
import { VorgangDetailMoreMenuComponent } from './vorgang-detail-more-menu.component'; import { VorgangDetailMoreMenuComponent } from './vorgang-detail-more-menu.component';
import { VorgangExportContainerComponent } from './vorgang-export-container/vorgang-export-container.component'; import { VorgangExportContainerComponent } from './vorgang-export-container/vorgang-export-container.component';
import { ProcessVorgangContainerComponent } from './vorgang-process-vorgang-container/vorgang-process-vorgang-container.component'; import { ProcessVorgangContainerComponent } from './vorgang-process-vorgang-container/vorgang-process-vorgang-container.component';
...@@ -21,6 +17,7 @@ describe('VorgangDetailMoreMenuComponent', () => { ...@@ -21,6 +17,7 @@ describe('VorgangDetailMoreMenuComponent', () => {
let fixture: ComponentFixture<VorgangDetailMoreMenuComponent>; let fixture: ComponentFixture<VorgangDetailMoreMenuComponent>;
const moreMenuButton: string = getDataTestIdOf('more-menu-button'); const moreMenuButton: string = getDataTestIdOf('more-menu-button');
const archiveMenuItem: string = getDataTestIdOf('vorgang-archive-button');
const exportMenuItem: string = getDataTestIdOf('vorgang-exportieren-button'); const exportMenuItem: string = getDataTestIdOf('vorgang-exportieren-button');
const processVorgangMenuItem: string = getDataTestIdOf('vorgang-process-vorgang-button'); const processVorgangMenuItem: string = getDataTestIdOf('vorgang-process-vorgang-button');
...@@ -32,6 +29,7 @@ describe('VorgangDetailMoreMenuComponent', () => { ...@@ -32,6 +29,7 @@ describe('VorgangDetailMoreMenuComponent', () => {
MockComponent(OzgcloudIconComponent), MockComponent(OzgcloudIconComponent),
MockComponent(VorgangExportContainerComponent), MockComponent(VorgangExportContainerComponent),
MockComponent(ProcessVorgangContainerComponent), MockComponent(ProcessVorgangContainerComponent),
MockComponent(VorgangArchiveContainerComponent),
], ],
imports: [UiModule, NoopAnimationsModule], imports: [UiModule, NoopAnimationsModule],
}).compileComponents(); }).compileComponents();
...@@ -114,9 +112,7 @@ describe('VorgangDetailMoreMenuComponent', () => { ...@@ -114,9 +112,7 @@ describe('VorgangDetailMoreMenuComponent', () => {
}); });
describe('export menu item', () => { describe('export menu item', () => {
const vorgangWithEingang: VorgangWithEingangResource = createVorgangWithEingangResource([ const vorgangWithEingang: VorgangWithEingangResource = createVorgangWithEingangResource([VorgangWithEingangLinkRel.EXPORT]);
VorgangWithEingangLinkRel.EXPORT,
]);
beforeEach(() => { beforeEach(() => {
component.buttonEnabled = true; component.buttonEnabled = true;
...@@ -142,7 +138,7 @@ describe('VorgangDetailMoreMenuComponent', () => { ...@@ -142,7 +138,7 @@ describe('VorgangDetailMoreMenuComponent', () => {
it('should contains headline', () => { it('should contains headline', () => {
getElementFromFixture(fixture, moreMenuButton).click(); getElementFromFixture(fixture, moreMenuButton).click();
const menuItem: MenuItemComponent = getMockComponent(fixture, MenuItemComponent); const menuItem: MenuItemComponent = getMockComponents(fixture, MenuItemComponent)[0];
expect(menuItem.headline).toBe('Vorgang exportieren'); expect(menuItem.headline).toBe('Vorgang exportieren');
}); });
...@@ -150,17 +146,15 @@ describe('VorgangDetailMoreMenuComponent', () => { ...@@ -150,17 +146,15 @@ describe('VorgangDetailMoreMenuComponent', () => {
it('should contains text', () => { it('should contains text', () => {
getElementFromFixture(fixture, moreMenuButton).click(); getElementFromFixture(fixture, moreMenuButton).click();
const menuItem: MenuItemComponent = getMockComponent(fixture, MenuItemComponent); const menuItem: MenuItemComponent = getMockComponents(fixture, MenuItemComponent)[0];
expect(menuItem.text).toBe( expect(menuItem.text).toBe('Alle Informationen und Anhänge des Vorgangs zur Archivierung im DMS.');
'Alle Informationen und Anhänge des Vorgangs zur Archivierung im DMS.',
);
}); });
it('should contains icon', () => { it('should contains icon', () => {
getElementFromFixture(fixture, moreMenuButton).click(); getElementFromFixture(fixture, moreMenuButton).click();
const menuItem: MenuItemComponent = getMockComponent(fixture, MenuItemComponent); const menuItem: MenuItemComponent = getMockComponents(fixture, MenuItemComponent)[0];
expect(menuItem.icon).toBe('xdomea_file'); expect(menuItem.icon).toBe('xdomea_file');
}); });
...@@ -168,19 +162,70 @@ describe('VorgangDetailMoreMenuComponent', () => { ...@@ -168,19 +162,70 @@ describe('VorgangDetailMoreMenuComponent', () => {
it('should contains iconSizeBig', () => { it('should contains iconSizeBig', () => {
getElementFromFixture(fixture, moreMenuButton).click(); getElementFromFixture(fixture, moreMenuButton).click();
const menuItem: MenuItemComponent = getMockComponent(fixture, MenuItemComponent); const menuItem: MenuItemComponent = getMockComponents(fixture, MenuItemComponent)[0];
expect(menuItem.iconSizeBig).toBeTruthy(); expect(menuItem.iconSizeBig).toBeTruthy();
}); });
describe('for button', () => { describe('for button', () => {
it.skip('should contains vorgangWithEingang', () => { it.skip('should contains vorgangWithEingang', () => {
getElementFromFixture(fixture, moreMenuButton).click(); getElementFromFixture(fixture, moreMenuButton).click();
const button: ProcessVorgangContainerComponent = getMockComponent( const button: VorgangExportContainerComponent = getMockComponent(fixture, VorgangExportContainerComponent);
fixture,
ProcessVorgangContainerComponent, expect(button.vorgangWithEingang).toBe(vorgangWithEingang);
});
});
});
});
describe('archive menu item', () => {
const vorgangWithEingang: VorgangWithEingangResource = createVorgangWithEingangResource([VorgangWithEingangLinkRel.ARCHIVE]);
beforeEach(() => {
component.buttonEnabled = true;
component.vorgangWithEingang = vorgangWithEingang;
fixture.detectChanges();
getElementFromFixture(fixture, moreMenuButton).click();
fixture.detectChanges();
});
it('should be visible', () => {
const archiveElement: HTMLElement = getElementFromDomRoot(fixture, archiveMenuItem);
expect(archiveElement).toBeInTheDocument();
});
describe('input', () => {
let menuItem: MenuItemComponent;
beforeEach(() => {
menuItem = getMockComponent(fixture, MenuItemComponent);
});
it('should contains headline', () => {
expect(menuItem.headline).toBe('Vorgang im DMS archivieren');
});
it('should contains text', () => {
expect(menuItem.text).toBe(
'Alle Informationen und Anhänge werden zur Archivierung ins DMS gesendet. Der Vorgang wird nach der Archivierung in Alfa gelöscht.',
); );
});
it('should contains icon', () => {
// TODO: change icon
expect(menuItem.icon).toBe('xdomea_file');
});
it('should contains iconSizeBig', () => {
expect(menuItem.iconSizeBig).toBeTruthy();
});
describe('for button', () => {
it.skip('should contains vorgangWithEingang', () => {
getElementFromFixture(fixture, moreMenuButton).click();
const button: VorgangArchiveContainerComponent = getMockComponent(fixture, VorgangArchiveContainerComponent);
expect(button.vorgangWithEingang).toBe(vorgangWithEingang); expect(button.vorgangWithEingang).toBe(vorgangWithEingang);
}); });
...@@ -237,9 +282,7 @@ describe('VorgangDetailMoreMenuComponent', () => { ...@@ -237,9 +282,7 @@ describe('VorgangDetailMoreMenuComponent', () => {
const menuItem: MenuItemComponent = getMockComponents(fixture, MenuItemComponent)[1]; const menuItem: MenuItemComponent = getMockComponents(fixture, MenuItemComponent)[1];
expect(menuItem.text).toBe( expect(menuItem.text).toBe('Eine Vorprüfung wird durchgeführt. Das Ergebnis wird als Kommentar hinzugefügt.');
'Eine Vorprüfung wird durchgeführt. Das Ergebnis wird als Kommentar hinzugefügt.',
);
}); });
it('should contains icon', () => { it('should contains icon', () => {
...@@ -262,10 +305,7 @@ describe('VorgangDetailMoreMenuComponent', () => { ...@@ -262,10 +305,7 @@ describe('VorgangDetailMoreMenuComponent', () => {
it.skip('should contains vorgangWithEingang', () => { it.skip('should contains vorgangWithEingang', () => {
getElementFromFixture(fixture, moreMenuButton).click(); getElementFromFixture(fixture, moreMenuButton).click();
const button: VorgangExportContainerComponent = getMockComponent( const button: ProcessVorgangContainerComponent = getMockComponent(fixture, ProcessVorgangContainerComponent);
fixture,
VorgangExportContainerComponent,
);
expect(button.vorgangWithEingang).toBe(vorgangWithEingang); expect(button.vorgangWithEingang).toBe(vorgangWithEingang);
}); });
......
...@@ -110,6 +110,7 @@ import { VorgangDetailBescheidenUeberspringenDialogComponent } from './vorgang-d ...@@ -110,6 +110,7 @@ import { VorgangDetailBescheidenUeberspringenDialogComponent } from './vorgang-d
import { VorgangDetailBescheidenStepsComponent } from './vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps.component'; import { VorgangDetailBescheidenStepsComponent } from './vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps.component';
import { VorgangDetailBescheidenWeiterButtonComponent } from './vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-weiter-button/vorgang-detail-bescheiden-weiter-button.component'; import { VorgangDetailBescheidenWeiterButtonComponent } from './vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-weiter-button/vorgang-detail-bescheiden-weiter-button.component';
import { VorgangDetailBescheidenComponent } from './vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component'; import { VorgangDetailBescheidenComponent } from './vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component';
import { VorgangArchiveContainerComponent } from './vorgang-detail-page/vorgang-detail-more-menu/vorgang-archive-container/vorgang-archive-container.component';
import { VorgangDetailMoreMenuComponent } from './vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component'; import { VorgangDetailMoreMenuComponent } from './vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component';
import { VorgangExportContainerComponent } from './vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component'; import { VorgangExportContainerComponent } from './vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component';
import { ProcessVorgangContainerComponent } from './vorgang-detail-page/vorgang-detail-more-menu/vorgang-process-vorgang-container/vorgang-process-vorgang-container.component'; import { ProcessVorgangContainerComponent } from './vorgang-detail-page/vorgang-detail-more-menu/vorgang-process-vorgang-container/vorgang-process-vorgang-container.component';
...@@ -214,11 +215,8 @@ const routes: Routes = [ ...@@ -214,11 +215,8 @@ const routes: Routes = [
VorgangDetailBescheidenBescheidVersendenComponent, VorgangDetailBescheidenBescheidVersendenComponent,
VorgangDetailBescheidenResultNachrichtComponent, VorgangDetailBescheidenResultNachrichtComponent,
VorgangDetailDateienContainerComponent, VorgangDetailDateienContainerComponent,
VorgangArchiveContainerComponent,
], ],
exports: [ exports: [VorgangDetailAntragstellerComponent, VorgangDetailAntragDataComponent, VorgangDetailBescheidenComponent],
VorgangDetailAntragstellerComponent,
VorgangDetailAntragDataComponent,
VorgangDetailBescheidenComponent,
],
}) })
export class VorgangDetailModule {} export class VorgangDetailModule {}
...@@ -56,6 +56,7 @@ export enum VorgangWithEingangLinkRel { ...@@ -56,6 +56,7 @@ export enum VorgangWithEingangLinkRel {
HISTORIE = 'historie', HISTORIE = 'historie',
SEARCH_USER_PROFILES = 'search-user-profiles', SEARCH_USER_PROFILES = 'search-user-profiles',
EXPORT = 'export', EXPORT = 'export',
ARCHIVE = 'archive',
CREATE_BESCHEID_DRAFT = 'createBescheidDraft', CREATE_BESCHEID_DRAFT = 'createBescheidDraft',
PROCESS_VORGANG = 'processVorgang', PROCESS_VORGANG = 'processVorgang',
......
...@@ -32,15 +32,10 @@ import { ...@@ -32,15 +32,10 @@ import {
} from '@alfa-client/command-shared'; } from '@alfa-client/command-shared';
import { ENVIRONMENT_CONFIG, Environment } from '@alfa-client/environment-shared'; import { ENVIRONMENT_CONFIG, Environment } from '@alfa-client/environment-shared';
import { NavigationService } from '@alfa-client/navigation-shared'; import { NavigationService } from '@alfa-client/navigation-shared';
import { import { StateResource, createEmptyStateResource, doIfLoadingRequired, isNotNull } from '@alfa-client/tech-shared';
StateResource,
createEmptyStateResource,
doIfLoadingRequired,
isNotNull,
} from '@alfa-client/tech-shared';
import { Inject, Injectable } from '@angular/core'; import { Inject, Injectable } from '@angular/core';
import { ResourceUri, hasLink } from '@ngxp/rest'; import { ResourceUri, hasLink } from '@ngxp/rest';
import { Observable, combineLatest } from 'rxjs'; import { Observable, combineLatest, of } from 'rxjs';
import { filter, map, startWith, tap, withLatestFrom } from 'rxjs/operators'; import { filter, map, startWith, tap, withLatestFrom } from 'rxjs/operators';
import { VorgangFacade } from './+state/vorgang.facade'; import { VorgangFacade } from './+state/vorgang.facade';
import { buildLinkRelFromPathSegments } from './vorgang-navigation.util'; import { buildLinkRelFromPathSegments } from './vorgang-navigation.util';
...@@ -61,15 +56,10 @@ export class VorgangService { ...@@ -61,15 +56,10 @@ export class VorgangService {
) {} ) {}
public getVorgangWithEingang(): Observable<StateResource<VorgangWithEingangResource>> { public getVorgangWithEingang(): Observable<StateResource<VorgangWithEingangResource>> {
return combineLatest([ return combineLatest([this.facade.getVorgangWithEingang(), this.apiRootService.getApiRoot()]).pipe(
this.facade.getVorgangWithEingang(),
this.apiRootService.getApiRoot(),
]).pipe(
tap(([vorgangWithEingang, apiRoot]) => { tap(([vorgangWithEingang, apiRoot]) => {
if (isNotNull(apiRoot.resource)) if (isNotNull(apiRoot.resource))
doIfLoadingRequired(vorgangWithEingang, () => doIfLoadingRequired(vorgangWithEingang, () => this.facade.loadVorgangWithEingang(this.getVorgangWithEingangUri()));
this.facade.loadVorgangWithEingang(this.getVorgangWithEingangUri()),
);
}), }),
map(([vorgangWithEingang]) => vorgangWithEingang), map(([vorgangWithEingang]) => vorgangWithEingang),
startWith(createEmptyStateResource<VorgangWithEingangResource>(true)), startWith(createEmptyStateResource<VorgangWithEingangResource>(true)),
...@@ -80,9 +70,7 @@ export class VorgangService { ...@@ -80,9 +70,7 @@ export class VorgangService {
return this.facade.getAttachmentList().pipe( return this.facade.getAttachmentList().pipe(
withLatestFrom(this.facade.getVorgangWithEingang()), withLatestFrom(this.facade.getVorgangWithEingang()),
tap(([attachmentList, vorgangWithEingang]) => tap(([attachmentList, vorgangWithEingang]) =>
doIfLoadingRequired(attachmentList, () => doIfLoadingRequired(attachmentList, () => this.facade.loadAttachmentList(vorgangWithEingang.resource)),
this.facade.loadAttachmentList(vorgangWithEingang.resource),
),
), ),
map(([attachmentList]) => attachmentList), map(([attachmentList]) => attachmentList),
startWith(createEmptyStateResource<BinaryFileListResource>(true)), startWith(createEmptyStateResource<BinaryFileListResource>(true)),
...@@ -93,9 +81,7 @@ export class VorgangService { ...@@ -93,9 +81,7 @@ export class VorgangService {
return this.facade.getRepresentationList().pipe( return this.facade.getRepresentationList().pipe(
withLatestFrom(this.facade.getVorgangWithEingang()), withLatestFrom(this.facade.getVorgangWithEingang()),
tap(([representationList, vorgangWithEingang]) => tap(([representationList, vorgangWithEingang]) =>
doIfLoadingRequired(representationList, () => doIfLoadingRequired(representationList, () => this.facade.loadRepresentationList(vorgangWithEingang.resource)),
this.facade.loadRepresentationList(vorgangWithEingang.resource),
),
), ),
map(([representationList]) => representationList), map(([representationList]) => representationList),
startWith(createEmptyStateResource<BinaryFileListResource>(true)), startWith(createEmptyStateResource<BinaryFileListResource>(true)),
...@@ -131,10 +117,7 @@ export class VorgangService { ...@@ -131,10 +117,7 @@ export class VorgangService {
} }
public reloadCurrentVorgangWithAddtionalActions(additionalActions: AdditionalActions): void { public reloadCurrentVorgangWithAddtionalActions(additionalActions: AdditionalActions): void {
this.facade.loadVorgangWithEingangWithAdditionalActions( this.facade.loadVorgangWithEingangWithAdditionalActions(this.getVorgangWithEingangUri(), additionalActions);
this.getVorgangWithEingangUri(),
additionalActions,
);
} }
getVorgangWithEingangUri(): ResourceUri { getVorgangWithEingangUri(): ResourceUri {
...@@ -185,17 +168,17 @@ export class VorgangService { ...@@ -185,17 +168,17 @@ export class VorgangService {
this.facade.export(vorgangWithEingang); this.facade.export(vorgangWithEingang);
} }
public processVorgang( public getVorgangArchive(): Observable<StateResource<boolean>> {
vorgangWithEingang: VorgangWithEingangResource, return of(createEmptyStateResource<boolean>());
): Observable<StateResource<CommandResource>> {
return this.commandService.createCommandByProps(
this.createProcessVorgangCommandProps(vorgangWithEingang),
);
} }
private createProcessVorgangCommandProps( public archive(vorgangWithEingang: VorgangWithEingangResource): void {}
vorgangWithEingang: VorgangWithEingangResource,
): CreateCommandProps { public processVorgang(vorgangWithEingang: VorgangWithEingangResource): Observable<StateResource<CommandResource>> {
return this.commandService.createCommandByProps(this.createProcessVorgangCommandProps(vorgangWithEingang));
}
private createProcessVorgangCommandProps(vorgangWithEingang: VorgangWithEingangResource): CreateCommandProps {
return { return {
resource: vorgangWithEingang, resource: vorgangWithEingang,
linkRel: VorgangWithEingangLinkRel.PROCESS_VORGANG, linkRel: VorgangWithEingangLinkRel.PROCESS_VORGANG,
...@@ -204,15 +187,8 @@ export class VorgangService { ...@@ -204,15 +187,8 @@ export class VorgangService {
}; };
} }
public setAktenzeichen( public setAktenzeichen(vorgang: VorgangWithEingangResource, aktenzeichen: string): Observable<StateResource<CommandResource>> {
vorgang: VorgangWithEingangResource,
aktenzeichen: string,
): Observable<StateResource<CommandResource>> {
const createCommand = { order: CommandOrder.SET_AKTENZEICHEN, body: { aktenzeichen } }; const createCommand = { order: CommandOrder.SET_AKTENZEICHEN, body: { aktenzeichen } };
return this.commandService.createCommand( return this.commandService.createCommand(vorgang, VorgangWithEingangLinkRel.SET_AKTENZEICHEN, createCommand);
vorgang,
VorgangWithEingangLinkRel.SET_AKTENZEICHEN,
createCommand,
);
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment