@dative-gpi/foundation-core-domain 1.0.147-maps → 1.0.147-scenario-device-model

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.
Files changed (4) hide show
  1. package/models/deviceOrganisations/deviceOrganisationInfos.ts +0 -6
  2. package/models/scenarioDeviceOrganisations/scenarioDeviceOrganisationDetails.ts +9 -3
  3. package/models/scenarioDeviceOrganisations/scenarioDeviceOrganisationInfos.ts +9 -3
  4. package/package.json +4 -4
package/models/deviceOrganisations/deviceOrganisationInfos.ts CHANGED
@@ -24,8 +24,6 @@ export class DeviceOrganisationInfos {
24
24
  locationId: string | null;
25
25
  locationLabel: string | null;
26
26
  locationAddress: string | null;
27
- locationLatitude: number | null;
28
- locationLongitude: number | null;
29
27
  groupId: string | null;
30
28
  groupLabel: string | null;
31
29
  groupIcon: string | null;
@@ -63,8 +61,6 @@ export class DeviceOrganisationInfos {
63
61
  this.locationId = params.locationId;
64
62
  this.locationLabel = params.locationLabel;
65
63
  this.locationAddress = params.locationAddress;
66
- this.locationLatitude = params.locationLatitude;
67
- this.locationLongitude = params.locationLongitude;
68
64
  this.groupId = params.groupId;
69
65
  this.groupLabel = params.groupLabel;
70
66
  this.groupIcon = params.groupIcon;
@@ -105,8 +101,6 @@ export interface DeviceOrganisationInfosDTO {
105
101
  locationId: string | null;
106
102
  locationLabel: string | null;
107
103
  locationAddress: string | null;
108
- locationLatitude: number | null;
109
- locationLongitude: number | null;
110
104
  groupId: string | null;
111
105
  groupLabel: string | null;
112
106
  groupIcon: string | null;
package/models/scenarioDeviceOrganisations/scenarioDeviceOrganisationDetails.ts CHANGED
@@ -22,10 +22,12 @@ export interface CreateScenarioDeviceOrganisationDTO {
22
22
  deviceOrganisationId: string;
23
23
  overrideTimeRanges: boolean;
24
24
  timeRanges: CreateTimeRangeDTO[] | null;
25
+ overrideDelay: boolean;
25
26
  delay: number | null;
26
27
  warnDeviceManager: boolean;
27
28
  userOrganisationsIds: string[];
28
- overrideParameters: CreateScenarioParameterOverrideDTO[];
29
+ overrideParameters: boolean;
30
+ parameters: CreateScenarioParameterOverrideDTO[] | null;
29
31
  }
30
32
 
31
33
  export interface CreateManyScenarioDeviceOrganisationDTO {
@@ -34,17 +36,21 @@ export interface CreateManyScenarioDeviceOrganisationDTO {
34
36
  deviceOrganisationsIds: string[];
35
37
  overrideTimeRanges: boolean;
36
38
  timeRanges: CreateTimeRangeDTO[] | null;
39
+ overrideDelay: boolean;
37
40
  delay: number | null;
38
41
  warnDeviceManager: boolean;
39
42
  userOrganisationsIds: string[];
40
- overrideParameters: CreateScenarioParameterOverrideDTO[];
43
+ overrideParameters: boolean;
44
+ parameters: CreateScenarioParameterOverrideDTO[] | null;
41
45
  }
42
46
 
43
47
  export interface UpdateScenarioDeviceOrganisationDTO {
44
48
  overrideTimeRanges: boolean;
45
49
  timeRanges: CreateTimeRangeDTO[] | null;
46
50
  warnDeviceManager: boolean;
51
+ overrideDelay: boolean;
47
52
  delay: number | null;
48
53
  userOrganisationsIds: string[];
49
- overrideParameters: CreateScenarioParameterOverrideDTO[];
54
+ overrideParameters: boolean;
55
+ parameters: CreateScenarioParameterOverrideDTO[] | null;
50
56
  }
package/models/scenarioDeviceOrganisations/scenarioDeviceOrganisationInfos.ts CHANGED
@@ -15,12 +15,14 @@ export class ScenarioDeviceOrganisationInfos {
15
15
  deviceOrganisationLabel: string;
16
16
  overrideTimeRanges: boolean;
17
17
  timeRanges: TimeRange[] | null;
18
+ overrideDelay: boolean;
18
19
  delay: number | null;
19
20
  scenarioIcon: string;
20
21
  warnDeviceManager: boolean;
21
22
  userOrganisationsIds: string[];
22
23
  modelId: string;
23
- overrideParameters: ScenarioParameterOverride[];
24
+ overrideParameters: boolean;
25
+ parameters: ScenarioParameterOverride[] | null;
24
26
  defaultParameters: ScenarioParameter[];
25
27
  scenarioId: string;
26
28
  scenarioScope: ApplicationScope;
@@ -36,11 +38,13 @@ export class ScenarioDeviceOrganisationInfos {
36
38
  this.timeRanges = params.timeRanges ?
37
39
  params.timeRanges.map(dto => new TimeRange(dto)) : null;
38
40
  this.warnDeviceManager = params.warnDeviceManager;
41
+ this.overrideDelay = params.overrideDelay;
39
42
  this.delay = params.delay;
40
43
  this.scenarioIcon = params.scenarioIcon;
41
44
  this.userOrganisationsIds = params.userOrganisationsIds;
42
45
  this.modelId = params.modelId;
43
- this.overrideParameters = params.overrideParameters.map(dto => new ScenarioParameterOverride(dto));
46
+ this.overrideParameters = params.overrideParameters;
47
+ this.parameters = params.parameters ? params.parameters.map(dto => new ScenarioParameterOverride(dto)) : null;
44
48
  this.defaultParameters = params.defaultParameters.map(dto => new ScenarioParameter(dto));
45
49
  this.scenarioId = params.scenarioId;
46
50
  this.scenarioScope = params.scenarioScope;
@@ -56,12 +60,14 @@ export interface ScenarioDeviceOrganisationInfosDTO {
56
60
  deviceOrganisationLabel: string;
57
61
  overrideTimeRanges: boolean;
58
62
  timeRanges: TimeRangeDTO[] | null;
63
+ overrideDelay: boolean;
59
64
  delay: number | null;
60
65
  scenarioIcon: string;
61
66
  modelId: string;
62
67
  warnDeviceManager: boolean;
63
68
  userOrganisationsIds: string[];
64
- overrideParameters: ScenarioParameterOverrideDTO[];
69
+ overrideParameters: boolean;
70
+ parameters: ScenarioParameterOverrideDTO[] | null;
65
71
  defaultParameters: ScenarioParameterDTO[];
66
72
  scenarioId: string;
67
73
  scenarioScope: ApplicationScope;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@dative-gpi/foundation-core-domain",
3
3
  "sideEffects": false,
4
- "version": "1.0.147-maps",
4
+ "version": "1.0.147-scenario-device-model",
5
5
  "description": "",
6
6
  "publishConfig": {
7
7
  "access": "public"
@@ -10,8 +10,8 @@
10
10
  "author": "",
11
11
  "license": "ISC",
12
12
  "dependencies": {
13
- "@dative-gpi/foundation-shared-domain": "1.0.147-maps",
14
- "@dative-gpi/foundation-shared-services": "1.0.147-maps"
13
+ "@dative-gpi/foundation-shared-domain": "1.0.147-scenario-device-model",
14
+ "@dative-gpi/foundation-shared-services": "1.0.147-scenario-device-model"
15
15
  },
16
- "gitHead": "ae8bef1eca27c0f0c345f01c69bf851e12fec0df"
16
+ "gitHead": "ba43dc060cfc192f9b838e4385748e3d5e83c963"
17
17
  }