@loxia/mst-viewer 8.1.3-202511131950 → 8.1.3-202511132206
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/lib/atomic-components/message/message.component.mjs +3 -3
- package/esm2022/lib/components/ritdelen-lijst/ritdelen-lijst.component.mjs +7 -17
- package/esm2022/lib/components/svg-visualisatie/svg-visualisatie.component.mjs +4 -6
- package/esm2022/lib/components/viewer-controls/viewer-controls.component.mjs +1 -2
- package/esm2022/lib/model/ritdeel.mjs +4 -4
- package/esm2022/lib/mst-viewer.module.mjs +1 -2
- package/esm2022/lib/resources/mstlogging.resource.mjs +145 -12
- package/esm2022/lib/resources/signaleringsbeeldinfo.resource.mjs +1 -2
- package/esm2022/lib/services/editor.service.mjs +1 -3
- package/esm2022/lib/services/rit-lezer.service.mjs +4 -4
- package/esm2022/lib/services/viewer-control.service.mjs +4 -3
- package/esm2022/lib/state/actions/actions.mjs +1 -1
- package/esm2022/lib/state/effect/bepaal-ongeplande-acties.effect.mjs +2 -2
- package/esm2022/lib/state/effect/bepaal-sb-infos.effect.mjs +2 -2
- package/esm2022/lib/state/effect/beweging-invoegen.effect.mjs +1 -1
- package/esm2022/lib/state/effect/delete-ongeplande-actie.effect.mjs +1 -1
- package/esm2022/lib/state/effect/laad-route-files.effect.mjs +2 -2
- package/esm2022/lib/state/effect/laad-signaleringsbeelden.effect.mjs +10 -10
- package/esm2022/lib/state/effect/ritdelen.effect.mjs +22 -22
- package/esm2022/lib/state/mst-editor-state.mjs +12 -9
- package/esm2022/lib/state/reducer/rit-delen.reducer.mjs +1 -1
- package/esm2022/lib/util/actie-helper.mjs +6 -6
- package/esm2022/lib/util/actie-popover-bepaler.mjs +2 -2
- package/esm2022/lib/util/logging-helper.mjs +12 -9
- package/esm2022/lib/util/multi-map.mjs +3 -2
- package/esm2022/lib/util/utils.mjs +5 -2
- package/esm2022/lib/util/zone-util.mjs +1 -2
- package/fesm2022/loxia-mst-viewer.mjs +438 -1649
- package/fesm2022/loxia-mst-viewer.mjs.map +1 -1
- package/lib/atomic-components/message/message.component.d.ts +2 -2
- package/lib/components/ritdelen-lijst/ritdelen-lijst.component.d.ts +2 -2
- package/lib/components/svg-visualisatie/svg-visualisatie.component.d.ts +1 -1
- package/lib/model/ritdeel.d.ts +6 -7
- package/lib/resources/mstlogging.resource.d.ts +95 -6
- package/lib/state/actions/actions.d.ts +4 -4
- package/lib/state/effect/delete-ongeplande-actie.effect.d.ts +1 -1
- package/lib/state/effect/laad-route-files.effect.d.ts +1 -2
- package/lib/state/effect/laad-signaleringsbeelden.effect.d.ts +9 -9
- package/lib/state/effect/ritdelen.effect.d.ts +6 -7
- package/lib/state/mst-editor-state.d.ts +72 -11
- package/lib/util/actie-helper.d.ts +2 -2
- package/lib/util/logging-helper.d.ts +6 -4
- package/lib/util/utils.d.ts +1 -0
- package/package.json +1 -7
- package/esm2022/generated/openapi/api/api.mjs +0 -23
- package/esm2022/generated/openapi/api/appConfigController.service.mjs +0 -140
- package/esm2022/generated/openapi/api/appConfigController.serviceInterface.mjs +0 -2
- package/esm2022/generated/openapi/api/bewegingController.service.mjs +0 -155
- package/esm2022/generated/openapi/api/bewegingController.serviceInterface.mjs +0 -2
- package/esm2022/generated/openapi/api/class0BuildProperties.service.mjs +0 -140
- package/esm2022/generated/openapi/api/class0BuildProperties.serviceInterface.mjs +0 -2
- package/esm2022/generated/openapi/api/connectorController.service.mjs +0 -146
- package/esm2022/generated/openapi/api/connectorController.serviceInterface.mjs +0 -2
- package/esm2022/generated/openapi/api/logController.service.mjs +0 -150
- package/esm2022/generated/openapi/api/logController.serviceInterface.mjs +0 -2
- package/esm2022/generated/openapi/api/p21Controller.service.mjs +0 -236
- package/esm2022/generated/openapi/api/p21Controller.serviceInterface.mjs +0 -2
- package/esm2022/generated/openapi/api/sbController.service.mjs +0 -202
- package/esm2022/generated/openapi/api/sbController.serviceInterface.mjs +0 -2
- package/esm2022/generated/openapi/api.module.mjs +0 -40
- package/esm2022/generated/openapi/configuration.mjs +0 -99
- package/esm2022/generated/openapi/encoder.mjs +0 -19
- package/esm2022/generated/openapi/index.mjs +0 -7
- package/esm2022/generated/openapi/model/actieDto.mjs +0 -13
- package/esm2022/generated/openapi/model/algemeneRitDto.mjs +0 -13
- package/esm2022/generated/openapi/model/bewegingDto.mjs +0 -2
- package/esm2022/generated/openapi/model/frontendKeycloakConfig.mjs +0 -13
- package/esm2022/generated/openapi/model/frontendProperties.mjs +0 -2
- package/esm2022/generated/openapi/model/logDto.mjs +0 -2
- package/esm2022/generated/openapi/model/models.mjs +0 -10
- package/esm2022/generated/openapi/model/ritRequestDto.mjs +0 -2
- package/esm2022/generated/openapi/model/signaleringsbeeldDto.mjs +0 -13
- package/esm2022/generated/openapi/model/signaleringsbeeldRequestDto.mjs +0 -13
- package/esm2022/generated/openapi/param.mjs +0 -2
- package/esm2022/generated/openapi/variables.mjs +0 -9
- package/esm2022/src/generated/openapi/api/api.mjs +0 -23
- package/esm2022/src/generated/openapi/api/appConfigController.service.mjs +0 -140
- package/esm2022/src/generated/openapi/api/appConfigController.serviceInterface.mjs +0 -2
- package/esm2022/src/generated/openapi/api/bewegingController.service.mjs +0 -155
- package/esm2022/src/generated/openapi/api/bewegingController.serviceInterface.mjs +0 -2
- package/esm2022/src/generated/openapi/api/class0BuildProperties.service.mjs +0 -140
- package/esm2022/src/generated/openapi/api/class0BuildProperties.serviceInterface.mjs +0 -2
- package/esm2022/src/generated/openapi/api/connectorController.service.mjs +0 -146
- package/esm2022/src/generated/openapi/api/connectorController.serviceInterface.mjs +0 -2
- package/esm2022/src/generated/openapi/api/logController.service.mjs +0 -150
- package/esm2022/src/generated/openapi/api/logController.serviceInterface.mjs +0 -2
- package/esm2022/src/generated/openapi/api/p21Controller.service.mjs +0 -236
- package/esm2022/src/generated/openapi/api/p21Controller.serviceInterface.mjs +0 -2
- package/esm2022/src/generated/openapi/api/sbController.service.mjs +0 -202
- package/esm2022/src/generated/openapi/api/sbController.serviceInterface.mjs +0 -2
- package/esm2022/src/generated/openapi/api.module.mjs +0 -40
- package/esm2022/src/generated/openapi/configuration.mjs +0 -99
- package/esm2022/src/generated/openapi/encoder.mjs +0 -19
- package/esm2022/src/generated/openapi/index.mjs +0 -7
- package/esm2022/src/generated/openapi/loxia-mst-viewer-src-generated-openapi.mjs +0 -5
- package/esm2022/src/generated/openapi/model/actieDto.mjs +0 -13
- package/esm2022/src/generated/openapi/model/algemeneRitDto.mjs +0 -13
- package/esm2022/src/generated/openapi/model/bewegingDto.mjs +0 -2
- package/esm2022/src/generated/openapi/model/frontendKeycloakConfig.mjs +0 -13
- package/esm2022/src/generated/openapi/model/frontendProperties.mjs +0 -2
- package/esm2022/src/generated/openapi/model/logDto.mjs +0 -2
- package/esm2022/src/generated/openapi/model/models.mjs +0 -10
- package/esm2022/src/generated/openapi/model/ritRequestDto.mjs +0 -2
- package/esm2022/src/generated/openapi/model/signaleringsbeeldDto.mjs +0 -13
- package/esm2022/src/generated/openapi/model/signaleringsbeeldRequestDto.mjs +0 -13
- package/esm2022/src/generated/openapi/param.mjs +0 -2
- package/esm2022/src/generated/openapi/variables.mjs +0 -9
- package/fesm2022/loxia-mst-viewer-src-generated-openapi.mjs +0 -1341
- package/fesm2022/loxia-mst-viewer-src-generated-openapi.mjs.map +0 -1
- package/generated/openapi/api/api.d.ts +0 -22
- package/generated/openapi/api/appConfigController.service.d.ts +0 -38
- package/generated/openapi/api/appConfigController.serviceInterface.d.ts +0 -24
- package/generated/openapi/api/bewegingController.service.d.ts +0 -40
- package/generated/openapi/api/bewegingController.serviceInterface.d.ts +0 -27
- package/generated/openapi/api/class0BuildProperties.service.d.ts +0 -36
- package/generated/openapi/api/class0BuildProperties.serviceInterface.d.ts +0 -23
- package/generated/openapi/api/connectorController.service.d.ts +0 -38
- package/generated/openapi/api/connectorController.serviceInterface.d.ts +0 -25
- package/generated/openapi/api/logController.service.d.ts +0 -38
- package/generated/openapi/api/logController.serviceInterface.d.ts +0 -25
- package/generated/openapi/api/p21Controller.service.d.ts +0 -62
- package/generated/openapi/api/p21Controller.serviceInterface.d.ts +0 -30
- package/generated/openapi/api/sbController.service.d.ts +0 -60
- package/generated/openapi/api/sbController.serviceInterface.d.ts +0 -32
- package/generated/openapi/api.module.d.ts +0 -11
- package/generated/openapi/configuration.d.ts +0 -104
- package/generated/openapi/encoder.d.ts +0 -11
- package/generated/openapi/index.d.ts +0 -6
- package/generated/openapi/model/actieDto.d.ts +0 -35
- package/generated/openapi/model/algemeneRitDto.d.ts +0 -28
- package/generated/openapi/model/bewegingDto.d.ts +0 -37
- package/generated/openapi/model/frontendKeycloakConfig.d.ts +0 -16
- package/generated/openapi/model/frontendProperties.d.ts +0 -15
- package/generated/openapi/model/logDto.d.ts +0 -22
- package/generated/openapi/model/models.d.ts +0 -9
- package/generated/openapi/model/ritRequestDto.d.ts +0 -17
- package/generated/openapi/model/signaleringsbeeldDto.d.ts +0 -16
- package/generated/openapi/model/signaleringsbeeldRequestDto.d.ts +0 -16
- package/generated/openapi/param.d.ts +0 -37
- package/generated/openapi/variables.d.ts +0 -8
- package/src/generated/openapi/README.md +0 -226
- package/src/generated/openapi/api/api.d.ts +0 -22
- package/src/generated/openapi/api/appConfigController.service.d.ts +0 -38
- package/src/generated/openapi/api/appConfigController.serviceInterface.d.ts +0 -24
- package/src/generated/openapi/api/bewegingController.service.d.ts +0 -40
- package/src/generated/openapi/api/bewegingController.serviceInterface.d.ts +0 -27
- package/src/generated/openapi/api/class0BuildProperties.service.d.ts +0 -36
- package/src/generated/openapi/api/class0BuildProperties.serviceInterface.d.ts +0 -23
- package/src/generated/openapi/api/connectorController.service.d.ts +0 -38
- package/src/generated/openapi/api/connectorController.serviceInterface.d.ts +0 -25
- package/src/generated/openapi/api/logController.service.d.ts +0 -38
- package/src/generated/openapi/api/logController.serviceInterface.d.ts +0 -25
- package/src/generated/openapi/api/p21Controller.service.d.ts +0 -62
- package/src/generated/openapi/api/p21Controller.serviceInterface.d.ts +0 -30
- package/src/generated/openapi/api/sbController.service.d.ts +0 -60
- package/src/generated/openapi/api/sbController.serviceInterface.d.ts +0 -32
- package/src/generated/openapi/api.module.d.ts +0 -11
- package/src/generated/openapi/configuration.d.ts +0 -104
- package/src/generated/openapi/encoder.d.ts +0 -11
- package/src/generated/openapi/index.d.ts +0 -6
- package/src/generated/openapi/model/actieDto.d.ts +0 -35
- package/src/generated/openapi/model/algemeneRitDto.d.ts +0 -28
- package/src/generated/openapi/model/bewegingDto.d.ts +0 -37
- package/src/generated/openapi/model/frontendKeycloakConfig.d.ts +0 -16
- package/src/generated/openapi/model/frontendProperties.d.ts +0 -15
- package/src/generated/openapi/model/logDto.d.ts +0 -22
- package/src/generated/openapi/model/models.d.ts +0 -9
- package/src/generated/openapi/model/ritRequestDto.d.ts +0 -17
- package/src/generated/openapi/model/signaleringsbeeldDto.d.ts +0 -16
- package/src/generated/openapi/model/signaleringsbeeldRequestDto.d.ts +0 -16
- package/src/generated/openapi/param.d.ts +0 -37
- package/src/generated/openapi/variables.d.ts +0 -8
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as i2 from '@angular/common';
|
|
2
2
|
import { CommonModule } from '@angular/common';
|
|
3
3
|
import * as i0 from '@angular/core';
|
|
4
|
-
import { EventEmitter, Output, Input, Component, Injectable, ChangeDetectionStrategy, ViewChild,
|
|
4
|
+
import { EventEmitter, Output, Input, Component, Injectable, ChangeDetectionStrategy, ViewChild, HostListener, NgModule } from '@angular/core';
|
|
5
5
|
import * as i7 from '@loxia/imx-viewer';
|
|
6
6
|
import { SelectieInfo, PopoverInfo, Point, SvgInfo, ImxViewerComponent, ImxViewerModule } from '@loxia/imx-viewer';
|
|
7
7
|
import * as i4 from '@loxia/rijwegen';
|
|
@@ -11,13 +11,13 @@ import { createEffect, ofType, EffectsModule } from '@ngrx/effects';
|
|
|
11
11
|
import * as i2$1 from '@ngrx/store';
|
|
12
12
|
import { createAction, union, select, createReducer, on, StoreModule } from '@ngrx/store';
|
|
13
13
|
import { ResourceModule } from '@ngx-resource/handler-ngx-http';
|
|
14
|
-
import { BehaviorSubject,
|
|
15
|
-
import { take, filter, map, catchError, withLatestFrom, switchMap, tap } from 'rxjs/operators';
|
|
16
|
-
import * as i1 from '@angular/common/http';
|
|
17
|
-
import { HttpHeaders, HttpContext, HttpParams } from '@angular/common/http';
|
|
14
|
+
import { BehaviorSubject, Subscription, from, combineLatest, of, throwError } from 'rxjs';
|
|
18
15
|
import { __decorate } from 'tslib';
|
|
19
|
-
import * as i1
|
|
16
|
+
import * as i1 from '@ngx-resource/core';
|
|
20
17
|
import { Resource, ResourceAction, ResourceRequestMethod, ResourceParams, ResourceModel } from '@ngx-resource/core';
|
|
18
|
+
import { take, filter, map, catchError, withLatestFrom, switchMap, tap } from 'rxjs/operators';
|
|
19
|
+
import * as i1$1 from '@angular/common/http';
|
|
20
|
+
import { HttpHeaders } from '@angular/common/http';
|
|
21
21
|
|
|
22
22
|
class Message {
|
|
23
23
|
constructor(severity, text, timeout = 0) {
|
|
@@ -41,7 +41,7 @@ class MessageComponent {
|
|
|
41
41
|
this.onClearMessage = new EventEmitter();
|
|
42
42
|
}
|
|
43
43
|
ngOnInit() {
|
|
44
|
-
if (this.message
|
|
44
|
+
if (this.message.timeout > 0) {
|
|
45
45
|
setTimeout(() => {
|
|
46
46
|
this.closeMessage({ stopPropagation: () => null });
|
|
47
47
|
}, this.message.timeout);
|
|
@@ -53,7 +53,7 @@ class MessageComponent {
|
|
|
53
53
|
this.message = undefined;
|
|
54
54
|
}
|
|
55
55
|
get severity() {
|
|
56
|
-
return this.message
|
|
56
|
+
return this.message.severity;
|
|
57
57
|
}
|
|
58
58
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: MessageComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
|
|
59
59
|
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.2.7", type: MessageComponent, selector: "loxia-message", inputs: { message: "message" }, outputs: { onClearMessage: "onClearMessage" }, ngImport: i0, template: "<div id=\"alert-1\" *ngIf=\"message\"\n [ngClass]=\"severity\"\n class=\" loxia-message flex items-center p-4 text-white\" role=\"alert\">\n <svg class=\"flex-shrink-0 size-4 mt-0.5\" xmlns=\"http://www.w3.org/2000/svg\" width=\"24\" height=\"24\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\">\n <path d=\"m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3Z\"></path>\n <path d=\"M12 9v4\"></path>\n <path d=\"M12 17h.01\"></path>\n </svg>\n <span class=\"sr-only\">Info</span>\n <div class=\"ms-3 text-sm font-medium\">\n {{message.text}}\n </div>\n <button type=\"button\"\n (click)=\"closeMessage($event)\"\n class=\"ms-auto -mx-1.5 -my-1.5 rounded-lg inline-flex items-center justify-center h-8 w-8\" data-dismiss-target=\"#alert-1\" aria-label=\"Close\">\n <span class=\"sr-only\">Close</span>\n <svg class=\"w-3 h-3\" aria-hidden=\"true\" xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 14 14\">\n <path stroke=\"currentColor\" stroke-linecap=\"round\" stroke-linejoin=\"round\" stroke-width=\"2\" d=\"m1 1 6 6m0 0 6 6M7 7l6-6M7 7l-6 6\"/>\n </svg>\n </button>\n</div>\n", styles: ["svg{background-color:transparent;stroke-width:unset}.loxia-message.information{background-color:#0288d1}.loxia-message.warning{background-color:#ff6a00}.loxia-message.notification{background-color:#f3ed38}.loxia-message.error{background-color:#b5061b}.loxia-message.success{background-color:#297d03}\n"], dependencies: [{ kind: "directive", type: i2.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }] }); }
|
|
@@ -299,6 +299,191 @@ const ritdeelActions = union({
|
|
|
299
299
|
ritdeelInvoegen
|
|
300
300
|
});
|
|
301
301
|
|
|
302
|
+
let MstLoggingResource = class MstLoggingResource extends Resource {
|
|
303
|
+
constructor(restHandler, store) {
|
|
304
|
+
super(restHandler);
|
|
305
|
+
this.store = store;
|
|
306
|
+
this.subscriptions = new Subscription();
|
|
307
|
+
this.subscriptions.add(this.store.select('baseUrl').subscribe(baseUrl => this.$setUrl(baseUrl)));
|
|
308
|
+
}
|
|
309
|
+
ngOnDestroy() {
|
|
310
|
+
this.subscriptions.unsubscribe();
|
|
311
|
+
}
|
|
312
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: MstLoggingResource, deps: [{ token: i1.ResourceHandler }, { token: i2$1.Store }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
313
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: MstLoggingResource }); }
|
|
314
|
+
};
|
|
315
|
+
__decorate([
|
|
316
|
+
ResourceAction({
|
|
317
|
+
path: '/',
|
|
318
|
+
method: ResourceRequestMethod.Post
|
|
319
|
+
})
|
|
320
|
+
], MstLoggingResource.prototype, "logErrorMessages", void 0);
|
|
321
|
+
MstLoggingResource = __decorate([
|
|
322
|
+
ResourceParams({
|
|
323
|
+
pathPrefix: '/mst/services/rest/logging'
|
|
324
|
+
})
|
|
325
|
+
], MstLoggingResource);
|
|
326
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: MstLoggingResource, decorators: [{
|
|
327
|
+
type: Injectable
|
|
328
|
+
}], ctorParameters: () => [{ type: i1.ResourceHandler }, { type: i2$1.Store }], propDecorators: { logErrorMessages: [] } });
|
|
329
|
+
class MstLoggingDto extends ResourceModel {
|
|
330
|
+
constructor(data) {
|
|
331
|
+
super();
|
|
332
|
+
this.$resource = MstLoggingResource;
|
|
333
|
+
this.$setData(data);
|
|
334
|
+
}
|
|
335
|
+
toJSON() {
|
|
336
|
+
return {
|
|
337
|
+
iaVersie: this.iaVersie,
|
|
338
|
+
meldingLevel: this.meldingLevel,
|
|
339
|
+
meldingMessage: this.meldingMessage,
|
|
340
|
+
algemeneRitInfoDto: this.algemeneRitInfoDto,
|
|
341
|
+
actieDto: this.actieDto,
|
|
342
|
+
sbinfoDtos: this.sbinfoDtos
|
|
343
|
+
};
|
|
344
|
+
}
|
|
345
|
+
toString() {
|
|
346
|
+
return `${this.iaVersie},${this.meldingLevel},${this.meldingMessage},${this.algemeneRitInfoDto},
|
|
347
|
+
${this.actieDto},${this.sbinfoDtos}`;
|
|
348
|
+
}
|
|
349
|
+
$setData(data) {
|
|
350
|
+
if (data) {
|
|
351
|
+
this.iaVersie = data.iaVersie;
|
|
352
|
+
this.meldingLevel = data.meldingLevel;
|
|
353
|
+
this.meldingMessage = data.meldingMessage;
|
|
354
|
+
this.algemeneRitInfoDto = data.algemeneRitInfoDto;
|
|
355
|
+
this.actieDto = data.actieDto;
|
|
356
|
+
this.sbinfoDtos = data.sbinfoDtos;
|
|
357
|
+
}
|
|
358
|
+
return this;
|
|
359
|
+
}
|
|
360
|
+
}
|
|
361
|
+
class ActieDto {
|
|
362
|
+
constructor(data) {
|
|
363
|
+
this.$setData(data);
|
|
364
|
+
}
|
|
365
|
+
toJSON() {
|
|
366
|
+
return {
|
|
367
|
+
pplgNaam: this.pplgNaam,
|
|
368
|
+
ritActieTypeOmschrijving: this.ritActieTypeOmschrijving,
|
|
369
|
+
ritActieStatus: this.ritActieStatus,
|
|
370
|
+
bewegingId: this.bewegingId,
|
|
371
|
+
wisselType: this.wisselType,
|
|
372
|
+
wisselNaam: this.wisselNaam,
|
|
373
|
+
wisselKantCode: this.wisselKantCode,
|
|
374
|
+
vanKilometerlint: this.vanKilometerlint,
|
|
375
|
+
vanKilometrering: this.vanKilometrering,
|
|
376
|
+
totKilometerlint: this.totKilometerlint,
|
|
377
|
+
totKilometrering: this.totKilometrering
|
|
378
|
+
};
|
|
379
|
+
}
|
|
380
|
+
toString() {
|
|
381
|
+
return `${this.pplgNaam},${this.ritActieTypeOmschrijving},${this.ritActieStatus},
|
|
382
|
+
${this.bewegingId},${this.wisselType},${this.wisselNaam},${this.wisselKantCode},
|
|
383
|
+
${this.vanKilometerlint},${this.vanKilometrering},${this.totKilometerlint},${this.totKilometrering}`;
|
|
384
|
+
}
|
|
385
|
+
$setData(data) {
|
|
386
|
+
if (data) {
|
|
387
|
+
this.pplgNaam = data.pplgNaam;
|
|
388
|
+
this.ritActieTypeOmschrijving = data.ritActieTypeOmschrijving;
|
|
389
|
+
this.ritActieStatus = data.ritActieStatus;
|
|
390
|
+
this.bewegingId = data.bewegingId;
|
|
391
|
+
this.wisselType = data.wisselType;
|
|
392
|
+
this.wisselNaam = data.wisselNaam;
|
|
393
|
+
this.wisselKantCode = data.wisselKantCode;
|
|
394
|
+
this.vanKilometerlint = data.vanKilometerlint;
|
|
395
|
+
this.vanKilometrering = data.vanKilometrering;
|
|
396
|
+
this.totKilometerlint = data.totKilometerlint;
|
|
397
|
+
this.totKilometrering = data.totKilometrering;
|
|
398
|
+
}
|
|
399
|
+
return this;
|
|
400
|
+
}
|
|
401
|
+
}
|
|
402
|
+
class AlgemeneRitInfoDto {
|
|
403
|
+
constructor(data) {
|
|
404
|
+
this.$setData(data);
|
|
405
|
+
}
|
|
406
|
+
toJSON() {
|
|
407
|
+
return {
|
|
408
|
+
id: this.id,
|
|
409
|
+
jaarplanId: this.jaarplanId,
|
|
410
|
+
volgnummer: this.volgnummer,
|
|
411
|
+
machineTypeId: this.machineTypeId,
|
|
412
|
+
machineTypeOmschrijving: this.machineTypeOmschrijving,
|
|
413
|
+
ritDatum: this.ritDatum,
|
|
414
|
+
startDatum: this.startDatum,
|
|
415
|
+
eindDatum: this.eindDatum,
|
|
416
|
+
ritNaam: this.ritNaam,
|
|
417
|
+
startLocatie: this.startLocatie,
|
|
418
|
+
eindLocatie: this.eindLocatie,
|
|
419
|
+
ritStatus: this.ritStatus,
|
|
420
|
+
modified: this.modified,
|
|
421
|
+
modifiedBy: this.modifiedBy,
|
|
422
|
+
planJobId: this.planJobId
|
|
423
|
+
};
|
|
424
|
+
}
|
|
425
|
+
toString() {
|
|
426
|
+
return `${this.id},${this.jaarplanId},${this.volgnummer},${this.machineTypeId},${this.machineTypeOmschrijving}
|
|
427
|
+
,${this.ritDatum},${this.startDatum},${this.eindDatum},${this.ritNaam},${this.startLocatie}
|
|
428
|
+
,${this.eindLocatie},${this.ritStatus},${this.modified},${this.modifiedBy},${this.planJobId}`;
|
|
429
|
+
}
|
|
430
|
+
$setData(data) {
|
|
431
|
+
if (data) {
|
|
432
|
+
this.id = data.id;
|
|
433
|
+
this.jaarplanId = data.jaarplanId;
|
|
434
|
+
this.volgnummer = data.volgnummer;
|
|
435
|
+
this.machineTypeId = data.machineTypeId;
|
|
436
|
+
this.machineTypeOmschrijving = data.machineTypeOmschrijving;
|
|
437
|
+
this.ritDatum = data.ritDatum;
|
|
438
|
+
this.startDatum = data.startDatum;
|
|
439
|
+
this.eindDatum = data.eindDatum;
|
|
440
|
+
this.ritNaam = data.ritNaam;
|
|
441
|
+
this.startLocatie = data.startLocatie;
|
|
442
|
+
this.eindLocatie = data.eindLocatie;
|
|
443
|
+
this.ritStatus = data.ritStatus;
|
|
444
|
+
this.modified = data.modified;
|
|
445
|
+
this.modifiedBy = data.modifiedBy;
|
|
446
|
+
this.planJobId = data.planJobId;
|
|
447
|
+
}
|
|
448
|
+
return this;
|
|
449
|
+
}
|
|
450
|
+
}
|
|
451
|
+
|
|
452
|
+
class Utils {
|
|
453
|
+
static flatMap(xs, f) {
|
|
454
|
+
return xs.reduce((acc, x) => acc.concat(f(x)), []);
|
|
455
|
+
}
|
|
456
|
+
static getValidErorrMessage(err) {
|
|
457
|
+
let errorMsg = '';
|
|
458
|
+
if (err.msg) {
|
|
459
|
+
errorMsg += err.msg;
|
|
460
|
+
}
|
|
461
|
+
if (Array.isArray(err.body)) {
|
|
462
|
+
err.body.forEach(x => errorMsg += x);
|
|
463
|
+
}
|
|
464
|
+
else if (err.body) {
|
|
465
|
+
if (err.body instanceof ProgressEvent) {
|
|
466
|
+
errorMsg = 'Kon geen verbinding maken met de server';
|
|
467
|
+
}
|
|
468
|
+
else if (err.body.text) {
|
|
469
|
+
errorMsg += err.body.text;
|
|
470
|
+
}
|
|
471
|
+
else {
|
|
472
|
+
errorMsg += err.body;
|
|
473
|
+
}
|
|
474
|
+
}
|
|
475
|
+
if (err.message) {
|
|
476
|
+
errorMsg += err.message;
|
|
477
|
+
}
|
|
478
|
+
if (typeof err === 'string' || err instanceof String) {
|
|
479
|
+
errorMsg += err;
|
|
480
|
+
}
|
|
481
|
+
if (errorMsg !== '') {
|
|
482
|
+
return errorMsg;
|
|
483
|
+
}
|
|
484
|
+
}
|
|
485
|
+
}
|
|
486
|
+
|
|
302
487
|
/**
|
|
303
488
|
* https://gist.github.com/jordanluyke/609a4fffb69d1ebafdadd313ee2ee804
|
|
304
489
|
*
|
|
@@ -362,7 +547,7 @@ class ArrayMultimap {
|
|
|
362
547
|
return Array.from(new Set(this._entries.map(entry => entry.key)));
|
|
363
548
|
}
|
|
364
549
|
values() {
|
|
365
|
-
return this._entries
|
|
550
|
+
return Utils.flatMap(this._entries, x => x.value);
|
|
366
551
|
}
|
|
367
552
|
put(key, value) {
|
|
368
553
|
this._entries.push(new MultimapEntry(key, value));
|
|
@@ -468,7 +653,6 @@ class EditorService {
|
|
|
468
653
|
this.signaleringsBeeldManagerService = signaleringsBeeldManagerService;
|
|
469
654
|
this.initReadyPromise();
|
|
470
655
|
}
|
|
471
|
-
// Called from GWT only, can be removed when GWT is gone
|
|
472
656
|
setEditor(editor) {
|
|
473
657
|
this.editor = editor;
|
|
474
658
|
this.resolveReadyPromise();
|
|
@@ -476,7 +660,6 @@ class EditorService {
|
|
|
476
660
|
isReady() {
|
|
477
661
|
return this.promise;
|
|
478
662
|
}
|
|
479
|
-
// Called from GWT only, can be removed when GWT is gone
|
|
480
663
|
setSignaleringsBeeldManager(signaleringsBeeldManager) {
|
|
481
664
|
this.signaleringsBeeldManagerService.set(signaleringsBeeldManager);
|
|
482
665
|
}
|
|
@@ -706,7 +889,7 @@ class ViewerControlService {
|
|
|
706
889
|
}
|
|
707
890
|
setOrigineelTreinPad(treinpad) {
|
|
708
891
|
const rit = JSON.parse(JSON.stringify(treinpad));
|
|
709
|
-
this.store.dispatch(SetAlgemeneRitInfo({
|
|
892
|
+
this.store.dispatch(SetAlgemeneRitInfo(new AlgemeneRitInfoDto({
|
|
710
893
|
id: rit.id,
|
|
711
894
|
jaarplanId: rit.jaarplanId,
|
|
712
895
|
volgnummer: rit.volgnummer,
|
|
@@ -722,7 +905,7 @@ class ViewerControlService {
|
|
|
722
905
|
modified: rit.modified,
|
|
723
906
|
modifiedBy: rit.modifiedBy,
|
|
724
907
|
planJobId: rit.planJobId
|
|
725
|
-
}));
|
|
908
|
+
})));
|
|
726
909
|
this.origineelTreinPad = rit;
|
|
727
910
|
}
|
|
728
911
|
isValideRit$() {
|
|
@@ -781,1593 +964,212 @@ class DebugService {
|
|
|
781
964
|
for (const km of kms) {
|
|
782
965
|
logline += km.getKmLint() + ' ' + km.getKmWaarde() + ' ';
|
|
783
966
|
}
|
|
784
|
-
console.log(logline);
|
|
785
|
-
}
|
|
786
|
-
}
|
|
787
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: DebugService, deps: [{ token: i2$1.Store }, { token: SignaleringsBeeldManagerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
788
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: DebugService, providedIn: 'root' }); }
|
|
789
|
-
}
|
|
790
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: DebugService, decorators: [{
|
|
791
|
-
type: Injectable,
|
|
792
|
-
args: [{
|
|
793
|
-
providedIn: 'root'
|
|
794
|
-
}]
|
|
795
|
-
}], ctorParameters: () => [{ type: i2$1.Store }, { type: SignaleringsBeeldManagerService }] });
|
|
796
|
-
|
|
797
|
-
class PrintBewegingService {
|
|
798
|
-
constructor(store, viewerControlService, sbmService) {
|
|
799
|
-
this.store = store;
|
|
800
|
-
this.viewerControlService = viewerControlService;
|
|
801
|
-
this.sbmService = sbmService;
|
|
802
|
-
this.store.select(s => s.ritDelen).subscribe(ritdelen => this.ritdelen = ritdelen);
|
|
803
|
-
}
|
|
804
|
-
printBeweging(bewegingId, paginationSize, iaVersieInfo) {
|
|
805
|
-
const gevondenRitdeel = this.ritdelen.filter(r => parseInt(r.getBewegingId(), 10) === bewegingId);
|
|
806
|
-
// hide/show de knoppen
|
|
807
|
-
const printing = !!bewegingId && gevondenRitdeel.length === 1;
|
|
808
|
-
this.viewerControlService.setPrinting(printing);
|
|
809
|
-
if (!printing) {
|
|
810
|
-
return Promise.reject(new Error('Geen beweging gevonden voor ' + bewegingId));
|
|
811
|
-
}
|
|
812
|
-
return new Promise((resolve) => {
|
|
813
|
-
const ritdeel = gevondenRitdeel[0];
|
|
814
|
-
if (ritdeel.isNietBeschikbaar()) {
|
|
815
|
-
this.store.dispatch(navigeerVanaf(paginationSize, iaVersieInfo, ritdeel));
|
|
816
|
-
this.store.dispatch(ShowProgress());
|
|
817
|
-
setTimeout(() => this.focusOpBeweging(ritdeel, resolve), 1000);
|
|
818
|
-
}
|
|
819
|
-
else {
|
|
820
|
-
this.focusOpBeweging(ritdeel, resolve);
|
|
821
|
-
}
|
|
822
|
-
});
|
|
823
|
-
}
|
|
824
|
-
focusOpBeweging(ritdeel, resolve) {
|
|
825
|
-
// deselecteer alles
|
|
826
|
-
this.store.dispatch(setZichtbaarheidAlleRitdelen(false));
|
|
827
|
-
// enable ritacties (checkbox) voor alle ritdelen met beweging die matched met bewegingId(s)
|
|
828
|
-
this.store.dispatch(toggleZichtbaarheidVoorBewegingen([parseInt(ritdeel.getBewegingId(), 10)]));
|
|
829
|
-
setTimeout(() => {
|
|
830
|
-
// dit neemt niet de vrijebaan elementen mee
|
|
831
|
-
const topoElementen = this.sbmService.bepaalRouteElementen(ritdeel.getRoute());
|
|
832
|
-
const dwangPuics = this.getPuics(topoElementen);
|
|
833
|
-
this.store.dispatch(focusOpIds(dwangPuics));
|
|
834
|
-
setTimeout(() => {
|
|
835
|
-
// resolve de promise, om aan te geven dat focus klaar is
|
|
836
|
-
resolve(true);
|
|
837
|
-
this.viewerControlService.setPrinting(false);
|
|
838
|
-
this.store.dispatch(ClearProgress());
|
|
839
|
-
}, 1000);
|
|
840
|
-
});
|
|
841
|
-
}
|
|
842
|
-
getPuics(topoElementen) {
|
|
843
|
-
return topoElementen.map(e => e.getPuic());
|
|
844
|
-
}
|
|
845
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: PrintBewegingService, deps: [{ token: i2$1.Store }, { token: ViewerControlService }, { token: SignaleringsBeeldManagerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
846
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: PrintBewegingService, providedIn: 'root' }); }
|
|
847
|
-
}
|
|
848
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: PrintBewegingService, decorators: [{
|
|
849
|
-
type: Injectable,
|
|
850
|
-
args: [{
|
|
851
|
-
providedIn: 'root'
|
|
852
|
-
}]
|
|
853
|
-
}], ctorParameters: () => [{ type: i2$1.Store }, { type: ViewerControlService }, { type: SignaleringsBeeldManagerService }] });
|
|
854
|
-
|
|
855
|
-
class RpeComponent {
|
|
856
|
-
convertToScript() {
|
|
857
|
-
const element = this.script.nativeElement;
|
|
858
|
-
const script = document.createElement('script');
|
|
859
|
-
script.type = 'text/javascript';
|
|
860
|
-
if (this.baseurl && this.path) {
|
|
861
|
-
script.src = this.baseurl + this.path;
|
|
862
|
-
// eslint-disable-next-line no-console
|
|
863
|
-
console.log('Code geladen van: ' + script.src); //useful for debugging in GWT environment
|
|
864
|
-
}
|
|
865
|
-
const parent = element.parentElement;
|
|
866
|
-
parent.parentElement.replaceChild(script, parent);
|
|
867
|
-
}
|
|
868
|
-
ngAfterViewInit() {
|
|
869
|
-
this.convertToScript();
|
|
870
|
-
}
|
|
871
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: RpeComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
|
|
872
|
-
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.2.7", type: RpeComponent, selector: "rpe-component", inputs: { baseurl: "baseurl", path: "path" }, viewQueries: [{ propertyName: "script", first: true, predicate: ["rpescript"], descendants: true }], ngImport: i0, template: "<div #rpescript style.display=\"none\">\n <ng-content></ng-content>\n</div>\n" }); }
|
|
873
|
-
}
|
|
874
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: RpeComponent, decorators: [{
|
|
875
|
-
type: Component,
|
|
876
|
-
args: [{ selector: 'rpe-component', template: "<div #rpescript style.display=\"none\">\n <ng-content></ng-content>\n</div>\n" }]
|
|
877
|
-
}], propDecorators: { baseurl: [{
|
|
878
|
-
type: Input
|
|
879
|
-
}], path: [{
|
|
880
|
-
type: Input
|
|
881
|
-
}], script: [{
|
|
882
|
-
type: ViewChild,
|
|
883
|
-
args: ['rpescript']
|
|
884
|
-
}] } });
|
|
885
|
-
|
|
886
|
-
class OngeplandeActie {
|
|
887
|
-
constructor(actie, puics) {
|
|
888
|
-
this.actie = actie;
|
|
889
|
-
this.puics = puics;
|
|
890
|
-
}
|
|
891
|
-
}
|
|
892
|
-
|
|
893
|
-
class KmRange {
|
|
894
|
-
constructor(topologyElement, vanKilometreringen, totKilometreringen) {
|
|
895
|
-
this.topologyElement = topologyElement;
|
|
896
|
-
this.vanKilometreringen = vanKilometreringen;
|
|
897
|
-
this.totKilometreringen = totKilometreringen;
|
|
898
|
-
}
|
|
899
|
-
static rangeVoorPuntObject(topologyElement) {
|
|
900
|
-
return new KmRange(topologyElement, JsJavaUtil.listToArray(topologyElement.getKilometreringen()), JsJavaUtil.listToArray(topologyElement.getKilometreringen()));
|
|
901
|
-
}
|
|
902
|
-
static rangeVoorStrekObject(topologyElement, vanKilometreringen, totKilometreringen) {
|
|
903
|
-
return new KmRange(topologyElement, vanKilometreringen, totKilometreringen);
|
|
904
|
-
}
|
|
905
|
-
static getKilometrering(lintNaam, kilometreringen) {
|
|
906
|
-
const result = kilometreringen.filter(kilometrering => kilometrering.getKmLint() === lintNaam);
|
|
907
|
-
if (result.length >= 1) {
|
|
908
|
-
return result[0];
|
|
909
|
-
}
|
|
910
|
-
return null;
|
|
911
|
-
}
|
|
912
|
-
heeftOverlap(kilometrering1, kilometrering2) {
|
|
913
|
-
const vanKilometrering = KmRange.getKilometrering(kilometrering1.getKmLint(), this.vanKilometreringen);
|
|
914
|
-
const totKilometrering = KmRange.getKilometrering(kilometrering2.getKmLint(), this.totKilometreringen);
|
|
915
|
-
if (!vanKilometrering || !totKilometrering) {
|
|
916
|
-
return false;
|
|
917
|
-
}
|
|
918
|
-
let startKmWaarde = vanKilometrering.getKmWaarde();
|
|
919
|
-
let endKmWaarde = totKilometrering.getKmWaarde();
|
|
920
|
-
if (startKmWaarde > endKmWaarde) {
|
|
921
|
-
const temp = { end: endKmWaarde, start: startKmWaarde };
|
|
922
|
-
startKmWaarde = temp.end;
|
|
923
|
-
endKmWaarde = temp.start;
|
|
924
|
-
}
|
|
925
|
-
const actieStartKmWaarde = kilometrering1.getKmWaarde();
|
|
926
|
-
const actieEndKmWaarde = kilometrering2.getKmWaarde();
|
|
927
|
-
return endKmWaarde >= actieStartKmWaarde && actieEndKmWaarde >= startKmWaarde;
|
|
928
|
-
}
|
|
929
|
-
}
|
|
930
|
-
|
|
931
|
-
class WisselKantCode {
|
|
932
|
-
constructor(naam, kantCode) {
|
|
933
|
-
this.naam = naam;
|
|
934
|
-
this.kantCode = kantCode;
|
|
935
|
-
}
|
|
936
|
-
}
|
|
937
|
-
|
|
938
|
-
class MeldingEvent {
|
|
939
|
-
constructor(meldingMessage, meldingLevel) {
|
|
940
|
-
this.meldingMessage = meldingMessage;
|
|
941
|
-
this.meldingLevel = meldingLevel;
|
|
942
|
-
}
|
|
943
|
-
}
|
|
944
|
-
|
|
945
|
-
const MELDING_LEVEL_ERROR = 'error';
|
|
946
|
-
const MELDING_LEVEL_WARNING = 'warn';
|
|
947
|
-
const MELDING_LEVEL_INFO = 'info';
|
|
948
|
-
class MeldingBuilder {
|
|
949
|
-
static nietGevondenTakkenOngeplandeActies(nietGevondenTakken) {
|
|
950
|
-
return new MeldingEvent('Niet gevonden takken uit \'OngeplandeActies\': ' + nietGevondenTakken, MELDING_LEVEL_INFO);
|
|
951
|
-
}
|
|
952
|
-
static actieHighlightError(actieZonderElementen) {
|
|
953
|
-
return new MeldingEvent('Highlight error. Geen elementen kunnen vinden voor actie(s) met id: ' + actieZonderElementen, MELDING_LEVEL_ERROR);
|
|
954
|
-
}
|
|
955
|
-
}
|
|
956
|
-
|
|
957
|
-
class Utils {
|
|
958
|
-
static getValidErorrMessage(err) {
|
|
959
|
-
let errorMsg = '';
|
|
960
|
-
if (err.msg) {
|
|
961
|
-
errorMsg += err.msg;
|
|
962
|
-
}
|
|
963
|
-
if (Array.isArray(err.body)) {
|
|
964
|
-
err.body.forEach((x) => errorMsg += x);
|
|
965
|
-
}
|
|
966
|
-
else if (err.body) {
|
|
967
|
-
if (err.body instanceof ProgressEvent) {
|
|
968
|
-
errorMsg = 'Kon geen verbinding maken met de server';
|
|
969
|
-
}
|
|
970
|
-
else if (err.body.text) {
|
|
971
|
-
errorMsg += err.body.text;
|
|
972
|
-
}
|
|
973
|
-
else {
|
|
974
|
-
errorMsg += err.body;
|
|
975
|
-
}
|
|
976
|
-
}
|
|
977
|
-
if (err.message) {
|
|
978
|
-
errorMsg += err.message;
|
|
979
|
-
}
|
|
980
|
-
if (typeof err === 'string' || err instanceof String) {
|
|
981
|
-
errorMsg += err;
|
|
982
|
-
}
|
|
983
|
-
if (errorMsg !== '') {
|
|
984
|
-
return errorMsg;
|
|
985
|
-
}
|
|
986
|
-
}
|
|
987
|
-
}
|
|
988
|
-
|
|
989
|
-
class MessageBuilder {
|
|
990
|
-
static rwpDataNietGevonden(err) {
|
|
991
|
-
return new Message(Severity.ERROR, 'Error bij ophalen van rijwegplan data: ' + err);
|
|
992
|
-
}
|
|
993
|
-
static rijwegNietGevonden(beweging) {
|
|
994
|
-
return new Message(Severity.ERROR, `Rijweg van ${beweging.vanSpoor} in PPLG ${beweging.vanPplg} naar ${beweging.naarSpoor} niet gevonden`);
|
|
995
|
-
}
|
|
996
|
-
static rijwegplanNietGevonden(beweging) {
|
|
997
|
-
return new Message(Severity.ERROR, `Rijwegplan van PPLG ${beweging.vanPplg} niet gevonden`);
|
|
998
|
-
}
|
|
999
|
-
static dwangNietGevonden(beweging) {
|
|
1000
|
-
return new Message(Severity.ERROR, `Dwang ${beweging.dwangNummer} voor rijweg van ${beweging.vanSpoor} in PPLG ${beweging.vanPplg} naar ${beweging.naarSpoor} niet gevonden`);
|
|
1001
|
-
}
|
|
1002
|
-
static nietGevondenSBI(err) {
|
|
1003
|
-
return new Message(Severity.ERROR, 'Error bij het ophalen van signaleringsbeeldinfo: ' + Utils.getValidErorrMessage(err));
|
|
1004
|
-
}
|
|
1005
|
-
static actieHighlightError(actieZonderElementen) {
|
|
1006
|
-
return new Message(Severity.ERROR, 'Highlight error. Geen elementen kunnen vinden voor actie(s) met id: ' + actieZonderElementen);
|
|
1007
|
-
}
|
|
1008
|
-
static ritFileAlGewijzigdError(beweging) {
|
|
1009
|
-
return new Message(Severity.ERROR, 'Rit bevat een beweging met status \'Gewijzigd\': Beweging met ID:' + beweging.id);
|
|
1010
|
-
}
|
|
1011
|
-
static meerDan12BladenGevonden(bladAmount) {
|
|
1012
|
-
return new Message(Severity.WARNING, 'Warning, Rit bevat ' + bladAmount + ' bladen. Er worden maximaal 12 bladen ondersteund.');
|
|
1013
|
-
}
|
|
1014
|
-
static nietGevondenTakkenOngeplandeActies(nietGevondenTakken) {
|
|
1015
|
-
return new Message(Severity.INFORMATION, 'Info, Niet gevonden takken uit \'OngeplandeActies\': ' + nietGevondenTakken);
|
|
1016
|
-
}
|
|
1017
|
-
}
|
|
1018
|
-
|
|
1019
|
-
/**
|
|
1020
|
-
* Custom HttpParameterCodec
|
|
1021
|
-
* Workaround for https://github.com/angular/angular/issues/18261
|
|
1022
|
-
*/
|
|
1023
|
-
class CustomHttpParameterCodec {
|
|
1024
|
-
encodeKey(k) {
|
|
1025
|
-
return encodeURIComponent(k);
|
|
1026
|
-
}
|
|
1027
|
-
encodeValue(v) {
|
|
1028
|
-
return encodeURIComponent(v);
|
|
1029
|
-
}
|
|
1030
|
-
decodeKey(k) {
|
|
1031
|
-
return decodeURIComponent(k);
|
|
1032
|
-
}
|
|
1033
|
-
decodeValue(v) {
|
|
1034
|
-
return decodeURIComponent(v);
|
|
1035
|
-
}
|
|
1036
|
-
}
|
|
1037
|
-
|
|
1038
|
-
const BASE_PATH = new InjectionToken('basePath');
|
|
1039
|
-
const COLLECTION_FORMATS = {
|
|
1040
|
-
'csv': ',',
|
|
1041
|
-
'tsv': ' ',
|
|
1042
|
-
'ssv': ' ',
|
|
1043
|
-
'pipes': '|'
|
|
1044
|
-
};
|
|
1045
|
-
|
|
1046
|
-
class Configuration {
|
|
1047
|
-
constructor(configurationParameters = {}) {
|
|
1048
|
-
this.apiKeys = configurationParameters.apiKeys;
|
|
1049
|
-
this.username = configurationParameters.username;
|
|
1050
|
-
this.password = configurationParameters.password;
|
|
1051
|
-
this.accessToken = configurationParameters.accessToken;
|
|
1052
|
-
this.basePath = configurationParameters.basePath;
|
|
1053
|
-
this.withCredentials = configurationParameters.withCredentials;
|
|
1054
|
-
this.encoder = configurationParameters.encoder;
|
|
1055
|
-
if (configurationParameters.encodeParam) {
|
|
1056
|
-
this.encodeParam = configurationParameters.encodeParam;
|
|
1057
|
-
}
|
|
1058
|
-
else {
|
|
1059
|
-
this.encodeParam = param => this.defaultEncodeParam(param);
|
|
1060
|
-
}
|
|
1061
|
-
if (configurationParameters.credentials) {
|
|
1062
|
-
this.credentials = configurationParameters.credentials;
|
|
1063
|
-
}
|
|
1064
|
-
else {
|
|
1065
|
-
this.credentials = {};
|
|
1066
|
-
}
|
|
1067
|
-
// init default keycloak_auth credential
|
|
1068
|
-
if (!this.credentials['keycloak_auth']) {
|
|
1069
|
-
this.credentials['keycloak_auth'] = () => {
|
|
1070
|
-
return typeof this.accessToken === 'function'
|
|
1071
|
-
? this.accessToken()
|
|
1072
|
-
: this.accessToken;
|
|
1073
|
-
};
|
|
1074
|
-
}
|
|
1075
|
-
}
|
|
1076
|
-
/**
|
|
1077
|
-
* Select the correct content-type to use for a request.
|
|
1078
|
-
* Uses {@link Configuration#isJsonMime} to determine the correct content-type.
|
|
1079
|
-
* If no content type is found return the first found type if the contentTypes is not empty
|
|
1080
|
-
* @param contentTypes - the array of content types that are available for selection
|
|
1081
|
-
* @returns the selected content-type or <code>undefined</code> if no selection could be made.
|
|
1082
|
-
*/
|
|
1083
|
-
selectHeaderContentType(contentTypes) {
|
|
1084
|
-
if (contentTypes.length === 0) {
|
|
1085
|
-
return undefined;
|
|
1086
|
-
}
|
|
1087
|
-
const type = contentTypes.find((x) => this.isJsonMime(x));
|
|
1088
|
-
if (type === undefined) {
|
|
1089
|
-
return contentTypes[0];
|
|
1090
|
-
}
|
|
1091
|
-
return type;
|
|
1092
|
-
}
|
|
1093
|
-
/**
|
|
1094
|
-
* Select the correct accept content-type to use for a request.
|
|
1095
|
-
* Uses {@link Configuration#isJsonMime} to determine the correct accept content-type.
|
|
1096
|
-
* If no content type is found return the first found type if the contentTypes is not empty
|
|
1097
|
-
* @param accepts - the array of content types that are available for selection.
|
|
1098
|
-
* @returns the selected content-type or <code>undefined</code> if no selection could be made.
|
|
1099
|
-
*/
|
|
1100
|
-
selectHeaderAccept(accepts) {
|
|
1101
|
-
if (accepts.length === 0) {
|
|
1102
|
-
return undefined;
|
|
1103
|
-
}
|
|
1104
|
-
const type = accepts.find((x) => this.isJsonMime(x));
|
|
1105
|
-
if (type === undefined) {
|
|
1106
|
-
return accepts[0];
|
|
1107
|
-
}
|
|
1108
|
-
return type;
|
|
1109
|
-
}
|
|
1110
|
-
/**
|
|
1111
|
-
* Check if the given MIME is a JSON MIME.
|
|
1112
|
-
* JSON MIME examples:
|
|
1113
|
-
* application/json
|
|
1114
|
-
* application/json; charset=UTF8
|
|
1115
|
-
* APPLICATION/JSON
|
|
1116
|
-
* application/vnd.company+json
|
|
1117
|
-
* @param mime - MIME (Multipurpose Internet Mail Extensions)
|
|
1118
|
-
* @return True if the given MIME is JSON, false otherwise.
|
|
1119
|
-
*/
|
|
1120
|
-
isJsonMime(mime) {
|
|
1121
|
-
const jsonMime = new RegExp('^(application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(;.*)?$', 'i');
|
|
1122
|
-
return mime !== null && (jsonMime.test(mime) || mime.toLowerCase() === 'application/json-patch+json');
|
|
1123
|
-
}
|
|
1124
|
-
lookupCredential(key) {
|
|
1125
|
-
const value = this.credentials[key];
|
|
1126
|
-
return typeof value === 'function'
|
|
1127
|
-
? value()
|
|
1128
|
-
: value;
|
|
1129
|
-
}
|
|
1130
|
-
defaultEncodeParam(param) {
|
|
1131
|
-
// This implementation exists as fallback for missing configuration
|
|
1132
|
-
// and for backwards compatibility to older typescript-angular generator versions.
|
|
1133
|
-
// It only works for the 'simple' parameter style.
|
|
1134
|
-
// Date-handling only works for the 'date-time' format.
|
|
1135
|
-
// All other styles and Date-formats are probably handled incorrectly.
|
|
1136
|
-
//
|
|
1137
|
-
// But: if that's all you need (i.e.: the most common use-case): no need for customization!
|
|
1138
|
-
const value = param.dataFormat === 'date-time' && param.value instanceof Date
|
|
1139
|
-
? param.value.toISOString()
|
|
1140
|
-
: param.value;
|
|
1141
|
-
return encodeURIComponent(String(value));
|
|
1142
|
-
}
|
|
1143
|
-
}
|
|
1144
|
-
|
|
1145
|
-
/**
|
|
1146
|
-
* MST
|
|
1147
|
-
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
|
|
1148
|
-
*
|
|
1149
|
-
* The version of the OpenAPI document: 1
|
|
1150
|
-
*
|
|
1151
|
-
*
|
|
1152
|
-
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
|
|
1153
|
-
* https://openapi-generator.tech
|
|
1154
|
-
* Do not edit the class manually.
|
|
1155
|
-
*/
|
|
1156
|
-
/* tslint:disable:no-unused-variable member-ordering */
|
|
1157
|
-
class AppConfigControllerService {
|
|
1158
|
-
constructor(httpClient, basePath, configuration) {
|
|
1159
|
-
this.httpClient = httpClient;
|
|
1160
|
-
this.basePath = 'http://localhost:8080/mst';
|
|
1161
|
-
this.defaultHeaders = new HttpHeaders();
|
|
1162
|
-
this.configuration = new Configuration();
|
|
1163
|
-
if (configuration) {
|
|
1164
|
-
this.configuration = configuration;
|
|
1165
|
-
}
|
|
1166
|
-
if (typeof this.configuration.basePath !== 'string') {
|
|
1167
|
-
if (Array.isArray(basePath) && basePath.length > 0) {
|
|
1168
|
-
basePath = basePath[0];
|
|
1169
|
-
}
|
|
1170
|
-
if (typeof basePath !== 'string') {
|
|
1171
|
-
basePath = this.basePath;
|
|
1172
|
-
}
|
|
1173
|
-
this.configuration.basePath = basePath;
|
|
1174
|
-
}
|
|
1175
|
-
this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
|
|
1176
|
-
}
|
|
1177
|
-
// @ts-ignore
|
|
1178
|
-
addToHttpParams(httpParams, value, key) {
|
|
1179
|
-
if (typeof value === "object" && value instanceof Date === false) {
|
|
1180
|
-
httpParams = this.addToHttpParamsRecursive(httpParams, value);
|
|
1181
|
-
}
|
|
1182
|
-
else {
|
|
1183
|
-
httpParams = this.addToHttpParamsRecursive(httpParams, value, key);
|
|
1184
|
-
}
|
|
1185
|
-
return httpParams;
|
|
1186
|
-
}
|
|
1187
|
-
addToHttpParamsRecursive(httpParams, value, key) {
|
|
1188
|
-
if (value == null) {
|
|
1189
|
-
return httpParams;
|
|
1190
|
-
}
|
|
1191
|
-
if (typeof value === "object") {
|
|
1192
|
-
if (Array.isArray(value)) {
|
|
1193
|
-
value.forEach(elem => httpParams = this.addToHttpParamsRecursive(httpParams, elem, key));
|
|
1194
|
-
}
|
|
1195
|
-
else if (value instanceof Date) {
|
|
1196
|
-
if (key != null) {
|
|
1197
|
-
httpParams = httpParams.append(key, value.toISOString().substring(0, 10));
|
|
1198
|
-
}
|
|
1199
|
-
else {
|
|
1200
|
-
throw Error("key may not be null if value is Date");
|
|
1201
|
-
}
|
|
1202
|
-
}
|
|
1203
|
-
else {
|
|
1204
|
-
Object.keys(value).forEach(k => httpParams = this.addToHttpParamsRecursive(httpParams, value[k], key != null ? `${key}.${k}` : k));
|
|
1205
|
-
}
|
|
1206
|
-
}
|
|
1207
|
-
else if (key != null) {
|
|
1208
|
-
httpParams = httpParams.append(key, value);
|
|
1209
|
-
}
|
|
1210
|
-
else {
|
|
1211
|
-
throw Error("key may not be null if value is not object or array");
|
|
1212
|
-
}
|
|
1213
|
-
return httpParams;
|
|
1214
|
-
}
|
|
1215
|
-
getAppConfig(observe = 'body', reportProgress = false, options) {
|
|
1216
|
-
let localVarHeaders = this.defaultHeaders;
|
|
1217
|
-
let localVarHttpHeaderAcceptSelected = options && options.httpHeaderAccept;
|
|
1218
|
-
if (localVarHttpHeaderAcceptSelected === undefined) {
|
|
1219
|
-
// to determine the Accept header
|
|
1220
|
-
const httpHeaderAccepts = [
|
|
1221
|
-
'*/*'
|
|
1222
|
-
];
|
|
1223
|
-
localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
|
|
1224
|
-
}
|
|
1225
|
-
if (localVarHttpHeaderAcceptSelected !== undefined) {
|
|
1226
|
-
localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
|
|
1227
|
-
}
|
|
1228
|
-
let localVarHttpContext = options && options.context;
|
|
1229
|
-
if (localVarHttpContext === undefined) {
|
|
1230
|
-
localVarHttpContext = new HttpContext();
|
|
1231
|
-
}
|
|
1232
|
-
let localVarTransferCache = options && options.transferCache;
|
|
1233
|
-
if (localVarTransferCache === undefined) {
|
|
1234
|
-
localVarTransferCache = true;
|
|
1235
|
-
}
|
|
1236
|
-
let responseType_ = 'json';
|
|
1237
|
-
if (localVarHttpHeaderAcceptSelected) {
|
|
1238
|
-
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
|
|
1239
|
-
responseType_ = 'text';
|
|
1240
|
-
}
|
|
1241
|
-
else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
|
|
1242
|
-
responseType_ = 'json';
|
|
1243
|
-
}
|
|
1244
|
-
else {
|
|
1245
|
-
responseType_ = 'blob';
|
|
1246
|
-
}
|
|
1247
|
-
}
|
|
1248
|
-
let localVarPath = `/rest/appconfig`;
|
|
1249
|
-
return this.httpClient.request('get', `${this.configuration.basePath}${localVarPath}`, {
|
|
1250
|
-
context: localVarHttpContext,
|
|
1251
|
-
responseType: responseType_,
|
|
1252
|
-
withCredentials: this.configuration.withCredentials,
|
|
1253
|
-
headers: localVarHeaders,
|
|
1254
|
-
observe: observe,
|
|
1255
|
-
transferCache: localVarTransferCache,
|
|
1256
|
-
reportProgress: reportProgress
|
|
1257
|
-
});
|
|
1258
|
-
}
|
|
1259
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: AppConfigControllerService, deps: [{ token: i1.HttpClient }, { token: BASE_PATH, optional: true }, { token: Configuration, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
1260
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: AppConfigControllerService, providedIn: 'root' }); }
|
|
1261
|
-
}
|
|
1262
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: AppConfigControllerService, decorators: [{
|
|
1263
|
-
type: Injectable,
|
|
1264
|
-
args: [{
|
|
1265
|
-
providedIn: 'root'
|
|
1266
|
-
}]
|
|
1267
|
-
}], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
|
|
1268
|
-
type: Optional
|
|
1269
|
-
}, {
|
|
1270
|
-
type: Inject,
|
|
1271
|
-
args: [BASE_PATH]
|
|
1272
|
-
}] }, { type: Configuration, decorators: [{
|
|
1273
|
-
type: Optional
|
|
1274
|
-
}] }] });
|
|
1275
|
-
|
|
1276
|
-
/**
|
|
1277
|
-
* MST
|
|
1278
|
-
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
|
|
1279
|
-
*
|
|
1280
|
-
* The version of the OpenAPI document: 1
|
|
1281
|
-
*
|
|
1282
|
-
*
|
|
1283
|
-
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
|
|
1284
|
-
* https://openapi-generator.tech
|
|
1285
|
-
* Do not edit the class manually.
|
|
1286
|
-
*/
|
|
1287
|
-
/* tslint:disable:no-unused-variable member-ordering */
|
|
1288
|
-
class BewegingControllerService {
|
|
1289
|
-
constructor(httpClient, basePath, configuration) {
|
|
1290
|
-
this.httpClient = httpClient;
|
|
1291
|
-
this.basePath = 'http://localhost:8080/mst';
|
|
1292
|
-
this.defaultHeaders = new HttpHeaders();
|
|
1293
|
-
this.configuration = new Configuration();
|
|
1294
|
-
if (configuration) {
|
|
1295
|
-
this.configuration = configuration;
|
|
1296
|
-
}
|
|
1297
|
-
if (typeof this.configuration.basePath !== 'string') {
|
|
1298
|
-
if (Array.isArray(basePath) && basePath.length > 0) {
|
|
1299
|
-
basePath = basePath[0];
|
|
1300
|
-
}
|
|
1301
|
-
if (typeof basePath !== 'string') {
|
|
1302
|
-
basePath = this.basePath;
|
|
1303
|
-
}
|
|
1304
|
-
this.configuration.basePath = basePath;
|
|
1305
|
-
}
|
|
1306
|
-
this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
|
|
1307
|
-
}
|
|
1308
|
-
// @ts-ignore
|
|
1309
|
-
addToHttpParams(httpParams, value, key) {
|
|
1310
|
-
if (typeof value === "object" && value instanceof Date === false) {
|
|
1311
|
-
httpParams = this.addToHttpParamsRecursive(httpParams, value);
|
|
1312
|
-
}
|
|
1313
|
-
else {
|
|
1314
|
-
httpParams = this.addToHttpParamsRecursive(httpParams, value, key);
|
|
1315
|
-
}
|
|
1316
|
-
return httpParams;
|
|
1317
|
-
}
|
|
1318
|
-
addToHttpParamsRecursive(httpParams, value, key) {
|
|
1319
|
-
if (value == null) {
|
|
1320
|
-
return httpParams;
|
|
1321
|
-
}
|
|
1322
|
-
if (typeof value === "object") {
|
|
1323
|
-
if (Array.isArray(value)) {
|
|
1324
|
-
value.forEach(elem => httpParams = this.addToHttpParamsRecursive(httpParams, elem, key));
|
|
1325
|
-
}
|
|
1326
|
-
else if (value instanceof Date) {
|
|
1327
|
-
if (key != null) {
|
|
1328
|
-
httpParams = httpParams.append(key, value.toISOString().substring(0, 10));
|
|
1329
|
-
}
|
|
1330
|
-
else {
|
|
1331
|
-
throw Error("key may not be null if value is Date");
|
|
1332
|
-
}
|
|
1333
|
-
}
|
|
1334
|
-
else {
|
|
1335
|
-
Object.keys(value).forEach(k => httpParams = this.addToHttpParamsRecursive(httpParams, value[k], key != null ? `${key}.${k}` : k));
|
|
1336
|
-
}
|
|
1337
|
-
}
|
|
1338
|
-
else if (key != null) {
|
|
1339
|
-
httpParams = httpParams.append(key, value);
|
|
1340
|
-
}
|
|
1341
|
-
else {
|
|
1342
|
-
throw Error("key may not be null if value is not object or array");
|
|
1343
|
-
}
|
|
1344
|
-
return httpParams;
|
|
1345
|
-
}
|
|
1346
|
-
verrijkBewegingenMetOngeplandeActies(iaVersie, ritRequestDto, observe = 'body', reportProgress = false, options) {
|
|
1347
|
-
if (iaVersie === null || iaVersie === undefined) {
|
|
1348
|
-
throw new Error('Required parameter iaVersie was null or undefined when calling verrijkBewegingenMetOngeplandeActies.');
|
|
1349
|
-
}
|
|
1350
|
-
if (ritRequestDto === null || ritRequestDto === undefined) {
|
|
1351
|
-
throw new Error('Required parameter ritRequestDto was null or undefined when calling verrijkBewegingenMetOngeplandeActies.');
|
|
1352
|
-
}
|
|
1353
|
-
let localVarHeaders = this.defaultHeaders;
|
|
1354
|
-
let localVarHttpHeaderAcceptSelected = options && options.httpHeaderAccept;
|
|
1355
|
-
if (localVarHttpHeaderAcceptSelected === undefined) {
|
|
1356
|
-
// to determine the Accept header
|
|
1357
|
-
const httpHeaderAccepts = [
|
|
1358
|
-
'*/*'
|
|
1359
|
-
];
|
|
1360
|
-
localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
|
|
1361
|
-
}
|
|
1362
|
-
if (localVarHttpHeaderAcceptSelected !== undefined) {
|
|
1363
|
-
localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
|
|
1364
|
-
}
|
|
1365
|
-
let localVarHttpContext = options && options.context;
|
|
1366
|
-
if (localVarHttpContext === undefined) {
|
|
1367
|
-
localVarHttpContext = new HttpContext();
|
|
1368
|
-
}
|
|
1369
|
-
let localVarTransferCache = options && options.transferCache;
|
|
1370
|
-
if (localVarTransferCache === undefined) {
|
|
1371
|
-
localVarTransferCache = true;
|
|
1372
|
-
}
|
|
1373
|
-
// to determine the Content-Type header
|
|
1374
|
-
const consumes = [
|
|
1375
|
-
'application/json'
|
|
1376
|
-
];
|
|
1377
|
-
const httpContentTypeSelected = this.configuration.selectHeaderContentType(consumes);
|
|
1378
|
-
if (httpContentTypeSelected !== undefined) {
|
|
1379
|
-
localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
|
|
1380
|
-
}
|
|
1381
|
-
let responseType_ = 'json';
|
|
1382
|
-
if (localVarHttpHeaderAcceptSelected) {
|
|
1383
|
-
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
|
|
1384
|
-
responseType_ = 'text';
|
|
1385
|
-
}
|
|
1386
|
-
else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
|
|
1387
|
-
responseType_ = 'json';
|
|
1388
|
-
}
|
|
1389
|
-
else {
|
|
1390
|
-
responseType_ = 'blob';
|
|
1391
|
-
}
|
|
1392
|
-
}
|
|
1393
|
-
let localVarPath = `/rest/beweging/${this.configuration.encodeParam({ name: "iaVersie", value: iaVersie, in: "path", style: "simple", explode: false, dataType: "string", dataFormat: undefined })}`;
|
|
1394
|
-
return this.httpClient.request('put', `${this.configuration.basePath}${localVarPath}`, {
|
|
1395
|
-
context: localVarHttpContext,
|
|
1396
|
-
body: ritRequestDto,
|
|
1397
|
-
responseType: responseType_,
|
|
1398
|
-
withCredentials: this.configuration.withCredentials,
|
|
1399
|
-
headers: localVarHeaders,
|
|
1400
|
-
observe: observe,
|
|
1401
|
-
transferCache: localVarTransferCache,
|
|
1402
|
-
reportProgress: reportProgress
|
|
1403
|
-
});
|
|
1404
|
-
}
|
|
1405
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: BewegingControllerService, deps: [{ token: i1.HttpClient }, { token: BASE_PATH, optional: true }, { token: Configuration, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
1406
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: BewegingControllerService, providedIn: 'root' }); }
|
|
1407
|
-
}
|
|
1408
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: BewegingControllerService, decorators: [{
|
|
1409
|
-
type: Injectable,
|
|
1410
|
-
args: [{
|
|
1411
|
-
providedIn: 'root'
|
|
1412
|
-
}]
|
|
1413
|
-
}], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
|
|
1414
|
-
type: Optional
|
|
1415
|
-
}, {
|
|
1416
|
-
type: Inject,
|
|
1417
|
-
args: [BASE_PATH]
|
|
1418
|
-
}] }, { type: Configuration, decorators: [{
|
|
1419
|
-
type: Optional
|
|
1420
|
-
}] }] });
|
|
1421
|
-
|
|
1422
|
-
/**
|
|
1423
|
-
* MST
|
|
1424
|
-
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
|
|
1425
|
-
*
|
|
1426
|
-
* The version of the OpenAPI document: 1
|
|
1427
|
-
*
|
|
1428
|
-
*
|
|
1429
|
-
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
|
|
1430
|
-
* https://openapi-generator.tech
|
|
1431
|
-
* Do not edit the class manually.
|
|
1432
|
-
*/
|
|
1433
|
-
/* tslint:disable:no-unused-variable member-ordering */
|
|
1434
|
-
class Class0BuildPropertiesService {
|
|
1435
|
-
constructor(httpClient, basePath, configuration) {
|
|
1436
|
-
this.httpClient = httpClient;
|
|
1437
|
-
this.basePath = 'http://localhost:8080/mst';
|
|
1438
|
-
this.defaultHeaders = new HttpHeaders();
|
|
1439
|
-
this.configuration = new Configuration();
|
|
1440
|
-
if (configuration) {
|
|
1441
|
-
this.configuration = configuration;
|
|
1442
|
-
}
|
|
1443
|
-
if (typeof this.configuration.basePath !== 'string') {
|
|
1444
|
-
if (Array.isArray(basePath) && basePath.length > 0) {
|
|
1445
|
-
basePath = basePath[0];
|
|
1446
|
-
}
|
|
1447
|
-
if (typeof basePath !== 'string') {
|
|
1448
|
-
basePath = this.basePath;
|
|
1449
|
-
}
|
|
1450
|
-
this.configuration.basePath = basePath;
|
|
1451
|
-
}
|
|
1452
|
-
this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
|
|
1453
|
-
}
|
|
1454
|
-
// @ts-ignore
|
|
1455
|
-
addToHttpParams(httpParams, value, key) {
|
|
1456
|
-
if (typeof value === "object" && value instanceof Date === false) {
|
|
1457
|
-
httpParams = this.addToHttpParamsRecursive(httpParams, value);
|
|
1458
|
-
}
|
|
1459
|
-
else {
|
|
1460
|
-
httpParams = this.addToHttpParamsRecursive(httpParams, value, key);
|
|
1461
|
-
}
|
|
1462
|
-
return httpParams;
|
|
1463
|
-
}
|
|
1464
|
-
addToHttpParamsRecursive(httpParams, value, key) {
|
|
1465
|
-
if (value == null) {
|
|
1466
|
-
return httpParams;
|
|
1467
|
-
}
|
|
1468
|
-
if (typeof value === "object") {
|
|
1469
|
-
if (Array.isArray(value)) {
|
|
1470
|
-
value.forEach(elem => httpParams = this.addToHttpParamsRecursive(httpParams, elem, key));
|
|
1471
|
-
}
|
|
1472
|
-
else if (value instanceof Date) {
|
|
1473
|
-
if (key != null) {
|
|
1474
|
-
httpParams = httpParams.append(key, value.toISOString().substring(0, 10));
|
|
1475
|
-
}
|
|
1476
|
-
else {
|
|
1477
|
-
throw Error("key may not be null if value is Date");
|
|
1478
|
-
}
|
|
1479
|
-
}
|
|
1480
|
-
else {
|
|
1481
|
-
Object.keys(value).forEach(k => httpParams = this.addToHttpParamsRecursive(httpParams, value[k], key != null ? `${key}.${k}` : k));
|
|
1482
|
-
}
|
|
1483
|
-
}
|
|
1484
|
-
else if (key != null) {
|
|
1485
|
-
httpParams = httpParams.append(key, value);
|
|
1486
|
-
}
|
|
1487
|
-
else {
|
|
1488
|
-
throw Error("key may not be null if value is not object or array");
|
|
1489
|
-
}
|
|
1490
|
-
return httpParams;
|
|
1491
|
-
}
|
|
1492
|
-
getBuildProperties(observe = 'body', reportProgress = false, options) {
|
|
1493
|
-
let localVarHeaders = this.defaultHeaders;
|
|
1494
|
-
let localVarHttpHeaderAcceptSelected = options && options.httpHeaderAccept;
|
|
1495
|
-
if (localVarHttpHeaderAcceptSelected === undefined) {
|
|
1496
|
-
// to determine the Accept header
|
|
1497
|
-
const httpHeaderAccepts = [
|
|
1498
|
-
'application/json'
|
|
1499
|
-
];
|
|
1500
|
-
localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
|
|
1501
|
-
}
|
|
1502
|
-
if (localVarHttpHeaderAcceptSelected !== undefined) {
|
|
1503
|
-
localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
|
|
1504
|
-
}
|
|
1505
|
-
let localVarHttpContext = options && options.context;
|
|
1506
|
-
if (localVarHttpContext === undefined) {
|
|
1507
|
-
localVarHttpContext = new HttpContext();
|
|
1508
|
-
}
|
|
1509
|
-
let localVarTransferCache = options && options.transferCache;
|
|
1510
|
-
if (localVarTransferCache === undefined) {
|
|
1511
|
-
localVarTransferCache = true;
|
|
1512
|
-
}
|
|
1513
|
-
let responseType_ = 'json';
|
|
1514
|
-
if (localVarHttpHeaderAcceptSelected) {
|
|
1515
|
-
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
|
|
1516
|
-
responseType_ = 'text';
|
|
1517
|
-
}
|
|
1518
|
-
else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
|
|
1519
|
-
responseType_ = 'json';
|
|
1520
|
-
}
|
|
1521
|
-
else {
|
|
1522
|
-
responseType_ = 'blob';
|
|
1523
|
-
}
|
|
1524
|
-
}
|
|
1525
|
-
let localVarPath = `/build.properties`;
|
|
1526
|
-
return this.httpClient.request('get', `${this.configuration.basePath}${localVarPath}`, {
|
|
1527
|
-
context: localVarHttpContext,
|
|
1528
|
-
responseType: responseType_,
|
|
1529
|
-
withCredentials: this.configuration.withCredentials,
|
|
1530
|
-
headers: localVarHeaders,
|
|
1531
|
-
observe: observe,
|
|
1532
|
-
transferCache: localVarTransferCache,
|
|
1533
|
-
reportProgress: reportProgress
|
|
1534
|
-
});
|
|
1535
|
-
}
|
|
1536
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: Class0BuildPropertiesService, deps: [{ token: i1.HttpClient }, { token: BASE_PATH, optional: true }, { token: Configuration, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
1537
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: Class0BuildPropertiesService, providedIn: 'root' }); }
|
|
1538
|
-
}
|
|
1539
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: Class0BuildPropertiesService, decorators: [{
|
|
1540
|
-
type: Injectable,
|
|
1541
|
-
args: [{
|
|
1542
|
-
providedIn: 'root'
|
|
1543
|
-
}]
|
|
1544
|
-
}], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
|
|
1545
|
-
type: Optional
|
|
1546
|
-
}, {
|
|
1547
|
-
type: Inject,
|
|
1548
|
-
args: [BASE_PATH]
|
|
1549
|
-
}] }, { type: Configuration, decorators: [{
|
|
1550
|
-
type: Optional
|
|
1551
|
-
}] }] });
|
|
1552
|
-
|
|
1553
|
-
/**
|
|
1554
|
-
* MST
|
|
1555
|
-
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
|
|
1556
|
-
*
|
|
1557
|
-
* The version of the OpenAPI document: 1
|
|
1558
|
-
*
|
|
1559
|
-
*
|
|
1560
|
-
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
|
|
1561
|
-
* https://openapi-generator.tech
|
|
1562
|
-
* Do not edit the class manually.
|
|
1563
|
-
*/
|
|
1564
|
-
/* tslint:disable:no-unused-variable member-ordering */
|
|
1565
|
-
class ConnectorControllerService {
|
|
1566
|
-
constructor(httpClient, basePath, configuration) {
|
|
1567
|
-
this.httpClient = httpClient;
|
|
1568
|
-
this.basePath = 'http://localhost:8080/mst';
|
|
1569
|
-
this.defaultHeaders = new HttpHeaders();
|
|
1570
|
-
this.configuration = new Configuration();
|
|
1571
|
-
if (configuration) {
|
|
1572
|
-
this.configuration = configuration;
|
|
1573
|
-
}
|
|
1574
|
-
if (typeof this.configuration.basePath !== 'string') {
|
|
1575
|
-
if (Array.isArray(basePath) && basePath.length > 0) {
|
|
1576
|
-
basePath = basePath[0];
|
|
1577
|
-
}
|
|
1578
|
-
if (typeof basePath !== 'string') {
|
|
1579
|
-
basePath = this.basePath;
|
|
1580
|
-
}
|
|
1581
|
-
this.configuration.basePath = basePath;
|
|
1582
|
-
}
|
|
1583
|
-
this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
|
|
1584
|
-
}
|
|
1585
|
-
// @ts-ignore
|
|
1586
|
-
addToHttpParams(httpParams, value, key) {
|
|
1587
|
-
if (typeof value === "object" && value instanceof Date === false) {
|
|
1588
|
-
httpParams = this.addToHttpParamsRecursive(httpParams, value);
|
|
1589
|
-
}
|
|
1590
|
-
else {
|
|
1591
|
-
httpParams = this.addToHttpParamsRecursive(httpParams, value, key);
|
|
1592
|
-
}
|
|
1593
|
-
return httpParams;
|
|
1594
|
-
}
|
|
1595
|
-
addToHttpParamsRecursive(httpParams, value, key) {
|
|
1596
|
-
if (value == null) {
|
|
1597
|
-
return httpParams;
|
|
1598
|
-
}
|
|
1599
|
-
if (typeof value === "object") {
|
|
1600
|
-
if (Array.isArray(value)) {
|
|
1601
|
-
value.forEach(elem => httpParams = this.addToHttpParamsRecursive(httpParams, elem, key));
|
|
1602
|
-
}
|
|
1603
|
-
else if (value instanceof Date) {
|
|
1604
|
-
if (key != null) {
|
|
1605
|
-
httpParams = httpParams.append(key, value.toISOString().substring(0, 10));
|
|
1606
|
-
}
|
|
1607
|
-
else {
|
|
1608
|
-
throw Error("key may not be null if value is Date");
|
|
1609
|
-
}
|
|
1610
|
-
}
|
|
1611
|
-
else {
|
|
1612
|
-
Object.keys(value).forEach(k => httpParams = this.addToHttpParamsRecursive(httpParams, value[k], key != null ? `${key}.${k}` : k));
|
|
1613
|
-
}
|
|
1614
|
-
}
|
|
1615
|
-
else if (key != null) {
|
|
1616
|
-
httpParams = httpParams.append(key, value);
|
|
1617
|
-
}
|
|
1618
|
-
else {
|
|
1619
|
-
throw Error("key may not be null if value is not object or array");
|
|
1620
|
-
}
|
|
1621
|
-
return httpParams;
|
|
1622
|
-
}
|
|
1623
|
-
getOtherConnector(iaVersie, connectorPuic, observe = 'body', reportProgress = false, options) {
|
|
1624
|
-
if (iaVersie === null || iaVersie === undefined) {
|
|
1625
|
-
throw new Error('Required parameter iaVersie was null or undefined when calling getOtherConnector.');
|
|
1626
|
-
}
|
|
1627
|
-
if (connectorPuic === null || connectorPuic === undefined) {
|
|
1628
|
-
throw new Error('Required parameter connectorPuic was null or undefined when calling getOtherConnector.');
|
|
1629
|
-
}
|
|
1630
|
-
let localVarHeaders = this.defaultHeaders;
|
|
1631
|
-
let localVarHttpHeaderAcceptSelected = options && options.httpHeaderAccept;
|
|
1632
|
-
if (localVarHttpHeaderAcceptSelected === undefined) {
|
|
1633
|
-
// to determine the Accept header
|
|
1634
|
-
const httpHeaderAccepts = [
|
|
1635
|
-
'*/*'
|
|
1636
|
-
];
|
|
1637
|
-
localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
|
|
1638
|
-
}
|
|
1639
|
-
if (localVarHttpHeaderAcceptSelected !== undefined) {
|
|
1640
|
-
localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
|
|
1641
|
-
}
|
|
1642
|
-
let localVarHttpContext = options && options.context;
|
|
1643
|
-
if (localVarHttpContext === undefined) {
|
|
1644
|
-
localVarHttpContext = new HttpContext();
|
|
1645
|
-
}
|
|
1646
|
-
let localVarTransferCache = options && options.transferCache;
|
|
1647
|
-
if (localVarTransferCache === undefined) {
|
|
1648
|
-
localVarTransferCache = true;
|
|
1649
|
-
}
|
|
1650
|
-
let responseType_ = 'json';
|
|
1651
|
-
if (localVarHttpHeaderAcceptSelected) {
|
|
1652
|
-
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
|
|
1653
|
-
responseType_ = 'text';
|
|
1654
|
-
}
|
|
1655
|
-
else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
|
|
1656
|
-
responseType_ = 'json';
|
|
1657
|
-
}
|
|
1658
|
-
else {
|
|
1659
|
-
responseType_ = 'blob';
|
|
1660
|
-
}
|
|
1661
|
-
}
|
|
1662
|
-
let localVarPath = `/rest/connector/${this.configuration.encodeParam({ name: "iaVersie", value: iaVersie, in: "path", style: "simple", explode: false, dataType: "string", dataFormat: undefined })}/${this.configuration.encodeParam({ name: "connectorPuic", value: connectorPuic, in: "path", style: "simple", explode: false, dataType: "string", dataFormat: undefined })}`;
|
|
1663
|
-
return this.httpClient.request('get', `${this.configuration.basePath}${localVarPath}`, {
|
|
1664
|
-
context: localVarHttpContext,
|
|
1665
|
-
responseType: responseType_,
|
|
1666
|
-
withCredentials: this.configuration.withCredentials,
|
|
1667
|
-
headers: localVarHeaders,
|
|
1668
|
-
observe: observe,
|
|
1669
|
-
transferCache: localVarTransferCache,
|
|
1670
|
-
reportProgress: reportProgress
|
|
1671
|
-
});
|
|
1672
|
-
}
|
|
1673
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: ConnectorControllerService, deps: [{ token: i1.HttpClient }, { token: BASE_PATH, optional: true }, { token: Configuration, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
1674
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: ConnectorControllerService, providedIn: 'root' }); }
|
|
1675
|
-
}
|
|
1676
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: ConnectorControllerService, decorators: [{
|
|
1677
|
-
type: Injectable,
|
|
1678
|
-
args: [{
|
|
1679
|
-
providedIn: 'root'
|
|
1680
|
-
}]
|
|
1681
|
-
}], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
|
|
1682
|
-
type: Optional
|
|
1683
|
-
}, {
|
|
1684
|
-
type: Inject,
|
|
1685
|
-
args: [BASE_PATH]
|
|
1686
|
-
}] }, { type: Configuration, decorators: [{
|
|
1687
|
-
type: Optional
|
|
1688
|
-
}] }] });
|
|
1689
|
-
|
|
1690
|
-
/**
|
|
1691
|
-
* MST
|
|
1692
|
-
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
|
|
1693
|
-
*
|
|
1694
|
-
* The version of the OpenAPI document: 1
|
|
1695
|
-
*
|
|
1696
|
-
*
|
|
1697
|
-
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
|
|
1698
|
-
* https://openapi-generator.tech
|
|
1699
|
-
* Do not edit the class manually.
|
|
1700
|
-
*/
|
|
1701
|
-
/* tslint:disable:no-unused-variable member-ordering */
|
|
1702
|
-
class LogControllerService {
|
|
1703
|
-
constructor(httpClient, basePath, configuration) {
|
|
1704
|
-
this.httpClient = httpClient;
|
|
1705
|
-
this.basePath = 'http://localhost:8080/mst';
|
|
1706
|
-
this.defaultHeaders = new HttpHeaders();
|
|
1707
|
-
this.configuration = new Configuration();
|
|
1708
|
-
if (configuration) {
|
|
1709
|
-
this.configuration = configuration;
|
|
1710
|
-
}
|
|
1711
|
-
if (typeof this.configuration.basePath !== 'string') {
|
|
1712
|
-
if (Array.isArray(basePath) && basePath.length > 0) {
|
|
1713
|
-
basePath = basePath[0];
|
|
1714
|
-
}
|
|
1715
|
-
if (typeof basePath !== 'string') {
|
|
1716
|
-
basePath = this.basePath;
|
|
1717
|
-
}
|
|
1718
|
-
this.configuration.basePath = basePath;
|
|
1719
|
-
}
|
|
1720
|
-
this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
|
|
1721
|
-
}
|
|
1722
|
-
// @ts-ignore
|
|
1723
|
-
addToHttpParams(httpParams, value, key) {
|
|
1724
|
-
if (typeof value === "object" && value instanceof Date === false) {
|
|
1725
|
-
httpParams = this.addToHttpParamsRecursive(httpParams, value);
|
|
1726
|
-
}
|
|
1727
|
-
else {
|
|
1728
|
-
httpParams = this.addToHttpParamsRecursive(httpParams, value, key);
|
|
1729
|
-
}
|
|
1730
|
-
return httpParams;
|
|
1731
|
-
}
|
|
1732
|
-
addToHttpParamsRecursive(httpParams, value, key) {
|
|
1733
|
-
if (value == null) {
|
|
1734
|
-
return httpParams;
|
|
1735
|
-
}
|
|
1736
|
-
if (typeof value === "object") {
|
|
1737
|
-
if (Array.isArray(value)) {
|
|
1738
|
-
value.forEach(elem => httpParams = this.addToHttpParamsRecursive(httpParams, elem, key));
|
|
1739
|
-
}
|
|
1740
|
-
else if (value instanceof Date) {
|
|
1741
|
-
if (key != null) {
|
|
1742
|
-
httpParams = httpParams.append(key, value.toISOString().substring(0, 10));
|
|
1743
|
-
}
|
|
1744
|
-
else {
|
|
1745
|
-
throw Error("key may not be null if value is Date");
|
|
1746
|
-
}
|
|
1747
|
-
}
|
|
1748
|
-
else {
|
|
1749
|
-
Object.keys(value).forEach(k => httpParams = this.addToHttpParamsRecursive(httpParams, value[k], key != null ? `${key}.${k}` : k));
|
|
1750
|
-
}
|
|
1751
|
-
}
|
|
1752
|
-
else if (key != null) {
|
|
1753
|
-
httpParams = httpParams.append(key, value);
|
|
1754
|
-
}
|
|
1755
|
-
else {
|
|
1756
|
-
throw Error("key may not be null if value is not object or array");
|
|
1757
|
-
}
|
|
1758
|
-
return httpParams;
|
|
1759
|
-
}
|
|
1760
|
-
log(logDto, observe = 'body', reportProgress = false, options) {
|
|
1761
|
-
if (logDto === null || logDto === undefined) {
|
|
1762
|
-
throw new Error('Required parameter logDto was null or undefined when calling log.');
|
|
1763
|
-
}
|
|
1764
|
-
let localVarHeaders = this.defaultHeaders;
|
|
1765
|
-
let localVarHttpHeaderAcceptSelected = options && options.httpHeaderAccept;
|
|
1766
|
-
if (localVarHttpHeaderAcceptSelected === undefined) {
|
|
1767
|
-
// to determine the Accept header
|
|
1768
|
-
const httpHeaderAccepts = [];
|
|
1769
|
-
localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
|
|
1770
|
-
}
|
|
1771
|
-
if (localVarHttpHeaderAcceptSelected !== undefined) {
|
|
1772
|
-
localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
|
|
1773
|
-
}
|
|
1774
|
-
let localVarHttpContext = options && options.context;
|
|
1775
|
-
if (localVarHttpContext === undefined) {
|
|
1776
|
-
localVarHttpContext = new HttpContext();
|
|
1777
|
-
}
|
|
1778
|
-
let localVarTransferCache = options && options.transferCache;
|
|
1779
|
-
if (localVarTransferCache === undefined) {
|
|
1780
|
-
localVarTransferCache = true;
|
|
1781
|
-
}
|
|
1782
|
-
// to determine the Content-Type header
|
|
1783
|
-
const consumes = [
|
|
1784
|
-
'application/json'
|
|
1785
|
-
];
|
|
1786
|
-
const httpContentTypeSelected = this.configuration.selectHeaderContentType(consumes);
|
|
1787
|
-
if (httpContentTypeSelected !== undefined) {
|
|
1788
|
-
localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
|
|
1789
|
-
}
|
|
1790
|
-
let responseType_ = 'json';
|
|
1791
|
-
if (localVarHttpHeaderAcceptSelected) {
|
|
1792
|
-
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
|
|
1793
|
-
responseType_ = 'text';
|
|
1794
|
-
}
|
|
1795
|
-
else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
|
|
1796
|
-
responseType_ = 'json';
|
|
1797
|
-
}
|
|
1798
|
-
else {
|
|
1799
|
-
responseType_ = 'blob';
|
|
1800
|
-
}
|
|
1801
|
-
}
|
|
1802
|
-
let localVarPath = `/rest/logging/`;
|
|
1803
|
-
return this.httpClient.request('post', `${this.configuration.basePath}${localVarPath}`, {
|
|
1804
|
-
context: localVarHttpContext,
|
|
1805
|
-
body: logDto,
|
|
1806
|
-
responseType: responseType_,
|
|
1807
|
-
withCredentials: this.configuration.withCredentials,
|
|
1808
|
-
headers: localVarHeaders,
|
|
1809
|
-
observe: observe,
|
|
1810
|
-
transferCache: localVarTransferCache,
|
|
1811
|
-
reportProgress: reportProgress
|
|
1812
|
-
});
|
|
1813
|
-
}
|
|
1814
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: LogControllerService, deps: [{ token: i1.HttpClient }, { token: BASE_PATH, optional: true }, { token: Configuration, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
1815
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: LogControllerService, providedIn: 'root' }); }
|
|
1816
|
-
}
|
|
1817
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: LogControllerService, decorators: [{
|
|
1818
|
-
type: Injectable,
|
|
1819
|
-
args: [{
|
|
1820
|
-
providedIn: 'root'
|
|
1821
|
-
}]
|
|
1822
|
-
}], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
|
|
1823
|
-
type: Optional
|
|
1824
|
-
}, {
|
|
1825
|
-
type: Inject,
|
|
1826
|
-
args: [BASE_PATH]
|
|
1827
|
-
}] }, { type: Configuration, decorators: [{
|
|
1828
|
-
type: Optional
|
|
1829
|
-
}] }] });
|
|
1830
|
-
|
|
1831
|
-
/**
|
|
1832
|
-
* MST
|
|
1833
|
-
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
|
|
1834
|
-
*
|
|
1835
|
-
* The version of the OpenAPI document: 1
|
|
1836
|
-
*
|
|
1837
|
-
*
|
|
1838
|
-
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
|
|
1839
|
-
* https://openapi-generator.tech
|
|
1840
|
-
* Do not edit the class manually.
|
|
1841
|
-
*/
|
|
1842
|
-
/* tslint:disable:no-unused-variable member-ordering */
|
|
1843
|
-
class P21ControllerService {
|
|
1844
|
-
constructor(httpClient, basePath, configuration) {
|
|
1845
|
-
this.httpClient = httpClient;
|
|
1846
|
-
this.basePath = 'http://localhost:8080/mst';
|
|
1847
|
-
this.defaultHeaders = new HttpHeaders();
|
|
1848
|
-
this.configuration = new Configuration();
|
|
1849
|
-
if (configuration) {
|
|
1850
|
-
this.configuration = configuration;
|
|
1851
|
-
}
|
|
1852
|
-
if (typeof this.configuration.basePath !== 'string') {
|
|
1853
|
-
if (Array.isArray(basePath) && basePath.length > 0) {
|
|
1854
|
-
basePath = basePath[0];
|
|
1855
|
-
}
|
|
1856
|
-
if (typeof basePath !== 'string') {
|
|
1857
|
-
basePath = this.basePath;
|
|
1858
|
-
}
|
|
1859
|
-
this.configuration.basePath = basePath;
|
|
1860
|
-
}
|
|
1861
|
-
this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
|
|
1862
|
-
}
|
|
1863
|
-
/**
|
|
1864
|
-
* @param consumes string[] mime-types
|
|
1865
|
-
* @return true: consumes contains 'multipart/form-data', false: otherwise
|
|
1866
|
-
*/
|
|
1867
|
-
canConsumeForm(consumes) {
|
|
1868
|
-
const form = 'multipart/form-data';
|
|
1869
|
-
for (const consume of consumes) {
|
|
1870
|
-
if (form === consume) {
|
|
1871
|
-
return true;
|
|
1872
|
-
}
|
|
1873
|
-
}
|
|
1874
|
-
return false;
|
|
1875
|
-
}
|
|
1876
|
-
// @ts-ignore
|
|
1877
|
-
addToHttpParams(httpParams, value, key) {
|
|
1878
|
-
if (typeof value === "object" && value instanceof Date === false) {
|
|
1879
|
-
httpParams = this.addToHttpParamsRecursive(httpParams, value);
|
|
1880
|
-
}
|
|
1881
|
-
else {
|
|
1882
|
-
httpParams = this.addToHttpParamsRecursive(httpParams, value, key);
|
|
1883
|
-
}
|
|
1884
|
-
return httpParams;
|
|
1885
|
-
}
|
|
1886
|
-
addToHttpParamsRecursive(httpParams, value, key) {
|
|
1887
|
-
if (value == null) {
|
|
1888
|
-
return httpParams;
|
|
1889
|
-
}
|
|
1890
|
-
if (typeof value === "object") {
|
|
1891
|
-
if (Array.isArray(value)) {
|
|
1892
|
-
value.forEach(elem => httpParams = this.addToHttpParamsRecursive(httpParams, elem, key));
|
|
1893
|
-
}
|
|
1894
|
-
else if (value instanceof Date) {
|
|
1895
|
-
if (key != null) {
|
|
1896
|
-
httpParams = httpParams.append(key, value.toISOString().substring(0, 10));
|
|
1897
|
-
}
|
|
1898
|
-
else {
|
|
1899
|
-
throw Error("key may not be null if value is Date");
|
|
1900
|
-
}
|
|
1901
|
-
}
|
|
1902
|
-
else {
|
|
1903
|
-
Object.keys(value).forEach(k => httpParams = this.addToHttpParamsRecursive(httpParams, value[k], key != null ? `${key}.${k}` : k));
|
|
1904
|
-
}
|
|
1905
|
-
}
|
|
1906
|
-
else if (key != null) {
|
|
1907
|
-
httpParams = httpParams.append(key, value);
|
|
1908
|
-
}
|
|
1909
|
-
else {
|
|
1910
|
-
throw Error("key may not be null if value is not object or array");
|
|
1911
|
-
}
|
|
1912
|
-
return httpParams;
|
|
1913
|
-
}
|
|
1914
|
-
createP21Levering(p21Levering, update, observe = 'body', reportProgress = false, options) {
|
|
1915
|
-
if (p21Levering === null || p21Levering === undefined) {
|
|
1916
|
-
throw new Error('Required parameter p21Levering was null or undefined when calling createP21Levering.');
|
|
1917
|
-
}
|
|
1918
|
-
let localVarHeaders = this.defaultHeaders;
|
|
1919
|
-
let localVarCredential;
|
|
1920
|
-
// authentication (keycloak_auth) required
|
|
1921
|
-
localVarCredential = this.configuration.lookupCredential('keycloak_auth');
|
|
1922
|
-
if (localVarCredential) {
|
|
1923
|
-
localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
|
|
1924
|
-
}
|
|
1925
|
-
let localVarHttpHeaderAcceptSelected = options && options.httpHeaderAccept;
|
|
1926
|
-
if (localVarHttpHeaderAcceptSelected === undefined) {
|
|
1927
|
-
// to determine the Accept header
|
|
1928
|
-
const httpHeaderAccepts = [
|
|
1929
|
-
'*/*'
|
|
1930
|
-
];
|
|
1931
|
-
localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
|
|
1932
|
-
}
|
|
1933
|
-
if (localVarHttpHeaderAcceptSelected !== undefined) {
|
|
1934
|
-
localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
|
|
1935
|
-
}
|
|
1936
|
-
let localVarHttpContext = options && options.context;
|
|
1937
|
-
if (localVarHttpContext === undefined) {
|
|
1938
|
-
localVarHttpContext = new HttpContext();
|
|
1939
|
-
}
|
|
1940
|
-
let localVarTransferCache = options && options.transferCache;
|
|
1941
|
-
if (localVarTransferCache === undefined) {
|
|
1942
|
-
localVarTransferCache = true;
|
|
1943
|
-
}
|
|
1944
|
-
// to determine the Content-Type header
|
|
1945
|
-
const consumes = [
|
|
1946
|
-
'multipart/form-data'
|
|
1947
|
-
];
|
|
1948
|
-
const canConsumeForm = this.canConsumeForm(consumes);
|
|
1949
|
-
let localVarFormParams;
|
|
1950
|
-
let localVarUseForm = false;
|
|
1951
|
-
let localVarConvertFormParamsToString = false;
|
|
1952
|
-
// use FormData to transmit files using content-type "multipart/form-data"
|
|
1953
|
-
// see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data
|
|
1954
|
-
localVarUseForm = canConsumeForm;
|
|
1955
|
-
if (localVarUseForm) {
|
|
1956
|
-
localVarFormParams = new FormData();
|
|
1957
|
-
}
|
|
1958
|
-
else {
|
|
1959
|
-
localVarFormParams = new HttpParams({ encoder: this.encoder });
|
|
1960
|
-
}
|
|
1961
|
-
if (update !== undefined) {
|
|
1962
|
-
localVarFormParams = localVarFormParams.append('update', update) || localVarFormParams;
|
|
1963
|
-
}
|
|
1964
|
-
if (p21Levering !== undefined) {
|
|
1965
|
-
localVarFormParams = localVarFormParams.append('p21Levering', p21Levering) || localVarFormParams;
|
|
1966
|
-
}
|
|
1967
|
-
let responseType_ = 'json';
|
|
1968
|
-
if (localVarHttpHeaderAcceptSelected) {
|
|
1969
|
-
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
|
|
1970
|
-
responseType_ = 'text';
|
|
1971
|
-
}
|
|
1972
|
-
else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
|
|
1973
|
-
responseType_ = 'json';
|
|
1974
|
-
}
|
|
1975
|
-
else {
|
|
1976
|
-
responseType_ = 'blob';
|
|
1977
|
-
}
|
|
1978
|
-
}
|
|
1979
|
-
let localVarPath = `/services/secure/rest/backend/uploadversie`;
|
|
1980
|
-
return this.httpClient.request('post', `${this.configuration.basePath}${localVarPath}`, {
|
|
1981
|
-
context: localVarHttpContext,
|
|
1982
|
-
body: localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams,
|
|
1983
|
-
responseType: responseType_,
|
|
1984
|
-
withCredentials: this.configuration.withCredentials,
|
|
1985
|
-
headers: localVarHeaders,
|
|
1986
|
-
observe: observe,
|
|
1987
|
-
transferCache: localVarTransferCache,
|
|
1988
|
-
reportProgress: reportProgress
|
|
1989
|
-
});
|
|
1990
|
-
}
|
|
1991
|
-
getVersies(observe = 'body', reportProgress = false, options) {
|
|
1992
|
-
let localVarHeaders = this.defaultHeaders;
|
|
1993
|
-
let localVarCredential;
|
|
1994
|
-
// authentication (keycloak_auth) required
|
|
1995
|
-
localVarCredential = this.configuration.lookupCredential('keycloak_auth');
|
|
1996
|
-
if (localVarCredential) {
|
|
1997
|
-
localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
|
|
1998
|
-
}
|
|
1999
|
-
let localVarHttpHeaderAcceptSelected = options && options.httpHeaderAccept;
|
|
2000
|
-
if (localVarHttpHeaderAcceptSelected === undefined) {
|
|
2001
|
-
// to determine the Accept header
|
|
2002
|
-
const httpHeaderAccepts = [
|
|
2003
|
-
'application/json'
|
|
2004
|
-
];
|
|
2005
|
-
localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
|
|
2006
|
-
}
|
|
2007
|
-
if (localVarHttpHeaderAcceptSelected !== undefined) {
|
|
2008
|
-
localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
|
|
2009
|
-
}
|
|
2010
|
-
let localVarHttpContext = options && options.context;
|
|
2011
|
-
if (localVarHttpContext === undefined) {
|
|
2012
|
-
localVarHttpContext = new HttpContext();
|
|
2013
|
-
}
|
|
2014
|
-
let localVarTransferCache = options && options.transferCache;
|
|
2015
|
-
if (localVarTransferCache === undefined) {
|
|
2016
|
-
localVarTransferCache = true;
|
|
2017
|
-
}
|
|
2018
|
-
let responseType_ = 'json';
|
|
2019
|
-
if (localVarHttpHeaderAcceptSelected) {
|
|
2020
|
-
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
|
|
2021
|
-
responseType_ = 'text';
|
|
2022
|
-
}
|
|
2023
|
-
else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
|
|
2024
|
-
responseType_ = 'json';
|
|
2025
|
-
}
|
|
2026
|
-
else {
|
|
2027
|
-
responseType_ = 'blob';
|
|
2028
|
-
}
|
|
967
|
+
console.log(logline);
|
|
2029
968
|
}
|
|
2030
|
-
let localVarPath = `/services/secure/rest/backend/versies`;
|
|
2031
|
-
return this.httpClient.request('get', `${this.configuration.basePath}${localVarPath}`, {
|
|
2032
|
-
context: localVarHttpContext,
|
|
2033
|
-
responseType: responseType_,
|
|
2034
|
-
withCredentials: this.configuration.withCredentials,
|
|
2035
|
-
headers: localVarHeaders,
|
|
2036
|
-
observe: observe,
|
|
2037
|
-
transferCache: localVarTransferCache,
|
|
2038
|
-
reportProgress: reportProgress
|
|
2039
|
-
});
|
|
2040
969
|
}
|
|
2041
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type:
|
|
2042
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type:
|
|
970
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: DebugService, deps: [{ token: i2$1.Store }, { token: SignaleringsBeeldManagerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
971
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: DebugService, providedIn: 'root' }); }
|
|
2043
972
|
}
|
|
2044
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type:
|
|
973
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: DebugService, decorators: [{
|
|
2045
974
|
type: Injectable,
|
|
2046
975
|
args: [{
|
|
2047
976
|
providedIn: 'root'
|
|
2048
977
|
}]
|
|
2049
|
-
}], ctorParameters: () => [{ type:
|
|
2050
|
-
type: Optional
|
|
2051
|
-
}, {
|
|
2052
|
-
type: Inject,
|
|
2053
|
-
args: [BASE_PATH]
|
|
2054
|
-
}] }, { type: Configuration, decorators: [{
|
|
2055
|
-
type: Optional
|
|
2056
|
-
}] }] });
|
|
978
|
+
}], ctorParameters: () => [{ type: i2$1.Store }, { type: SignaleringsBeeldManagerService }] });
|
|
2057
979
|
|
|
2058
|
-
|
|
2059
|
-
|
|
2060
|
-
|
|
2061
|
-
|
|
2062
|
-
|
|
2063
|
-
|
|
2064
|
-
*
|
|
2065
|
-
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
|
|
2066
|
-
* https://openapi-generator.tech
|
|
2067
|
-
* Do not edit the class manually.
|
|
2068
|
-
*/
|
|
2069
|
-
/* tslint:disable:no-unused-variable member-ordering */
|
|
2070
|
-
class SbControllerService {
|
|
2071
|
-
constructor(httpClient, basePath, configuration) {
|
|
2072
|
-
this.httpClient = httpClient;
|
|
2073
|
-
this.basePath = 'http://localhost:8080/mst';
|
|
2074
|
-
this.defaultHeaders = new HttpHeaders();
|
|
2075
|
-
this.configuration = new Configuration();
|
|
2076
|
-
if (configuration) {
|
|
2077
|
-
this.configuration = configuration;
|
|
2078
|
-
}
|
|
2079
|
-
if (typeof this.configuration.basePath !== 'string') {
|
|
2080
|
-
if (Array.isArray(basePath) && basePath.length > 0) {
|
|
2081
|
-
basePath = basePath[0];
|
|
2082
|
-
}
|
|
2083
|
-
if (typeof basePath !== 'string') {
|
|
2084
|
-
basePath = this.basePath;
|
|
2085
|
-
}
|
|
2086
|
-
this.configuration.basePath = basePath;
|
|
2087
|
-
}
|
|
2088
|
-
this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
|
|
2089
|
-
}
|
|
2090
|
-
// @ts-ignore
|
|
2091
|
-
addToHttpParams(httpParams, value, key) {
|
|
2092
|
-
if (typeof value === "object" && value instanceof Date === false) {
|
|
2093
|
-
httpParams = this.addToHttpParamsRecursive(httpParams, value);
|
|
2094
|
-
}
|
|
2095
|
-
else {
|
|
2096
|
-
httpParams = this.addToHttpParamsRecursive(httpParams, value, key);
|
|
2097
|
-
}
|
|
2098
|
-
return httpParams;
|
|
980
|
+
class PrintBewegingService {
|
|
981
|
+
constructor(store, viewerControlService, sbmService) {
|
|
982
|
+
this.store = store;
|
|
983
|
+
this.viewerControlService = viewerControlService;
|
|
984
|
+
this.sbmService = sbmService;
|
|
985
|
+
this.store.select(s => s.ritDelen).subscribe(ritdelen => this.ritdelen = ritdelen);
|
|
2099
986
|
}
|
|
2100
|
-
|
|
2101
|
-
|
|
2102
|
-
|
|
2103
|
-
|
|
2104
|
-
|
|
2105
|
-
|
|
2106
|
-
|
|
2107
|
-
}
|
|
2108
|
-
else if (value instanceof Date) {
|
|
2109
|
-
if (key != null) {
|
|
2110
|
-
httpParams = httpParams.append(key, value.toISOString().substring(0, 10));
|
|
2111
|
-
}
|
|
2112
|
-
else {
|
|
2113
|
-
throw Error("key may not be null if value is Date");
|
|
2114
|
-
}
|
|
2115
|
-
}
|
|
2116
|
-
else {
|
|
2117
|
-
Object.keys(value).forEach(k => httpParams = this.addToHttpParamsRecursive(httpParams, value[k], key != null ? `${key}.${k}` : k));
|
|
2118
|
-
}
|
|
2119
|
-
}
|
|
2120
|
-
else if (key != null) {
|
|
2121
|
-
httpParams = httpParams.append(key, value);
|
|
987
|
+
printBeweging(bewegingId, paginationSize, iaVersieInfo) {
|
|
988
|
+
const gevondenRitdeel = this.ritdelen.filter(r => parseInt(r.getBewegingId(), 10) === bewegingId);
|
|
989
|
+
// hide/show de knoppen
|
|
990
|
+
const printing = !!bewegingId && gevondenRitdeel.length === 1;
|
|
991
|
+
this.viewerControlService.setPrinting(printing);
|
|
992
|
+
if (!printing) {
|
|
993
|
+
return Promise.reject(new Error('Geen beweging gevonden voor ' + bewegingId));
|
|
2122
994
|
}
|
|
2123
|
-
|
|
2124
|
-
|
|
2125
|
-
|
|
2126
|
-
|
|
2127
|
-
|
|
2128
|
-
|
|
2129
|
-
if (signaleringsbeeldRequestDto === null || signaleringsbeeldRequestDto === undefined) {
|
|
2130
|
-
throw new Error('Required parameter signaleringsbeeldRequestDto was null or undefined when calling getSignaleringsbeelden.');
|
|
2131
|
-
}
|
|
2132
|
-
let localVarHeaders = this.defaultHeaders;
|
|
2133
|
-
let localVarHttpHeaderAcceptSelected = options && options.httpHeaderAccept;
|
|
2134
|
-
if (localVarHttpHeaderAcceptSelected === undefined) {
|
|
2135
|
-
// to determine the Accept header
|
|
2136
|
-
const httpHeaderAccepts = [
|
|
2137
|
-
'*/*'
|
|
2138
|
-
];
|
|
2139
|
-
localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
|
|
2140
|
-
}
|
|
2141
|
-
if (localVarHttpHeaderAcceptSelected !== undefined) {
|
|
2142
|
-
localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
|
|
2143
|
-
}
|
|
2144
|
-
let localVarHttpContext = options && options.context;
|
|
2145
|
-
if (localVarHttpContext === undefined) {
|
|
2146
|
-
localVarHttpContext = new HttpContext();
|
|
2147
|
-
}
|
|
2148
|
-
let localVarTransferCache = options && options.transferCache;
|
|
2149
|
-
if (localVarTransferCache === undefined) {
|
|
2150
|
-
localVarTransferCache = true;
|
|
2151
|
-
}
|
|
2152
|
-
// to determine the Content-Type header
|
|
2153
|
-
const consumes = [
|
|
2154
|
-
'application/json'
|
|
2155
|
-
];
|
|
2156
|
-
const httpContentTypeSelected = this.configuration.selectHeaderContentType(consumes);
|
|
2157
|
-
if (httpContentTypeSelected !== undefined) {
|
|
2158
|
-
localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
|
|
2159
|
-
}
|
|
2160
|
-
let responseType_ = 'json';
|
|
2161
|
-
if (localVarHttpHeaderAcceptSelected) {
|
|
2162
|
-
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
|
|
2163
|
-
responseType_ = 'text';
|
|
2164
|
-
}
|
|
2165
|
-
else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
|
|
2166
|
-
responseType_ = 'json';
|
|
995
|
+
return new Promise((resolve) => {
|
|
996
|
+
const ritdeel = gevondenRitdeel[0];
|
|
997
|
+
if (ritdeel.isNietBeschikbaar()) {
|
|
998
|
+
this.store.dispatch(navigeerVanaf(paginationSize, iaVersieInfo, ritdeel));
|
|
999
|
+
this.store.dispatch(ShowProgress());
|
|
1000
|
+
setTimeout(() => this.focusOpBeweging(ritdeel, resolve), 1000);
|
|
2167
1001
|
}
|
|
2168
1002
|
else {
|
|
2169
|
-
|
|
1003
|
+
this.focusOpBeweging(ritdeel, resolve);
|
|
2170
1004
|
}
|
|
2171
|
-
}
|
|
2172
|
-
let localVarPath = `/rest/signaleringsbeeldeninfo`;
|
|
2173
|
-
return this.httpClient.request('post', `${this.configuration.basePath}${localVarPath}`, {
|
|
2174
|
-
context: localVarHttpContext,
|
|
2175
|
-
body: signaleringsbeeldRequestDto,
|
|
2176
|
-
responseType: responseType_,
|
|
2177
|
-
withCredentials: this.configuration.withCredentials,
|
|
2178
|
-
headers: localVarHeaders,
|
|
2179
|
-
observe: observe,
|
|
2180
|
-
transferCache: localVarTransferCache,
|
|
2181
|
-
reportProgress: reportProgress
|
|
2182
1005
|
});
|
|
2183
1006
|
}
|
|
2184
|
-
|
|
2185
|
-
|
|
2186
|
-
|
|
2187
|
-
|
|
2188
|
-
|
|
2189
|
-
|
|
2190
|
-
|
|
2191
|
-
|
|
2192
|
-
|
|
2193
|
-
|
|
2194
|
-
|
|
2195
|
-
|
|
2196
|
-
|
|
2197
|
-
|
|
2198
|
-
|
|
2199
|
-
|
|
2200
|
-
localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
|
|
2201
|
-
}
|
|
2202
|
-
let localVarHttpContext = options && options.context;
|
|
2203
|
-
if (localVarHttpContext === undefined) {
|
|
2204
|
-
localVarHttpContext = new HttpContext();
|
|
2205
|
-
}
|
|
2206
|
-
let localVarTransferCache = options && options.transferCache;
|
|
2207
|
-
if (localVarTransferCache === undefined) {
|
|
2208
|
-
localVarTransferCache = true;
|
|
2209
|
-
}
|
|
2210
|
-
let responseType_ = 'json';
|
|
2211
|
-
if (localVarHttpHeaderAcceptSelected) {
|
|
2212
|
-
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
|
|
2213
|
-
responseType_ = 'text';
|
|
2214
|
-
}
|
|
2215
|
-
else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
|
|
2216
|
-
responseType_ = 'json';
|
|
2217
|
-
}
|
|
2218
|
-
else {
|
|
2219
|
-
responseType_ = 'blob';
|
|
2220
|
-
}
|
|
2221
|
-
}
|
|
2222
|
-
let localVarPath = `/rest/signaleringsbeeldeninfo/valideeriaversie`;
|
|
2223
|
-
return this.httpClient.request('get', `${this.configuration.basePath}${localVarPath}`, {
|
|
2224
|
-
context: localVarHttpContext,
|
|
2225
|
-
params: localVarQueryParameters,
|
|
2226
|
-
responseType: responseType_,
|
|
2227
|
-
withCredentials: this.configuration.withCredentials,
|
|
2228
|
-
headers: localVarHeaders,
|
|
2229
|
-
observe: observe,
|
|
2230
|
-
transferCache: localVarTransferCache,
|
|
2231
|
-
reportProgress: reportProgress
|
|
1007
|
+
focusOpBeweging(ritdeel, resolve) {
|
|
1008
|
+
// deselecteer alles
|
|
1009
|
+
this.store.dispatch(setZichtbaarheidAlleRitdelen(false));
|
|
1010
|
+
// enable ritacties (checkbox) voor alle ritdelen met beweging die matched met bewegingId(s)
|
|
1011
|
+
this.store.dispatch(toggleZichtbaarheidVoorBewegingen([parseInt(ritdeel.getBewegingId(), 10)]));
|
|
1012
|
+
setTimeout(() => {
|
|
1013
|
+
// dit neemt niet de vrijebaan elementen mee
|
|
1014
|
+
const topoElementen = this.sbmService.bepaalRouteElementen(ritdeel.getRoute());
|
|
1015
|
+
const dwangPuics = this.getPuics(topoElementen);
|
|
1016
|
+
this.store.dispatch(focusOpIds(dwangPuics));
|
|
1017
|
+
setTimeout(() => {
|
|
1018
|
+
// resolve de promise, om aan te geven dat focus klaar is
|
|
1019
|
+
resolve(true);
|
|
1020
|
+
this.viewerControlService.setPrinting(false);
|
|
1021
|
+
this.store.dispatch(ClearProgress());
|
|
1022
|
+
}, 1000);
|
|
2232
1023
|
});
|
|
2233
1024
|
}
|
|
2234
|
-
|
|
2235
|
-
|
|
1025
|
+
getPuics(topoElementen) {
|
|
1026
|
+
return topoElementen.map(e => e.getPuic());
|
|
1027
|
+
}
|
|
1028
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: PrintBewegingService, deps: [{ token: i2$1.Store }, { token: ViewerControlService }, { token: SignaleringsBeeldManagerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
1029
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: PrintBewegingService, providedIn: 'root' }); }
|
|
2236
1030
|
}
|
|
2237
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type:
|
|
1031
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: PrintBewegingService, decorators: [{
|
|
2238
1032
|
type: Injectable,
|
|
2239
1033
|
args: [{
|
|
2240
1034
|
providedIn: 'root'
|
|
2241
1035
|
}]
|
|
2242
|
-
}], ctorParameters: () => [{ type:
|
|
2243
|
-
type: Optional
|
|
2244
|
-
}, {
|
|
2245
|
-
type: Inject,
|
|
2246
|
-
args: [BASE_PATH]
|
|
2247
|
-
}] }, { type: Configuration, decorators: [{
|
|
2248
|
-
type: Optional
|
|
2249
|
-
}] }] });
|
|
2250
|
-
|
|
2251
|
-
const APIS = [AppConfigControllerService, BewegingControllerService, Class0BuildPropertiesService, ConnectorControllerService, LogControllerService, P21ControllerService, SbControllerService];
|
|
1036
|
+
}], ctorParameters: () => [{ type: i2$1.Store }, { type: ViewerControlService }, { type: SignaleringsBeeldManagerService }] });
|
|
2252
1037
|
|
|
2253
|
-
|
|
2254
|
-
|
|
2255
|
-
|
|
2256
|
-
|
|
2257
|
-
|
|
2258
|
-
|
|
2259
|
-
|
|
2260
|
-
|
|
2261
|
-
|
|
2262
|
-
|
|
2263
|
-
|
|
1038
|
+
class RpeComponent {
|
|
1039
|
+
convertToScript() {
|
|
1040
|
+
const element = this.script.nativeElement;
|
|
1041
|
+
const script = document.createElement('script');
|
|
1042
|
+
script.type = 'text/javascript';
|
|
1043
|
+
if (this.baseurl && this.path) {
|
|
1044
|
+
script.src = this.baseurl + this.path;
|
|
1045
|
+
// eslint-disable-next-line no-console
|
|
1046
|
+
console.log('Code geladen van: ' + script.src); //useful for debugging in GWT environment
|
|
1047
|
+
}
|
|
1048
|
+
const parent = element.parentElement;
|
|
1049
|
+
parent.parentElement.replaceChild(script, parent);
|
|
1050
|
+
}
|
|
1051
|
+
ngAfterViewInit() {
|
|
1052
|
+
this.convertToScript();
|
|
1053
|
+
}
|
|
1054
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: RpeComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
|
|
1055
|
+
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.2.7", type: RpeComponent, selector: "rpe-component", inputs: { baseurl: "baseurl", path: "path" }, viewQueries: [{ propertyName: "script", first: true, predicate: ["rpescript"], descendants: true }], ngImport: i0, template: "<div #rpescript style.display=\"none\">\n <ng-content></ng-content>\n</div>\n" }); }
|
|
1056
|
+
}
|
|
1057
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: RpeComponent, decorators: [{
|
|
1058
|
+
type: Component,
|
|
1059
|
+
args: [{ selector: 'rpe-component', template: "<div #rpescript style.display=\"none\">\n <ng-content></ng-content>\n</div>\n" }]
|
|
1060
|
+
}], propDecorators: { baseurl: [{
|
|
1061
|
+
type: Input
|
|
1062
|
+
}], path: [{
|
|
1063
|
+
type: Input
|
|
1064
|
+
}], script: [{
|
|
1065
|
+
type: ViewChild,
|
|
1066
|
+
args: ['rpescript']
|
|
1067
|
+
}] } });
|
|
2264
1068
|
|
|
2265
|
-
|
|
2266
|
-
|
|
2267
|
-
|
|
2268
|
-
|
|
2269
|
-
|
|
2270
|
-
|
|
2271
|
-
*
|
|
2272
|
-
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
|
|
2273
|
-
* https://openapi-generator.tech
|
|
2274
|
-
* Do not edit the class manually.
|
|
2275
|
-
*/
|
|
1069
|
+
class OngeplandeActie {
|
|
1070
|
+
constructor(actie, puics) {
|
|
1071
|
+
this.actie = actie;
|
|
1072
|
+
this.puics = puics;
|
|
1073
|
+
}
|
|
1074
|
+
}
|
|
2276
1075
|
|
|
2277
|
-
|
|
2278
|
-
|
|
2279
|
-
|
|
2280
|
-
|
|
2281
|
-
|
|
2282
|
-
|
|
2283
|
-
|
|
2284
|
-
|
|
2285
|
-
|
|
2286
|
-
|
|
2287
|
-
|
|
1076
|
+
class KmRange {
|
|
1077
|
+
constructor(topologyElement, vanKilometreringen, totKilometreringen) {
|
|
1078
|
+
this.topologyElement = topologyElement;
|
|
1079
|
+
this.vanKilometreringen = vanKilometreringen;
|
|
1080
|
+
this.totKilometreringen = totKilometreringen;
|
|
1081
|
+
}
|
|
1082
|
+
static rangeVoorPuntObject(topologyElement) {
|
|
1083
|
+
return new KmRange(topologyElement, JsJavaUtil.listToArray(topologyElement.getKilometreringen()), JsJavaUtil.listToArray(topologyElement.getKilometreringen()));
|
|
1084
|
+
}
|
|
1085
|
+
static rangeVoorStrekObject(topologyElement, vanKilometreringen, totKilometreringen) {
|
|
1086
|
+
return new KmRange(topologyElement, vanKilometreringen, totKilometreringen);
|
|
1087
|
+
}
|
|
1088
|
+
static getKilometrering(lintNaam, kilometreringen) {
|
|
1089
|
+
const result = kilometreringen.filter(kilometrering => kilometrering.getKmLint() === lintNaam);
|
|
1090
|
+
if (result.length >= 1) {
|
|
1091
|
+
return result[0];
|
|
1092
|
+
}
|
|
1093
|
+
return null;
|
|
1094
|
+
}
|
|
1095
|
+
heeftOverlap(kilometrering1, kilometrering2) {
|
|
1096
|
+
const vanKilometrering = KmRange.getKilometrering(kilometrering1.getKmLint(), this.vanKilometreringen);
|
|
1097
|
+
const totKilometrering = KmRange.getKilometrering(kilometrering2.getKmLint(), this.totKilometreringen);
|
|
1098
|
+
if (!vanKilometrering || !totKilometrering) {
|
|
1099
|
+
return false;
|
|
1100
|
+
}
|
|
1101
|
+
let startKmWaarde = vanKilometrering.getKmWaarde();
|
|
1102
|
+
let endKmWaarde = totKilometrering.getKmWaarde();
|
|
1103
|
+
if (startKmWaarde > endKmWaarde) {
|
|
1104
|
+
const temp = { end: endKmWaarde, start: startKmWaarde };
|
|
1105
|
+
startKmWaarde = temp.end;
|
|
1106
|
+
endKmWaarde = temp.start;
|
|
1107
|
+
}
|
|
1108
|
+
const actieStartKmWaarde = kilometrering1.getKmWaarde();
|
|
1109
|
+
const actieEndKmWaarde = kilometrering2.getKmWaarde();
|
|
1110
|
+
return endKmWaarde >= actieStartKmWaarde && actieEndKmWaarde >= startKmWaarde;
|
|
1111
|
+
}
|
|
1112
|
+
}
|
|
2288
1113
|
|
|
2289
|
-
|
|
2290
|
-
|
|
2291
|
-
|
|
2292
|
-
|
|
2293
|
-
|
|
2294
|
-
|
|
2295
|
-
*
|
|
2296
|
-
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
|
|
2297
|
-
* https://openapi-generator.tech
|
|
2298
|
-
* Do not edit the class manually.
|
|
2299
|
-
*/
|
|
1114
|
+
class WisselKantCode {
|
|
1115
|
+
constructor(naam, kantCode) {
|
|
1116
|
+
this.naam = naam;
|
|
1117
|
+
this.kantCode = kantCode;
|
|
1118
|
+
}
|
|
1119
|
+
}
|
|
2300
1120
|
|
|
2301
|
-
|
|
2302
|
-
|
|
2303
|
-
|
|
2304
|
-
|
|
2305
|
-
|
|
2306
|
-
|
|
2307
|
-
*
|
|
2308
|
-
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
|
|
2309
|
-
* https://openapi-generator.tech
|
|
2310
|
-
* Do not edit the class manually.
|
|
2311
|
-
*/
|
|
1121
|
+
class MeldingEvent {
|
|
1122
|
+
constructor(meldingMessage, meldingLevel) {
|
|
1123
|
+
this.meldingMessage = meldingMessage;
|
|
1124
|
+
this.meldingLevel = meldingLevel;
|
|
1125
|
+
}
|
|
1126
|
+
}
|
|
2312
1127
|
|
|
2313
|
-
|
|
2314
|
-
|
|
2315
|
-
|
|
2316
|
-
|
|
2317
|
-
|
|
2318
|
-
|
|
1128
|
+
const MELDING_LEVEL_ERROR = 'error';
|
|
1129
|
+
const MELDING_LEVEL_WARNING = 'warn';
|
|
1130
|
+
const MELDING_LEVEL_INFO = 'info';
|
|
1131
|
+
class MeldingBuilder {
|
|
1132
|
+
static nietGevondenTakkenOngeplandeActies(nietGevondenTakken) {
|
|
1133
|
+
return new MeldingEvent('Niet gevonden takken uit \'OngeplandeActies\': ' + nietGevondenTakken, MELDING_LEVEL_INFO);
|
|
2319
1134
|
}
|
|
2320
|
-
|
|
2321
|
-
|
|
2322
|
-
throw new Error('ApiModule is already loaded. Import in your base AppModule only.');
|
|
2323
|
-
}
|
|
2324
|
-
if (!http) {
|
|
2325
|
-
throw new Error('You need to import the HttpClientModule in your AppModule! \n' +
|
|
2326
|
-
'See also https://github.com/angular/angular/issues/20575');
|
|
2327
|
-
}
|
|
1135
|
+
static actieHighlightError(actieZonderElementen) {
|
|
1136
|
+
return new MeldingEvent('Highlight error. Geen elementen kunnen vinden voor actie(s) met id: ' + actieZonderElementen, MELDING_LEVEL_ERROR);
|
|
2328
1137
|
}
|
|
2329
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: ApiModule, deps: [{ token: ApiModule, optional: true, skipSelf: true }, { token: i1.HttpClient, optional: true }], target: i0.ɵɵFactoryTarget.NgModule }); }
|
|
2330
|
-
static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "18.2.7", ngImport: i0, type: ApiModule }); }
|
|
2331
|
-
static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: ApiModule }); }
|
|
2332
1138
|
}
|
|
2333
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: ApiModule, decorators: [{
|
|
2334
|
-
type: NgModule,
|
|
2335
|
-
args: [{
|
|
2336
|
-
imports: [],
|
|
2337
|
-
declarations: [],
|
|
2338
|
-
exports: [],
|
|
2339
|
-
providers: []
|
|
2340
|
-
}]
|
|
2341
|
-
}], ctorParameters: () => [{ type: ApiModule, decorators: [{
|
|
2342
|
-
type: Optional
|
|
2343
|
-
}, {
|
|
2344
|
-
type: SkipSelf
|
|
2345
|
-
}] }, { type: i1.HttpClient, decorators: [{
|
|
2346
|
-
type: Optional
|
|
2347
|
-
}] }] });
|
|
2348
1139
|
|
|
2349
|
-
class
|
|
2350
|
-
|
|
2351
|
-
|
|
2352
|
-
this.store = store;
|
|
2353
|
-
this.subscriptions = new Subscription();
|
|
2354
|
-
this.subscriptions.add(this.store.select('baseUrl').subscribe(baseUrl => controller.configuration.basePath = baseUrl + '/mst'));
|
|
1140
|
+
class MessageBuilder {
|
|
1141
|
+
static rwpDataNietGevonden(err) {
|
|
1142
|
+
return new Message(Severity.ERROR, 'Error bij ophalen van rijwegplan data: ' + err);
|
|
2355
1143
|
}
|
|
2356
|
-
|
|
2357
|
-
|
|
1144
|
+
static rijwegNietGevonden(beweging) {
|
|
1145
|
+
return new Message(Severity.ERROR, `Rijweg van ${beweging.vanSpoor} in PPLG ${beweging.vanPplg} naar ${beweging.naarSpoor} niet gevonden`);
|
|
2358
1146
|
}
|
|
2359
|
-
|
|
2360
|
-
|
|
1147
|
+
static rijwegplanNietGevonden(beweging) {
|
|
1148
|
+
return new Message(Severity.ERROR, `Rijwegplan van PPLG ${beweging.vanPplg} niet gevonden`);
|
|
1149
|
+
}
|
|
1150
|
+
static dwangNietGevonden(beweging) {
|
|
1151
|
+
return new Message(Severity.ERROR, `Dwang ${beweging.dwangNummer} voor rijweg van ${beweging.vanSpoor} in PPLG ${beweging.vanPplg} naar ${beweging.naarSpoor} niet gevonden`);
|
|
1152
|
+
}
|
|
1153
|
+
static nietGevondenSBI(err) {
|
|
1154
|
+
return new Message(Severity.ERROR, 'Error bij het ophalen van signaleringsbeeldinfo: ' + Utils.getValidErorrMessage(err));
|
|
1155
|
+
}
|
|
1156
|
+
static actieHighlightError(actieZonderElementen) {
|
|
1157
|
+
return new Message(Severity.ERROR, 'Highlight error. Geen elementen kunnen vinden voor actie(s) met id: ' + actieZonderElementen);
|
|
1158
|
+
}
|
|
1159
|
+
static ritFileAlGewijzigdError(beweging) {
|
|
1160
|
+
return new Message(Severity.ERROR, 'Rit bevat een beweging met status \'Gewijzigd\': Beweging met ID:' + beweging.id);
|
|
1161
|
+
}
|
|
1162
|
+
static meerDan12BladenGevonden(bladAmount) {
|
|
1163
|
+
return new Message(Severity.WARNING, 'Warning, Rit bevat ' + bladAmount + ' bladen. Er worden maximaal 12 bladen ondersteund.');
|
|
1164
|
+
}
|
|
1165
|
+
static nietGevondenTakkenOngeplandeActies(nietGevondenTakken) {
|
|
1166
|
+
return new Message(Severity.INFORMATION, 'Info, Niet gevonden takken uit \'OngeplandeActies\': ' + nietGevondenTakken);
|
|
2361
1167
|
}
|
|
2362
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: MstLoggingResource, deps: [{ token: LogControllerService }, { token: i2$1.Store }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
2363
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: MstLoggingResource }); }
|
|
2364
1168
|
}
|
|
2365
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: MstLoggingResource, decorators: [{
|
|
2366
|
-
type: Injectable
|
|
2367
|
-
}], ctorParameters: () => [{ type: LogControllerService }, { type: i2$1.Store }] });
|
|
2368
1169
|
|
|
2369
1170
|
class LoggingHelper {
|
|
2370
|
-
constructor(store) {
|
|
1171
|
+
constructor(sbmService, store) {
|
|
1172
|
+
this.sbmService = sbmService;
|
|
2371
1173
|
this.store = store;
|
|
2372
1174
|
}
|
|
2373
1175
|
maakLogDTO(melding, actie) {
|
|
@@ -2381,7 +1183,7 @@ class LoggingHelper {
|
|
|
2381
1183
|
iaVersie = ia.versie;
|
|
2382
1184
|
});
|
|
2383
1185
|
if (actie) {
|
|
2384
|
-
actieDto = {
|
|
1186
|
+
actieDto = new ActieDto({
|
|
2385
1187
|
pplgNaam: actie.pplgNaam,
|
|
2386
1188
|
ritActieTypeOmschrijving: actie.ritActieTypeOmschrijving,
|
|
2387
1189
|
ritActieStatus: actie.ritActieStatus,
|
|
@@ -2393,16 +1195,16 @@ class LoggingHelper {
|
|
|
2393
1195
|
vanKilometrering: actie.vanKilometrering,
|
|
2394
1196
|
totKilometerlint: actie.totKilometerlint,
|
|
2395
1197
|
totKilometrering: actie.totKilometrering
|
|
2396
|
-
};
|
|
1198
|
+
});
|
|
2397
1199
|
}
|
|
2398
|
-
return {
|
|
1200
|
+
return new MstLoggingDto({
|
|
2399
1201
|
iaVersie,
|
|
2400
1202
|
meldingLevel: melding.meldingLevel,
|
|
2401
1203
|
meldingMessage: melding.meldingMessage,
|
|
2402
1204
|
actieDto,
|
|
2403
1205
|
algemeneRitInfoDto,
|
|
2404
1206
|
sbinfoDtos: this.getSbInfoDtos()
|
|
2405
|
-
};
|
|
1207
|
+
});
|
|
2406
1208
|
}
|
|
2407
1209
|
getSbInfoDtos() {
|
|
2408
1210
|
const sbInfoDtos = [];
|
|
@@ -2413,12 +1215,12 @@ class LoggingHelper {
|
|
|
2413
1215
|
});
|
|
2414
1216
|
return sbInfoDtos;
|
|
2415
1217
|
}
|
|
2416
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: LoggingHelper, deps: [{ token: i2$1.Store }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
1218
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: LoggingHelper, deps: [{ token: SignaleringsBeeldManagerService }, { token: i2$1.Store }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
2417
1219
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: LoggingHelper }); }
|
|
2418
1220
|
}
|
|
2419
1221
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: LoggingHelper, decorators: [{
|
|
2420
1222
|
type: Injectable
|
|
2421
|
-
}], ctorParameters: () => [{ type: i2$1.Store }] });
|
|
1223
|
+
}], ctorParameters: () => [{ type: SignaleringsBeeldManagerService }, { type: i2$1.Store }] });
|
|
2422
1224
|
|
|
2423
1225
|
/**
|
|
2424
1226
|
* export const RIT_ACTIE_1 = 1;
|
|
@@ -2741,9 +1543,9 @@ class ActieHelper {
|
|
|
2741
1543
|
this.logLegeMeldingDto(logMeldingDTOs);
|
|
2742
1544
|
return retval;
|
|
2743
1545
|
}
|
|
2744
|
-
logLegeMeldingDto(
|
|
2745
|
-
if (
|
|
2746
|
-
|
|
1546
|
+
logLegeMeldingDto(logMeldingDTOs) {
|
|
1547
|
+
if (logMeldingDTOs.length > 0) {
|
|
1548
|
+
this.mstLogResource.logErrorMessages(logMeldingDTOs);
|
|
2747
1549
|
}
|
|
2748
1550
|
}
|
|
2749
1551
|
verwerkTopoElementen(topoElementen) {
|
|
@@ -2826,14 +1628,14 @@ class ActieHelper {
|
|
|
2826
1628
|
if (ActieHelper.isKantCodeLinks(kantcode)) {
|
|
2827
1629
|
return wissel.getLeft();
|
|
2828
1630
|
}
|
|
2829
|
-
return
|
|
1631
|
+
return null;
|
|
2830
1632
|
}
|
|
2831
1633
|
bepaalPuicVoorWisselSlijpenActie(actie) {
|
|
2832
1634
|
const storingsSymboolPuic = this.sbmService.getSBWissel(actie.wisselNaam, actie.pplgNaam)?.getStoringSymboolPuic();
|
|
2833
1635
|
if (!storingsSymboolPuic && this.debug) {
|
|
2834
1636
|
const melding = MeldingBuilder.actieHighlightError([actie.id]);
|
|
2835
1637
|
this.messagesService.showMessage(MessageBuilder.actieHighlightError([actie.id]));
|
|
2836
|
-
this.mstLogResource.
|
|
1638
|
+
this.mstLogResource.logErrorMessages([this.loggingHelper.maakLogDTO(melding, actie)]);
|
|
2837
1639
|
}
|
|
2838
1640
|
return storingsSymboolPuic ? [storingsSymboolPuic] : [];
|
|
2839
1641
|
}
|
|
@@ -2848,16 +1650,10 @@ class RitdelenLijstComponent {
|
|
|
2848
1650
|
constructor(store, sbmService) {
|
|
2849
1651
|
this.store = store;
|
|
2850
1652
|
this.sbmService = sbmService;
|
|
2851
|
-
this.nietGeplandeActies = [];
|
|
2852
1653
|
this.focusEmitter = new EventEmitter();
|
|
2853
1654
|
this.keurAlleActiesGoed = new EventEmitter();
|
|
2854
|
-
this.ritdeelViewModels = [];
|
|
2855
1655
|
this.selectedRitdeelActies = [];
|
|
2856
1656
|
this.selectedRitdeelOngeplandeActies = [];
|
|
2857
|
-
this.disableActieKnoppenVanRitdeel = true;
|
|
2858
|
-
this.editable = false;
|
|
2859
|
-
this.ongeplandeActiesMap = new ArrayMultimap();
|
|
2860
|
-
this.geplandeActies = new ArrayMultimap();
|
|
2861
1657
|
this.NG_ACTIE_PREFIX = '* ';
|
|
2862
1658
|
this.subscriptions = [];
|
|
2863
1659
|
this.subscriptions.push(store.select('ritDelen').subscribe((ritdelen) => {
|
|
@@ -2907,14 +1703,12 @@ class RitdelenLijstComponent {
|
|
|
2907
1703
|
this.store.dispatch(deleteRitdeel(ritdeel));
|
|
2908
1704
|
}
|
|
2909
1705
|
deleteActiesUitRit() {
|
|
2910
|
-
this.selectedRitdeel
|
|
1706
|
+
this.selectedRitdeel.acties.slice().forEach(actie => {
|
|
2911
1707
|
this.deleteActieUitRit(actie);
|
|
2912
1708
|
});
|
|
2913
1709
|
}
|
|
2914
1710
|
deleteActieUitRit(actie) {
|
|
2915
|
-
|
|
2916
|
-
return;
|
|
2917
|
-
const acties = this.selectedRitdeel.acties ?? [];
|
|
1711
|
+
const acties = this.selectedRitdeel.acties;
|
|
2918
1712
|
const idx = acties.indexOf(actie);
|
|
2919
1713
|
if (idx >= 0) {
|
|
2920
1714
|
this.verhuisActieNaarOngepland(actie);
|
|
@@ -3042,13 +1836,13 @@ class RitdelenLijstComponent {
|
|
|
3042
1836
|
return `${prefix}${ActieHelper.getVSTActieOmschrijving(actie)}`;
|
|
3043
1837
|
}
|
|
3044
1838
|
bepaalPrefixVoorActieOmschrijving(actie) {
|
|
3045
|
-
const
|
|
3046
|
-
if (this.selectedRitdeel
|
|
1839
|
+
const prefix = '';
|
|
1840
|
+
if (this.selectedRitdeel.acties.includes(actie)) {
|
|
3047
1841
|
// Afwijkende naam bij niet gevisualiseerde actie in rit
|
|
3048
1842
|
const puics = this.geplandeActies.get(actie);
|
|
3049
|
-
return puics.length > 0 ?
|
|
1843
|
+
return puics.length > 0 ? prefix : this.NG_ACTIE_PREFIX;
|
|
3050
1844
|
}
|
|
3051
|
-
return
|
|
1845
|
+
return prefix;
|
|
3052
1846
|
}
|
|
3053
1847
|
actieVanKmTekst(actie) {
|
|
3054
1848
|
if (ActieHelper.isWisselSlijpenActie(actie)) {
|
|
@@ -3069,7 +1863,6 @@ class RitdelenLijstComponent {
|
|
|
3069
1863
|
return ritdeel.getPplgString();
|
|
3070
1864
|
}
|
|
3071
1865
|
getKantCode(stand) {
|
|
3072
|
-
// @ts-ignore
|
|
3073
1866
|
if (stand === window['domein'].Stand.LINKS) {
|
|
3074
1867
|
return 'L';
|
|
3075
1868
|
}
|
|
@@ -3249,7 +2042,6 @@ class ViewerControlsComponent {
|
|
|
3249
2042
|
this.printing$ = this.viewerControlsService.isPrinting$();
|
|
3250
2043
|
this.valideRit$ = this.viewerControlsService.isValideRit$();
|
|
3251
2044
|
this.subscriptions = new Subscription();
|
|
3252
|
-
this.editable = false;
|
|
3253
2045
|
this.subscriptions.add(this.store.select('editable').subscribe(editable => this.editable = editable));
|
|
3254
2046
|
}
|
|
3255
2047
|
ngOnChanges({ treinpad }) {
|
|
@@ -3333,7 +2125,7 @@ class ActiePopoverBepaler {
|
|
|
3333
2125
|
ongeplandeActies.entries.forEach(entry => {
|
|
3334
2126
|
const treinNummerActieInfos = puicNaarOngeplandeActieMap.get(entry.key);
|
|
3335
2127
|
if (!treinNummerActieInfos?.map(({ actie }) => actie).includes(entry.value.actie)) {
|
|
3336
|
-
puicNaarOngeplandeActieMap.put(entry.key, { actie: entry.value.actie });
|
|
2128
|
+
puicNaarOngeplandeActieMap.put(entry.key, { treinNummer: undefined, actie: entry.value.actie });
|
|
3337
2129
|
}
|
|
3338
2130
|
});
|
|
3339
2131
|
}
|
|
@@ -3393,15 +2185,12 @@ class SvgVisualisatieComponent {
|
|
|
3393
2185
|
this.actieHelper = actieHelper;
|
|
3394
2186
|
this.sbmService = sbmService;
|
|
3395
2187
|
this.editorService = editorService;
|
|
3396
|
-
this.nietGeplandeActies = [];
|
|
3397
|
-
this.useClickArea = false;
|
|
3398
2188
|
this.svgInfos$ = this.store.select('svgInfos');
|
|
3399
2189
|
this.popoverInfos = [];
|
|
3400
2190
|
this.clickableIds = [];
|
|
3401
2191
|
this.rightClickableIds = [];
|
|
3402
2192
|
this.contextMenuActions = [];
|
|
3403
2193
|
this.contextMenuStyle = { display: 'none' };
|
|
3404
|
-
this.editable = false;
|
|
3405
2194
|
this.puicNaarBeginSeinRitdeel = new Map();
|
|
3406
2195
|
this.puicNaarEindSeinCombinatie = new Map();
|
|
3407
2196
|
this.puicNaarAlternatieveRoute = new Map();
|
|
@@ -3425,7 +2214,7 @@ class SvgVisualisatieComponent {
|
|
|
3425
2214
|
}));
|
|
3426
2215
|
}
|
|
3427
2216
|
ngOnInit() {
|
|
3428
|
-
document.getElementById('contextMenu')
|
|
2217
|
+
document.getElementById('contextMenu').addEventListener('mouseleave', () => this.hideContextMenu());
|
|
3429
2218
|
}
|
|
3430
2219
|
ngOnDestroy() {
|
|
3431
2220
|
this.subscriptions.forEach(s => s.unsubscribe());
|
|
@@ -3596,7 +2385,7 @@ class SvgVisualisatieComponent {
|
|
|
3596
2385
|
});
|
|
3597
2386
|
this.viewerControlsService.setValideRit(!gebrokenRit);
|
|
3598
2387
|
this.store.dispatch(SetGeplandeActies(actieOpRitSelectiePuics));
|
|
3599
|
-
const actieOpRitSelectiePuicsArray = Array.from(actieOpRitSelectiePuics.values())
|
|
2388
|
+
const actieOpRitSelectiePuicsArray = Utils.flatMap(Array.from(actieOpRitSelectiePuics.values()), x => x);
|
|
3600
2389
|
this.store.dispatch(SetActieOpRitSelectieIds(actieOpRitSelectiePuicsArray));
|
|
3601
2390
|
ritSelectiePuics = ritSelectiePuics.filter(item => actieOpRitSelectiePuicsArray.indexOf(item) < 0); // make mutually exclusive
|
|
3602
2391
|
this.store.dispatch(SetRitSelectieIds(ritSelectiePuics));
|
|
@@ -3743,7 +2532,7 @@ let SignaleringsbeeldInfoResource = class SignaleringsbeeldInfoResource extends
|
|
|
3743
2532
|
ngOnDestroy() {
|
|
3744
2533
|
this.subscriptions.unsubscribe();
|
|
3745
2534
|
}
|
|
3746
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: SignaleringsbeeldInfoResource, deps: [{ token: i1
|
|
2535
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: SignaleringsbeeldInfoResource, deps: [{ token: i1.ResourceHandler }, { token: i2$1.Store }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
3747
2536
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: SignaleringsbeeldInfoResource }); }
|
|
3748
2537
|
};
|
|
3749
2538
|
__decorate([
|
|
@@ -3764,7 +2553,7 @@ SignaleringsbeeldInfoResource = __decorate([
|
|
|
3764
2553
|
], SignaleringsbeeldInfoResource);
|
|
3765
2554
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: SignaleringsbeeldInfoResource, decorators: [{
|
|
3766
2555
|
type: Injectable
|
|
3767
|
-
}], ctorParameters: () => [{ type: i1
|
|
2556
|
+
}], ctorParameters: () => [{ type: i1.ResourceHandler }, { type: i2$1.Store }], propDecorators: { laadSignaleringsbeeldInfo: [], getBestaatIALevering: [] } });
|
|
3768
2557
|
class SignaleringsbeeldInfoDto extends ResourceModel {
|
|
3769
2558
|
constructor(data) {
|
|
3770
2559
|
super();
|
|
@@ -3798,7 +2587,7 @@ class BaseRestService {
|
|
|
3798
2587
|
ngOnDestroy() {
|
|
3799
2588
|
this.subscriptions.unsubscribe();
|
|
3800
2589
|
}
|
|
3801
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: BaseRestService, deps: [{ token: i1.HttpClient }, { token: i2$1.Store }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
2590
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: BaseRestService, deps: [{ token: i1$1.HttpClient }, { token: i2$1.Store }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
3802
2591
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: BaseRestService, providedIn: 'root' }); }
|
|
3803
2592
|
}
|
|
3804
2593
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: BaseRestService, decorators: [{
|
|
@@ -3806,7 +2595,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImpor
|
|
|
3806
2595
|
args: [{
|
|
3807
2596
|
providedIn: 'root'
|
|
3808
2597
|
}]
|
|
3809
|
-
}], ctorParameters: () => [{ type: i1.HttpClient }, { type: i2$1.Store }] });
|
|
2598
|
+
}], ctorParameters: () => [{ type: i1$1.HttpClient }, { type: i2$1.Store }] });
|
|
3810
2599
|
|
|
3811
2600
|
class BewegingVerrijkerService extends BaseRestService {
|
|
3812
2601
|
getBewegingen(bewegingen, ongeplandeActies) {
|
|
@@ -4048,10 +2837,10 @@ class Ritdeel {
|
|
|
4048
2837
|
getZichtbaarheidBuitenPaginatie() {
|
|
4049
2838
|
return this.zichtbaarBuitenPaginatie;
|
|
4050
2839
|
}
|
|
4051
|
-
bepaalTopologieElementen(
|
|
4052
|
-
const topoElementen =
|
|
2840
|
+
bepaalTopologieElementen(signaleringsBeeldManagerService) {
|
|
2841
|
+
const topoElementen = signaleringsBeeldManagerService.bepaalRouteElementen(this.getRoute());
|
|
4053
2842
|
if (this.heeftVrijebaanInfo()) {
|
|
4054
|
-
const vrijebaanTopoElementen =
|
|
2843
|
+
const vrijebaanTopoElementen = signaleringsBeeldManagerService.bepaalRouteElementen(this.getVrijebaanPrlRoute());
|
|
4055
2844
|
topoElementen.push(...vrijebaanTopoElementen);
|
|
4056
2845
|
}
|
|
4057
2846
|
this.topoElementen = topoElementen;
|
|
@@ -4097,7 +2886,7 @@ class RitLezerService {
|
|
|
4097
2886
|
ritDelen.push(new Ritdeel(dwangInfo, beweging.ritActies, beweging, vrijebaanDwangInfo, vervolgSpoor, []));
|
|
4098
2887
|
}
|
|
4099
2888
|
extractVrijebaanDwangInfo(beweging, rijwegPlan, rijweg) {
|
|
4100
|
-
let vrijebaanDwangInfo =
|
|
2889
|
+
let vrijebaanDwangInfo = null;
|
|
4101
2890
|
let vervolgSpoor;
|
|
4102
2891
|
if (beweging.naarSpoor.endsWith(SPOOR_NAAR_VRIJEBAAN_POSTFIX) ||
|
|
4103
2892
|
beweging.naarSpoor.endsWith(SPOOR_NAAR_VEERWISSEL_VRIJEBAAN_POSTFIX)) {
|
|
@@ -4111,9 +2900,9 @@ class RitLezerService {
|
|
|
4111
2900
|
vrijebaanRijweg = vrijebaanRijwegen[0];
|
|
4112
2901
|
vrijebaanDwang = vrijebaanRijweg.getDwangVoorDwangNummer(0);
|
|
4113
2902
|
vervolgSpoor = vrijebaanRijwegplan.getVervolgSpoor(vrijebaanRijweg);
|
|
4114
|
-
vrijebaanDwangInfo =
|
|
4115
|
-
new RijwegplanRijwegDwangCombinatie(vrijebaanRijwegplan, vrijebaanRijweg, vrijebaanDwang);
|
|
4116
2903
|
}
|
|
2904
|
+
vrijebaanDwangInfo =
|
|
2905
|
+
new RijwegplanRijwegDwangCombinatie(vrijebaanRijwegplan, vrijebaanRijweg, vrijebaanDwang);
|
|
4117
2906
|
}
|
|
4118
2907
|
}
|
|
4119
2908
|
return { vrijebaanDwangInfo, vervolgSpoor };
|
|
@@ -4196,7 +2985,7 @@ class BepaalOngeplandeActiesEffect {
|
|
|
4196
2985
|
this.messagesService.showMessage(MessageBuilder.nietGevondenTakkenOngeplandeActies(nietGevondenTakken));
|
|
4197
2986
|
}
|
|
4198
2987
|
if (logMeldingDTOs.length > 0) {
|
|
4199
|
-
this.mstLogResource.
|
|
2988
|
+
this.mstLogResource.logErrorMessages(logMeldingDTOs);
|
|
4200
2989
|
}
|
|
4201
2990
|
this.store.dispatch(SetOngeplandeActies(puicActieMap));
|
|
4202
2991
|
this.store.dispatch(SetOngeplandeActieSelectieIds(Array.from(puicActieMap.keys())));
|
|
@@ -4266,7 +3055,7 @@ class BepaalSbInfosEffect {
|
|
|
4266
3055
|
next: _res => this.store.dispatch(laadEnVerwerkSignaleringsbeeldInfo(treinpad, paginationSize, pplgs, ritGewijzigdToegestaan)),
|
|
4267
3056
|
error: err => {
|
|
4268
3057
|
this.messagesService.showMessage(new Message(Severity.INFORMATION, Utils.getValidErorrMessage(err)));
|
|
4269
|
-
const iaVersieInfo = { versie: '
|
|
3058
|
+
const iaVersieInfo = { versie: 'DONNA_77136_VER_1', ingangsDatum: this.dateService.getCurrentDate() };
|
|
4270
3059
|
this.store.dispatch(SetIaVersie(iaVersieInfo));
|
|
4271
3060
|
this.store.dispatch(laadEnVerwerkSignaleringsbeeldInfo(treinpad, paginationSize, pplgs, ritGewijzigdToegestaan));
|
|
4272
3061
|
}
|
|
@@ -4420,7 +3209,7 @@ class LaadRouteFilesEffect {
|
|
|
4420
3209
|
const promise = this.editorService.laadRouteFiles(actie.iaversieinfo.versie, pplgs);
|
|
4421
3210
|
promise.then(() => {
|
|
4422
3211
|
this.updateRitdelen(actie);
|
|
4423
|
-
},
|
|
3212
|
+
}, err => {
|
|
4424
3213
|
this.messagesService.showMessage(MessageBuilder.rwpDataNietGevonden(Utils.getValidErorrMessage(err)));
|
|
4425
3214
|
});
|
|
4426
3215
|
});
|
|
@@ -4480,14 +3269,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImpor
|
|
|
4480
3269
|
}] });
|
|
4481
3270
|
|
|
4482
3271
|
class LaadSignaleringsbeeldenEffect {
|
|
4483
|
-
constructor(actions$, store, signaleringsBeeldManagerService, editorService, sbiResource, connectorService,
|
|
3272
|
+
constructor(actions$, store, signaleringsBeeldManagerService, editorService, sbiResource, connectorService, messagesSerivce) {
|
|
4484
3273
|
this.actions$ = actions$;
|
|
4485
3274
|
this.store = store;
|
|
4486
3275
|
this.signaleringsBeeldManagerService = signaleringsBeeldManagerService;
|
|
4487
3276
|
this.editorService = editorService;
|
|
4488
3277
|
this.sbiResource = sbiResource;
|
|
4489
3278
|
this.connectorService = connectorService;
|
|
4490
|
-
this.
|
|
3279
|
+
this.messagesSerivce = messagesSerivce;
|
|
4491
3280
|
this.SVG_PIXEL_RUIMTE = 30;
|
|
4492
3281
|
this.verwerkRitdelen$ = createEffect(() => this.actions$.pipe(ofType(setRitDelen, navigeer, navigeerVanaf), withLatestFrom(this.store), map(([actie, storeState]) => {
|
|
4493
3282
|
this.store.dispatch(SetOngeplandeActiesBepaald(false));
|
|
@@ -4502,13 +3291,13 @@ class LaadSignaleringsbeeldenEffect {
|
|
|
4502
3291
|
}
|
|
4503
3292
|
handleSignaleringsbeeldInfo({ actie, storeState }) {
|
|
4504
3293
|
return this.sbiResource.laadSignaleringsbeeldInfo(this.createSignaleringsbeeldInfoQueryDto(actie.pplgs, storeState.iaVersie)).pipe(take(1), tap((dtos) => this.processResponse({ dtos, storeState, actie })), catchError((err) => {
|
|
4505
|
-
this.
|
|
3294
|
+
this.messagesSerivce.showMessage(MessageBuilder.nietGevondenSBI(err));
|
|
4506
3295
|
return throwError(() => err);
|
|
4507
3296
|
}));
|
|
4508
3297
|
}
|
|
4509
3298
|
processResponse({ dtos, storeState, actie }) {
|
|
4510
3299
|
if (dtos && dtos.filter(dto => dto.metVisualisatie).length > 12) {
|
|
4511
|
-
this.
|
|
3300
|
+
this.messagesSerivce.showMessage(MessageBuilder.meerDan12BladenGevonden(dtos.length));
|
|
4512
3301
|
}
|
|
4513
3302
|
this.store.dispatch(SetSignaleringsbeeldInfoDtos(dtos, storeState.iaVersie, actie.rit, actie.paginationSize, actie.ritGewijzigdToegestaan));
|
|
4514
3303
|
this.store.dispatch(SetVisibleSignaleringsbeeldInfoDtos(dtos));
|
|
@@ -4542,7 +3331,7 @@ class LaadSignaleringsbeeldenEffect {
|
|
|
4542
3331
|
this.verwerkSvgs(svgDataUrls);
|
|
4543
3332
|
this.updateState(ritDelen, visibleDtos, storeState, visibleRitPplgs, loadingDtos, isInit, storeDtos);
|
|
4544
3333
|
}), catchError(err => {
|
|
4545
|
-
this.
|
|
3334
|
+
this.messagesSerivce.showMessage(MessageBuilder.rwpDataNietGevonden(Utils.getValidErorrMessage(err)));
|
|
4546
3335
|
throw err;
|
|
4547
3336
|
})).subscribe();
|
|
4548
3337
|
}
|
|
@@ -4597,8 +3386,8 @@ class LaadSignaleringsbeeldenEffect {
|
|
|
4597
3386
|
dtos.filter(d => !visibleDtos.includes(d)).forEach(d => d.metVisualisatie = false);
|
|
4598
3387
|
return visibleDtos;
|
|
4599
3388
|
}
|
|
4600
|
-
distinct(value, index,
|
|
4601
|
-
return
|
|
3389
|
+
distinct(value, index, self) {
|
|
3390
|
+
return self.indexOf(value) === index;
|
|
4602
3391
|
}
|
|
4603
3392
|
addPrevNonVisibleDto(firstIdx, ritdelen, loadingDtos, visibleRitPplgs, allDtos) {
|
|
4604
3393
|
if (firstIdx >= 0) {
|
|
@@ -4687,7 +3476,7 @@ class LaadSignaleringsbeeldenEffect {
|
|
|
4687
3476
|
}
|
|
4688
3477
|
}
|
|
4689
3478
|
}
|
|
4690
|
-
this.
|
|
3479
|
+
this.updateZichtbaarheidAangrezendeRitdelen(min, max, ritdelen, visibleDtos);
|
|
4691
3480
|
return this.updateZichtbaarheidBuitenWindow(ritdelen, visibleDtos);
|
|
4692
3481
|
}
|
|
4693
3482
|
updateZichtbaarheidBuitenWindow(nieuweRitdelen, visibleDtos) {
|
|
@@ -4703,7 +3492,7 @@ class LaadSignaleringsbeeldenEffect {
|
|
|
4703
3492
|
}
|
|
4704
3493
|
return nieuweRitdelen;
|
|
4705
3494
|
}
|
|
4706
|
-
|
|
3495
|
+
updateZichtbaarheidAangrezendeRitdelen(min, max, nieuweRitdelen, visibleDtos) {
|
|
4707
3496
|
let i = min - 1;
|
|
4708
3497
|
while (i >= 0) {
|
|
4709
3498
|
i = this.updateZichtbaarHeid(i, 0, visibleDtos, nieuweRitdelen) - 1;
|
|
@@ -4838,11 +3627,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImpor
|
|
|
4838
3627
|
}], ctorParameters: () => [{ type: i1$2.Actions }, { type: i2$1.Store }, { type: BewegingVerrijkerService }] });
|
|
4839
3628
|
|
|
4840
3629
|
class RitdelenEffect {
|
|
4841
|
-
constructor(actions$, store, sbmService,
|
|
3630
|
+
constructor(actions$, store, sbmService, rijwegPlanEditorService) {
|
|
4842
3631
|
this.actions$ = actions$;
|
|
4843
3632
|
this.store = store;
|
|
4844
3633
|
this.sbmService = sbmService;
|
|
4845
|
-
this.
|
|
3634
|
+
this.rijwegPlanEditorService = rijwegPlanEditorService;
|
|
4846
3635
|
this.updateRitDelen$ = createEffect(() => this.actions$.pipe(ofType(updateRitDelen), withLatestFrom(this.store), map(([actie, _storeState]) => {
|
|
4847
3636
|
const nieuweRitDelen = actie.ritDelen.map(ritDeel => ritDeel.isZichtbaar() ?
|
|
4848
3637
|
ritDeel.copyMetAlternatieveRoutes(this.sbmService.bepaalAlternativeRoutes(ritDeel.getRijweg())) : ritDeel);
|
|
@@ -4860,25 +3649,25 @@ class RitdelenEffect {
|
|
|
4860
3649
|
return setRitdelenAfterUpdate(ritDelen);
|
|
4861
3650
|
})));
|
|
4862
3651
|
this.ritdeelInvoegen$ = createEffect(() => this.actions$.pipe(ofType(ritdeelInvoegen), withLatestFrom(this.store), map(([actie, storeState]) => {
|
|
4863
|
-
const ritDelen = this.ritdeelInvoegenFunc(storeState.ritDelen, actie.nieuweRoute);
|
|
3652
|
+
const ritDelen = this.ritdeelInvoegenFunc(storeState.ritDelen, actie.nieuweRoute, this.rijwegPlanEditorService, this.sbmService);
|
|
4864
3653
|
return setRitdelenAfterUpdate(ritDelen);
|
|
4865
3654
|
})));
|
|
4866
3655
|
}
|
|
4867
|
-
ritdeelInvoegenFunc(ritDelen, nieuweRoute) {
|
|
3656
|
+
ritdeelInvoegenFunc(ritDelen, nieuweRoute, rijwegPlanEditorService, sbmService) {
|
|
4868
3657
|
const origineelRitdeel = nieuweRoute.beginSeinOpRitdeel.ritdeel;
|
|
4869
3658
|
const beginSein = nieuweRoute.beginSeinOpRitdeel.sein;
|
|
4870
|
-
const rijwegplan =
|
|
3659
|
+
const rijwegplan = rijwegPlanEditorService.getRijwegplan(beginSein.getPPLG());
|
|
4871
3660
|
const dwangen = JsJavaUtil.listToArray(rijwegplan.getOnderliggendeDwangenTotEnVanSein(origineelRitdeel.getDwang(), beginSein));
|
|
4872
3661
|
const isSamengesteldeRoute = dwangen[0] && dwangen[1];
|
|
4873
3662
|
let newRitdeel1 = origineelRitdeel;
|
|
4874
3663
|
if (isSamengesteldeRoute) {
|
|
4875
|
-
newRitdeel1 = this.verwerkSamengesteldeRoute(origineelRitdeel, rijwegplan, dwangen, ritDelen);
|
|
3664
|
+
newRitdeel1 = this.verwerkSamengesteldeRoute(origineelRitdeel, rijwegplan, dwangen, sbmService, ritDelen);
|
|
4876
3665
|
}
|
|
4877
3666
|
if (nieuweRoute.combinatieVoorEindsein.isVrijeBaanRijweg()) {
|
|
4878
|
-
this.extendRitdeelMetVrijebaanInfo(newRitdeel1, nieuweRoute);
|
|
3667
|
+
this.extendRitdeelMetVrijebaanInfo(newRitdeel1, nieuweRoute, sbmService);
|
|
4879
3668
|
}
|
|
4880
3669
|
else {
|
|
4881
|
-
this.maakNieuwRitdeel(newRitdeel1, nieuweRoute, ritDelen);
|
|
3670
|
+
this.maakNieuwRitdeel(newRitdeel1, nieuweRoute, sbmService, ritDelen);
|
|
4882
3671
|
}
|
|
4883
3672
|
if (isSamengesteldeRoute) {
|
|
4884
3673
|
ritDelen.splice(ritDelen.indexOf(origineelRitdeel), 1);
|
|
@@ -4893,38 +3682,38 @@ class RitdelenEffect {
|
|
|
4893
3682
|
}
|
|
4894
3683
|
}
|
|
4895
3684
|
}
|
|
4896
|
-
verwerkSamengesteldeRoute(origineelRitdeel, rijwegplan, dwangen, ritDelen) {
|
|
3685
|
+
verwerkSamengesteldeRoute(origineelRitdeel, rijwegplan, dwangen, sbmService, ritDelen) {
|
|
4897
3686
|
// dwangen in 2 nieuwe ritdelen verwerken voor de knip
|
|
4898
3687
|
const nieuweRijweg1 = rijwegplan.getRijwegVoorSeinen(dwangen[0].getRoute().getBeginSein(), dwangen[0].getRoute().getEindSein());
|
|
4899
3688
|
const dwangInfo1 = new RijwegplanRijwegDwangCombinatie(rijwegplan, nieuweRijweg1, dwangen[0]);
|
|
4900
|
-
const newRitdeel1 = new Ritdeel(dwangInfo1, [],
|
|
3689
|
+
const newRitdeel1 = new Ritdeel(dwangInfo1, [], null, null, null, []);
|
|
4901
3690
|
// remove vrijbaan info uit ritdeel
|
|
4902
|
-
newRitdeel1.vrijebaanRijwegplanRijwegDwangCombi =
|
|
4903
|
-
newRitdeel1.vervolgSpoor =
|
|
4904
|
-
newRitdeel1.bepaalTopologieElementen(
|
|
3691
|
+
newRitdeel1.vrijebaanRijwegplanRijwegDwangCombi = null;
|
|
3692
|
+
newRitdeel1.vervolgSpoor = null;
|
|
3693
|
+
newRitdeel1.bepaalTopologieElementen(sbmService);
|
|
4905
3694
|
this.insertRitdeel(ritDelen, origineelRitdeel, newRitdeel1);
|
|
4906
3695
|
const nieuweRijweg2 = rijwegplan.getRijwegVoorSeinen(dwangen[1].getRoute().getBeginSein(), dwangen[1].getRoute().getEindSein());
|
|
4907
3696
|
const dwangInfo2 = new RijwegplanRijwegDwangCombinatie(rijwegplan, nieuweRijweg2, dwangen[1]);
|
|
4908
|
-
const newRitdeel2 = new Ritdeel(dwangInfo2, [],
|
|
4909
|
-
newRitdeel2.bepaalTopologieElementen(
|
|
3697
|
+
const newRitdeel2 = new Ritdeel(dwangInfo2, [], null, null, null, []);
|
|
3698
|
+
newRitdeel2.bepaalTopologieElementen(sbmService);
|
|
4910
3699
|
this.insertRitdeel(ritDelen, newRitdeel1, newRitdeel2);
|
|
4911
3700
|
return newRitdeel1;
|
|
4912
3701
|
}
|
|
4913
|
-
extendRitdeelMetVrijebaanInfo(newRitdeel1, nieuweRoute) {
|
|
3702
|
+
extendRitdeelMetVrijebaanInfo(newRitdeel1, nieuweRoute, sbmService) {
|
|
4914
3703
|
newRitdeel1.vrijebaanRijwegplanRijwegDwangCombi = nieuweRoute.combinatieVoorEindsein;
|
|
4915
3704
|
const vbrwp = nieuweRoute.combinatieVoorEindsein.rijwegplan;
|
|
4916
3705
|
newRitdeel1.vervolgSpoor = vbrwp.getVervolgSpoor(nieuweRoute.combinatieVoorEindsein.rijweg);
|
|
4917
|
-
newRitdeel1.bepaalTopologieElementen(
|
|
3706
|
+
newRitdeel1.bepaalTopologieElementen(sbmService);
|
|
4918
3707
|
}
|
|
4919
|
-
maakNieuwRitdeel(newRitdeel1, nieuweRoute, ritDelen) {
|
|
3708
|
+
maakNieuwRitdeel(newRitdeel1, nieuweRoute, sbmService, ritDelen) {
|
|
4920
3709
|
let newRitdeel = this.createRitdeel(nieuweRoute);
|
|
4921
|
-
const altRoutes =
|
|
3710
|
+
const altRoutes = sbmService.bepaalAlternativeRoutes(newRitdeel.getRijweg());
|
|
4922
3711
|
newRitdeel = newRitdeel.copyMetAlternatieveRoutes(altRoutes);
|
|
4923
|
-
newRitdeel.bepaalTopologieElementen(
|
|
3712
|
+
newRitdeel.bepaalTopologieElementen(sbmService);
|
|
4924
3713
|
this.insertRitdeel(ritDelen, newRitdeel1, newRitdeel);
|
|
4925
3714
|
}
|
|
4926
3715
|
createRitdeel(nieuweRoute) {
|
|
4927
|
-
return new Ritdeel(nieuweRoute.combinatieVoorEindsein, [],
|
|
3716
|
+
return new Ritdeel(nieuweRoute.combinatieVoorEindsein, [], null, null, null, []);
|
|
4928
3717
|
}
|
|
4929
3718
|
insertRitdeel(ritdelen, naRitdeelPositie, newRitdeel) {
|
|
4930
3719
|
const idx = ritdelen.indexOf(naRitdeelPositie);
|
|
@@ -5047,7 +3836,7 @@ function addRitdeelActieFunc(ritDelen, { ritDeel, actie }) {
|
|
|
5047
3836
|
const onIdsActionHandler = (action) => on(action, (_, { ids }) => ids);
|
|
5048
3837
|
const createIdsReducer = (action) => createReducer([], onIdsActionHandler(action));
|
|
5049
3838
|
const editableReducer = createReducer(true, on(setEditable, (_, { editable }) => editable));
|
|
5050
|
-
const progressIndicatorReducer = createReducer(
|
|
3839
|
+
const progressIndicatorReducer = createReducer(undefined, on(ShowProgress, () => ({ progressIndicator: {} })), on(ClearProgress, () => undefined));
|
|
5051
3840
|
const svgInfoReducer = createReducer([], on(SetSvgInfos, (_, { svgInfos }) => svgInfos));
|
|
5052
3841
|
const debugReducer = createReducer(false, on(SetDebug, (_, { debug }) => debug));
|
|
5053
3842
|
const ritSelectieIdsReducer = createIdsReducer(SetRitSelectieIds);
|
|
@@ -5073,7 +3862,9 @@ const ongeplandeActieReducer = createReducer(new ArrayMultimap(), on(SetOngeplan
|
|
|
5073
3862
|
ongeplandeActie.puics.forEach(puic => ongeplandeActies.delete(puic, ongeplandeActie));
|
|
5074
3863
|
return new ArrayMultimap(ongeplandeActies);
|
|
5075
3864
|
}));
|
|
5076
|
-
const ongeplandeActieSelectieIdsReducer = createReducer([],
|
|
3865
|
+
const ongeplandeActieSelectieIdsReducer = createReducer([],
|
|
3866
|
+
// on(MstActions.SetOngeplandeActieSelectieIds, (_, { ids }) => ids),
|
|
3867
|
+
onIdsActionHandler(SetOngeplandeActieSelectieIds), on(AddOngeplandeActie, (ids, { ongeplandeActie }) => {
|
|
5077
3868
|
ongeplandeActie.puics.filter(puic => !ids.includes(puic)).forEach(puic => ids.push(puic));
|
|
5078
3869
|
return [...ids];
|
|
5079
3870
|
}), on(DeleteOngeplandeActieSelectieId, (ids, { id }) => [].concat(ids.includes(id) ? ids.filter(_id => _id !== id) : ids)));
|
|
@@ -5088,13 +3879,13 @@ const beginSeinRightClickableIdsReducer = createIdsReducer(SetBeginSeinRightClic
|
|
|
5088
3879
|
const nieuweRouteReducer = createReducer(new NieuweRoute(null, null), on(SetNieuwRouteBeginSein, (_, { startSeinOpRitdeel }) => new NieuweRoute(startSeinOpRitdeel, null)), on(SetNieuwRouteEindSein, (nieuweRoute, { combinatieVoorEindsein }) => new NieuweRoute(nieuweRoute.beginSeinOpRitdeel, combinatieVoorEindsein)), on(ResetNieuweRoute, () => new NieuweRoute(null, null)));
|
|
5089
3880
|
const signaleringsbeeldInfoDtosReducer = createReducer([], on(SetSignaleringsbeeldInfoDtos, (_, { dtos }) => dtos), on(UpdateSignaleringsbeeldInfoDtos, (_, { dtos }) => [...dtos]));
|
|
5090
3881
|
const visibleSbInfoDtosReducer = createReducer([], on(SetVisibleSignaleringsbeeldInfoDtos, (_, { dtos }) => dtos), on(UpdateVisibleSignaleringsbeeldInfoDtos, (_, { dtos }) => [...dtos]));
|
|
5091
|
-
const iaVersieReducer = createReducer({
|
|
5092
|
-
const algemeneRitInfoDtoReducer = createReducer(
|
|
3882
|
+
const iaVersieReducer = createReducer({}, on(SetIaVersie, (_, { iaVersie }) => Object.assign({}, iaVersie, { versie: iaVersie.versie.toUpperCase() })));
|
|
3883
|
+
const algemeneRitInfoDtoReducer = createReducer(new AlgemeneRitInfoDto(), on(SetAlgemeneRitInfo, (_, { algemeneRitInfoDto }) => algemeneRitInfoDto));
|
|
5093
3884
|
const ongeplandeActiesBepaaldReducer = createReducer(false, on(SetOngeplandeActiesBepaald, (_, { bepaald }) => bepaald));
|
|
5094
|
-
const nieuweBewegingReducer = createReducer(
|
|
5095
|
-
const baseUrlReducer = createReducer(
|
|
5096
|
-
const focusIdsReducer = createReducer(
|
|
5097
|
-
const selectedRitdeelIdReducer = createReducer(
|
|
3885
|
+
const nieuweBewegingReducer = createReducer({}, on(UpdateRit, (_, { bewegingen }) => bewegingen));
|
|
3886
|
+
const baseUrlReducer = createReducer(undefined, on(SetBaseUrl, (_, { baseUrl }) => baseUrl));
|
|
3887
|
+
const focusIdsReducer = createReducer({}, on(focusOpIds, (_, { puics }) => puics));
|
|
3888
|
+
const selectedRitdeelIdReducer = createReducer({}, on(SetSelectedRitdeel, (_, { id }) => id));
|
|
5098
3889
|
const storeReducers = {
|
|
5099
3890
|
ritDelen: ritdelenReducer,
|
|
5100
3891
|
ritSelectieIds: ritSelectieIdsReducer,
|
|
@@ -5126,7 +3917,6 @@ const storeReducers = {
|
|
|
5126
3917
|
selectedRitdeelId: selectedRitdeelIdReducer
|
|
5127
3918
|
};
|
|
5128
3919
|
|
|
5129
|
-
// @ts-nocheck
|
|
5130
3920
|
class ZoneUtil {
|
|
5131
3921
|
constructor(ngZone) {
|
|
5132
3922
|
this.ngZone = ngZone;
|
|
@@ -5189,7 +3979,6 @@ class MstViewerModule {
|
|
|
5189
3979
|
constructor(service, zoneUtil) {
|
|
5190
3980
|
this.service = service;
|
|
5191
3981
|
// maak de EditorService toegankelijk voor GWT code
|
|
5192
|
-
// @ts-ignore
|
|
5193
3982
|
window['rpe'] = {
|
|
5194
3983
|
EditorService: zoneUtil.proxy(service)
|
|
5195
3984
|
};
|
|
@@ -5207,7 +3996,7 @@ class MstViewerModule {
|
|
|
5207
3996
|
SvgVisualisatieComponent,
|
|
5208
3997
|
MessagesComponent], imports: [CommonModule,
|
|
5209
3998
|
ImxViewerModule,
|
|
5210
|
-
RijwegenModule, i1
|
|
3999
|
+
RijwegenModule, i1.ResourceModule, i2$1.StoreRootModule, i1$2.EffectsRootModule], exports: [MstviewerComponent] }); }
|
|
5211
4000
|
static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: MstViewerModule, providers: [
|
|
5212
4001
|
ZoneUtil,
|
|
5213
4002
|
SignaleringsbeeldInfoResource,
|