@dative-gpi/foundation-core-domain 1.0.66 → 1.0.67-map-edit

package/models/actions/actionInfos.ts

@@ -7,6 +7,7 @@ export class ActionInfos {
     uri: string;
     label: string;
     icon: string;
+    color: string | null;
     
     constructor(params: ActionInfosDTO) {
         this.extensionId = params.extensionId;
@@ -15,6 +16,7 @@ export class ActionInfos {
         this.uri = params.uri;
         this.label = params.label;
         this.icon = params.icon;
+        this.color = params.color ?? null;
     }
 }
 
@@ -25,6 +27,7 @@ export interface ActionInfosDTO {
     uri: string;
     label: string;
     icon: string;
+    color?: string | null;
 }
 
 export interface ActionFilters {

package/models/alerts/alertDetails.ts

@@ -1,24 +1,17 @@
-import type { ApplicationScope } from "@/shared/foundation-shared-domain/enums";
 import { AlertInfos, type AlertInfosDTO } from "./alertInfos";
 
 export class AlertDetails extends AlertInfos {
   description: string;
   comments: string;
-  scenarioId: string;
-  scenarioScope: ApplicationScope;
 
   constructor(params: AlertDetailsDTO) {
     super(params);
     this.comments = params.comments;
     this.description = params.description;
-    this.scenarioId = params.scenarioId;
-    this.scenarioScope = params.scenarioScope;
   }
 }
 
 export interface AlertDetailsDTO extends AlertInfosDTO {
   description: string;
   comments: string;
-  scenarioId: string;
-  scenarioScope: ApplicationScope;
 }

package/models/alerts/alertInfos.ts

@@ -1,4 +1,4 @@
-import { type AlertStatus, type Criticity } from "@dative-gpi/foundation-shared-domain/enums";
+import { type ApplicationScope, type AlertStatus, type Criticity } from "@dative-gpi/foundation-shared-domain/enums";
 import { isoToEpoch } from "@dative-gpi/foundation-shared-domain/tools";
 
 import { AlertDataDefinition, type AlertDataDefinitionDTO } from "./alertDataDefinition";
@@ -8,13 +8,16 @@ import { type DateVariable } from "../shared/dateVariable";
 
 export class AlertInfos {
   id: string;
-  deprecatedScenarioId: string;
+  scenarioId: string;
+  scenarioScope: ApplicationScope;
   scenarioLabel: string;
   organisationId: string;
   deviceOrganisationId: string;
   deviceOrganisationImageId: string | null;
   deviceOrganisationCode: string;
   deviceOrganisationLabel: string;
+  deviceOrganisationLocationLabel: string | null;
+  deviceOrganisationOwnerLabel: string | null;
   icon: string;
   code: string;
   label: string;
@@ -28,24 +31,29 @@ export class AlertInfos {
   triggerSourceTimestamp: number | null;
   triggerEnqueuedTimestamp: number | null;
   triggerProcessedTimestamp: number | null;
+  triggerActualTimestamp: number | null;
   lastState: AlertState;
   currentSourceTimestamp: number | null;
   currentEnqueuedTimestamp: number | null;
   currentProcessedTimestamp: number | null;
-  status: AlertStatus;
+  currentActualTimestamp: number | null;
+  currentStatus: AlertStatus;
   tags: string[];
   history: AlertState[];
   groupByValues: AlertDataDefinition[];
 
   constructor(params: AlertInfosDTO) {
     this.id = params.id;
-    this.deprecatedScenarioId = params.deprecatedScenarioId;
+    this.scenarioId = params.scenarioId;
+    this.scenarioScope = params.scenarioScope;
     this.scenarioLabel = params.scenarioLabel;
     this.organisationId = params.organisationId;
     this.deviceOrganisationId = params.deviceOrganisationId;
     this.deviceOrganisationImageId = params.deviceOrganisationImageId;
     this.deviceOrganisationCode = params.deviceOrganisationCode;
     this.deviceOrganisationLabel = params.deviceOrganisationLabel;
+    this.deviceOrganisationLocationLabel = params.deviceOrganisationLocationLabel;
+    this.deviceOrganisationOwnerLabel = params.deviceOrganisationOwnerLabel;
     this.icon = params.icon;
     this.code = params.code;
     this.label = params.label;
@@ -63,6 +71,8 @@ export class AlertInfos {
       isoToEpoch(params.triggerEnqueuedTimestamp) : null;
     this.triggerProcessedTimestamp = params.triggerProcessedTimestamp ?
       isoToEpoch(params.triggerProcessedTimestamp) : null;
+    this.triggerActualTimestamp = params.triggerActualTimestamp ?
+      isoToEpoch(params.triggerActualTimestamp) : null;
     this.lastState = new AlertState(params.lastState);
     this.currentSourceTimestamp = params.currentSourceTimestamp ?
       isoToEpoch(params.currentSourceTimestamp) : null;
@@ -70,7 +80,9 @@ export class AlertInfos {
       isoToEpoch(params.currentEnqueuedTimestamp) : null;
     this.currentProcessedTimestamp = params.currentProcessedTimestamp ?
       isoToEpoch(params.currentProcessedTimestamp) : null;
-    this.status = params.status;
+    this.currentActualTimestamp = params.currentActualTimestamp ?
+      isoToEpoch(params.currentActualTimestamp) : null;
+    this.currentStatus = params.currentStatus;
     this.tags = params.tags;
     this.history = params.history.map(dto => new AlertState(dto));
     this.groupByValues = params.groupByValues.map(dto => new AlertDataDefinition(dto));
@@ -79,13 +91,16 @@ export class AlertInfos {
 
 export interface AlertInfosDTO {
   id: string;
-  deprecatedScenarioId: string;
+  scenarioId: string;
+  scenarioScope: ApplicationScope;
   scenarioLabel: string;
   organisationId: string;
   deviceOrganisationId: string;
   deviceOrganisationImageId: string | null;
   deviceOrganisationCode: string;
   deviceOrganisationLabel: string;
+  deviceOrganisationLocationLabel: string | null;
+  deviceOrganisationOwnerLabel: string | null;
   icon: string;
   code: string;
   label: string;
@@ -99,18 +114,21 @@ export interface AlertInfosDTO {
   triggerSourceTimestamp: string | null;
   triggerEnqueuedTimestamp: string | null;
   triggerProcessedTimestamp: string | null;
+  triggerActualTimestamp: string | null;
   lastState: AlertStateDTO;
   currentSourceTimestamp: string | null;
   currentEnqueuedTimestamp: string | null;
   currentProcessedTimestamp: string | null;
-  status: AlertStatus;
+  currentActualTimestamp: string | null;
+  currentStatus: AlertStatus;
   tags: string[];
   history: AlertStateDTO[];
   groupByValues: AlertDataDefinitionDTO[];
 }
 
 export interface AlertFilters {
-  deprecatedScenarioId?: string | null;
+  scenarioId?: string | null;
+  scenarioScope?: ApplicationScope | null;
   deviceOrganisationId?: string | null;
   statuses?: AlertStatus[] | null;
   acknowledged?: boolean | null;

package/models/alerts/alertState.ts

@@ -6,17 +6,19 @@ import { AlertDataDefinition, type AlertDataDefinitionDTO } from "./alertDataDef
 export class AlertState {
   id: string;
   status: AlertStatus;
-  sourceTimestamp: number;
-  enqueuedTimestamp: number;
+  sourceTimestamp: number | null;
+  enqueuedTimestamp: number | null;
   processedTimestamp: number;
+  actualTimestamp: number;
   metadataValues?: AlertDataDefinition[];
 
   constructor(params: AlertStateDTO) {
     this.id = params.id;
     this.status = params.status;
-    this.sourceTimestamp = isoToEpoch(params.sourceTimestamp);
-    this.enqueuedTimestamp = isoToEpoch(params.enqueuedTimestamp);
+    this.sourceTimestamp = params.sourceTimestamp ? isoToEpoch(params.sourceTimestamp) : null;
+    this.enqueuedTimestamp = params.enqueuedTimestamp ? isoToEpoch(params.enqueuedTimestamp) : null;
     this.processedTimestamp = isoToEpoch(params.processedTimestamp);
+    this.actualTimestamp = isoToEpoch(params.actualTimestamp);
     this.metadataValues = params.metadataValues?.map(dto => new AlertDataDefinition(dto));
   }
 }
@@ -24,8 +26,9 @@ export class AlertState {
 export interface AlertStateDTO {
   id: string;
   status: AlertStatus;
-  sourceTimestamp: string;
-  enqueuedTimestamp: string;
+  sourceTimestamp: string | null;
+  enqueuedTimestamp: string | null;
   processedTimestamp: string;
+  actualTimestamp: string;
   metadataValues?: AlertDataDefinitionDTO[];
 }

package/models/chartCategories/chartCategoryDetails.ts

@@ -23,11 +23,13 @@ export interface ChartCategoryDetailsDTO extends ChartCategoryInfosDTO {
 export interface CreateChartCategoryDTO {
   labelDefault: string;
   code: string;
+  index: number;
   translations: ChartCategoryTranslationDTO[];
 }
 
 export interface UpdateChartCategoryDTO {
   labelDefault: string;
   code: string;
+  index: number;
   translations: ChartCategoryTranslationDTO[];
 }

package/models/chartCategories/chartCategoryInfos.ts

@@ -2,11 +2,13 @@ export class ChartCategoryInfos {
   id: string;
   label: string;
   code: string;
+  index: number;
 
   constructor(params: ChartCategoryInfosDTO) {
     this.id = params.id;
     this.label = params.label;
     this.code = params.code;
+    this.index = params.index;
   }
 }
 
@@ -14,6 +16,7 @@ export interface ChartCategoryInfosDTO {
   id: string;
   label: string;
   code: string;
+  index: number;
 }
 
 export interface ChartCategoryFilters {

package/models/chartOrganisationTypes/chartOrganisationTypeDetails.ts

@@ -13,14 +13,15 @@ import { ChartAxis } from "../charts/chartAxis";
 import type { ChartPlotDTO, CreateChartPlotDTO } from "../charts/chartPlot";
 import { ChartPlot } from "../charts/chartPlot";
 import { ChartFilter } from "../charts/chartFilter";
-import type { ChartFilterDTO,CreateChartFilterDTO } from "../charts/chartFilter";
+import type { ChartFilterDTO, CreateChartFilterDTO } from "../charts/chartFilter";
 import { ChartModifier } from "../charts/chartModifier";
-import type { ChartModifierDTO,CreateChartModifierDTO } from "../charts/chartModifier";
+import type { ChartModifierDTO, CreateChartModifierDTO } from "../charts/chartModifier";
 import { ChartOperand } from "../charts/chartOperand";
-import type { ChartOperandDTO,CreateChartOperandDTO } from "../charts/chartOperand";
+import type { ChartOperandDTO, CreateChartOperandDTO } from "../charts/chartOperand";
 import { ChartSerie } from "../charts/chartSerie";
-import type { ChartSerieDTO,CreateChartSerieDTO } from "../charts/chartSerie";
+import type { ChartSerieDTO, CreateChartSerieDTO } from "../charts/chartSerie";
 import type { ColorSets } from "@dative-gpi/foundation-shared-domain/enums";
+import { ChartAllowedStep, type ChartAllowedStepDTO, type CreateChartAllowedStepDTO } from "../charts/chartAllowedStep";
 
 export class ChartOrganisationTypeDetails extends ChartOrganisationTypeInfos {
   labelDefault: string;
@@ -30,6 +31,8 @@ export class ChartOrganisationTypeDetails extends ChartOrganisationTypeInfos {
   xAxis: ChartAxis | null;
   aggregates: boolean | null;
   dynamicVariables: boolean | null;
+  showAllowedStep: boolean | null;
+  showPlotPerOnGraph: boolean | null;
   chartVariables: ChartVariable[];
   chartPresets: ChartPreset[];
   chartPresetFilters: ChartPresetFilter[];
@@ -39,6 +42,7 @@ export class ChartOrganisationTypeDetails extends ChartOrganisationTypeInfos {
   chartFilters: ChartFilter[];
   chartModifiers: ChartModifier[];
   yAxis: ChartAxis[];
+  chartAllowedSteps: ChartAllowedStep[];
   translations: ChartTranslation[];
 
   constructor(params: ChartOrganisationTypeDetailsDTO) {
@@ -52,6 +56,8 @@ export class ChartOrganisationTypeDetails extends ChartOrganisationTypeInfos {
       new ChartAxis(params.xAxis) : null;
     this.aggregates = params.aggregates;
     this.dynamicVariables = params.dynamicVariables;
+    this.showAllowedStep = params.showAllowedStep;
+    this.showPlotPerOnGraph = params.showPlotPerOnGraph;
     this.chartVariables = params.chartVariables.map(cv => new ChartVariable(cv));
     this.chartPresets = params.chartPresets.map(cp => new ChartPreset(cp));
     this.chartPresetFilters = params.chartPresetFilters.map(cpf => new ChartPresetFilter(cpf));
@@ -61,6 +67,7 @@ export class ChartOrganisationTypeDetails extends ChartOrganisationTypeInfos {
     this.chartFilters = params.chartFilters.map(cf => new ChartFilter(cf));
     this.chartModifiers = params.chartModifiers.map(cm => new ChartModifier(cm));
     this.yAxis = params.yAxis.map(ya => new ChartAxis(ya));
+    this.chartAllowedSteps = params.chartAllowedSteps.map(cas => new ChartAllowedStep(cas));
     this.translations = params.translations.map((translation) => new ChartTranslation(translation));
   }
 }
@@ -73,6 +80,8 @@ export interface ChartOrganisationTypeDetailsDTO extends ChartOrganisationTypeIn
   xAxis: ChartAxisDTO | null;
   aggregates: boolean | null;
   dynamicVariables: boolean | null;
+  showAllowedStep: boolean | null;
+  showPlotPerOnGraph: boolean | null;
   chartVariables: ChartVariableDTO[];
   chartPresets: ChartPresetDTO[];
   chartPresetFilters: ChartPresetFilterDTO[];
@@ -82,6 +91,7 @@ export interface ChartOrganisationTypeDetailsDTO extends ChartOrganisationTypeIn
   chartFilters: ChartFilterDTO[];
   chartModifiers: ChartModifierDTO[];
   yAxis: ChartAxisDTO[];
+  chartAllowedSteps: ChartAllowedStepDTO[];
   translations: ChartTranslationDTO[];
 }
 
@@ -106,6 +116,8 @@ export interface UpdateChartOrganisationTypeDTO {
   xAxis: CreateChartAxisDTO | null;
   aggregates: boolean | null;
   dynamicVariables: boolean | null;
+  showAllowedStep: boolean | null;
+  showPlotPerOnGraph: boolean | null;
   chartVariables: CreateChartVariableDTO[];
   chartPresets: CreateChartPresetDTO[];
   chartPresetFilters: CreateChartPresetFilterDTO[];
@@ -115,5 +127,6 @@ export interface UpdateChartOrganisationTypeDTO {
   chartFilters: CreateChartFilterDTO[];
   chartModifiers: CreateChartModifierDTO[];
   yAxis: CreateChartAxisDTO[];
+  chartAllowedSteps: CreateChartAllowedStepDTO[];
   translations: ChartTranslationDTO[];
 }

package/models/chartOrganisationTypes/chartOrganisationTypeInfos.ts

@@ -11,11 +11,13 @@ export class ChartOrganisationTypeInfos {
   organisationTypeLabel: string;
   chartCategoryId: string | null;
   chartCategoryLabel: string | null;
+  chartCategoryIndex: number | null;
   scope: ApplicationScope;
   label: string;
   title: string;
   code: string;
   icon: string;
+  draft: boolean;
   tags: string[];
   multiple: boolean;
   chartType: ChartType;
@@ -29,11 +31,13 @@ export class ChartOrganisationTypeInfos {
     this.organisationTypeLabel = params.organisationTypeLabel;
     this.chartCategoryId = params.chartCategoryId;
     this.chartCategoryLabel = params.chartCategoryLabel;
+    this.chartCategoryIndex = params.chartCategoryIndex;
     this.scope = params.scope;
     this.label = params.label;
     this.title = params.title;
     this.code = params.code;
     this.icon = params.icon;
+    this.draft = params.draft;
     this.tags = params.tags.slice();
     this.multiple = params.multiple;
     this.chartType = params.chartType;
@@ -48,11 +52,13 @@ export interface ChartOrganisationTypeInfosDTO {
   organisationTypeLabel: string;
   chartCategoryId: string | null;
   chartCategoryLabel: string | null;
+  chartCategoryIndex: number | null;
   scope: ApplicationScope;
   label: string;
   title: string;
   code: string;
   icon: string;
+  draft: boolean;
   imageId: string | null;
   tags: string[];
   multiple: boolean;
@@ -62,7 +68,10 @@ export interface ChartOrganisationTypeInfosDTO {
 
 export interface ChartOrganisationTypeFilters {
   modelsIds?: string[] | null;
-  plotPer?: PlotPer | null;
+  plotPers?: PlotPer[] | null;
   search?: string | null;
+  draft?: boolean | null;
   deprecatedChartId?: string | null;
+  deviceOrganisationsIds?: string[] | null
+  dataDefinitionsIds?: string[] | null;
 }

package/models/chartOrganisations/chartOrganisationDetails.ts

@@ -13,14 +13,15 @@ import { ChartAxis } from "../charts/chartAxis";
 import type { ChartPlotDTO, CreateChartPlotDTO } from "../charts/chartPlot";
 import { ChartPlot } from "../charts/chartPlot";
 import { ChartFilter } from "../charts/chartFilter";
-import type { ChartFilterDTO,CreateChartFilterDTO } from "../charts/chartFilter";
+import type { ChartFilterDTO, CreateChartFilterDTO } from "../charts/chartFilter";
 import { ChartModifier } from "../charts/chartModifier";
-import type { ChartModifierDTO,CreateChartModifierDTO } from "../charts/chartModifier";
+import type { ChartModifierDTO, CreateChartModifierDTO } from "../charts/chartModifier";
 import { ChartOperand } from "../charts/chartOperand";
-import type { ChartOperandDTO,CreateChartOperandDTO } from "../charts/chartOperand";
+import type { ChartOperandDTO, CreateChartOperandDTO } from "../charts/chartOperand";
 import { ChartSerie } from "../charts/chartSerie";
-import type { ChartSerieDTO,CreateChartSerieDTO } from "../charts/chartSerie";
+import type { ChartSerieDTO, CreateChartSerieDTO } from "../charts/chartSerie";
 import type { ColorSets } from "@dative-gpi/foundation-shared-domain/enums";
+import { ChartAllowedStep, type ChartAllowedStepDTO, type CreateChartAllowedStepDTO } from "../charts/chartAllowedStep";
 
 export class ChartOrganisationDetails extends ChartOrganisationInfos {
   labelDefault: string;
@@ -30,6 +31,8 @@ export class ChartOrganisationDetails extends ChartOrganisationInfos {
   xAxis: ChartAxis | null;
   aggregates: boolean | null;
   dynamicVariables: boolean | null;
+  showAllowedStep: boolean | null;
+  showPlotPerOnGraph: boolean | null;
   chartVariables: ChartVariable[];
   chartPresets: ChartPreset[];
   chartPresetFilters: ChartPresetFilter[];
@@ -39,6 +42,7 @@ export class ChartOrganisationDetails extends ChartOrganisationInfos {
   chartModifiers: ChartModifier[];
   chartFilters: ChartFilter[];
   yAxis: ChartAxis[];
+  chartAllowedSteps: ChartAllowedStep[];
   translations: ChartTranslation[];
 
   constructor(params: ChartOrganisationDetailsDTO) {
@@ -49,9 +53,11 @@ export class ChartOrganisationDetails extends ChartOrganisationInfos {
     this.colorSet = params.colorSet as ColorSets;
     this.colorSeed = params.colorSeed;
     this.xAxis = params.xAxis ?
-        new ChartAxis(params.xAxis) : null;
+      new ChartAxis(params.xAxis) : null;
     this.aggregates = params.aggregates;
     this.dynamicVariables = params.dynamicVariables;
+    this.showAllowedStep = params.showAllowedStep;
+    this.showPlotPerOnGraph = params.showPlotPerOnGraph;
     this.chartVariables = params.chartVariables.map(cv => new ChartVariable(cv));
     this.chartPresets = params.chartPresets.map(cp => new ChartPreset(cp));
     this.chartPresetFilters = params.chartPresetFilters.map(cpf => new ChartPresetFilter(cpf));
@@ -61,6 +67,7 @@ export class ChartOrganisationDetails extends ChartOrganisationInfos {
     this.chartModifiers = params.chartModifiers.map(cm => new ChartModifier(cm));
     this.chartFilters = params.chartFilters.map(cf => new ChartFilter(cf));
     this.yAxis = params.yAxis.map(ya => new ChartAxis(ya));
+    this.chartAllowedSteps = params.chartAllowedSteps.map(cas => new ChartAllowedStep(cas));
     this.translations = params.translations.map(t => new ChartTranslation(t));
   }
 }
@@ -73,6 +80,8 @@ export interface ChartOrganisationDetailsDTO extends ChartOrganisationInfosDTO {
   xAxis: ChartAxisDTO | null;
   aggregates: boolean | null;
   dynamicVariables: boolean | null;
+  showAllowedStep: boolean | null;
+  showPlotPerOnGraph: boolean | null;
   chartVariables: ChartVariableDTO[];
   chartPresets: ChartPresetDTO[];
   chartPresetFilters: ChartPresetFilterDTO[];
@@ -81,7 +90,8 @@ export interface ChartOrganisationDetailsDTO extends ChartOrganisationInfosDTO {
   chartOperands: ChartOperandDTO[];
   chartModifiers: ChartModifierDTO[];
   chartFilters: ChartFilterDTO[];
-  yAxis: ChartAxisDTO[]
+  yAxis: ChartAxisDTO[];
+  chartAllowedSteps: ChartAllowedStepDTO[];
   translations: ChartTranslationDTO[];
 }
 
@@ -113,6 +123,8 @@ export interface UpdateChartOrganisationDTO {
   xAxis: CreateChartAxisDTO | null;
   aggregates: boolean | null;
   dynamicVariables: boolean | null;
+  showAllowedStep: boolean | null;
+  showPlotPerOnGraph: boolean | null;
   chartVariables: CreateChartVariableDTO[];
   chartPresets: CreateChartPresetDTO[];
   chartPresetFilters: CreateChartPresetFilterDTO[];
@@ -121,6 +133,7 @@ export interface UpdateChartOrganisationDTO {
   chartOperands: CreateChartOperandDTO[];
   chartModifiers: CreateChartModifierDTO[];
   chartFilters: CreateChartFilterDTO[];
-  yAxis: ChartAxisDTO[];
+  yAxis: CreateChartAxisDTO[];
+  chartAllowedSteps: CreateChartAllowedStepDTO[];
   translations: ChartTranslationDTO[];
 }

package/models/chartOrganisations/chartOrganisationInfos.ts

@@ -10,11 +10,13 @@ export class ChartOrganisationInfos {
   organisationId: string;
   chartCategoryId: string | null;
   chartCategoryLabel: string | null;
+  chartCategoryIndex: number | null;
   scope: ApplicationScope;
   label: string;
   title: string;
   code: string;
   icon: string;
+  draft: boolean;
   tags: string[];
   multiple: boolean;
   chartType: ChartType;
@@ -27,11 +29,13 @@ export class ChartOrganisationInfos {
     this.organisationId = params.organisationId;
     this.chartCategoryId = params.chartCategoryId;
     this.chartCategoryLabel = params.chartCategoryLabel;
+    this.chartCategoryIndex = params.chartCategoryIndex;
     this.scope = params.scope;
     this.label = params.label;
     this.title = params.title;
     this.code = params.code;
     this.icon = params.icon;
+    this.draft = params.draft;
     this.tags = params.tags.slice();
     this.multiple = params.multiple;
     this.chartType = params.chartType;
@@ -46,11 +50,13 @@ export interface ChartOrganisationInfosDTO {
   organisationId: string;
   chartCategoryId: string | null;
   chartCategoryLabel: string | null;
+  chartCategoryIndex: number | null;
   scope: ApplicationScope;
   label: string;
   title: string;
   code: string;
   icon: string;
+  draft: boolean;
   tags: string[];
   multiple: boolean;
   chartType: ChartType;
@@ -59,7 +65,10 @@ export interface ChartOrganisationInfosDTO {
 
 export interface ChartOrganisationFilters {
   modelsIds?: string[] | null;
-  plotPer?: PlotPer | null;
+  plotPers?: PlotPer[] | null;
   search?: string | null;
+  draft?: boolean | null;
   deprecatedChartId?: string | null;
+  deviceOrganisationsIds?: string[] | null;
+  dataDefinitionsIds?: string[] | null;
 }

package/models/charts/chartAllowedStep.ts

@@ -0,0 +1,31 @@
+import { ChartAllowedStepTranslation, type ChartAllowedStepTranslationDTO, type CreateChartAllowedStepTranslationDTO } from "./chartAllowedStepTranslation";
+
+export class ChartAllowedStep {
+  id: string;
+  value: string;
+  labelDefault: string;
+  label: string;
+  translations: ChartAllowedStepTranslation[];
+
+  constructor(params: ChartAllowedStepDTO) {
+    this.id = params.id;
+    this.labelDefault = params.labelDefault;
+    this.value = params.value;
+    this.label = params.label;
+    this.translations = params.translations.map(t => new ChartAllowedStepTranslation(t));
+  }
+}
+
+export interface ChartAllowedStepDTO {
+  id: string;
+  value: string;
+  labelDefault: string;
+  label: string;
+  translations: ChartAllowedStepTranslationDTO[];
+}
+
+export interface CreateChartAllowedStepDTO {
+  value: string;
+  labelDefault: string;
+  translations: CreateChartAllowedStepTranslationDTO[];
+}

package/models/charts/chartAllowedStepTranslation.ts

@@ -0,0 +1,19 @@
+export class ChartAllowedStepTranslation {
+  languageCode: string;
+  label: string;
+
+  constructor(params: ChartAllowedStepTranslationDTO) {
+    this.languageCode = params.languageCode;
+    this.label = params.label;
+  }
+}
+
+export interface ChartAllowedStepTranslationDTO {
+  languageCode: string;
+  label: string;
+}
+
+export interface CreateChartAllowedStepTranslationDTO {
+  languageCode: string;
+  label: string;
+}

package/models/charts/chartDetails.ts

@@ -16,8 +16,10 @@ import { ChartOperand } from "./chartOperand";
 import type { ChartOperandDTO } from "./chartOperand";
 import { ChartModifier } from "./chartModifier";
 import type { ChartModifierDTO } from "./chartModifier";
-import { ChartFilter} from "./chartFilter";
+import { ChartFilter } from "./chartFilter";
 import type { ChartFilterDTO } from "./chartFilter";
+import { ChartAllowedStep } from "./chartAllowedStep";
+import type { ChartAllowedStepDTO } from "./chartAllowedStep";
 
 import type { ColorSets } from "@dative-gpi/foundation-shared-domain/enums";
 
@@ -27,6 +29,8 @@ export class ChartDetails extends ChartInfos {
   xAxis: ChartAxis | null;
   aggregates: boolean | null;
   dynamicVariables: boolean | null;
+  showAllowedStep: boolean | null;
+  showPlotPerOnGraph: boolean | null;
   chartVariables: ChartVariable[];
   chartSeries: ChartSerie[];
   chartOperands: ChartOperand[];
@@ -36,6 +40,7 @@ export class ChartDetails extends ChartInfos {
   chartPresets: ChartPreset[];
   chartPresetFilters: ChartPresetFilter[];
   chartPlots: ChartPlot[];
+  chartAllowedSteps: ChartAllowedStep[];
 
   constructor(params: ChartDetailsDTO) {
     super(params);
@@ -46,6 +51,8 @@ export class ChartDetails extends ChartInfos {
       new ChartAxis(params.xAxis) : null;
     this.aggregates = params.aggregates;
     this.dynamicVariables = params.dynamicVariables;
+    this.showAllowedStep = params.showAllowedStep;
+    this.showPlotPerOnGraph = params.showPlotPerOnGraph;
     this.chartVariables = params.chartVariables.map(cv => new ChartVariable(cv));
     this.chartPresets = params.chartPresets.map(cp => new ChartPreset(cp));
     this.chartPresetFilters = params.chartPresetFilters.map(cpf => new ChartPresetFilter(cpf));
@@ -55,6 +62,7 @@ export class ChartDetails extends ChartInfos {
     this.chartModifiers = params.chartModifiers.map(cm => new ChartModifier(cm));
     this.chartFilters = params.chartFilters.map(cf => new ChartFilter(cf));
     this.yAxis = params.yAxis.map(ya => new ChartAxis(ya));
+    this.chartAllowedSteps = params.chartAllowedSteps.map(cas => new ChartAllowedStep(cas));
   }
 }
 
@@ -64,6 +72,8 @@ export interface ChartDetailsDTO extends ChartInfosDTO {
   xAxis: ChartAxisDTO | null;
   aggregates: boolean | null;
   dynamicVariables: boolean | null;
+  showAllowedStep: boolean | null;
+  showPlotPerOnGraph: boolean | null;
   chartVariables: ChartVariableDTO[];
   chartPresets: ChartPresetDTO[];
   chartSeries: ChartSerieDTO[];
@@ -73,4 +83,5 @@ export interface ChartDetailsDTO extends ChartInfosDTO {
   yAxis: ChartAxisDTO[];
   chartPresetFilters: ChartPresetFilterDTO[];
   chartPlots: ChartPlotDTO[];
+  chartAllowedSteps: ChartAllowedStepDTO[];
 }

package/models/charts/chartInfos.ts

@@ -8,11 +8,13 @@ export class ChartInfos {
   imageId: string | null;
   chartCategoryId: string | null;
   chartCategoryLabel: string | null;
+  chartCategoryIndex: number | null;
   scope: ApplicationScope;
   label: string;
   title: string;
   icon: string;
   code: string;
+  draft: boolean;
   tags: string[];
   multiple: boolean;
   chartType: ChartType;
@@ -23,11 +25,13 @@ export class ChartInfos {
     this.imageId = params.imageId;
     this.chartCategoryId = params.chartCategoryId;
     this.chartCategoryLabel = params.chartCategoryLabel;
+    this.chartCategoryIndex = params.chartCategoryIndex;
     this.scope = params.scope;
     this.label = params.label;
     this.title = params.title;
     this.icon = params.icon;
     this.code = params.code;
+    this.draft = params.draft;
     this.tags = params.tags.slice();
     this.multiple = params.multiple;
     this.chartType = params.chartType;
@@ -40,11 +44,13 @@ export interface ChartInfosDTO {
   imageId: string | null;
   chartCategoryId: string | null;
   chartCategoryLabel: string | null;
+  chartCategoryIndex: number | null;
   scope: ApplicationScope;
   label: string;
   title: string;
   icon: string;
   code: string;
+  draft: boolean;
   tags: string[];
   multiple: boolean;
   chartType: ChartType;