@dative-gpi/foundation-core-domain 1.1.29 → 1.1.30-timerange2

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 (9) hide show
  1. package/models/charts/chartTimeRange.ts +2 -0
  2. package/models/scenarioDeviceOrganisations/scenarioDeviceOrganisationDetails.ts +7 -6
  3. package/models/scenarioDeviceOrganisations/scenarioDeviceOrganisationInfos.ts +5 -6
  4. package/models/scenarioOrganisationTypes/scenarioOrganisationTypeDetails.ts +6 -6
  5. package/models/scenarioOrganisations/scenarioOrganisationDetails.ts +7 -7
  6. package/models/scenarios/index.ts +3 -2
  7. package/models/scenarios/scenarioTimeRange.ts +31 -0
  8. package/models/shared/timeRange.ts +1 -5
  9. package/package.json +4 -4
package/models/charts/chartTimeRange.ts CHANGED
@@ -9,6 +9,7 @@ export class ChartTimeRange extends TimeRange {
9
9
  opacity: number;
10
10
  label: string;
11
11
  labelDefault: string;
12
+ variant: DateType;
12
13
  translations: ChartTimeRangeTranslation[];
13
14
 
14
15
  constructor(params: ChartTimeRangeDTO) {
@@ -18,6 +19,7 @@ export class ChartTimeRange extends TimeRange {
18
19
  this.opacity = params.opacity;
19
20
  this.label = params.label;
20
21
  this.labelDefault = params.labelDefault;
22
+ this.variant = params.variant;
21
23
  this.translations = params.translations.map(t => new ChartTimeRangeTranslation(t));
22
24
  }
23
25
  }
package/models/scenarioDeviceOrganisations/scenarioDeviceOrganisationDetails.ts CHANGED
@@ -1,8 +1,9 @@
1
- import type { CreateTimeRangeDTO } from "../shared/timeRange";
2
- import type { ScenarioDeviceOrganisationInfosDTO } from "./scenarioDeviceOrganisationInfos";
1
+
2
+ import type { ApplicationScope } from "@dative-gpi/foundation-shared-domain/enums";
3
3
  import { ScenarioDeviceOrganisationInfos } from "./scenarioDeviceOrganisationInfos";
4
+ import type { ScenarioDeviceOrganisationInfosDTO } from "./scenarioDeviceOrganisationInfos";
4
5
  import type { CreateScenarioParameterOverrideDTO } from "../scenarios/scenarioParameterOverride";
5
- import type { ApplicationScope } from "@dative-gpi/foundation-shared-domain/enums";
6
+ import type { CreateScenarioTimeRangeDTO } from '../scenarios/scenarioTimeRange';
6
7
 
7
8
 
8
9
  export class ScenarioDeviceOrganisationDetails extends ScenarioDeviceOrganisationInfos {
@@ -21,7 +22,7 @@ export interface CreateScenarioDeviceOrganisationDTO {
21
22
  scenarioScope: ApplicationScope;
22
23
  deviceOrganisationId: string;
23
24
  overrideTimeRanges: boolean;
24
- timeRanges: CreateTimeRangeDTO[];
25
+ timeRanges: CreateScenarioTimeRangeDTO[];
25
26
  overrideDelay: boolean;
26
27
  delay: number | null;
27
28
  warnDeviceManager: boolean;
@@ -35,7 +36,7 @@ export interface UpsertScenarioDeviceOrganisationDTO {
35
36
  scenarioScope: ApplicationScope;
36
37
  deviceOrganisationsIds: string[];
37
38
  overrideTimeRanges: boolean;
38
- timeRanges: CreateTimeRangeDTO[];
39
+ timeRanges: CreateScenarioTimeRangeDTO[];
39
40
  overrideDelay: boolean;
40
41
  delay: number | null;
41
42
  warnDeviceManager: boolean;
@@ -46,7 +47,7 @@ export interface UpsertScenarioDeviceOrganisationDTO {
46
47
 
47
48
  export interface UpdateScenarioDeviceOrganisationDTO {
48
49
  overrideTimeRanges: boolean;
49
- timeRanges: CreateTimeRangeDTO[];
50
+ timeRanges: CreateScenarioTimeRangeDTO[];
50
51
  warnDeviceManager: boolean;
51
52
  overrideDelay: boolean;
52
53
  delay: number | null;
package/models/scenarioDeviceOrganisations/scenarioDeviceOrganisationInfos.ts CHANGED
@@ -2,9 +2,8 @@ import type { ScenarioParameterOverrideDTO } from "../scenarios/scenarioParamete
2
2
  import { ScenarioParameterOverride } from "../scenarios/scenarioParameterOverride";
3
3
  import { ScenarioParameter } from "../scenarios/scenarioParameter";
4
4
  import type { ScenarioParameterDTO } from "../scenarios/scenarioParameter";
5
- import type { TimeRangeDTO } from "../shared/timeRange";
6
- import { TimeRange } from "../shared/timeRange";
7
- import type { ApplicationScope } from "@/shared/foundation-shared-domain/enums";
5
+ import type { ApplicationScope } from "@dative-gpi/foundation-shared-domain/enums";
6
+ import { ScenarioTimeRange, type ScenarioTimeRangeDTO } from '../scenarios/scenarioTimeRange';
8
7
 
9
8
  export class ScenarioDeviceOrganisationInfos {
10
9
  id: string;
@@ -14,7 +13,7 @@ export class ScenarioDeviceOrganisationInfos {
14
13
  deviceOrganisationCode: string;
15
14
  deviceOrganisationLabel: string;
16
15
  overrideTimeRanges: boolean;
17
- timeRanges: TimeRange[];
16
+ timeRanges: ScenarioTimeRange[];
18
17
  overrideDelay: boolean;
19
18
  delay: number | null;
20
19
  scenarioIcon: string;
@@ -35,7 +34,7 @@ export class ScenarioDeviceOrganisationInfos {
35
34
  this.deviceOrganisationCode = params.deviceOrganisationCode;
36
35
  this.deviceOrganisationLabel = params.deviceOrganisationLabel;
37
36
  this.overrideTimeRanges = params.overrideTimeRanges;
38
- this.timeRanges = params.timeRanges.map(dto => new TimeRange(dto));
37
+ this.timeRanges = params.timeRanges.map(dto => new ScenarioTimeRange(dto));
39
38
  this.warnDeviceManager = params.warnDeviceManager;
40
39
  this.overrideDelay = params.overrideDelay;
41
40
  this.delay = params.delay;
@@ -58,7 +57,7 @@ export interface ScenarioDeviceOrganisationInfosDTO {
58
57
  deviceOrganisationCode: string;
59
58
  deviceOrganisationLabel: string;
60
59
  overrideTimeRanges: boolean;
61
- timeRanges: TimeRangeDTO[];
60
+ timeRanges: ScenarioTimeRangeDTO[];
62
61
  overrideDelay: boolean;
63
62
  delay: number | null;
64
63
  scenarioIcon: string;
package/models/scenarioOrganisationTypes/scenarioOrganisationTypeDetails.ts CHANGED
@@ -2,8 +2,7 @@ import type { PlotPer, ResolveOn, TriggerOn } from "@dative-gpi/foundation-share
2
2
 
3
3
  import type { ScenarioOrganisationTypeInfosDTO } from "./scenarioOrganisationTypeInfos";
4
4
  import { ScenarioOrganisationTypeInfos } from "./scenarioOrganisationTypeInfos";
5
- import type { CreateTimeRangeDTO, TimeRangeDTO } from "../shared/timeRange";
6
- import { TimeRange } from "../shared/timeRange";
5
+
7
6
  import {
8
7
  ScenarioParameter,
9
8
  ScenarioTranslation,
@@ -13,6 +12,7 @@ import {
13
12
  type ScenarioTranslationDTO
14
13
  } from "../scenarios";
15
14
  import type { CreateChartTimeStepDTO } from "../charts/chartTimeStep";
15
+ import { ScenarioTimeRange, type CreateScenarioTimeRangeDTO, type ScenarioTimeRangeDTO } from '../scenarios/scenarioTimeRange';
16
16
 
17
17
  export class ScenarioOrganisationTypeDetails extends ScenarioOrganisationTypeInfos {
18
18
  groupByIds: string[];
@@ -27,7 +27,7 @@ export class ScenarioOrganisationTypeDetails extends ScenarioOrganisationTypeInf
27
27
  alertCode: string;
28
28
  alertIcon: string;
29
29
  alertTags: string[];
30
- timeRanges: TimeRange[];
30
+ timeRanges: ScenarioTimeRange[];
31
31
  triggerOn: TriggerOn;
32
32
  triggerCondition: string;
33
33
  triggerMin: number | null;
@@ -55,7 +55,7 @@ export class ScenarioOrganisationTypeDetails extends ScenarioOrganisationTypeInf
55
55
  this.alertIcon = params.alertIcon;
56
56
  this.alertCode = params.alertCode;
57
57
  this.alertTags = params.alertTags.slice();
58
- this.timeRanges = params.timeRanges.map(dto => new TimeRange(dto));
58
+ this.timeRanges = params.timeRanges.map(dto => new ScenarioTimeRange(dto));
59
59
  this.triggerOn = params.triggerOn as TriggerOn;
60
60
  this.triggerCondition = params.triggerCondition;
61
61
  this.triggerMin = params.triggerMin;
@@ -84,7 +84,7 @@ export interface ScenarioOrganisationTypeDetailsDTO extends ScenarioOrganisation
84
84
  alertIcon: string;
85
85
  alertCode: string;
86
86
  alertTags: string[];
87
- timeRanges: TimeRangeDTO[];
87
+ timeRanges: ScenarioTimeRangeDTO[];
88
88
  triggerOn: number;
89
89
  triggerCondition: string;
90
90
  triggerMin: number | null;
@@ -124,7 +124,7 @@ export interface UpdateScenarioOrganisationTypeDTO {
124
124
  alertCode: string;
125
125
  alertIcon: string;
126
126
  alertTags: string[];
127
- timeRanges: CreateTimeRangeDTO[];
127
+ timeRanges: CreateScenarioTimeRangeDTO[];
128
128
  triggerOn: number;
129
129
  triggerCondition: string;
130
130
  triggerMin: number | null;
package/models/scenarioOrganisations/scenarioOrganisationDetails.ts CHANGED
@@ -2,8 +2,7 @@ import type { PlotPer, ResolveOn, TriggerOn } from "@dative-gpi/foundation-share
2
2
 
3
3
  import type { ScenarioOrganisationInfosDTO } from "./scenarioOrganisationInfos";
4
4
  import { ScenarioOrganisationInfos } from "./scenarioOrganisationInfos";
5
- import type { CreateTimeRangeDTO, TimeRangeDTO } from "../shared/timeRange";
6
- import { TimeRange } from "../shared/timeRange";
5
+
7
6
  import {
8
7
  ScenarioParameter,
9
8
  ScenarioTranslation,
@@ -13,6 +12,7 @@ import {
13
12
  type ScenarioTranslationDTO
14
13
  } from "../scenarios";
15
14
  import type { CreateChartTimeStepDTO } from "../charts/chartTimeStep";
15
+ import { ScenarioTimeRange, type CreateScenarioTimeRangeDTO, type ScenarioTimeRangeDTO } from '../scenarios/scenarioTimeRange';
16
16
 
17
17
  export class ScenarioOrganisationDetails extends ScenarioOrganisationInfos {
18
18
  groupByIds: string[];
@@ -27,7 +27,7 @@ export class ScenarioOrganisationDetails extends ScenarioOrganisationInfos {
27
27
  alertCode: string;
28
28
  alertIcon: string;
29
29
  alertTags: string[];
30
- timeRanges: TimeRange[];
30
+ timeRanges: ScenarioTimeRange[];
31
31
  triggerOn: TriggerOn;
32
32
  triggerCondition: string;
33
33
  triggerMin: number | null;
@@ -55,7 +55,7 @@ export class ScenarioOrganisationDetails extends ScenarioOrganisationInfos {
55
55
  this.alertCode = params.alertCode;
56
56
  this.alertIcon = params.alertIcon;
57
57
  this.alertTags = params.alertTags.slice();
58
- this.timeRanges = params.timeRanges.map(dto => new TimeRange(dto));
58
+ this.timeRanges = params.timeRanges.map(dto => new ScenarioTimeRange(dto));
59
59
  this.triggerOn = params.triggerOn as TriggerOn;
60
60
  this.triggerCondition = params.triggerCondition;
61
61
  this.triggerMin = params.triggerMin;
@@ -83,7 +83,7 @@ export interface ScenarioOrganisationDetailsDTO extends ScenarioOrganisationInfo
83
83
  alertCode: string;
84
84
  alertIcon: string;
85
85
  alertTags: string[];
86
- timeRanges: TimeRangeDTO[];
86
+ timeRanges: ScenarioTimeRangeDTO[];
87
87
  triggerOn: number;
88
88
  triggerCondition: string;
89
89
  triggerMin: number | null;
@@ -118,7 +118,7 @@ export interface CreateScenarioOrganisationDTO {
118
118
  chartEndDate: string;
119
119
  chartPlotPer: PlotPer | null;
120
120
  chartStep: CreateChartTimeStepDTO | null;
121
- timeRanges: CreateTimeRangeDTO[];
121
+ timeRanges: CreateScenarioTimeRangeDTO[];
122
122
  triggerOn: number;
123
123
  triggerCondition: string;
124
124
  triggerMin: number | null;
@@ -154,7 +154,7 @@ export interface UpdateScenarioOrganisationDTO {
154
154
  alertCode: string;
155
155
  alertIcon: string;
156
156
  alertTags: string[];
157
- timeRanges: CreateTimeRangeDTO[];
157
+ timeRanges: CreateScenarioTimeRangeDTO[];
158
158
  triggerOn: number;
159
159
  triggerCondition: string;
160
160
  triggerMin: number | null;
package/models/scenarios/index.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  export * from "./scenarioTranslation";
2
2
  export * from "./scenarioParameter";
3
3
  export * from "./scenarioChart";
4
- export * from "./translationScenarioParameter";
5
- export * from "./scenarioParameterOverride";
4
+ export * from "./scenarioTimeRange";
5
+ export * from "./scenarioParameterOverride";
6
+ export * from "./translationScenarioParameter";
package/models/scenarios/scenarioTimeRange.ts ADDED
@@ -0,0 +1,31 @@
1
+ import type { Days } from "@dative-gpi/foundation-shared-domain/enums";
2
+ import { TimeRange } from "../shared/timeRange";
3
+
4
+ export class ScenarioTimeRange extends TimeRange {
5
+ timeZoneId: string | null;
6
+
7
+ constructor(params: ScenarioTimeRangeDTO) {
8
+ super(params);
9
+ this.timeZoneId = params.timeZoneId ?? null;
10
+ }
11
+ }
12
+
13
+ export interface ScenarioTimeRangeDTO {
14
+ startDay: Days;
15
+ startHour: number;
16
+ startMinute: number;
17
+ endDay: Days;
18
+ endHour: number;
19
+ endMinute: number;
20
+ timeZoneId?: string | null;
21
+ }
22
+
23
+ export interface CreateScenarioTimeRangeDTO {
24
+ startDay: Days;
25
+ startHour: number;
26
+ startMinute: number;
27
+ endDay: Days;
28
+ endHour: number;
29
+ endMinute: number;
30
+ timeZoneId: string;
31
+ }
package/models/shared/timeRange.ts CHANGED
@@ -1,4 +1,4 @@
1
- import type { Days, DateType } from "@dative-gpi/foundation-shared-domain/enums";
1
+ import type { Days } from "@dative-gpi/foundation-shared-domain/enums";
2
2
 
3
3
  export class TimeRange {
4
4
  startDay: Days;
@@ -7,7 +7,6 @@ export class TimeRange {
7
7
  endDay: Days;
8
8
  endHour: number;
9
9
  endMinute: number;
10
- variant: DateType;
11
10
 
12
11
  constructor(params: TimeRangeDTO) {
13
12
  this.startDay = params.startDay;
@@ -16,7 +15,6 @@ export class TimeRange {
16
15
  this.endDay = params.endDay;
17
16
  this.endHour = params.endHour;
18
17
  this.endMinute = params.endMinute;
19
- this.variant = params.variant;
20
18
  }
21
19
  }
22
20
 
@@ -27,7 +25,6 @@ export interface TimeRangeDTO {
27
25
  endDay: Days;
28
26
  endHour: number;
29
27
  endMinute: number;
30
- variant: DateType;
31
28
  }
32
29
 
33
30
  export interface CreateTimeRangeDTO {
@@ -37,5 +34,4 @@ export interface CreateTimeRangeDTO {
37
34
  endDay: Days;
38
35
  endHour: number;
39
36
  endMinute: number;
40
- variant: DateType;
41
37
  }
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "url": "https://github.com/Dative-GPI/foundation-shared-ui.git"
5
5
  },
6
6
  "sideEffects": false,
7
- "version": "1.1.29",
7
+ "version": "1.1.30-timerange2",
8
8
  "description": "",
9
9
  "publishConfig": {
10
10
  "access": "public"
@@ -13,8 +13,8 @@
13
13
  "author": "",
14
14
  "license": "ISC",
15
15
  "dependencies": {
16
- "@dative-gpi/foundation-shared-domain": "1.1.29",
17
- "@dative-gpi/foundation-shared-services": "1.1.29"
16
+ "@dative-gpi/foundation-shared-domain": "1.1.30-timerange2",
17
+ "@dative-gpi/foundation-shared-services": "1.1.30-timerange2"
18
18
  },
19
- "gitHead": "9818edd929a8928ce8176cd3eb6c480af6a0d084"
19
+ "gitHead": "edf64fc77d32073ba98757c8b00c33958c24e4c4"
20
20
  }