@dative-gpi/foundation-core-domain 1.0.154 → 1.0.156-maps

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